From 89e7167a83e0d8409ca87698e4c08651a37cc26e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 12 六月 2020 18:19:35 +0800
Subject: [PATCH] 2020-06-12

---
 src/tabviews/verupmanage/index.jsx |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/tabviews/verupmanage/index.jsx b/src/tabviews/verupmanage/index.jsx
index bc2f11f..373bd50 100644
--- a/src/tabviews/verupmanage/index.jsx
+++ b/src/tabviews/verupmanage/index.jsx
@@ -9,15 +9,15 @@
 import enUS from '@/locales/en-US/main.js'
 import Utils from '@/utils/utils.js'
 import options from '@/store/options.js'
-import asyncLoadComponent from '@/utils/asyncLoadComponent'
+import asyncSpinComponent from '@/utils/asyncSpinComponent'
 import { verupMainTable, buttonConfig } from './config'
 
-import MainTable from '@/tabviews/zshare/normalTable'
 import TopSearch from './topSearch'
 import MainAction from './actionList'
 import './index.scss'
 
-const SubTable = asyncLoadComponent(() => import('./subtabtable'))
+const SubTable = asyncSpinComponent(() => import('./subtabtable'))
+const MainTable = asyncSpinComponent(() => import('@/tabviews/zshare/normalTable'))
 
 const { TabPane } = Tabs
 
@@ -39,6 +39,8 @@
     logcolumns: null,     // 鏃ュ織涓樉绀虹殑鍒椾俊鎭� (澧炲姞鑷冲叏閮ㄥ垪锛岄櫎鍘诲悎骞跺垪)
     setting: {},          // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
     data: [],             // 鍒楄〃鏁版嵁闆�
+    selectedData: [],     // 宸查�夎〃鏍兼暟鎹�
+    resetTable: false,    // 琛ㄦ牸閲嶇疆锛屽�煎湪true涓巉alse涔嬮棿鍒囨崲锛屽垏鎹㈡椂琛ㄦ牸閲嶇疆
     total: 0,             // 鎬绘暟
     loading: false,       // 鍒楄〃鏁版嵁鍔犺浇涓�
     pageIndex: 1,         // 椤电爜
@@ -274,11 +276,11 @@
    * 鍚湁鍒濆涓嶅姞杞界殑椤甸潰锛屼慨鏀硅缃�
    */
   refreshbysearch = (searches) => {
-    this.refs.mainTable.resetTable()
-
     this.setState({
       loading: true,
       pageIndex: 1,
+      selectedData: [],
+      resetTable: !this.state.resetTable,
       search: searches
     }, () => {
       this.loadmaindata()
@@ -299,6 +301,7 @@
 
     this.setState({
       loading: true,
+      selectedData: [],
       pageIndex: pagination.current,
       pageSize: pagination.pageSize,
       orderBy: (sorter.field && sorter.order) ? `${sorter.field} ${sorter.order}` : ''
@@ -311,10 +314,11 @@
    * @description 琛ㄦ牸鍒锋柊
    */
   reloadtable = () => {
-    this.refs.mainTable.resetTable()
     this.setState({
+      pageIndex: 1,
       loading: true,
-      pageIndex: 1
+      selectedData: [],
+      resetTable: !this.state.resetTable
     }, () => {
       this.loadmaindata()
     })
@@ -386,14 +390,10 @@
   }
 
   /**
-   * @description 鑾峰彇琛ㄦ牸閫夋嫨椤�
+   * @description 琛ㄦ牸閫夋嫨椤瑰垏鎹�
    */
-  gettableselected = () => {
-    let data = []
-    this.refs.mainTable.state.selectedRowKeys.forEach(item => {
-      data.push(this.refs.mainTable.props.data[item])
-    })
-    return data
+  changeSelectedData = (selectedData) => {
+    this.setState({selectedData})
   }
 
   /**
@@ -440,7 +440,7 @@
   }
 
   render() {
-    const { dict, searchlist, setting, actions, columns, pickup, config } = this.state
+    const { dict, searchlist, setting, actions, columns, pickup, config, selectedData } = this.state
 
     return (
       <div className="veruptable pick-control" id={this.state.ContainerId}>
@@ -456,10 +456,10 @@
           actions={actions}
           dict={this.state.dict}
           MenuID={this.props.MenuID}
+          selectedData={selectedData}
           logcolumns={this.state.logcolumns}
           ContainerId={this.state.ContainerId}
           refreshdata={this.refreshbyaction}
-          gettableselected={this.gettableselected}
         />
         <div className="main-table-box">
           {this.state.data && this.state.data.length > 0 ?
@@ -468,8 +468,6 @@
             </div> : null
           }
           <MainTable
-            ref="mainTable"
-            menuType="HS"
             tableId="mainTable"
             pickup={pickup}
             config={config}
@@ -483,6 +481,8 @@
             refreshdata={this.refreshbytable}
             buttonTrigger={() => {}}
             handleTableId={this.handleTableId}
+            resetTable={this.state.resetTable}
+            chgSelectData={this.changeSelectedData}
           />
         </div>
         <Tabs defaultActiveKey="0">

--
Gitblit v1.8.0