From c7c3b0cd51c2c9251a11e4b5bc5057cc92f6e9a7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 02 十一月 2020 09:18:43 +0800
Subject: [PATCH] 2020-11-02

---
 src/tabviews/commontable/index.jsx |   70 +++++++++++-----------------------
 1 files changed, 23 insertions(+), 47 deletions(-)

diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 26c7116..dc44e40 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -28,9 +28,6 @@
 const CardComponent = asyncSpinComponent(() => import('@/tabviews/zshare/cardcomponent'))
 const ChartComponent = asyncSpinComponent(() => import('@/tabviews/zshare/chartcomponent'))
 
-// 鑷畾涔夋爣绛�
-const SecretKeyTable = asyncSpinComponent(() => import('./secretKeyTable'))
-
 const { TabPane } = Tabs
 const { TreeNode } = Tree
 const { Paragraph } = Typography
@@ -142,18 +139,6 @@
       }
       // 鍘婚櫎绌鸿鏍囩
       config.tabgroups = config.tabgroups.filter(group => group.sublist.length > 0)
-
-      // HS涓嬭嚜瀹氫箟澶勭悊鐨勬爣绛�
-      if (this.props.menuType === 'HS') {
-        config.tabgroups.forEach(group => {
-          group.sublist = group.sublist.map(tab => {
-            if (tab.linkTab === '1586577325055l2ng7t75g7i4ek2ng8o') {
-              tab.type = 'SecretKeyTable'
-            }
-            return tab
-          })
-        })
-      }
 
       // 瑙嗗浘鏉冮檺
       config.charts = config.charts.filter(item => {
@@ -504,6 +489,15 @@
     const { setting, arr_field, BIDs, search, orderBy, BID, pageIndex, pageSize } = this.state
     let requireFields = search.filter(item => item.required && (!item.value || item.value.length === 0))
 
+    this.setState({
+      selectedData: [],
+      BIDs: {
+        ...BIDs,
+        mainTable: '',
+        mainTabledata: ''
+      }
+    })
+
     if (requireFields.length > 0) {
       let labels = requireFields.map(item => item.label)
       labels = Array.from(new Set(labels))
@@ -517,13 +511,7 @@
     }
 
     this.setState({
-      selectedData: [],
-      loading: true,
-      BIDs: {
-        ...BIDs,
-        mainTable: '',
-        mainTabledata: ''
-      }
+      loading: true
     })
 
     let _orderBy = orderBy || setting.order
@@ -999,31 +987,19 @@
                       {_tab.label}
                     </span>
                   } key={_tab.uuid}>
-                    {_tab.type === 'SubTable' ?
-                      <SubTable
-                        Tab={_tab}
-                        MenuID={_tab.linkTab}
-                        mainSearch={_tab.searchPass === 'true' ? search : null}
-                        userConfig={userConfig ? userConfig[_tab.uuid] : null}
-                        SupMenuID={this.props.MenuID}
-                        refreshtabs={this.state.refreshtabs}
-                        ContainerId={this.state.ContainerId}
-                        BID={this.state.BIDs[_tab.supMenu] || ''}
-                        BData={this.state.BIDs[_tab.supMenu + 'data'] || ''}
-                        handleTableId={this.handleTableId}
-                        handleMainTable={(type) => this.handleMainTable(type, _tab)}
-                      /> : null}
-                    {_tab.type === 'SecretKeyTable' ?
-                      <SecretKeyTable
-                        Tab={_tab}
-                        MenuID={_tab.linkTab}
-                        SupMenuID={this.props.MenuID}
-                        refreshtabs={this.state.refreshtabs}
-                        ContainerId={this.state.ContainerId}
-                        BID={this.state.BIDs[_tab.supMenu] || ''}
-                        BData={this.state.BIDs[_tab.supMenu + 'data'] || ''}
-                        handleMainTable={(type) => this.handleMainTable(type, _tab)}
-                      /> : null}
+                    <SubTable
+                      Tab={_tab}
+                      MenuID={_tab.linkTab}
+                      mainSearch={_tab.searchPass === 'true' ? search : null}
+                      userConfig={userConfig ? userConfig[_tab.uuid] : null}
+                      SupMenuID={this.props.MenuID}
+                      refreshtabs={this.state.refreshtabs}
+                      ContainerId={this.state.ContainerId}
+                      BID={this.state.BIDs[_tab.supMenu] || ''}
+                      BData={this.state.BIDs[_tab.supMenu + 'data'] || ''}
+                      handleTableId={this.handleTableId}
+                      handleMainTable={(type) => this.handleMainTable(type, _tab)}
+                    />
                   </TabPane>
                 )
               })}

--
Gitblit v1.8.0