From 93ace1795e0e9b1a443b1c447a646fa8932f9678 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 七月 2023 20:43:25 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/form/step-form/index.jsx | 154 ++++++++++++++++++++++++++-------------------------
1 files changed, 79 insertions(+), 75 deletions(-)
diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index 3965ad6..7f3bb27 100644
--- a/src/tabviews/custom/components/form/step-form/index.jsx
+++ b/src/tabviews/custom/components/form/step-form/index.jsx
@@ -8,8 +8,6 @@
import asyncComponent from '@/utils/asyncComponent'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
import MKEmitter from '@/utils/events.js'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
import './index.scss'
const MutilForm = asyncSpinComponent(() => import('@/tabviews/zshare/mutilform'))
@@ -17,17 +15,13 @@
class StepForm extends Component {
static propTpyes = {
- data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
- config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
- mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
+ config: PropTypes.object
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
BID: '',
config: null,
loading: false,
- sync: false,
data: null,
group: null,
BData: '',
@@ -35,53 +29,50 @@
}
UNSAFE_componentWillMount () {
- const { data } = this.props
- let config = fromJS(this.props.config).toJS()
+ const { config } = this.props
+ let _config = fromJS(config).toJS()
let _data = null
- let _sync = false
-
let BID = ''
let BData = ''
- if (config.setting.supModule) {
- BData = window.GLOB.CacheData.get(config.setting.supModule)
+ if (_config.setting.supModule) {
+ BData = window.GLOB.CacheData.get(_config.setting.supModule)
} else {
- BData = window.GLOB.CacheData.get(config.$pageId)
+ BData = window.GLOB.CacheData.get(_config.$pageId)
}
if (BData) {
BID = BData.$BID || ''
}
- if (config.wrap.datatype !== 'static') {
- _sync = config.setting.sync === 'true'
+ if (_config.wrap.datatype !== 'static') {
+ if (_config.setting.sync === 'true' && window.GLOB.SyncData.has(_config.dataName)) {
+ _data = window.GLOB.SyncData.get(_config.dataName) || []
+ _data = _data[0] || {$$empty: true}
+ _data.$$uuid = _data[_config.setting.primaryKey] || ''
- if (_sync && data) {
- _data = data[config.dataName] || {$$empty: true}
- if (Array.isArray(_data)) {
- _data = _data[0] || {$$empty: true}
- }
- _sync = false
- _data.$$uuid = _data[config.setting.primaryKey] || ''
+ _config.setting.sync = 'false'
+
+ window.GLOB.SyncData.delete(_config.dataName)
}
} else {
_data = {$$empty: true}
}
- if (!config.wrap.groupLabel) {
- if (config.subcards.length > 1) {
- config.wrap.groupLabel = 'show'
+ if (!_config.wrap.groupLabel) {
+ if (_config.subcards.length > 1) {
+ _config.wrap.groupLabel = 'show'
} else {
- config.wrap.groupLabel = 'hidden'
+ _config.wrap.groupLabel = 'hidden'
}
}
- config.subcards = config.subcards.map((group, i) => {
+ _config.subcards = _config.subcards.map((group, i) => {
group.sort = i + 1
if (i === 0 && group.prevButton.actionType !== 'close') {
group.prevButton.enable = 'false'
}
- if (i + 1 === config.subcards.length && group.nextButton.actionType !== 'close') {
+ if (i + 1 === _config.subcards.length && group.nextButton.actionType !== 'close') {
group.nextButton.enable = 'false'
}
@@ -96,48 +87,57 @@
return group
})
- let _group = config.subcards[0]
+ let _group = _config.subcards[0]
- if (_data && config.wrap.statusControl && _data[config.wrap.statusControl] !== undefined) {
- let _status = _data[config.wrap.statusControl] + ''
+ if (_data && _config.wrap.statusControl && _data[_config.wrap.statusControl] !== undefined) {
+ let _status = _data[_config.wrap.statusControl] + ''
- let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
+ let _groups = _config.subcards.filter(item => item.setting.status === _status)[0]
_group = _groups || _group
}
- config.titleStyle = {}
- config.sortStyle = {}
+ _config.titleStyle = {}
+ _config.sortStyle = {}
- if (config.style.fontSize) {
- let size = parseInt(config.style.fontSize)
- config.titleStyle = {fontSize: size}
+ if (_config.style.fontSize) {
+ let size = parseInt(_config.style.fontSize)
+ _config.titleStyle = {fontSize: size}
let s = size * 1.5 + 'px'
- config.sortStyle = {width: s, height: s, lineHeight: s, borderRadius: s}
+ _config.sortStyle = {width: s, height: s, lineHeight: s, borderRadius: s}
}
this.setState({
- sync: _sync,
data: _data,
group: _group,
step: _group.sort - 1,
BID: BID || '',
BData: BData || '',
- config: config,
- arr_field: config.columns.map(col => col.field).join(','),
+ config: _config,
+ arr_field: _config.columns.map(col => col.field).join(','),
}, () => {
- if (config.wrap.datatype !== 'static' && config.setting && config.setting.sync !== 'true' && config.setting.onload === 'true') {
+ if (_config.wrap.datatype !== 'static' && config.setting.sync !== 'true' && _config.setting.onload === 'true') {
setTimeout(() => {
this.loadData()
- }, config.setting.delay || 0)
+ }, _config.setting.delay || 0)
}
})
}
componentDidMount () {
+ const { config } = this.state
+
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('mkFormSubmit', this.mkFormSubmit)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
+
+ if (config.setting.useMSearch) {
+ MKEmitter.addListener('searchRefresh', this.searchRefresh)
+ }
+
+ if (config.setting.sync === 'true') {
+ MKEmitter.addListener('transferSyncData', this.transferSyncData)
+ }
}
shouldComponentUpdate (nextProps, nextState) {
@@ -150,40 +150,44 @@
}
MKEmitter.removeListener('reloadData', this.reloadData)
MKEmitter.removeListener('mkFormSubmit', this.mkFormSubmit)
+ MKEmitter.removeListener('searchRefresh', this.searchRefresh)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.removeListener('transferSyncData', this.transferSyncData)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
- /**
- * @description 鍥捐〃鏁版嵁鏇存柊锛屽埛鏂板唴瀹�
- */
- UNSAFE_componentWillReceiveProps (nextProps) {
- const { sync, config, group } = this.state
+ transferSyncData = (syncId) => {
+ const { config, group } = this.state
- if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
- let _data = {$$empty: true}
- let _group = group
- if (nextProps.data && nextProps.data[config.dataName]) {
- _data = nextProps.data[config.dataName]
- if (Array.isArray(_data)) {
- _data = _data[0] || {$$empty: true}
- }
- }
+ if (config.$syncId !== syncId) return
- _data.$$uuid = _data[config.setting.primaryKey] || ''
+ let _data = window.GLOB.SyncData.get(config.dataName) || []
+ _data = _data[0] || {$$empty: true}
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
- if (config.wrap.statusControl && _data[config.wrap.statusControl] !== undefined) {
- let _status = _data[config.wrap.statusControl] + ''
- let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
- _group = _groups || _group
- }
+ let _group = group
- this.setState({sync: false, data: _data, group: _group, step: _group.sort - 1,})
- } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- this.setState({}, () => {
- this.loadData()
- })
+ if (config.wrap.statusControl && _data[config.wrap.statusControl] !== undefined) {
+ let _status = _data[config.wrap.statusControl] + ''
+ let _groups = config.subcards.filter(item => item.setting.status === _status)[0]
+ _group = _groups || _group
}
+
+ this.setState({data: _data, group: _group, step: _group.sort - 1})
+
+ window.GLOB.SyncData.delete(config.dataName)
+
+ MKEmitter.removeListener('transferSyncData', this.transferSyncData)
+ }
+
+ searchRefresh = (searchId) => {
+ const { config } = this.state
+
+ if (config.$searchId !== searchId) return
+
+ this.setState({}, () => {
+ this.loadData()
+ })
}
reloadData = (menuId, id) => {
@@ -271,7 +275,6 @@
}
async loadData (type) {
- const { mainSearch } = this.props
const { config, arr_field, BID } = this.state
if (config.wrap.datatype === 'static') {
@@ -289,10 +292,12 @@
return
}
- let searches = config.setting.useMSearch && mainSearch ? mainSearch : []
+ let searches = []
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ searches = window.GLOB.SearchBox.get(config.$searchId) || []
+ }
- let requireFields = searches.filter(item => item.required && item.value === '')
- if (requireFields.length > 0) {
+ if (config.$s_req && searches.filter(item => item.required && item.value === '').length > 0) {
return
}
@@ -411,7 +416,7 @@
}
render() {
- const { config, loading, BID, BData, data, group, dict, step } = this.state
+ const { config, loading, BID, BData, data, group, step } = this.state
if (config.wrap.empty === 'hidden' && (!data || data.$$empty)) return null
if (config.idCtrl && (!data || data.$$empty)) return null
@@ -437,7 +442,6 @@
{group && data ? <MutilForm
BID={BID}
BData={BData}
- dict={dict}
data={data}
action={group}
unload={config.setting.supModule && !BID}
--
Gitblit v1.8.0