From f36c523f0d0d949106acd490cdf4394cc68b1ae0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 29 五月 2021 22:43:13 +0800
Subject: [PATCH] 2021-05-29
---
src/tabviews/commontable/index.jsx | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 46c6f02..ed33f98 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -223,8 +223,7 @@
if (!config.setting.execute) { // 榛樿sql 涓嶆墽琛屾椂 缃┖
config.setting.dataresource = ''
- }
- if (/\s/.test(config.setting.dataresource)) {
+ } else if (/\s/.test(config.setting.dataresource)) {
config.setting.dataresource = '(' + config.setting.dataresource + ') tb'
}
@@ -898,13 +897,13 @@
/**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- getexceloutparam = (menuId, btnId) => {
+ queryModuleParam = (menuId, btnId) => {
const { MenuName, MenuID } = this.props
const { arr_field, orderBy, search, setting} = this.state
if (MenuID !== menuId) return
- MKEmitter.emit('execExcelout', MenuID, btnId, {
+ MKEmitter.emit('returnModuleParam', MenuID, btnId, {
arr_field: arr_field,
orderBy: orderBy || setting.order,
search: search,
@@ -1021,7 +1020,7 @@
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('reloadMenuView', this.reloadMenuView)
MKEmitter.addListener('resetActiveMenu', this.resetActiveMenu)
- MKEmitter.addListener('getexceloutparam', this.getexceloutparam)
+ MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
}
@@ -1036,7 +1035,7 @@
MKEmitter.removeListener('reloadData', this.reloadData)
MKEmitter.removeListener('reloadMenuView', this.reloadMenuView)
MKEmitter.removeListener('resetActiveMenu', this.resetActiveMenu)
- MKEmitter.removeListener('getexceloutparam', this.getexceloutparam)
+ MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
--
Gitblit v1.8.0