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/step-form/index.jsx | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index 442829d..b22dba9 100644
--- a/src/tabviews/custom/components/form/step-form/index.jsx
+++ b/src/tabviews/custom/components/form/step-form/index.jsx
@@ -131,6 +131,7 @@
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.sync === 'true') {
@@ -160,6 +161,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)
}
@@ -224,6 +226,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
@@ -239,9 +259,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)
@@ -493,7 +513,7 @@
inputSubmit={() => this.mkFormSubmit(group.uuid)}
wrappedComponentRef={(inst) => this.formRef = inst}
/> : null}
- {group && data ? <div className={'mk-form-action ' + (group.$button || '')}>
+ {group && data ? <div className={'mk-form-action ' + (group.$button || '') + (group.nextButton.enable === 'true' ? ' has-skip' : '')}>
{group.prevButton.enable === 'true' ? <Button type="link" className="prev" onClick={this.prevStep} style={group.prevButton.style}>{group.prevButton.label}</Button> : null}
<NormalButton
BID={BID}
--
Gitblit v1.8.0