From bb47f06e3c5eaf568aaecf870736787373ce73aa Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 18 六月 2021 13:28:11 +0800
Subject: [PATCH] 2021-06-18

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

diff --git a/src/tabviews/custom/components/form/normal-form/index.jsx b/src/tabviews/custom/components/form/normal-form/index.jsx
index aa6387c..e9fb1b3 100644
--- a/src/tabviews/custom/components/form/normal-form/index.jsx
+++ b/src/tabviews/custom/components/form/normal-form/index.jsx
@@ -33,7 +33,6 @@
     BID: '',                   // 涓婄骇ID
     config: null,              // 鍥捐〃閰嶇疆淇℃伅
     loading: false,            // 鏁版嵁鍔犺浇鐘舵��
-    activeKey: '',             // 閫変腑鏁版嵁
     sync: false,               // 鏄惁缁熶竴璇锋眰鏁版嵁
     data: null,                  // 鏁版嵁
     group: null,
@@ -66,6 +65,7 @@
       group.subButton.uuid = group.uuid
       group.subButton.$menuId = group.uuid
       group.subButton.Ot = 'requiredSgl'
+      group.subButton.$forbid = true
       group.subButton.OpenType = 'formSubmit'
       group.subButton.execError = 'never'
 
@@ -116,6 +116,7 @@
   }
 
   componentDidMount () {
+    MKEmitter.addListener('reloadData', this.reloadData)
     MKEmitter.addListener('mkFormSubmit', this.mkFormSubmit)
     MKEmitter.addListener('resetSelectLine', this.resetParentParam)
     MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
@@ -129,6 +130,7 @@
     this.setState = () => {
       return
     }
+    MKEmitter.removeListener('reloadData', this.reloadData)
     MKEmitter.removeListener('mkFormSubmit', this.mkFormSubmit)
     MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
     MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
@@ -165,6 +167,14 @@
     }
   }
 
+  reloadData = (menuId, id) => {
+    const { config } = this.state
+
+    if (config.uuid !== menuId) return
+
+    this.loadData(null, 'refresh')
+  }
+
   /**
    * @description 鎸夐挳鎵ц瀹屾垚鍚庨〉闈㈠埛鏂�
    * @param {*} menuId     // 鑿滃崟Id
@@ -179,6 +189,26 @@
     if (btn.syncComponentId && btn.syncComponentId !== config.uuid && btn.syncComponentId !== config.setting.supModule) {
       MKEmitter.emit('reloadData', btn.syncComponentId)                        // 鍚岀骇鏍囩鍒锋柊
     }
+
+    if (config.wrap.datatype !== 'static' && config.setting) {
+      this.loadData(btn)
+    } else {
+      this.execSuccess(btn)
+    }
+  }
+
+  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) {
+      this.setState({ BID: id }, () => {
+        this.loadData()
+      })
+    }
+  }
+
+  execSuccess = (btn) => {
+    const { config, group } = this.state
 
     if (config.subcards.length > group.sort) {
       let _group = config.subcards.filter(item => item.sort === (group.sort + 1))[0]
@@ -217,17 +247,7 @@
     }
   }
 
-  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) {
-      this.setState({ BID: id }, () => {
-        this.loadData()
-      })
-    }
-  }
-
-  async loadData () {
+  async loadData (btn, type) {
     const { mainSearch, menuType } = this.props
     const { config, arr_field, BID, group } = this.state
 
@@ -236,6 +256,7 @@
         data: {},
         loading: false
       })
+      btn && this.execSuccess(btn)
       return
     }
 
@@ -254,6 +275,7 @@
       this.setState({
         loading: false
       })
+      btn && this.execSuccess(btn)
       return
     }
 
@@ -267,20 +289,34 @@
     let result = await Api.genericInterface(param)
     if (result.status) {
       let _data = result.data && result.data[0] ? result.data[0] : {}
-      let _group = group
-      if (config.wrap.statusControl && _data[config.wrap.statusControl]) {
-        let _status = _data[config.wrap.statusControl]
-        let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
-        _group = _groups || _group
-      }
 
-      this.setState({
-        group: _group,
-        step: _group.sort - 1,
-        activeKey: '',
-        data: _data || {},
-        loading: false
-      })
+      if (btn) {
+        this.setState({
+          data: _data || {},
+          loading: false
+        })
+        this.execSuccess(btn)
+      } else {
+        let _group = group
+
+        if (type === 'refresh') {
+          _group = config.subcards[0]
+        }
+
+        if (config.wrap.statusControl && _data[config.wrap.statusControl]) {
+          let _status = _data[config.wrap.statusControl]
+          let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
+          _group = _groups || _group
+        }
+        this.setState({
+          group: null,
+          step: _group.sort - 1,
+          data: _data || {},
+          loading: false
+        }, () => {
+          this.setState({group: _group})
+        })
+      }
     } else {
       this.setState({
         loading: false,
@@ -290,6 +326,7 @@
         message: result.message,
         duration: 10
       })
+      btn && this.execSuccess(btn)
     }
   }
 

--
Gitblit v1.8.0