From b987be8dd8b6bc1fa01810daa1e1a60e58a3c921 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 04 九月 2020 17:24:36 +0800
Subject: [PATCH] 2020-09-04
---
src/tabviews/commontable/index.jsx | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 5d6b06e..ce2b81d 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -265,7 +265,18 @@
// 鏁版嵁婧愪俊鎭澶勭悊
config.setting.laypage = config.setting.laypage !== 'false' // 鏄惁鍒嗛〉锛岃浆涓篵oolean 缁熶竴鏍煎紡
config.setting.execute = config.setting.default !== 'false' // 榛樿sql鏄惁鎵ц锛岃浆涓篵oolean 缁熶竴鏍煎紡
- config.setting.customScript = config.setting.customScript || '' // 鑷畾涔夎剼鏈�
+ config.setting.customScript = '' // 鑷畾涔夎剼鏈�
+
+ if (config.setting.scripts && config.setting.scripts.length > 0) {
+ let _customScript = ''
+ config.setting.scripts.forEach(item => {
+ if (item.status === 'false') return
+ _customScript += `
+ ${item.sql}
+ `
+ })
+ config.setting.customScript = _customScript
+ }
if (!config.setting.execute) { // 榛樿sql 涓嶆墽琛屾椂 缃┖
config.setting.dataresource = ''
@@ -566,7 +577,7 @@
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, setting.customScript, arr_field, search, _orderBy, pageIndex, pageSize, BID, this.props.menuType, this.props.dataManager)
+ let param = UtilsDM.getQueryDataParams(setting, arr_field, search, _orderBy, pageIndex, pageSize, BID, this.props.menuType, this.props.dataManager)
let result = await Api.genericInterface(param)
if (result.status) {
--
Gitblit v1.8.0