From 92108e6c93de657838bbd766a9eb4f27d85e1c2d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 05 五月 2020 16:41:28 +0800
Subject: [PATCH] 2020-05-05
---
src/utils/utils.js | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 104 insertions(+), 15 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index a3f9b02..029cfc4 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -58,28 +58,28 @@
static verifySql (sql, type) {
if (!sql) return ''
let chars = [
- {key: 'create', reg: '(^|\\s)create\\s'},
- {key: 'insert', reg: '(^|\\s)insert\\s'},
- {key: 'delete', reg: '(^|\\s)delete\\s'},
- {key: 'update', reg: '(^|\\s)update\\s'},
- {key: 'set', reg: '(^|\\s)set\\s'},
- {key: 'drop', reg: '(^|\\s)drop\\s'},
- {key: 'alter', reg: '(^|\\s)alter\\s'},
- {key: 'truncate', reg: '(^|\\s)truncate\\s'},
- {key: 'if', reg: '(^|\\s)if\\s'},
- {key: 'exec', reg: 'exec'},
- {key: 'OBJECT', reg: 'OBJECT'},
- {key: 'sys.', reg: 'sys.'},
- {key: 'kill', reg: 'kill'},
+ {key: 'create', reg: /(^|\s)create\s/ig},
+ {key: 'insert', reg: /(^|\s)insert\s/ig},
+ {key: 'delete', reg: /(^|\s)delete\s/ig},
+ {key: 'update', reg: /(^|\s)update\s/ig},
+ {key: 'set', reg: /(^|\s)set\s/ig},
+ {key: 'drop', reg: /(^|\s)drop\s/ig},
+ {key: 'alter', reg: /(^|\s)alter\s/ig},
+ {key: 'truncate', reg: /(^|\s)truncate\s/ig},
+ {key: 'if', reg: /(^|\s)if\s/ig},
+ {key: 'exec', reg: /exec/ig},
+ {key: 'OBJECT', reg: /object/ig},
+ {key: 'sys.', reg: /sys\./ig},
+ {key: 'kill', reg: /kill/ig}
]
if (type === 'customscript') {
- chars = chars.map(char => !['insert', 'delete', 'update', 'set', 'if', 'exec'].includes(char.key))
+ chars = chars.filter(char => !['insert', 'delete', 'update', 'set', 'if', 'exec'].includes(char.key))
}
let error = ''
chars.forEach(char => {
- if (!error && new RegExp(char.reg, 'ig').test(sql)) {
+ if (!error && char.reg.test(sql)) {
error = char.key
}
})
@@ -360,6 +360,95 @@
}
/**
+ * @description 鎷兼帴鎼滅储鏉′欢main
+ * @param {Array} searches 鎼滅储鏉′欢
+ * @return {String} searchText 鎷兼帴缁撴灉
+ */
+ static getAllSearchOptions (searches) {
+ if (!searches || searches.length === 0) return []
+
+ let options = []
+ let fieldmap = new Map()
+ searches.forEach(search => {
+ let item = {
+ key: search.key,
+ match: search.match,
+ type: search.type,
+ label: search.label,
+ value: search.value,
+ required: search.required
+ }
+
+ if (fieldmap.has(item.key)) {
+ item.key = item.key + '1'
+ }
+
+ fieldmap.set(item.key, true)
+
+ if (item.type === 'date') {
+ if (['>=', '>'].includes(item.match)) {
+ item.value = item.value ? item.value + ' 00:00:00.000' : '1990-01-01 00:00:00.000'
+ } else if (['<=', '<'].includes(item.match)) {
+ item.value = item.value ? moment(item.value, 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000' : '2030-01-01 00:00:00.000'
+ }
+
+ options.push(item)
+ } else if (item.type === 'datemonth') {
+ let _startval = item.value ? moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000' : '1990-01-01 00:00:00.000'
+ let _endval = item.value ? moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000' : '2030-01-01 00:00:00.000'
+
+ let copy = JSON.parse(JSON.stringify(item))
+ copy.key = copy.key + '1'
+ copy.value = _endval
+
+ item.value = _startval
+
+ options.push(item)
+ options.push(copy)
+ } else if (item.type === 'dateweek') {
+ let _startval = item.value && item.value[0] ? moment(item.value[0], 'YYYY-MM-DD').format('YYYY-MM-DD') + ' 00:00:00.000' : '1990-01-01 00:00:00.000'
+ let _endval = item.value && item.value[1] ? moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000' : '2030-01-01 00:00:00.000'
+
+ let copy = JSON.parse(JSON.stringify(item))
+ copy.key = copy.key + '1'
+ copy.value = _endval
+
+ item.value = _startval
+
+ options.push(item)
+ options.push(copy)
+ } else if (item.type === 'daterange') {
+ let _startval = item.value && item.value[0] ? item.value[0] + ' 00:00:00.000' : '1990-01-01 00:00:00.000'
+ let _endval = item.value && item.value[1] ? moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000' : '2030-01-01 00:00:00.000'
+
+ let copy = JSON.parse(JSON.stringify(item))
+ copy.key = copy.key + '1'
+ copy.value = _endval
+
+ item.value = _startval
+
+ options.push(item)
+ options.push(copy)
+ } else if (item.type === 'multiselect') {
+ item.value = item.value ? item.value.join(',') : item.value
+
+ options.push(item)
+ } else if (item.type === 'text') {
+ item.key.split(',').forEach(field => { // 缁煎悎鎼滅储锛屾墍瀛楁鎷兼帴
+ let cell = JSON.parse(JSON.stringify(item))
+ cell.key = field
+
+ options.push(item)
+ })
+ } else {
+ options.push(item)
+ }
+ })
+
+ return options
+ }
+
+ /**
* @description 鎷兼帴鎼滅储鏉′欢datamanage
* @param {Array} searches 鎼滅储鏉′欢
* @return {String} searchText 鎷兼帴缁撴灉
--
Gitblit v1.8.0