From 96989af7e330a08d376002b0759705a477039f61 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 19 十月 2023 19:46:41 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx
index 9f4f640..365fd36 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx
@@ -95,9 +95,19 @@
_usefulFields.push(item.field)
_usefulFields.push(item.datefield)
_usefulFields.push(item.datefield + '1')
- } else if (['dateweek', 'datemonth', 'daterange'].includes(item.type)) {
+ } else if (['dateweek', 'datemonth'].includes(item.type)) {
_usefulFields.push(item.field)
_usefulFields.push(item.field + '1')
+ } else if (item.type === 'daterange') {
+ let _skey = item.field
+ let _ekey = item.field + '1'
+
+ if (/,/.test(item.field)) {
+ _skey = item.field.split(',')[0]
+ _ekey = item.field.split(',')[1]
+ }
+ _usefulFields.push(_skey)
+ _usefulFields.push(_ekey)
} else if (item.type === 'date' && _usefulFields.includes(item.field)) {
_usefulFields.push(item.field + '1')
} else {
@@ -173,6 +183,25 @@
duration: 5
})
return
+ } else if (/\son\s+[a-z0-9_]+\.[a-z0-9_]+\s*=\s*[a-z0-9_]+\.[a-z0-9_]+/ig.test(values.sql)) {
+ let list = values.sql.match(/\son\s+[a-z0-9_]+\.[a-z0-9_]+\s*=\s*[a-z0-9_]+\.[a-z0-9_]+/ig)
+ let errors = []
+ list.forEach(str => {
+ str = str.replace(/^\s/, '')
+ let strs = str.match(/(\s|=)[a-z0-9_]+\./ig)
+ if (strs.length === 2 && (strs[0].replace(/\s|\./g, '') === strs[1].replace(/\s|\./g, ''))) {
+ errors.push(str)
+ }
+ })
+
+ if (errors.length > 0) {
+ notification.warning({
+ top: 92,
+ message: '涓嶅彲浣跨敤鍚屼竴涓〃瀛楁杩涜鍏宠仈锛�' + errors.join('銆�'),
+ duration: 5
+ })
+ return
+ }
}
let error = Utils.verifySql(values.sql, 'customscript')
--
Gitblit v1.8.0