From 891f462e34c90372b8cb97e215bb9858839dc232 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 26 十月 2023 15:51:12 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/interfaces/interItem/index.jsx | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/custom/components/interfaces/interItem/index.jsx b/src/tabviews/custom/components/interfaces/interItem/index.jsx
index fe1514e..0d86e30 100644
--- a/src/tabviews/custom/components/interfaces/interItem/index.jsx
+++ b/src/tabviews/custom/components/interfaces/interItem/index.jsx
@@ -47,6 +47,10 @@
MKEmitter.addListener('initFinish', this.initFinish)
}
+ if (config.setting.useMSearch) {
+ MKEmitter.addListener('searchRefresh', this.searchRefresh)
+ }
+
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
}
@@ -63,7 +67,16 @@
this.timer && this.timer.stop()
MKEmitter.removeListener('initFinish', this.initFinish)
MKEmitter.removeListener('reloadData', this.reloadData)
+ MKEmitter.removeListener('searchRefresh', this.searchRefresh)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ }
+
+ searchRefresh = (searchId) => {
+ const { config } = this.props
+
+ if (config.$searchId !== searchId) return
+
+ this.loadData()
}
initFinish = (MenuID) => {
@@ -108,9 +121,14 @@
if (this.loading) return
+ let searches = []
+ if (config.setting.useMSearch) {
+ searches = window.GLOB.SearchBox.get(config.$searchId) || []
+ }
+
this.loading = true
- let param = UtilsDM.getQueryDataParams(config.setting, [], config.setting.order, 1, 1, BID)
+ let param = UtilsDM.getQueryDataParams(config.setting, searches, config.setting.order, 1, 1, BID)
let result = await Api.genericInterface(param)
if (result.status) {
--
Gitblit v1.8.0