From a5f41b5d98f23d618dc7519c605ce943b114dfd5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 13 十一月 2023 18:07:51 +0800
Subject: [PATCH] 2023-11-13
---
src/tabviews/custom/components/form/tab-form/index.jsx | 91 +++++++++++++++++++++++++++++++++------------
1 files changed, 66 insertions(+), 25 deletions(-)
diff --git a/src/tabviews/custom/components/form/tab-form/index.jsx b/src/tabviews/custom/components/form/tab-form/index.jsx
index 92a5018..7dd140a 100644
--- a/src/tabviews/custom/components/form/tab-form/index.jsx
+++ b/src/tabviews/custom/components/form/tab-form/index.jsx
@@ -24,7 +24,7 @@
loading: false, // 鏁版嵁鍔犺浇鐘舵��
data: null,
BData: '',
- group: null,
+ group: null
}
UNSAFE_componentWillMount () {
@@ -44,7 +44,9 @@
BID = BData.$BID || ''
}
- if (_config.wrap.datatype !== 'static') {
+ if (_config.wrap.datatype === 'dynamic') {
+ _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
+
if (_config.setting.sync === 'true' && window.GLOB.SyncData.has(_config.dataName)) {
_data = window.GLOB.SyncData.get(_config.dataName) || []
_data = _data[0] || {$$empty: true}
@@ -53,6 +55,13 @@
_config.setting.sync = 'false'
window.GLOB.SyncData.delete(_config.dataName)
+ }
+ } else if (_config.wrap.datatype === 'public') {
+ if (window.GLOB.CacheData.has(_config.wrap.publicId)) {
+ _data = window.GLOB.CacheData.get(_config.wrap.publicId)
+ _data = fromJS(_data).toJS()
+ _data.$$BID = BID || ''
+ _data.$$BData = BData || ''
}
} else {
_data = {$$empty: true}
@@ -86,14 +95,7 @@
group: _config.subcards[0],
BID: BID || '',
BData: BData || '',
- config: _config,
- arr_field: _config.columns.map(col => col.field).join(','),
- }, () => {
- if (_config.wrap.datatype !== 'static' && config.setting.sync !== 'true' && _config.setting.onload === 'true') {
- setTimeout(() => {
- this.loadData()
- }, _config.setting.delay || 0)
- }
+ config: _config
})
}
@@ -105,13 +107,17 @@
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)
}
+
+ if (config.wrap.datatype === 'public') {
+ MKEmitter.addListener('mkPublicData', this.mkPublicData)
+ } else if (config.setting.useMSearch) {
+ MKEmitter.addListener('searchRefresh', this.searchRefresh)
+ }
+
+ this.initExec()
}
shouldComponentUpdate (nextProps, nextState) {
@@ -123,6 +129,7 @@
return
}
MKEmitter.removeListener('reloadData', this.reloadData)
+ MKEmitter.removeListener('mkPublicData', this.mkPublicData)
MKEmitter.removeListener('mkFormSubmit', this.mkFormSubmit)
MKEmitter.removeListener('searchRefresh', this.searchRefresh)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
@@ -130,8 +137,18 @@
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
+ initExec = () => {
+ const { config } = this.state
+
+ if (config.wrap.datatype === 'dynamic' && config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
+ }
+ }
+
transferSyncData = (syncId) => {
- const { config, group } = this.state
+ const { config } = this.state
if (config.$syncId !== syncId) return
@@ -139,15 +156,28 @@
_data = _data[0] || {$$empty: true}
_data.$$uuid = _data[config.setting.primaryKey] || ''
- let _group = group
-
- this.setState({data: _data, group: null}, () => {
- this.setState({group: _group})
- })
+ this.setState({data: _data})
window.GLOB.SyncData.delete(config.dataName)
MKEmitter.removeListener('transferSyncData', this.transferSyncData)
+ }
+
+ mkPublicData = (publicId, data) => {
+ const { config, BID, BData } = this.state
+
+ if (config.wrap.datatype === 'public' && config.wrap.publicId === publicId) {
+ let _data = fromJS(data).toJS()
+
+ _data.$$BID = BID || ''
+ _data.$$BData = BData || ''
+
+ this.setState({
+ data: null
+ }, () => {
+ this.setState({data: _data})
+ })
+ }
}
searchRefresh = (searchId) => {
@@ -181,6 +211,12 @@
if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) {
MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ } else if (position === 'grid' && config.wrap.datatype === 'static') {
+ this.setState({
+ data: null
+ }, () => {
+ this.setState({data: {$$empty: true}})
+ })
} else {
this.loadData()
}
@@ -218,7 +254,7 @@
execSuccess = (btn, id) => {
if (btn.linkmenu && btn.linkmenu.length > 0) {
let menu_id = btn.linkmenu[btn.linkmenu.length - 1]
- let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || ''
+ let menu = window.GLOB.mkThdMenus.get(menu_id) || ''
if (!menu) return
@@ -232,9 +268,12 @@
}
async loadData () {
- const { config, arr_field, BID } = this.state
+ const { config, BID } = this.state
- if (config.wrap.datatype === 'static') {
+ if (config.wrap.datatype === 'public') {
+ MKEmitter.emit('reloadData', config.wrap.publicId)
+ return
+ } else if (config.wrap.datatype === 'static') {
this.setState({
data: {$$empty: true}
})
@@ -263,7 +302,7 @@
})
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 1, BID)
+ let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, 1, 1, BID)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -313,13 +352,15 @@
}
}
- mkFormSubmit = (btnId) => {
+ mkFormSubmit = (btnId, callback) => {
const { group } = this.state
if (group.uuid !== btnId) return
this.formRef.handleConfirm().then(res => {
MKEmitter.emit('triggerFormSubmit', {menuId: btnId, form: res})
+ }, () => {
+ callback && callback()
})
}
--
Gitblit v1.8.0