From e543372cc70a19ff2630c79d8421c2c593e54e5f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 02 六月 2021 17:15:21 +0800
Subject: [PATCH] 2021-06-02
---
src/tabviews/custom/components/carousel/data-card/index.jsx | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/custom/components/carousel/data-card/index.jsx b/src/tabviews/custom/components/carousel/data-card/index.jsx
index d276867..b75e1dc 100644
--- a/src/tabviews/custom/components/carousel/data-card/index.jsx
+++ b/src/tabviews/custom/components/carousel/data-card/index.jsx
@@ -92,7 +92,7 @@
componentDidMount () {
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
- MKEmitter.addListener('getexceloutparam', this.getexceloutparam)
+ MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
}
@@ -131,7 +131,7 @@
return
}
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
- MKEmitter.removeListener('getexceloutparam', this.getexceloutparam)
+ MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
@@ -174,7 +174,7 @@
/**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- getexceloutparam = (menuId, btnId) => {
+ queryModuleParam = (menuId, btnId) => {
const { mainSearch } = this.props
const { arr_field, config } = this.state
@@ -182,7 +182,7 @@
let searches = mainSearch ? fromJS(mainSearch).toJS() : []
- MKEmitter.emit('execExcelout', config.uuid, btnId, {
+ MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
arr_field: arr_field,
orderBy: config.setting.order || '',
search: searches,
@@ -261,7 +261,7 @@
}
if (card.setting.joint === 'true') {
- newtab.param.BID = item.$$uuid
+ newtab.param.$BID = item.$$uuid
}
if (['linkage_navigation', 'linkage'].includes(window.GLOB.navBar)) {
@@ -315,7 +315,7 @@
const { config, loading, data, card } = this.state
return (
- <div className="custom-data-carousel-box" style={{...config.style, minHeight: config.wrap.minHeight}}>
+ <div className="custom-data-carousel-box" style={config.style}>
{loading ?
<div className="loading-mask">
{data ? <div className="ant-spin-blur"></div> : null}
--
Gitblit v1.8.0