From 7e5200a09b2c6282382ec8725220f5561de139f6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 二月 2024 18:05:53 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/form/tab-form/index.jsx | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/custom/components/form/tab-form/index.jsx b/src/tabviews/custom/components/form/tab-form/index.jsx
index 6e921bb..da36b3c 100644
--- a/src/tabviews/custom/components/form/tab-form/index.jsx
+++ b/src/tabviews/custom/components/form/tab-form/index.jsx
@@ -105,11 +105,8 @@
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('mkFormSubmit', this.mkFormSubmit)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
-
- if (config.setting.useMSearch) {
- MKEmitter.addListener('searchRefresh', this.searchRefresh)
- }
if (config.setting.sync === 'true') {
MKEmitter.addListener('transferSyncData', this.transferSyncData)
@@ -117,6 +114,8 @@
if (config.wrap.datatype === 'public') {
MKEmitter.addListener('mkPublicData', this.mkPublicData)
+ } else if (config.setting.useMSearch) {
+ MKEmitter.addListener('searchRefresh', this.searchRefresh)
}
this.initExec()
@@ -136,6 +135,7 @@
MKEmitter.removeListener('searchRefresh', this.searchRefresh)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
MKEmitter.removeListener('transferSyncData', this.transferSyncData)
+ MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
@@ -192,6 +192,24 @@
})
}
+ /**
+ * @description 鑾峰彇缁勪欢鎼滅储
+ */
+ queryModuleParam = (menuId, callback) => {
+ const { config } = this.state
+
+ if (config.uuid !== menuId) return
+
+ let searches = []
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ searches = window.GLOB.SearchBox.get(config.$searchId) || []
+ }
+
+ callback({
+ search: searches
+ })
+ }
+
reloadData = (menuId, id) => {
const { config } = this.state
@@ -207,9 +225,9 @@
* @param {*} btn // 鎵ц鐨勬寜閽�
*/
refreshByButtonResult = (menuId, position, btn, id) => {
- const { config, group, BID } = this.state
+ const { config, BID } = this.state
- if (group.uuid !== menuId) return
+ if (config.uuid !== menuId) return
if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) {
MKEmitter.emit('reloadData', config.setting.supModule, BID)
--
Gitblit v1.8.0