From 26d0fa42ea8c63a87e8ef93d0915f75f46fb1f9c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 三月 2022 11:09:53 +0800
Subject: [PATCH] 2022-03-24
---
src/tabviews/custom/components/form/tab-form/index.jsx | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/tabviews/custom/components/form/tab-form/index.jsx b/src/tabviews/custom/components/form/tab-form/index.jsx
index 503ad51..c2fb8c6 100644
--- a/src/tabviews/custom/components/form/tab-form/index.jsx
+++ b/src/tabviews/custom/components/form/tab-form/index.jsx
@@ -49,12 +49,12 @@
if (_sync && data && data[config.dataName]) {
_data = data[config.dataName]
if (Array.isArray(_data)) {
- _data = _data[0] || {}
+ _data = _data[0] || {$$empty: true}
}
_sync = false
}
} else {
- _data = {}
+ _data = {$$empty: true}
}
if (!config.wrap.groupLabel) {
@@ -111,7 +111,9 @@
arr_field: config.columns.map(col => col.field).join(','),
}, () => {
if (config.wrap.datatype !== 'static' && config.setting && config.setting.sync !== 'true' && config.setting.onload === 'true') {
- this.loadData()
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
}
})
}
@@ -144,12 +146,12 @@
const { sync, config, group } = this.state
if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
- let _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] || {}
+ _data = _data[0] || {$$empty: true}
}
}
@@ -200,7 +202,7 @@
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) {
+ if (id !== this.state.BID || id !== '') {
this.setState({ BID: id }, () => {
this.loadData()
})
@@ -222,7 +224,7 @@
if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
MKEmitter.emit('modifyTabs', newtab, 'replace')
} else {
- MKEmitter.emit('modifyTabs', newtab, 'plus')
+ MKEmitter.emit('modifyTabs', newtab, 'plus', true)
}
}
}
@@ -233,7 +235,7 @@
if (config.wrap.datatype === 'static' || (config.setting.supModule && !BID)) {
this.setState({
- data: {}
+ data: {$$empty: true}
})
return
}
@@ -254,13 +256,13 @@
let result = await Api.genericInterface(param)
if (result.status) {
- let _data = result.data && result.data[0] ? result.data[0] : {}
+ let _data = result.data && result.data[0] ? result.data[0] : {$$empty: true}
let _group = group
this.setState({
group: null,
- data: _data || {},
+ data: _data || {$$empty: true},
loading: false
}, () => {
this.setState({group: _group})
@@ -328,7 +330,7 @@
btn={group.subButton}
setting={config.setting}
columns={config.columns}
- selectedData={[data]}
+ selectedData={data.$$empty ? [] : [data]}
/>
</div> : null}
</div>
--
Gitblit v1.8.0