From 5e82b0ad1b94b8d2d9603fb9384346e6be60d5ab Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 八月 2023 14:03:34 +0800
Subject: [PATCH] 2023-08-08
---
src/templates/sharecomponent/settingcomponent/settingform/utils.jsx | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
index 2f6b872..54a957d 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
@@ -103,7 +103,7 @@
if (arr_field && _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}
@@ -125,7 +125,7 @@
_dataresource = '(' + _dataresource + ') tb'
}
- _dataresource = `select ${setting.laypage !== 'false' ? 'top 10' : ''} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable ${setting.laypage !== 'false' ? 'where rows > 0' : ''} order by tmptable.rows`
+ _dataresource = `/*system_query*/select ${setting.laypage !== 'false' ? 'top 10' : ''} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable ${setting.laypage !== 'false' ? 'where rows > 0' : ''} order by tmptable.rows`
}
if (_customScript) {
@@ -151,13 +151,13 @@
let arr = sql.match(/@[0-9a-zA-Z_]+@/ig)
arr.forEach(item => {
- let reg = new RegExp(item, 'ig')
+ let reg = new RegExp(item, 'i')
if (reg.test(_dataresource)) {
errors.push(`鏁版嵁婧愪腑瀛樺湪鏈浛鎹㈠��${item}`)
}
scripts && scripts.forEach(script => {
if (reg.test(script.sql)) {
- errors.push(`鑷畾涔夎剼鏈�(${script.$index})瀛樺湪鏈浛鎹㈠��${item}`)
+ errors.push(`鑷畾涔夎剼鏈�(${script.$index || ''})瀛樺湪鏈浛鎹㈠��${item}`)
}
})
})
@@ -166,7 +166,9 @@
if (sumSql) {
sumSql = sumSql.replace(/\n\s{10}/ig, '\n')
console.info(sumSql)
+ sumSql = sumSql.replace(/\n/g, ' ')
}
+ sql = sql.replace(/\n/g, ' ')
return { sql, sumSql, errors: errors.join('锛�') }
}
--
Gitblit v1.8.0