From 6d0137932fcc8f9848123743c1aad5cff8172d8a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 09 二月 2020 13:09:39 +0800
Subject: [PATCH] 2020-02-09

---
 src/tabviews/formtab/index.jsx |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/tabviews/formtab/index.jsx b/src/tabviews/formtab/index.jsx
index 98b0f19..f375050 100644
--- a/src/tabviews/formtab/index.jsx
+++ b/src/tabviews/formtab/index.jsx
@@ -29,6 +29,7 @@
 
   state = {
     dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+    ContainerId: Utils.getuuid(), // 鑿滃崟澶栧眰html Id
     loadingview: true,    // 椤甸潰鍔犺浇涓�
     viewlost: false,      // 椤甸潰涓㈠け锛�1銆佹湭鑾峰彇鍒伴厤缃�-椤甸潰涓㈠け锛�2銆侀〉闈㈡湭鍚敤
     lostmsg: '',          // 椤甸潰涓㈠け鏃剁殑鎻愮ず淇℃伅
@@ -152,7 +153,8 @@
         arr_field: _arrField,
         data: _data,
         BIDs: {
-          mainTable: (!_isCustomData && _data && _data[0] && _data[0][config.setting.primaryKey]) || ''
+          mainTable: (!_isCustomData && _data && _data[0] && _data[0][config.setting.primaryKey]) || '',
+          mainTabledata: (!_isCustomData && _data && _data[0]) || ''
         }
       }, () => {
         this.improveSelectOption(config.groups)
@@ -297,7 +299,8 @@
       this.setState({
         data: result.data,
         BIDs: {
-          mainTable: (result.data[0] && result.data[0][setting.primaryKey]) || ''
+          mainTable: (result.data[0] && result.data[0][setting.primaryKey]) || '',
+          mainTabledata: result.data[0] || ''
         }
       })
     } else {
@@ -354,13 +357,14 @@
   /**
    * @description 琛ㄦ牸Id鍙樺寲
    */
-  handleTableId = (type, id) => {
+  handleTableId = (type, id, data) => {
     const { BIDs } = this.state
 
     this.setState({
       BIDs: {
         ...BIDs,
-        [type]: id
+        [type]: id,
+        [type + 'data']: data
       }
     })
   }
@@ -387,7 +391,7 @@
     const { setting, actions, loadingview, viewlost, isLinkMain, config, groups, data } = this.state
 
     return (
-      <div className={'formtab ' + (isLinkMain ? 'pick-control' : '')} id={'formtab' + this.props.MenuID}>
+      <div className={'formtab ' + (isLinkMain ? 'pick-control' : '')} id={this.state.ContainerId}>
         {loadingview && <Spin size="large" />}
         {groups && (groups.length > 1 || groups[0].sublist.length > 0) ?
           <FormGroup
@@ -415,7 +419,6 @@
             return (
               <Tabs defaultActiveKey="0" key={group}>
                 {config[group].map((_tab, index) => {
-                  // return !_tab.supMenu || (_tab.supMenu && this.state.BIDs[_tab.supMenu]) ?
                   return (
                     <TabPane tab={
                       <span>
@@ -428,7 +431,9 @@
                           Tab={_tab}
                           MenuID={_tab.linkTab}
                           SupMenuID={this.props.MenuID}
+                          ContainerId={this.state.ContainerId}
                           BID={this.state.BIDs[_tab.supMenu] || ''}
+                          BData={this.state.BIDs[_tab.supMenu + 'data'] || ''}
                           handleTableId={this.handleTableId}
                           handleMainTable={this.handleMainTable}
                         /> : null}

--
Gitblit v1.8.0