From 4141e18a9aee7c2a3887ff99bf0b1343d5771b79 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 09 十一月 2023 15:25:57 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/form/step-form/index.jsx | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index 895ff53..dca74c9 100644
--- a/src/tabviews/custom/components/form/step-form/index.jsx
+++ b/src/tabviews/custom/components/form/step-form/index.jsx
@@ -57,6 +57,13 @@
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}
}
@@ -134,6 +141,10 @@
MKEmitter.addListener('transferSyncData', this.transferSyncData)
}
+ if (config.wrap.datatype === 'public') {
+ MKEmitter.addListener('mkPublicData', this.mkPublicData)
+ }
+
this.initExec()
}
@@ -146,6 +157,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)
@@ -187,6 +199,23 @@
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) => {
const { config } = this.state
@@ -218,6 +247,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()
}
@@ -284,7 +319,10 @@
async loadData (type) {
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}
})
@@ -382,13 +420,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