From b6ccd63b80fc7017bfabc446787732a98c7cbab7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 06 一月 2021 19:10:28 +0800
Subject: [PATCH] 2021-01-06
---
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
index b200838..7c07cc0 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -233,6 +233,7 @@
componentDidMount () {
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.addListener('getexceloutparam', this.getexceloutparam)
}
/**
@@ -243,6 +244,7 @@
return
}
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.removeListener('getexceloutparam', this.getexceloutparam)
}
resetParentParam = (MenuID, id) => {
@@ -254,6 +256,33 @@
this.loadData()
})
}
+ }
+
+ /**
+ * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
+ */
+ getexceloutparam = (menuId, btnId) => {
+ const { mainSearch } = this.props
+ const { arr_field, config, search } = this.state
+
+ if (config.uuid !== menuId) return
+
+ let searches = search ? fromJS(search).toJS() : []
+ if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+ let keys = searches.map(item => item.key.toLowerCase())
+ mainSearch.forEach(item => {
+ if (!keys.includes(item.key.toLowerCase())) {
+ searches.push(item)
+ }
+ })
+ }
+
+ MKEmitter.emit('execExcelout', config.uuid, btnId, {
+ arr_field: arr_field,
+ orderBy: config.setting.order || '',
+ search: searches,
+ menuName: config.name
+ })
}
/**
@@ -272,7 +301,7 @@
return
}
- let searches = fromJS(search).toJS()
+ let searches = search ? fromJS(search).toJS() : []
if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
let keys = searches.map(item => item.key)
mainSearch.forEach(item => {
--
Gitblit v1.8.0