From 5ff23c882da8bd2dca0848ae1a97d23f6bfecd9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 六月 2021 23:10:07 +0800
Subject: [PATCH] 2021-06-27

---
 src/tabviews/custom/components/form/normal-form/index.jsx |   63 ++++++++++++++++++-------------
 1 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/src/tabviews/custom/components/form/normal-form/index.jsx b/src/tabviews/custom/components/form/normal-form/index.jsx
index 03e0350..b0e13a5 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'
@@ -40,7 +39,8 @@
   }
 
   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
@@ -57,6 +57,14 @@
       }
     } else {
       _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') || ''
@@ -116,6 +124,7 @@
   }
 
   componentDidMount () {
+    MKEmitter.addListener('reloadData', this.reloadData)
     MKEmitter.addListener('mkFormSubmit', this.mkFormSubmit)
     MKEmitter.addListener('resetSelectLine', this.resetParentParam)
     MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
@@ -129,6 +138,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 +166,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(null, 'refresh')
   }
 
   /**
@@ -237,34 +253,22 @@
     }
   }
 
-  async loadData (btn) {
+  async loadData (btn, 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: {}
       })
       btn && this.execSuccess(btn)
       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
-      })
       btn && this.execSuccess(btn)
       return
     }
@@ -288,16 +292,23 @@
         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: _group,
+          group: null,
           step: _group.sort - 1,
           data: _data || {},
           loading: false
+        }, () => {
+          this.setState({group: _group})
         })
       }
     } else {
@@ -354,7 +365,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>

--
Gitblit v1.8.0