From fb3ec146a9e1444ece749d0bcf232a554e933fb0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:56:16 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/carousel/prop-card/index.jsx | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/custom/components/carousel/prop-card/index.jsx b/src/tabviews/custom/components/carousel/prop-card/index.jsx
index 34f0eb3..10555d9 100644
--- a/src/tabviews/custom/components/carousel/prop-card/index.jsx
+++ b/src/tabviews/custom/components/carousel/prop-card/index.jsx
@@ -97,7 +97,8 @@
componentDidMount () {
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
- MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
+ MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
+ MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
}
shouldComponentUpdate (nextProps, nextState) {
@@ -110,6 +111,7 @@
}
MKEmitter.removeListener('reloadData', this.reloadData)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
@@ -180,6 +182,25 @@
this.loadData()
})
}
+ }
+
+ /**
+ * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
+ */
+ queryModuleParam = (menuId, btnId) => {
+ const { mainSearch } = this.props
+ const { config } = this.state
+
+ if (config.uuid !== menuId) return
+
+ let searches = config.setting.useMSearch && mainSearch ? mainSearch : []
+
+ MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
+ arr_field: '',
+ orderBy: '',
+ search: searches,
+ menuName: config.name
+ })
}
reloadData = (menuId) => {
@@ -255,7 +276,7 @@
if (config.wrap.empty === 'hidden' && (!data || data.$$empty)) return null
return (
- <div className="custom-prop-carousel-box" style={config.style}>
+ <div className="custom-prop-carousel-box" id={'anchor' + config.uuid} style={config.style}>
{loading ?
<div className="loading-mask">
<div className="ant-spin-blur"></div>
--
Gitblit v1.8.0