From a13b2a8d6e84662275ea913850e01be9b2ff31e5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 13 八月 2021 00:24:31 +0800
Subject: [PATCH] 2021-08-13

---
 src/tabviews/custom/components/form/normal-form/index.jsx |   54 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 28 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 e9fb1b3..f8bb190 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
@@ -59,6 +59,14 @@
       _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 => {
@@ -68,6 +76,14 @@
       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璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗�
@@ -158,12 +174,10 @@
       }
 
       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()
+      })
     }
   }
 
@@ -253,28 +267,16 @@
 
     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
     }
@@ -371,7 +373,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>
@@ -389,8 +391,8 @@
           inputSubmit={this.handleOk}
           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"

--
Gitblit v1.8.0