From 102be577a7f8df2ae30045d55a1a5fc584f90363 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 19 十二月 2022 18:31:38 +0800
Subject: [PATCH] 2022-12-19
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
index 72f7c39..306c80d 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
@@ -23,6 +23,10 @@
})
arr_field = arr_field.join(',')
+ if (!arr_field) {
+ arr_field = '*'
+ }
+
let _customScript = ''
scripts && scripts.forEach(script => {
if (script.status === 'false') return
@@ -39,14 +43,6 @@
if (verify.defaultSql === 'false') {
_dataresource = ''
- }
-
- if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
- window.GLOB.funcs.forEach(item => {
- let reg = new RegExp('\\$ex@' + item.func_code + '@ex\\$', 'ig')
- _dataresource = _dataresource.replace(reg, `/*$ex@${item.func_code}-begin*/\n${item.key_sql}\n/*@ex$-end*/`)
- _customScript = _customScript.replace(reg, `/*$ex@${item.func_code}-begin*/\n${item.key_sql}\n/*@ex$-end*/`)
- })
}
_dataresource = _dataresource.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${timestamp}'`)
@@ -105,15 +101,15 @@
}
// 鏁版嵁婧愬鐞�, 瀛樺湪鏄剧ず鍒楁椂
- if (arr_field && _dataresource) {
+ if (_dataresource) {
if (/\s/.test(_dataresource)) {
_dataresource = '(' + _dataresource + ') tb'
}
if (verify.order) {
- _dataresource = `select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${verify.order}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows`
+ _dataresource = `/*system_query*/select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${verify.order}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows`
} else {
- _dataresource = `select ${arr_field} from ${_dataresource} ${_search}`
+ _dataresource = `/*system_query*/select ${arr_field} from ${_dataresource} ${_search}`
}
}
--
Gitblit v1.8.0