From c98e45bfac25e9110ad0383faac54a54d98ea9d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 18 十一月 2021 20:47:04 +0800
Subject: [PATCH] 2021-11-18

---
 src/tabviews/custom/components/form/normal-form/index.jsx |  147 +++++++++++++++++++++++++++---------------------
 1 files changed, 83 insertions(+), 64 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..3d7cd2b 100644
--- a/src/tabviews/custom/components/form/normal-form/index.jsx
+++ b/src/tabviews/custom/components/form/normal-form/index.jsx
@@ -3,7 +3,6 @@
 import { is, fromJS } from 'immutable'
 import { connect } from 'react-redux'
 import { Spin, notification, Button } from 'antd'
-// import moment from 'moment'
 
 import Api from '@/api'
 import Utils from '@/utils/utils.js'
@@ -13,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'))
@@ -33,7 +31,6 @@
     BID: '',                   // 涓婄骇ID
     config: null,              // 鍥捐〃閰嶇疆淇℃伅
     loading: false,            // 鏁版嵁鍔犺浇鐘舵��
-    activeKey: '',             // 閫変腑鏁版嵁
     sync: false,               // 鏄惁缁熶竴璇锋眰鏁版嵁
     data: null,                  // 鏁版嵁
     group: null,
@@ -41,11 +38,12 @@
   }
 
   UNSAFE_componentWillMount () {
-    const { data, BID, config } = this.props
+    const { data, BID } = this.props
+    let config = fromJS(this.props.config).toJS()
 
     let _data = null
     let _sync = false
-    
+
     if (config.wrap.datatype !== 'static') {
       _sync = config.setting.sync === 'true'
 
@@ -60,14 +58,31 @@
       _data = {}
     }
 
+    if (!config.wrap.groupLabel) {
+      if (config.subcards.length > 1) {
+        config.wrap.groupLabel = 'show'
+      } else {
+        config.wrap.groupLabel = 'hidden'
+      }
+    }
+
     let roleId = sessionStorage.getItem('role_id') || ''
 
     config.subcards = config.subcards.map(group => {
       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'
+
+      if (group.subButton.enable === 'false') {
+        group.subButton.style.display = 'none'
+      }
+
+      if (group.prevButton.enable === 'false' && group.subButton.enable === 'false' && group.nextButton.enable === 'false') {
+        group.$button = 'no-button'
+      }
 
       group.fields = group.fields.map(cell => {
         // 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗�
@@ -116,6 +131,7 @@
   }
 
   componentDidMount () {
+    MKEmitter.addListener('reloadData', this.reloadData)
     MKEmitter.addListener('mkFormSubmit', this.mkFormSubmit)
     MKEmitter.addListener('resetSelectLine', this.resetParentParam)
     MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
@@ -129,6 +145,7 @@
     this.setState = () => {
       return
     }
+    MKEmitter.removeListener('reloadData', this.reloadData)
     MKEmitter.removeListener('mkFormSubmit', this.mkFormSubmit)
     MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
     MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
@@ -156,13 +173,19 @@
       }
 
       this.setState({sync: false, data: _data, group: _group, step: _group.sort - 1,})
-    } else if (nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
-      if (config.wrap.datatype !== 'static' && config.setting.syncRefresh === 'true') {
-        this.setState({}, () => {
-          this.loadData()
-        })
-      }
+    } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+      this.setState({}, () => {
+        this.loadData()
+      })
     }
+  }
+
+  reloadData = (menuId, id) => {
+    const { config } = this.state
+
+    if (config.uuid !== menuId) return
+
+    this.loadData('refresh')
   }
 
   /**
@@ -171,7 +194,7 @@
    * @param {*} position   // 鍒锋柊浣嶇疆
    * @param {*} btn        // 鎵ц鐨勬寜閽�
    */
-  refreshByButtonResult = (menuId, position, btn) => {
+  refreshByButtonResult = (menuId, position, btn, id) => {
     const { config, group } = this.state
 
     if (group.uuid !== menuId) return
@@ -179,6 +202,30 @@
     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()
+    }
+
+    if (id) {
+      MKEmitter.emit('resetSelectLine', config.uuid, id, '')
+    }
+
+    this.execSuccess(btn, id)
+  }
+
+  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()
+      })
+    }
+  }
+
+  execSuccess = (btn, id) => {
+    const { config, group } = this.state
 
     if (config.subcards.length > group.sort) {
       let _group = config.subcards.filter(item => item.sort === (group.sort + 1))[0]
@@ -198,62 +245,32 @@
 
       let newtab = {
         ...menu,
-        selected: true,
-        param: {}
-      }
-      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())
+        param: {$BID: id || ''}
       }
 
-      this.setState({}, () => {
-        tabs.push(newtab)
-        this.props.modifyTabview(tabs)
-      })
+      if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
+        MKEmitter.emit('modifyTabs', newtab, 'replace')
+      } else {
+        MKEmitter.emit('modifyTabs', newtab, 'plus', true)
+      }
     }
   }
 
-  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 (type) {
     const { mainSearch, menuType } = this.props
     const { config, arr_field, BID, group } = this.state
 
     if (config.wrap.datatype === 'static' || (config.setting.supModule && !BID)) {
       this.setState({
-        data: {},
-        loading: false
+        data: {}
       })
       return
     }
 
-    let searches = []
-    if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
-      let keys = searches.map(item => item.key)
-      mainSearch.forEach(item => {
-        if (!keys.includes(item.key)) {
-          searches.push(item)
-        }
-      })
-    }
+    let searches = config.setting.useMSearch && mainSearch ? mainSearch : []
 
-    let requireFields = searches.filter(item => item.required && (!item.value || item.value.length === 0))
+    let requireFields = searches.filter(item => item.required && item.value === '')
     if (requireFields.length > 0) {
-      this.setState({
-        loading: false
-      })
       return
     }
 
@@ -268,18 +285,23 @@
     if (result.status) {
       let _data = result.data && result.data[0] ? result.data[0] : {}
       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: _group,
+        group: null,
         step: _group.sort - 1,
-        activeKey: '',
         data: _data || {},
         loading: false
+      }, () => {
+        this.setState({group: _group})
       })
     } else {
       this.setState({
@@ -334,7 +356,7 @@
             <Spin />
           </div> : null
         }
-        {config.subcards.length > 1 ? <div className="mk-normal-form-title">
+        {config.wrap.groupLabel !== 'hidden' ? <div className="mk-normal-form-title">
           {config.subcards.map(card => (
             <div key={card.uuid} className={'form-title' + (card.sort <= step ? ' active' : '')}>
               <span className="form-sort" style={{background: config.wrap.color}}>{card.sort}</span>
@@ -349,11 +371,11 @@
           dict={dict}
           data={data}
           action={group}
-          inputSubmit={this.handleOk}
+          inputSubmit={() => this.mkFormSubmit(group.uuid)}
           wrappedComponentRef={(inst) => this.formRef = inst}
         /> : null}
-        {group && data ? <div className="mk-form-action">
-          {group.sort !== 1 ? <Button type="link" className="prev" onClick={this.prevStep} style={group.prevButton.style}>{group.prevButton.label}</Button> : 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}
           <NormalButton
             BID={BID}
             position="form"
@@ -372,14 +394,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