From 31871ca836e6fcbea9b1c54e2ec15f49667bf093 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 十二月 2022 14:14:04 +0800
Subject: [PATCH] 2022-12-23
---
src/menu/datasource/verifycard/utils.jsx | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 835d503..06c8b82 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -22,6 +22,10 @@
})
}
+ if (!arr_field) {
+ arr_field = '*'
+ }
+
if (setting.interType === 'system' && setting.execute !== 'false') {
_dataresource = setting.dataresource || ''
}
@@ -161,9 +165,9 @@
let sumSql = ''
- if (arr_field && _dataresource && /\/\*\$sum@/ig.test(_dataresource)) {
+ if (_dataresource && /\/\*\$sum@/ig.test(_dataresource)) {
let _sql = _dataresource.replace(/\/\*\$sum@|@sum\$\*\//ig, '')
- _sql = `${_sql} ${_search}`
+ _sql = `/*system_query*/${_sql} ${_search}`
if (_customScript) {
sumSql = `/* sql sum楠岃瘉 */
${_customScript}
@@ -180,15 +184,15 @@
}
// 鏁版嵁婧愬鐞�, 瀛樺湪鏄剧ず鍒楁椂
- if (arr_field && _dataresource) {
+ if (_dataresource) {
if (/\s/.test(_dataresource)) {
_dataresource = '(' + _dataresource + ') tb'
}
if (setting.order) {
- _dataresource = `select${setting.laypage === 'true' ? ' top 10' : ''} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable ${setting.laypage === 'true' ? 'where rows > 0' : ''} order by tmptable.rows`
+ _dataresource = `/*system_query*/select${setting.laypage === 'true' ? ' top 10' : ''} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable ${setting.laypage === 'true' ? 'where rows > 0' : ''} order by tmptable.rows`
} else {
- _dataresource = `select${setting.laypage === 'true' ? ' top 10' : ''} ${arr_field} from ${_dataresource} ${_search}`
+ _dataresource = `/*system_query*/select${setting.laypage === 'true' ? ' top 10' : ''} ${arr_field} from ${_dataresource} ${_search}`
}
}
@@ -231,8 +235,10 @@
sumSql = sumSql.replace(/\n\s{10}/ig, '\n')
console.info(sumSql)
+ sumSql = sumSql.replace(/\n/g, ' ')
}
-
+ sql = sql.replace(/\n/g, ' ')
+
return { error, sql, sumSql, errors: errors.join('锛�') }
}
}
\ No newline at end of file
--
Gitblit v1.8.0