From 682a74e858e5a6cd24d36183931d3afafd6443d7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 31 三月 2021 10:56:48 +0800
Subject: [PATCH] 2021-03-31
---
src/utils/utils.js | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index b1d5fcd..72edafc 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -598,6 +598,10 @@
key: search.datefield,
value: '0'
})
+ options.push({
+ key: search.datefield + '1',
+ value: '0'
+ })
if (search.transfer === 'true') {
options.push(item)
}
@@ -716,6 +720,17 @@
sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield},${item.orderBy} as orderfield from ${_datasource} ) a order by orderfield ${item.orderType}`
} else {
sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield} from ${_datasource}) a`
+ }
+
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+ sql = sql.replace(/\$@/ig, '/*')
+ sql = sql.replace(/@\$/ig, '*/')
+ } else {
+ sql = sql.replace(/@\$|\$@/ig, '')
+ }
+
+ if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ console.info(sql)
}
return {
@@ -1266,7 +1281,7 @@
}
// 澶辨晥楠岃瘉锛屾坊鍔犳暟鎹椂涓嶇敤
- if (btn.sqlType !== 'insert' && verify.invalid === 'true' && setting.dataresource) {
+ if (btn.sqlType !== 'insert' && btn.Ot !== 'notRequired' && verify.invalid === 'true' && setting.dataresource) {
let datasource = setting.dataresource
if (/\s/.test(datasource) && !/tb$/.test(datasource)) { // 鎷兼帴鍒悕
datasource = '(' + datasource + ') tb'
--
Gitblit v1.8.0