From 83592b5c2dcbfd0a91d36dfa89f1a6cbe95ab1d1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 27 十月 2022 15:22:01 +0800
Subject: [PATCH] 2022-10-27

---
 src/tabviews/subtable/index.jsx |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index 278430f..1f2429f 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -33,7 +33,6 @@
     MenuID: PropTypes.string,        // 鑿滃崟Id
     SupMenuID: PropTypes.string,     // 涓婄骇鑿滃崟Id
     mainSearch: PropTypes.any,       // 涓昏〃鎼滅储鏉′欢
-    ContainerId: PropTypes.any,      // 涓夌骇鑿滃崟Container(html) ID
   }
 
   state = {
@@ -99,6 +98,7 @@
         config.setting.$name = Tab.label
         config.setting.foreignKey = Tab.foreignKey || ''
         config.setting.supModule = Tab.supMenu || ''
+        config.setting.ContainerId = Tab.ContainerId || ''
       } catch (e) {
         console.warn('Parse Failure')
         config = ''
@@ -407,7 +407,7 @@
         statFValue: [],
         total: 0
       })
-      MKEmitter.emit('changeTableLine', this.props.ContainerId, this.props.Tab.uuid, '', '')
+      MKEmitter.emit('changeTableLine', this.props.Tab.ContainerId, this.props.Tab.uuid, '', '')
       return
     } else if (window.GLOB.systemType === 'production' && setting.interType === 'custom' && !setting.proInterface) {
       notification.warning({
@@ -421,7 +421,7 @@
     this.setState({
       selectedData: []
     })
-    MKEmitter.emit('changeTableLine', this.props.ContainerId, this.props.Tab.uuid, '', '')
+    MKEmitter.emit('changeTableLine', this.props.Tab.ContainerId, this.props.Tab.uuid, '', '')
 
     if (setting.interType === 'custom' && loadCustomApi) {
       if (setting.execTime === 'once') {
@@ -1025,7 +1025,6 @@
                       columns={columns}
                       MenuID={this.props.MenuID}
                       selectedData={selectedData}
-                      ContainerId={this.props.ContainerId}
                     />
                   </div>
                   <div className="subtable-box">
@@ -1045,7 +1044,6 @@
                       MenuID={this.props.MenuID}
                       loading={this.state.loading}
                       statFValue={this.state.statFValue}
-                      ContainerId={this.props.ContainerId}
                       refreshdata={this.refreshbytable}
                       chgSelectData={this.changeSelectedData}
                     />
@@ -1065,7 +1063,6 @@
                     MenuID={this.props.MenuID}
                     loading={this.state.loading}
                     tableId={this.props.Tab.uuid}
-                    ContainerId={this.props.ContainerId}
                   />
                 </Col>
               )
@@ -1094,7 +1091,6 @@
               columns={columns}
               MenuID={this.props.MenuID}
               selectedData={selectedData}
-              ContainerId={this.props.ContainerId}
             />
           </div>
           <div className="subtable-box">
@@ -1114,7 +1110,6 @@
               MenuID={this.props.MenuID}
               loading={this.state.loading}
               statFValue={this.state.statFValue}
-              ContainerId={this.props.ContainerId}
               refreshdata={this.refreshbytable}
               chgSelectData={this.changeSelectedData}
             />

--
Gitblit v1.8.0