From 73d56e1024cf420eff2aae3710886c84d56a385f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 04 六月 2022 14:48:36 +0800
Subject: [PATCH] 2022-06-04

---
 src/tabviews/custom/components/form/normal-form/index.jsx |   55 +++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/src/tabviews/custom/components/form/normal-form/index.jsx b/src/tabviews/custom/components/form/normal-form/index.jsx
index 2b856d0..08194e1 100644
--- a/src/tabviews/custom/components/form/normal-form/index.jsx
+++ b/src/tabviews/custom/components/form/normal-form/index.jsx
@@ -68,13 +68,26 @@
 
     let roleId = sessionStorage.getItem('role_id') || ''
 
-    config.subcards = config.subcards.map(group => {
+    config.subcards = config.subcards.map((group, i) => {
+      if (i === 0) {
+        group.prevButton.enable = 'false'
+      }
+      if (i + 1 === config.subcards.length) {
+        group.nextButton.enable = 'false'
+      }
+
       group.subButton.uuid = group.uuid
       group.subButton.$menuId = group.uuid
-      group.subButton.Ot = 'requiredSgl'
+      group.subButton.Ot = config.wrap.datatype === 'static' ? 'notRequired' : 'requiredSgl'
       group.subButton.$forbid = true
       group.subButton.OpenType = 'formSubmit'
       group.subButton.execError = 'never'
+
+      group.subButton.syncComponentId = group.subButton.syncComponent ? group.subButton.syncComponent.pop() : ''
+
+      if (group.subButton.syncComponentId === config.uuid) {
+        group.subButton.syncComponentId = ''
+      }
 
       if (group.subButton.enable === 'false') {
         group.subButton.style.display = 'none'
@@ -125,7 +138,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)
       }
     })
   }
@@ -199,12 +214,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) {
@@ -216,7 +231,9 @@
 
   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 || id !== '') {
       this.setState({ BID: id }, () => {
         this.loadData()
@@ -258,7 +275,7 @@
 
   async loadData (type) {
     const { mainSearch, menuType } = this.props
-    const { config, arr_field, BID, group } = this.state
+    const { config, arr_field, BID } = this.state
 
     if (config.wrap.datatype === 'static' || (config.setting.supModule && !BID)) {
       this.setState({
@@ -284,7 +301,7 @@
     let result = await Api.genericInterface(param)
     if (result.status) {
       let _data = result.data && result.data[0] ? result.data[0] : {$$empty: true}
-      let _group = group
+      let _group = this.state.group
 
       if (type === 'refresh') {
         _group = config.subcards[0]
@@ -295,10 +312,17 @@
         let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
         _group = _groups || _group
       }
+
+      let step = this.state.step
+
+      if (config.subcards.length !== _group.sort || config.subcards.length !== step) {
+        step = _group.sort - 1
+      }
+
       this.setState({
         group: null,
-        step: _group.sort - 1,
-        data: _data || {$$empty: true},
+        step: step,
+        data: _data,
         loading: false
       }, () => {
         this.setState({group: _group})
@@ -349,7 +373,7 @@
     const { config, loading, BID, data, group, dict, step } = this.state
 
     return (
-      <div className="custom-normal-form-box" style={{...config.style}}>
+      <div className="custom-normal-form-box" id={'anchor' + config.uuid} style={{...config.style}}>
         {loading ?
           <div className="loading-mask">
             <div className="ant-spin-blur"></div>
@@ -375,16 +399,15 @@
           wrappedComponentRef={(inst) => this.formRef = inst}
         /> : null}
         {group && data ? <div className={'mk-form-action ' + (group.$button || '')}>
-          {group.sort !== 1 && group.prevButton.enable !== 'false' ? <Button type="link" className="prev" onClick={this.prevStep} style={group.prevButton.style}>{group.prevButton.label}</Button> : null}
+          {group.prevButton.enable === 'true' ? <Button type="link" className="prev" onClick={this.prevStep} style={group.prevButton.style}>{group.prevButton.label}</Button> : null}
           <NormalButton
             BID={BID}
-            position="form"
             btn={group.subButton}
             setting={config.setting}
             columns={config.columns}
             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}
+          {group.nextButton.enable === 'true' ? <Button type="link" className="skip" onClick={this.nextStep} style={group.nextButton.style}>{group.nextButton.label}</Button> : null}
         </div> : null}
       </div>
     )

--
Gitblit v1.8.0