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 | 42 ++++++++++++++++++------------------------
1 files changed, 18 insertions(+), 24 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..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') || ''
@@ -158,12 +166,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 +259,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 +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