From b6cbfb08b51e87e6eac995be8e7751815715e6a1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 29 三月 2022 15:36:21 +0800
Subject: [PATCH] 2022-03-29

---
 src/tabviews/custom/components/form/normal-form/index.jsx |   59 +++++++++++++++++++++++++----------------------------------
 1 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/src/tabviews/custom/components/form/normal-form/index.jsx b/src/tabviews/custom/components/form/normal-form/index.jsx
index 54a0d90..566f00f 100644
--- a/src/tabviews/custom/components/form/normal-form/index.jsx
+++ b/src/tabviews/custom/components/form/normal-form/index.jsx
@@ -12,7 +12,6 @@
 import MKEmitter from '@/utils/events.js'
 import zhCN from '@/locales/zh-CN/main.js'
 import enUS from '@/locales/en-US/main.js'
-import { modifyTabview } from '@/store/action'
 import './index.scss'
 
 const MutilForm = asyncSpinComponent(() => import('@/tabviews/zshare/mutilform'))
@@ -51,12 +50,12 @@
       if (_sync && data && data[config.dataName]) {
         _data = data[config.dataName]
         if (Array.isArray(_data)) {
-          _data = _data[0] || {}
+          _data = _data[0] || {$$empty: true}
         }
         _sync = false
       }
     } else {
-      _data = {}
+      _data = {$$empty: true}
     }
 
     if (!config.wrap.groupLabel) {
@@ -126,7 +125,9 @@
       arr_field: config.columns.map(col => col.field).join(','),
     }, () => {
       if (config.wrap.datatype !== 'static' && config.setting && config.setting.sync !== 'true' && config.setting.onload === 'true') {
-        this.loadData()
+        setTimeout(() => {
+          this.loadData()
+        }, config.setting.delay || 0)
       }
     })
   }
@@ -159,12 +160,12 @@
     const { sync, config, group } = this.state
 
     if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
-      let _data = {}
+      let _data = {$$empty: true}
       let _group = group
       if (nextProps.data && nextProps.data[config.dataName]) {
         _data = nextProps.data[config.dataName]
         if (Array.isArray(_data)) {
-          _data = _data[0] || {}
+          _data = _data[0] || {$$empty: true}
         }
       }
       if (config.wrap.statusControl && _data[config.wrap.statusControl]) {
@@ -200,12 +201,12 @@
 
     if (group.uuid !== menuId) return
 
-    if (btn.syncComponentId && btn.syncComponentId !== config.uuid && btn.syncComponentId !== config.setting.supModule) {
-      MKEmitter.emit('reloadData', btn.syncComponentId)                        // 鍚岀骇鏍囩鍒锋柊
-    }
+    btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
 
-    if (config.wrap.datatype !== 'static' && config.setting) {
-      this.loadData()
+    if (!btn.syncComponentId || btn.syncComponentId !== config.setting.supModule) {
+      if (config.wrap.datatype !== 'static' && config.setting) {
+        this.loadData()
+      }
     }
 
     if (id) {
@@ -217,8 +218,10 @@
 
   resetParentParam = (MenuID, id) => {
     const { config } = this.state
+
     if (config.wrap.datatype === 'static' || !config.setting.supModule || config.setting.supModule !== MenuID) return
-    if (id !== this.state.BID) {
+    
+    if (id !== this.state.BID || id !== '') {
       this.setState({ BID: id }, () => {
         this.loadData()
       })
@@ -246,23 +249,14 @@
 
       let newtab = {
         ...menu,
-        selected: true,
         param: {$BID: id || ''}
       }
 
-      let tabs = this.props.tabviews.filter((tab, i) => {
-        tab.selected = false
-        return tab.MenuID !== newtab.MenuID
-      })
-
-      if (this.props.tabviews.length > tabs.length) {
-        this.props.modifyTabview(fromJS(tabs).toJS())
+      if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
+        MKEmitter.emit('modifyTabs', newtab, 'replace')
+      } else {
+        MKEmitter.emit('modifyTabs', newtab, 'plus', true)
       }
-
-      this.setState({}, () => {
-        tabs.push(newtab)
-        this.props.modifyTabview(tabs)
-      })
     }
   }
 
@@ -272,7 +266,7 @@
 
     if (config.wrap.datatype === 'static' || (config.setting.supModule && !BID)) {
       this.setState({
-        data: {}
+        data: {$$empty: true}
       })
       return
     }
@@ -293,7 +287,7 @@
 
     let result = await Api.genericInterface(param)
     if (result.status) {
-      let _data = result.data && result.data[0] ? result.data[0] : {}
+      let _data = result.data && result.data[0] ? result.data[0] : {$$empty: true}
       let _group = group
 
       if (type === 'refresh') {
@@ -308,7 +302,7 @@
       this.setState({
         group: null,
         step: _group.sort - 1,
-        data: _data || {},
+        data: _data || {$$empty: true},
         loading: false
       }, () => {
         this.setState({group: _group})
@@ -392,7 +386,7 @@
             btn={group.subButton}
             setting={config.setting}
             columns={config.columns}
-            selectedData={[data]}
+            selectedData={data.$$empty ? [] : [data]}
           />
           {group.nextButton.enable === 'true' && group.sort !== config.subcards.length ? <Button type="link" className="skip" onClick={this.nextStep} style={group.nextButton.style}>{group.nextButton.label}</Button> : null}
         </div> : null}
@@ -404,14 +398,11 @@
 const mapStateToProps = (state) => {
   return {
     permMenus: state.permMenus,
-    tabviews: state.tabviews,
   }
 }
 
-const mapDispatchToProps = (dispatch) => {
-  return {
-    modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews))
-  }
+const mapDispatchToProps = () => {
+  return {}
 }
 
 export default connect(mapStateToProps, mapDispatchToProps)(NormalForm)
\ No newline at end of file

--
Gitblit v1.8.0