From a07c0ccec35e8287ceb9bc2f4bd11302c5190d06 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 八月 2023 18:30:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils.js | 933 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 599 insertions(+), 334 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 2a92d14..35d083e 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -39,17 +39,42 @@
export default class Utils {
/**
- * @description 鏁版嵁婧愬悕绉帮紝鐢ㄤ簬缁熶竴鏌ヨ
- * @return {String} name
+ * @description 鑾峰彇浼氬憳绛夌骇
+ * @return {String} level
*/
- static getdataName () {
- let name = []
- let _options = 'abcdefghigklmnopqrstuvwxyz'
- for (let i = 0; i < 6; i++) {
- name.push(_options.substr(Math.floor(Math.random() * 26), 1))
+ static getMemberLevel () {
+ let _level = 10
+ let _Mlevel = sessionStorage.getItem('Member_Level')
+
+ if (_Mlevel) {
+ if (_Mlevel === md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 10)) {
+ _level = 10
+ } else if (_Mlevel === md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 20)) {
+ _level = 20
+ } else if (_Mlevel === md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 30)) {
+ _level = 30
+ }
}
- name.splice(3, 0, new Date().getTime())
- return name.join('')
+ return _level
+ }
+
+ /**
+ * @description 鑾峰彇鍥捐〃楂樺害
+ */
+ static getHeight (val) {
+ if (typeof(val) === 'string') {
+ if (val.indexOf('px') > -1) {
+ val = parseFloat(val)
+ } else if (val.indexOf('vw') > -1) {
+ val = parseFloat(val)
+ val = document.body.clientWidth * val / 100
+ } else if (val.indexOf('vh') > -1) {
+ val = parseFloat(val)
+ val = document.body.clientHeight * val / 100
+ }
+ }
+
+ return parseInt(val || 400) - 30
}
/**
@@ -74,12 +99,11 @@
static getguid () {
// 浜х敓涓�涓柊鐨凣UID鍊�
let uuid = []
- let d = new Date()
let options = '0123456789abcdefghigklmnopqrstuv'
for (let i = 0; i < 19; i++) {
uuid.push(options.substr(Math.floor(Math.random() * 0x20), 1))
}
- uuid = moment().format('YYYYMMDDHHmmss') + d.getMilliseconds() + uuid.join('')
+ uuid = moment().format('YYYYMMDDHHmmssSSS') + uuid.join('')
return uuid.toUpperCase()
}
@@ -118,19 +142,19 @@
static verifySql (sql, type) {
if (!sql) return ''
let chars = [
- {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: /(^|\s)exec(\s|\()/ig},
- {key: 'OBJECT', reg: /(^|\s)object(\s|\()/ig},
- {key: 'sys.', reg: /(^|\s)sys\./ig},
- {key: 'kill', reg: /(^|\s)kill\s/ig}
+ {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: /(^|\s|\(|\))exec(\s|\()/ig},
+ {key: 'OBJECT', reg: /(^|\s|\(|\))object(\s|\()/ig},
+ {key: 'sys.', reg: /(^|\s|\(|\))sys\./ig},
+ {key: 'kill', reg: /(^|\s|\(|\))kill\s/ig}
]
if (type === 'customscript') {
@@ -139,7 +163,7 @@
let error = ''
- sql = sql.replace(/sys\.fn_sqlvarbasetostr\(HashBytes\('MD5'/ig, '') // 璺宠繃MD5鍔犲瘑
+ sql = sql.replace(/sys\.fn_/ig, '') // 璺宠繃sys.fn_楠岃瘉
chars.forEach(char => {
if (!error && char.reg.test(sql)) {
@@ -181,6 +205,29 @@
return value
}
+
+ // /**
+ // * @description sql瑙ｅ瘑
+ // * @return {String} value
+ // */
+ // static unFormatOptions (value) {
+ // if (!value) return ''
+
+ // value = window.atob(value)
+ // value = value.replace('minKe', '')
+ // value = window.decodeURIComponent(window.atob(value))
+ // value = value.replace(/ mpercent /ig, '%')
+
+ // // 鏇挎崲鍏抽敭瀛�
+ // formatKeys.forEach(item => {
+ // let reg = new RegExp('(\\s)?' + item.value.replace(/\s/g, '') + '(\\s)?', 'ig')
+ // value = value.replace(reg, ' ' + item.key + ' ')
+ // })
+
+ // value = value.replace(/ \n /ig, '\n')
+
+ // return value
+ // }
/**
* @description sPC_TableData_InUpDe sql鍔犲瘑
@@ -239,27 +286,61 @@
* @description 鍒濆鍖栨悳绱㈡潯浠跺垵濮嬪��
* @param {Array} searches 鎼滅储鏉′欢
*/
- static initSearchVal (searches) {
- if (!searches) return []
+ static initSearchVal (config) {
+ if (!config.search) {
+ config.search = []
+ return
+ }
let roleId = sessionStorage.getItem('role_id') || ''
+ let required = false
+ let keys = []
- return searches.map(item => {
+ config.search = config.search.map(item => {
item.hidden = item.Hide === 'true'
item.required = !item.hidden && item.required === 'true'
item.advanced = item.advanced === 'true'
+ item.$forbid = item.query === 'false'
+ item.precision = item.precision || 'day'
if (item.type === 'date') { // 鏃堕棿鎼滅储
- item.initval = item.initval ? moment().subtract(item.initval, 'days').format('YYYY-MM-DD') : ''
+ let format = 'YYYY-MM-DD'
+ if (item.precision === 'day') {
+
+ } else if (item.precision === 'hour') {
+ format = 'YYYY-MM-DD HH'
+ } else if (item.precision === 'minute') {
+ format = 'YYYY-MM-DD HH:mm'
+ } else if (item.precision === 'second') {
+ format = 'YYYY-MM-DD HH:mm:ss'
+ }
+
+ item.initval = item.initval ? moment().subtract(item.initval, 'days').format(format) : ''
} else if (item.type === 'datemonth') {
item.initval = item.initval ? moment().subtract(item.initval, 'month').format('YYYY-MM') : ''
} else if (item.type === 'dateweek') {
item.initval = item.initval ? moment().subtract(item.initval * 7, 'days').format('YYYY-MM-DD') : ''
} else if (item.type === 'daterange') {
- if (item.initval) {
+ let format = 'YYYY-MM-DD'
+ if (item.precision === 'day') {
+
+ } else if (item.precision === 'hour') {
+ format = 'YYYY-MM-DD HH'
+ } else if (item.precision === 'minute') {
+ format = 'YYYY-MM-DD HH:mm'
+ } else if (item.precision === 'second') {
+ format = 'YYYY-MM-DD HH:mm:ss'
+ }
+ if (item.initval === 'week') {
+ item.initval = [moment().startOf('week').format(format), moment().endOf('week').format(format)].join(',')
+ } else if (item.initval === 'month') {
+ item.initval = [moment().startOf('month').format(format), moment().endOf('month').format(format)].join(',')
+ } else if (item.initval === 'lastMonth') {
+ item.initval = [moment().subtract(1, 'months').startOf('month').format(format), moment().subtract(1, 'months').endOf('month').format(format)].join(',')
+ } else if (item.initval) {
try {
let _initval = JSON.parse(item.initval)
- let _vals = [moment().subtract(_initval[0], 'days').format('YYYY-MM-DD'), moment().subtract(_initval[1], 'days').format('YYYY-MM-DD')]
+ let _vals = [moment().subtract(_initval[0], 'days').format(format), moment().subtract(_initval[1], 'days').format(format)]
item.initval = _vals.join(',')
} catch (e) {
item.initval = ''
@@ -333,8 +414,28 @@
}
}
+ if (item.required) {
+ required = true
+ }
+
+ if (item.type === 'text' || item.type === 'select') {
+ if (/,/.test(item.field)) {
+ item.field.split(',').forEach(field => {
+ keys.push(field.toLowerCase())
+ })
+ } else {
+ keys.push(item.field.toLowerCase())
+ }
+ } else if (item.type === 'group') {
+ keys.push(item.field.toLowerCase())
+ keys.push(item.datefield.toLowerCase())
+ }
+
return item
})
+
+ config.$s_keys = keys
+ config.$s_req = required
}
/**
@@ -352,7 +453,9 @@
type: cell.type,
label: cell.label,
value: cell.initval,
- required: cell.required
+ required: cell.required,
+ precision: cell.precision || 'day',
+ forbid: cell.$forbid
}
if (cell.type === 'multiselect' || (cell.type === 'checkcard' && cell.multiple === 'true')) {
@@ -392,10 +495,18 @@
let _val = item.value || ''
if (_val) {
- if (item.match === '<' || item.match === '<=') {
- _val = moment(_val, 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
- } else if (item.match === '>' || item.match === '>=') {
- _val = _val + ' 00:00:00.000'
+ if (item.precision === 'day') {
+ if (item.match === '<' || item.match === '<=') {
+ _val = moment(_val, 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+ } else if (item.match === '>' || item.match === '>=') {
+ _val = _val + ' 00:00:00.000'
+ }
+ } else if (item.precision === 'hour') {
+ _val = _val + ':00:00.000'
+ } else if (item.precision === 'minute') {
+ _val = _val + ':00.000'
+ } else if (item.precision === 'second') {
+ _val = _val + '.000'
}
}
@@ -431,8 +542,20 @@
let _endval = ''
if (item.value) {
let val = item.value.split(',')
- _startval = val[0] + ' 00:00:00.000'
- _endval = moment(val[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+
+ if (item.precision === 'day') {
+ _startval = val[0] + ' 00:00:00.000'
+ _endval = moment(val[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+ } else if (item.precision === 'hour') {
+ _startval = val[0] + ':00:00.000'
+ _endval = val[1] + ':00:00.000'
+ } else if (item.precision === 'minute') {
+ _startval = val[0] + ':00.000'
+ _endval = val[1] + ':00.000'
+ } else if (item.precision === 'second') {
+ _startval = val[0] + '.000'
+ _endval = val[1] + '.000'
+ }
}
newsearches[item.key] = _startval
@@ -457,59 +580,87 @@
static joinMainSearchkey (searches) {
if (!searches || searches.length === 0) return ''
- let searchText = ''
+ let searchText = []
searches.forEach(item => {
if (item.forbid || !item.value) return
- searchText += (searchText !== '' ? ' AND ' : '')
if (item.type === 'text' || item.type === 'select') { // 缁煎悎鎼滅储锛屾枃鏈垨涓嬫媺锛屾墍鏈夊瓧娈垫嫾鎺�
- let str = item.match === '=' ? '' : '%'
+ let str = item.match === 'like' || item.match === 'not like' ? '%' : ''
let fields = item.key.split(',').map(field => {
return field + ' ' + item.match + ' \'' + str + item.value + str + '\''
})
- searchText += '(' + fields.join(' OR ') + ')'
+ searchText.push('(' + fields.join(' OR ') + ')')
+ } else if (item.type === 'checkcard') {
+ let str = item.match === 'like' || item.match === 'not like' ? '%' : ''
+
+ searchText.push('(' + item.key + ' ' + item.match + ' \'' + str + item.value + str + '\')')
} else if (item.type === 'multi') {
- searchText += `'${item.value}' ${item.match} '%'+${item.key}+'%'`
+ searchText.push(`('${item.value}' ${item.match} '%'+${item.key}+'%')`)
} else if (item.type === 'date') {
let _val = item.value
- let timetail = ' 00:00:00.000'
+ let timetail = ''
let _match = item.match
if (item.match === '<' || item.match === '<=') { // 鏃堕棿涓�<=鏃讹紝鍖归厤鍚庝竴澶╃殑0鐐癸紝鍖归厤鏂瑰紡涓�<
_match = '<'
- _val = moment(_val, 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
- } else if (item.match === '=') {
+ if (item.precision === 'day') {
+ _val = moment(_val, 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ }
+ }
+ if (item.match === '=') {
timetail = ''
+ } else if (item.precision === 'day') {
+ timetail = ' 00:00:00.000'
+ } else if (item.precision === 'hour') {
+ timetail = ':00:00.000'
+ } else if (item.precision === 'minute') {
+ timetail = ':00.000'
+ } else if (item.precision === 'second') {
+ timetail = '.000'
}
- searchText += '(' + item.key + ' ' + _match + ' \'' + _val + timetail + '\')'
+ searchText.push('(' + item.key + ' ' + _match + ' \'' + _val + timetail + '\')')
} else if (item.type === 'datemonth') { // 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫锛岀粨鏉熸椂闂翠负鏈堟湯鍔犱竴澶╃殑0鐐癸紝鏂瑰紡涓�<
let _startval = moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000'
let _endval = moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
- searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
+ searchText.push('(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')')
} else if (item.type === 'dateweek') { // 鍛�-杩囨护鏉′欢
let _startval = moment(item.value, 'YYYY-MM-DD' ).startOf('week').format('YYYY-MM-DD') + ' 00:00:00.000'
let _endval = moment(item.value, 'YYYY-MM-DD').endOf('week').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
- searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
+ searchText.push('(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')')
} else if (item.type === 'daterange') {
let val = item.value.split(',')
- let _startval = val[0] + ' 00:00:00.000'
- let _endval = moment(val[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+ let _startval = ''
+ let _endval = ''
- searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
+ if (item.precision === 'day') {
+ _startval = val[0] + ' 00:00:00.000'
+ _endval = moment(val[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+ } else if (item.precision === 'hour') {
+ _startval = val[0] + ':00:00.000'
+ _endval = val[1] + ':00:00.000'
+ } else if (item.precision === 'minute') {
+ _startval = val[0] + ':00.000'
+ _endval = val[1] + ':00.000'
+ } else if (item.precision === 'second') {
+ _startval = val[0] + '.000'
+ _endval = val[1] + '.000'
+ }
+
+ searchText.push('(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')')
} else if (item.type === 'range') {
let val = item.value.split(',')
- searchText += '(' + item.key + ' >= \'' + val[0] + '\' AND ' + item.key + ' < \'' + val[1] + '\')'
+ searchText.push('(' + item.key + ' >= \'' + val[0] + '\' AND ' + item.key + ' < \'' + val[1] + '\')')
} else {
- searchText += '(' + item.key + ' ' + item.match + ' \'' + item.value + '\')'
+ searchText.push('(' + item.key + ' ' + item.match + ' \'' + item.value + '\')')
}
})
- return searchText
+ return searchText.join(' AND ')
}
/**
@@ -537,10 +688,24 @@
fieldmap.set(item.key, true)
if (item.type === 'date') {
- if (['>=', '>'].includes(item.match)) {
- item.value = item.value ? item.value + ' 00:00:00.000' : '1970-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' : '2050-01-01 00:00:00.000'
+ if (!item.value) {
+ if (['>=', '>'].includes(item.match)) {
+ item.value = '1970-01-01 00:00:00.000'
+ } else if (['<=', '<'].includes(item.match)) {
+ item.value = '2050-01-01 00:00:00.000'
+ }
+ } else if (search.precision === 'day') {
+ if (['>=', '>'].includes(item.match)) {
+ item.value = item.value + ' 00:00:00.000'
+ } else if (['<=', '<'].includes(item.match)) {
+ item.value = moment(item.value, 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+ }
+ } else if (search.precision === 'hour') {
+ item.value = item.value + ':00:00.000'
+ } else if (search.precision === 'minute') {
+ item.value = item.value + ':00.000'
+ } else if (search.precision === 'second') {
+ item.value = item.value + '.000'
}
options.push(item)
@@ -571,11 +736,23 @@
} else if (item.type === 'daterange') {
let _startval = '1970-01-01 00:00:00.000'
let _endval = '2050-01-01 00:00:00.000'
-
+
if (item.value) {
let val = item.value.split(',')
- _startval = val[0] + ' 00:00:00.000'
- _endval = moment(val[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+
+ if (search.precision === 'day') {
+ _startval = val[0] + ' 00:00:00.000'
+ _endval = moment(val[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+ } else if (search.precision === 'hour') {
+ _startval = val[0] + ':00:00.000'
+ _endval = val[1] + ':00:00.000'
+ } else if (search.precision === 'minute') {
+ _startval = val[0] + ':00.000'
+ _endval = val[1] + ':00.000'
+ } else if (search.precision === 'second') {
+ _startval = val[0] + '.000'
+ _endval = val[1] + '.000'
+ }
}
let copy = JSON.parse(JSON.stringify(item))
@@ -602,77 +779,13 @@
}
/**
- * @description 鑾峰彇鎼滅储鐢ㄤ簬姝ｅ垯鏇挎崲
- * @param {Array} searches 鎼滅储鏉′欢
- * @return {String} searchText 鎷兼帴缁撴灉
- */
- static getRegOptions (searches) {
- if (!searches || searches.length === 0) return []
-
- let options = []
- let fieldmap = new Map()
- searches.forEach(search => {
- let item = {
- key: search.field,
- value: '0'
- }
-
- if (fieldmap.has(item.key)) {
- item.key = item.key + '1'
- }
-
- fieldmap.set(item.key, true)
-
- if (search.type === 'group') {
- options.push({
- key: search.field,
- value: '0'
- })
- options.push({
- key: search.datefield,
- value: '0'
- })
- options.push({
- key: search.datefield + '1',
- value: '0'
- })
- options.push(item)
- } else if (['datemonth', 'dateweek', 'daterange'].includes(search.type)) {
- options.push(item)
- options.push({
- key: item.key + '1',
- value: '0'
- })
- } else if (search.type === 'text' || search.type === 'select') {
- item.key.split(',').forEach(field => {
- let cell = JSON.parse(JSON.stringify(item))
- cell.key = field
-
- options.push(cell)
- })
- } else {
- options.push(item)
- }
- })
-
- return options
- }
-
- /**
* @description 鑾峰彇鍥剧墖鐪熷疄璺緞
* @return {String} url 鍥剧墖璺緞
*/
static getrealurl (url) {
if (!url) return ''
- let baseurl = ''
- if (process.env.NODE_ENV === 'production') {
- baseurl = document.location.origin + '/' + window.GLOB.service
- } else {
- baseurl = window.GLOB.location + '/' + window.GLOB.service
- }
-
- let realurl = url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
+ let realurl = url.match(/^http/) || url.match(/^\/\//) ? url : window.GLOB.baseurl + url
return realurl
}
@@ -688,7 +801,7 @@
if (options.cloudServiceApi) {
baseurl = options.cloudServiceApi.replace(/webapi(.*)$/, '')
} else {
- baseurl = document.location.origin + '/' + window.GLOB.service
+ baseurl = window.GLOB.baseurl
}
return url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
@@ -701,16 +814,24 @@
static getSelectQueryOptions (item) {
let arrfield = [item.valueField, item.valueText]
- if (item.type === 'link') {
- arrfield.push(item.linkField)
- } else if (item.type === 'checkcard') {
- arrfield = item.fields.map(f => f.field)
+ if (item.type === 'checkcard') {
+ arrfield = item.fields ? item.fields.map(f => f.field) : []
arrfield.push(item.cardValField)
if (item.urlField) {
arrfield.push(item.urlField)
+ } else if (item.colorField) {
+ arrfield.push(item.colorField)
+ } else if (item.parentField) {
+ arrfield.push(item.parentField)
}
}
+
+ if (item.linkField) {
+ arrfield.push(item.linkField)
+ }
if (['select', 'radio', 'link', 'checkcard'].includes(item.type) && item.linkSubField && item.linkSubField.length > 0) {
+ arrfield.push(...item.linkSubField)
+ } else if (item.type === 'text' && item.editType === 'select' && item.linkSubField && item.linkSubField.length > 0) { // 鍙紪杈戣〃
arrfield.push(...item.linkSubField)
}
if (item.disableField) {
@@ -729,16 +850,15 @@
arrfield = arrfield.join(',')
if (item.orderBy) {
- sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield},${item.orderBy} as orderfield from ${_datasource} ) a order by orderfield ${item.orderType}`
+ sql = `select distinct ${arrfield},${item.orderBy} as orderfield from ${_datasource} order by orderfield ${item.orderType}`
} else {
- sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield} from ${_datasource}) a`
+ sql = `select distinct ${arrfield} from ${_datasource}`
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- sql = sql.replace(/\$@/ig, '/*')
- sql = sql.replace(/@\$/ig, '*/')
+ sql = sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- sql = sql.replace(/@\$|\$@/ig, '')
+ sql = sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
// 澶栬仈鏁版嵁搴撴浛鎹�
@@ -746,9 +866,8 @@
sql = sql.replace(/@db@/ig, window.GLOB.externalDatabase)
}
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
- console.info(sql)
- }
+ sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
return {
sql: sql,
@@ -761,10 +880,9 @@
* @description 鑾峰彇excel瀵煎叆鍙傛暟
* @return {Object} item 鎸夐挳淇℃伅
* @return {Array} data excel鏁版嵁
- * @return {Object} dict 瀛楀吀椤�
* @return {String} BID 涓婄骇Id
*/
-export function getExcelInSql (item, data, dict, BID) {
+export function getExcelInSql (item, data, BID, primaryId) {
let btn = item.verify
let keys = ['delete', 'drop', 'insert', 'truncate', 'update']
let userName = sessionStorage.getItem('User_Name') || ''
@@ -772,13 +890,13 @@
let RoleID = sessionStorage.getItem('role_id') || ''
let departmentcode = sessionStorage.getItem('departmentcode') || ''
let organization = sessionStorage.getItem('organization') || ''
+ let mk_user_type = sessionStorage.getItem('mk_user_type') || ''
+ let nation = sessionStorage.getItem('nation') || ''
+ let province = sessionStorage.getItem('province') || ''
let city = sessionStorage.getItem('city') || ''
+ let district = sessionStorage.getItem('district') || ''
+ let address = sessionStorage.getItem('address') || ''
let _sheet = item.sheet
-
- if (sessionStorage.getItem('isEditState') === 'true') {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
if (window.GLOB.externalDatabase !== null) {
_sheet = _sheet.replace(/@db@/ig, window.GLOB.externalDatabase)
@@ -812,20 +930,22 @@
btn.scripts.forEach(script => {
if (script.status === 'false') return
+ let _sql = script.sql
+
if (script.position === 'init') {
_initCustomScript += `
/* 鑷畾涔夎剼鏈� */
- ${script.sql}
+ ${_sql}
`
} else if (script.position === 'front') {
_prevCustomScript += `
/* 鑷畾涔夎剼鏈� */
- ${script.sql}
+ ${_sql}
`
} else {
_backCustomScript += `
/* 鑷畾涔夎剼鏈� */
- ${script.sql}
+ ${_sql}
`
}
})
@@ -846,64 +966,43 @@
let val = item[col.Column] !== undefined ? item[col.Column] : ''
let _colindex = cols[cindex] || (cindex + 1)
- let _position = (_topline + lindex + 1) + dict['main.excel.line'] + ' ' + _colindex + dict['main.excel.column'] + ' '
+ let _position = (_topline + lindex + 1) + '琛� ' + _colindex + '鍒� '
if (/^Nvarchar/ig.test(col.type)) {
- if (typeof(val) === 'number') {
- val = val.toString()
+ val = val + ''
+
+ if (/'/.test(val)) {
+ val = val.replace(/'/ig, '"')
}
- val = val.replace(/(^\s*$)|\t*|\v*|'*/ig, '')
+ val = val.replace(/(^\s+$)|\t+|\v+/ig, '')
if (!val && col.required === 'true') { // 蹇呭～鏍￠獙
- errors.push(_position + dict['main.excel.content.emptyerror'])
+ errors.push(_position + '鍐呭涓嶅彲涓虹┖')
} else if (col.limit && val.length > col.limit) { // 闀垮害鏍￠獙
- errors.push(_position + dict['main.excel.content.maxlimit'])
+ errors.push(_position + '鍐呭瓒呴暱')
} else { // 鍏抽敭瀛楁牎楠�
keys.forEach(key => {
let _patten = new RegExp('(^' + key + '\\s+)|(\\s+' + key + '\\s+)', 'ig')
if (_patten.test(val)) {
- errors.push(_position + dict['main.excel.includekey'] + key)
+ errors.push(_position + '鍚湁鍏抽敭瀛�' + key)
}
})
}
- } else if (/^int/ig.test(col.type)) {
+ } else if (/^Decimal/ig.test(col.type) || /^int/ig.test(col.type)) {
if (!val && val !== 0) {
- errors.push(_position + dict['main.excel.content.emptyerror'])
- } else {
- let _val = val + ''
-
- if (!/^(([^0][0-9]+|0)$)|^(([1-9]+)$)/.test(_val)) { // 妫�楠屾槸鍚︿负鏁存暟
- errors.push(_position + dict['main.excel.content.interror'])
- } else if ((col.min || col.min === 0) && val < col.min) { // 鏈�灏忓�兼楠�
- errors.push(_position + dict['main.excel.content.limitmin'])
- } else if ((col.max || col.max === 0) && val > col.max) { // 鏈�澶у�兼楠�
- errors.push(_position + dict['main.excel.content.limitmax'])
- }
- }
- } else if (/^Decimal/ig.test(col.type)) {
- if (!val && val !== 0) {
- errors.push(_position + dict['main.excel.content.emptyerror'])
- } else {
- let _val = val + ''
- let _vals = _val.split('.')
-
- if (!/^(([^0][0-9]+|0)\.([0-9]+)$)|^(([^0][0-9]+|0)$)|^(([1-9]+)\.([0-9]+)$)|^(([1-9]+)$)/.test(_val)) { // 妫�楠屾槸鍚︿负娴偣鏁�
- errors.push(_position + dict['main.excel.content.floaterror'])
- } else if (_vals[0].length > 18) { // 妫�楠屾暣鏁颁綅
- errors.push(_position + dict['main.excel.content.floatIntover'])
- } else if (_vals[1] && _vals[1].length > col.limit) { // 鏈�灏忓�兼楠�
- errors.push(_position + dict['main.excel.content.floatPointover'])
- } else if ((col.min || col.min === 0) && val < col.min) { // 鏈�灏忓�兼楠�
- errors.push(_position + dict['main.excel.content.limitmin'])
- } else if ((col.max || col.max === 0) && val > col.max) { // 鏈�澶у�兼楠�
- errors.push(_position + dict['main.excel.content.limitmax'])
- }
+ errors.push(_position + '鍐呭涓嶅彲涓虹┖')
+ } else if (isNaN(val)) { // 妫�楠屾槸鍚︿负鏁板��
+ errors.push(_position + '鍐呭搴斾负鏁板��')
+ } else if ((col.min || col.min === 0) && val < col.min) { // 鏈�灏忓�兼楠�
+ errors.push(_position + '灏忎簬鏈�灏忓��')
+ } else if ((col.max || col.max === 0) && val > col.max) { // 鏈�澶у�兼楠�
+ errors.push(_position + '澶т簬鏈�澶у��')
}
} else if (col.type === 'date') {
if (typeof(val) === 'number') {
if (val > 2958465 || val <= 0) { // 鏃堕棿杩囧ぇ鎴栧皬浜庣瓑浜�0
- errors.push(_position + dict['main.excel.content.date.over'])
+ errors.push(_position + '鏃堕棿涓鸿礋鍊兼垨澶ぇ')
} else { // 鏃堕棿鏍煎紡鍖�
if (val < 60) { // 1900-2-29锛宔xcel涓瓨鍦紝瀹為檯涓嶅瓨鍦�
val++
@@ -911,14 +1010,14 @@
val = moment('19000101', 'YYYYMMDD').add(Math.floor(val - 2), 'days').format('YYYY-MM-DD')
}
} else if (typeof(val) === 'string') {
- val = val.replace(/(^\s*$)|\t*|\v*/ig, '')
+ val = val.replace(/(^\s+$)|\t+|\v+/ig, '')
if (!val && col.required === 'true') { // 鏃堕棿蹇呭～鏍￠獙
- errors.push(_position + dict['main.excel.content.emptyerror'])
+ errors.push(_position + '鍐呭涓嶅彲涓虹┖')
} else if (val && !/^[1-9][0-9]{3}/.test(val)) { // 鏃堕棿姝ｅ垯鏍￠獙
- errors.push(_position + dict['main.excel.content.date.formatError'])
+ errors.push(_position + '鏃堕棿鏍煎紡閿欒')
}
} else { // 鏃堕棿鏍煎紡閿欒
- errors.push(_position + dict['main.excel.content.date.formatError'])
+ errors.push(_position + '鏃堕棿鏍煎紡閿欒')
}
}
@@ -957,14 +1056,14 @@
let _uniquesql = ''
if (btn.uniques && btn.uniques.length > 0) {
btn.uniques.forEach(unique => {
- if (unique.status === 'false') return
+ if (unique.status === 'false' || !unique.verifyType) return
let _fields = unique.field.split(',')
let _fields_ = _fields.map(_field => `a.${_field}=b.${_field}`)
let _afields = _fields.map(_field => `a.${_field}`)
_fields_ = _fields_.join(' and ')
- if (unique.verifyType !== 'physical') {
+ if (unique.verifyType === 'logic' || unique.verifyType === 'logic_temp') {
_fields_ += ' and b.deleted=0'
}
@@ -979,14 +1078,14 @@
goto aaa
end
- Set @tbid=''
+ ${unique.verifyType.indexOf('temp') === -1 ? `Set @tbid=''
Select top 1 @tbid=${_afields.join('+\' \'+')} from @${sheet} a Inner join ${sheet} b on ${_fields_}
If @tbid!=''
Begin
select @ErrorCode='${unique.errorCode}',@retmsg=@tbid+' 涓庡凡鏈夋暟鎹噸澶�'
goto aaa
- end
+ end` : ''}
`
})
}
@@ -1019,9 +1118,9 @@
_sql = `
/* 绯荤粺鐢熸垚 */
declare @${sheet} table (${declarefields.join(',')},jskey nvarchar(50),BID nvarchar(50) )
- Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@departmentcode nvarchar(50),@organization nvarchar(50),@login_city nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
+ Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
- Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @departmentcode='${departmentcode}', @organization='${organization}', @login_city='${city}'
+ Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
${_initCustomScript}
`
_sqlInsert = `Insert into @${sheet} (${fields},jskey,BID)`
@@ -1038,7 +1137,31 @@
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ _sql = _sql.replace(/@ID@/ig, `'${primaryId || ''}'`)
+ _sql = _sql.replace(/@BID@/ig, `'${BID}'`)
+ _sql = _sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ _sql = _sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ _sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+ _sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ _sql = _sql.replace(/@typename@/ig, `'admin'`)
+
+ _sqlBottom = _sqlBottom.replace(/@ID@/ig, `'${primaryId || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@BID@/ig, `'${BID}'`)
+ _sqlBottom = _sqlBottom.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@typename@/ig, `'admin'`)
+
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+ _sql = _sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ _sqlBottom = _sqlBottom.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ } else {
+ _sql = _sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ _sqlBottom = _sqlBottom.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ }
+
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
let fsql = `
${_sql}
${_sqlInsert}
@@ -1054,9 +1177,9 @@
_sql = `
/* 绯荤粺鐢熸垚 */
declare @${sheet} table (jskey nvarchar(50))
- Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@departmentcode nvarchar(50),@organization nvarchar(50),@login_city nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
+ Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
- Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @departmentcode='${departmentcode}', @organization='${organization}', @login_city='${city}'
+ Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
`
}
@@ -1086,14 +1209,15 @@
let RoleID = sessionStorage.getItem('role_id') || ''
let departmentcode = sessionStorage.getItem('departmentcode') || ''
let organization = sessionStorage.getItem('organization') || ''
+ let mk_user_type = sessionStorage.getItem('mk_user_type') || ''
+ let nation = sessionStorage.getItem('nation') || ''
+ let province = sessionStorage.getItem('province') || ''
let city = sessionStorage.getItem('city') || ''
+ let district = sessionStorage.getItem('district') || ''
+ let address = sessionStorage.getItem('address') || ''
+
let _sheet = btn.sheet
let BID = data[0].$$BID || ''
-
- if (sessionStorage.getItem('isEditState') === 'true') {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
if (window.GLOB.externalDatabase !== null) {
_sheet = _sheet.replace(/@db@/ig, window.GLOB.externalDatabase)
@@ -1103,19 +1227,6 @@
let sheet = _sheet.replace(/(.*)\.(.*)\./ig, '')
database = database ? (database[0] || '') : ''
-
- let getuuid = () => {
- let uuid = []
- let timestamp = new Date().getTime()
- let _options = '0123456789abcdefghigklmnopqrstuv'
- for (let i = 0; i < 19; i++) {
- uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
- }
- uuid = timestamp + uuid.join('')
- return uuid
- }
-
- // let upId = getuuid()
let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
@@ -1147,7 +1258,7 @@
// 鎺у埗鍙版墦鍗版暟鎹�
let conLtext = []
- let _Ltext = data.map((item, lindex) => {
+ let _Ltext = data.map(item => {
let vals = []
let convals = []
columns.forEach(col => {
@@ -1158,13 +1269,7 @@
})
let key = item.$$uuid
- let type = 'upt'
- if (key === '$new') {
- key = getuuid()
- type = 'add'
- } else if (item.$deleted) {
- type = 'del'
- }
+ let type = item.$type || 'upt'
vals.push(`'${key}'`)
vals.push(`'${type}'`)
@@ -1191,14 +1296,14 @@
let _uniquesql = ''
if (btn.uniques && btn.uniques.length > 0) {
btn.uniques.forEach(unique => {
- if (unique.status === 'false') return
+ if (unique.status === 'false' || !unique.verifyType) return
let _fields = unique.field.split(',')
let _fields_ = _fields.map(_field => `a.${_field}=b.${_field}`)
let _afields = _fields.map(_field => `a.${_field}`)
_fields_ = _fields_.join(' and ')
- if (unique.verifyType !== 'physical') {
+ if (unique.verifyType === 'logic' || unique.verifyType === 'logic_temp') {
_fields_ += ' and b.deleted=0'
}
@@ -1213,14 +1318,14 @@
goto aaa
end
- Set @tbid=''
+ ${unique.verifyType.indexOf('temp') === -1 ? `Set @tbid=''
Select top 1 @tbid=${_afields.join('+\' \'+')} from @${sheet} a Inner join ${sheet} b on ${_fields_}
If @tbid!=''
Begin
select @ErrorCode='${unique.errorCode}',@retmsg=@tbid+' 涓庡凡鏈夋暟鎹噸澶�'
goto aaa
- end
+ end` : ''}
`
})
}
@@ -1250,9 +1355,9 @@
_sql = `
/* 绯荤粺鐢熸垚 */
declare @${sheet} table (${declarefields.join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(50) )
- Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@departmentcode nvarchar(50),@organization nvarchar(50),@login_city nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
+ Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
- Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @departmentcode='${departmentcode}', @organization='${organization}', @login_city='${city}'
+ Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
${_initCustomScript}
`
_sqlInsert = `Insert into @${sheet} (${fields},jskey,data_type,BID)`
@@ -1269,7 +1374,29 @@
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ _sql = _sql.replace(/@BID@/ig, `'${BID}'`)
+ _sql = _sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ _sql = _sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ _sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+ _sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ _sql = _sql.replace(/@typename@/ig, `'admin'`)
+
+ _sqlBottom = _sqlBottom.replace(/@BID@/ig, `'${BID}'`)
+ _sqlBottom = _sqlBottom.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ _sqlBottom = _sqlBottom.replace(/@typename@/ig, `'admin'`)
+
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+ _sql = _sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ _sqlBottom = _sqlBottom.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ } else {
+ _sql = _sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ _sqlBottom = _sqlBottom.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ }
+
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
let fsql = `
${_sql}
${_sqlInsert}
@@ -1285,9 +1412,9 @@
_sql = `
/* 绯荤粺鐢熸垚 */
declare @${sheet} table (jskey nvarchar(50))
- Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@departmentcode nvarchar(50),@organization nvarchar(50),@login_city nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
+ Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
- Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @departmentcode='${departmentcode}', @organization='${organization}', @login_city='${city}'
+ Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
`
}
@@ -1312,17 +1439,16 @@
* @return {Object} param 璇锋眰鍙傛暟
* @return {Array} data 鍒楄〃琛屾暟鎹�
* @return {Array} columns 鏄剧ず鍒�
- * @return {Object} tab 鏍囩淇℃伅
* @return {Boolean} retmsg 鏄惁闇�瑕佹暟鎹繑鍥�
*/
-export function getSysDefaultSql (btn, setting, formdata, param, data, columns, tab, retmsg = false, moduleParams, getOptions) {
+export function getSysDefaultSql (btn, setting, formdata, param, data, columns, retmsg = false, moduleParams, getOptions) {
let primaryId = param.ID
- let BID = param.BID
+ let BID = param.BID || ''
let verify = btn.verify || {}
let datavars = {} // 澹版槑鐨勫彉閲忥紝琛ㄥ崟鍙婃樉绀哄垪
let _actionType = null
let _callbacksql = ''
- let foreignKey = tab && tab.foreignKey ? tab.foreignKey.toLowerCase() : ''
+ let foreignKey = setting.foreignKey ? setting.foreignKey.toLowerCase() : ''
if (verify.default !== 'false') { // 鍒ゆ柇鏄惁浣跨敤榛樿sql
_actionType = btn.sqlType
@@ -1354,7 +1480,7 @@
})
// 闇�瑕佸０鏄庣殑鍙橀噺闆�
- let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode', 'roleid', 'departmentcode', 'organization', 'login_city']
+ let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode', 'roleid', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'mk_deleted', 'bid']
// 涓婚敭瀛楁
let primaryKey = setting.primaryKey || 'id'
@@ -1374,18 +1500,24 @@
if (!_initvars.includes(_key)) {
_initvars.push(_key)
+ let val = form.value
- if (form.type === 'number') {
- let val = form.value
- if (typeof(val) !== 'number') {
- val = parseFloat(val)
- if (isNaN(val)) {
- val = 0
- }
+ if (form.type === 'number' || form.type === 'rate') {
+ if (isNaN(val)) {
+ val = 0
}
_initFormfields.push(`@${_key}=${val}`)
+ } else if (['date', 'datemonth'].includes(form.type)) {
+ _initFormfields.push(`@${_key}='${val || '1949-10-01'}'`)
} else {
- _initFormfields.push(`@${_key}='${form.value}'`)
+ if (/'/.test(val)) {
+ val = val.replace(/'/ig, '"')
+ }
+ if (form.isconst) {
+ _initFormfields.push(`@${_key}=N'${val}'`)
+ } else {
+ _initFormfields.push(`@${_key}='${val}'`)
+ }
}
}
@@ -1402,21 +1534,24 @@
_type = 'datetime'
} else if (form.type === 'number') {
_type = `decimal(18,${form.fieldlen})`
+ } else if (form.type === 'rate') {
+ _type = `decimal(18,2)`
}
_declarefields.push(`@${_key} ${_type}`)
}
})
+ let _data = {}
if (data) {
Object.keys(data).forEach(key => {
- data[key.toLowerCase()] = data[key]
+ _data[key.toLowerCase()] = data[key]
})
}
// 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
- if (data && !btn.$forbid && btn.Ot !== 'notRequired' && btn.Ot !== 'requiredOnce') {
- datavars = {...data, ...datavars}
+ if (data && btn.Ot !== 'notRequired' && columns && columns.length > 0) {
+ datavars = {..._data, ...datavars}
const setField = (col) => {
if (!col.field) return
@@ -1426,7 +1561,11 @@
let _val = datavars.hasOwnProperty(_key) ? datavars[_key] : ''
if (col.datatype && /^date/ig.test(col.datatype) && !_val) {
- _val = '1900-01-01'
+ _val = '1949-10-01'
+ }
+
+ if (/'/.test(_val)) {
+ _val = _val.replace(/'/ig, '"')
}
_initvars.push(_key)
@@ -1457,17 +1596,15 @@
}
}
- if (columns && columns.length > 0) {
- columns.forEach(col => {
- if (col.type === 'colspan' || col.type === 'old_colspan') {
- col.subcols.forEach(cell => {
- setField(cell)
- })
- } else {
- setField(col)
- }
- })
- }
+ columns.forEach(col => {
+ if (col.type === 'colspan' || col.type === 'old_colspan') {
+ col.subcols.forEach(cell => {
+ setField(cell)
+ })
+ } else {
+ setField(col)
+ }
+ })
}
// 鍙橀噺澹版槑
@@ -1476,8 +1613,26 @@
_declarefields = ',' + _declarefields
}
_sql = `/* 绯荤粺鐢熸垚 */
- Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@departmentcode nvarchar(50),@organization nvarchar(50),@login_city nvarchar(50),@ModularDetailCode nvarchar(50)${_declarefields}
+ Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50),@ModularDetailCode nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@mk_deleted int,@bid nvarchar(50)${_declarefields}
`
+
+ let userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+ let RoleID = sessionStorage.getItem('role_id') || ''
+ let departmentcode = sessionStorage.getItem('departmentcode') || ''
+ let organization = sessionStorage.getItem('organization') || ''
+ let mk_user_type = sessionStorage.getItem('mk_user_type') || ''
+ let nation = sessionStorage.getItem('nation') || ''
+ let province = sessionStorage.getItem('province') || ''
+ let city = sessionStorage.getItem('city') || ''
+ let district = sessionStorage.getItem('district') || ''
+ let address = sessionStorage.getItem('address') || ''
+
+ // 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
+ _sql += `
+ /* 鍑瘉鍙婄敤鎴蜂俊鎭垵濮嬪寲璧嬪�� */
+ select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}', @mk_deleted=1, @bid='${BID}', @BillCode='', @ModularDetailCode=''
+ `
// 琛ㄥ崟鍙橀噺璧嬪��
if (_initFormfields.length > 0) {
@@ -1507,24 +1662,6 @@
if (verify.billcodes) {
verify.billcodes = verify.billcodes.filter(item => item.status !== 'false')
}
-
- let userName = sessionStorage.getItem('User_Name') || ''
- let fullName = sessionStorage.getItem('Full_Name') || ''
- let RoleID = sessionStorage.getItem('role_id') || ''
- let departmentcode = sessionStorage.getItem('departmentcode') || ''
- let organization = sessionStorage.getItem('organization') || ''
- let city = sessionStorage.getItem('city') || ''
-
- if (sessionStorage.getItem('isEditState') === 'true') {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
-
- // 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
- _sql += `
- /* 鍑瘉鍙婄敤鎴蜂俊鎭垵濮嬪寲璧嬪�� */
- select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @departmentcode='${departmentcode}', @organization='${organization}', @login_city='${city}', @BillCode='', @ModularDetailCode=''
- `
if (retmsg) {
_callbacksql = _sql
@@ -1574,9 +1711,6 @@
}
})
regoptions.push({
- reg: new RegExp('@login_city@', 'ig'),
- value: `'${city}'`
- }, {
reg: new RegExp('@userName@', 'ig'),
value: `'${userName}'`
}, {
@@ -1611,7 +1745,7 @@
/* 澶辨晥楠岃瘉 */
select @tbid='', @ErrorCode='',@retmsg=''
select @tbid='X' from ${datasource} right join (select ID from dbo.SplitComma(@ID@)) sp
- on tb.id =sp.id where tb.id is null
+ on tb.${primaryKey} =sp.id where tb.${primaryKey} is null
If @tbid!=''
Begin
@@ -1685,8 +1819,8 @@
let _val = ''
if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
_val = BID
- } else if (data && data.hasOwnProperty(_linkKey)) {
- _val = data[_linkKey]
+ } else if (_data.hasOwnProperty(_linkKey)) {
+ _val = _data[_linkKey]
}
_ModularDetailCode = `'${item.TypeCharOne + _val}'`
} else {
@@ -1815,7 +1949,7 @@
_sql += `
/* 鍒涘缓鍑瘉 */
exec s_BVoucher_Create
- @Bill ='${data[_voucher.linkField.toLowerCase()]}',
+ @Bill ='${_data[_voucher.linkField.toLowerCase()]}',
@BVoucherType ='${_voucher.BVoucherType}',
@VoucherTypeOne ='${_voucher.VoucherTypeOne}',
@VoucherTypeTwo ='${_voucher.VoucherTypeTwo}',
@@ -1874,6 +2008,11 @@
values.push('@BID@')
}
+ if (!keys.includes('typename')) {
+ keys.push('typename')
+ values.push('@typename@')
+ }
+
keys = keys.join(',')
values = values.join(',')
_insertsql = `insert into ${btn.sql} (${keys}) select ${values};`
@@ -1896,12 +2035,24 @@
if (!_arr.includes('submitdate')) {
_form.push('submitdate=getdate()')
}
+ if (!_arr.includes('submituser')) {
+ _form.push('submituser=@username')
+ }
+ if (!_arr.includes('submitstaff')) {
+ _form.push('submitstaff=@fullname')
+ }
if (!_arr.includes('submituserid')) {
_form.push('submituserid=@userid@')
}
} else {
if (!_arr.includes('modifydate')) {
_form.push('modifydate=getdate()')
+ }
+ if (!_arr.includes('modifyuser')) {
+ _form.push('modifyuser=@username')
+ }
+ if (!_arr.includes('modifystaff')) {
+ _form.push('modifystaff=@fullname')
}
if (!_arr.includes('modifyuserid')) {
_form.push('modifyuserid=@userid@')
@@ -1918,6 +2069,9 @@
if (!_arr.includes('fiyear')) {
_form.push('FiYear=@FiYear')
}
+ }
+ if (!_arr.includes('typename')) {
+ _form.push('typename=@typename@')
}
_form = _form.join(',')
@@ -1950,17 +2104,16 @@
_sql += `
/* 榛樿sql */
- update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuserid=@userid@ where ${primaryKey}${_ID};`
+ update ${btn.sql} set deleted=@mk_deleted,modifydate=getdate(),modifyuser=@username,modifystaff=@fullname,modifyuserid=@userid@ where ${primaryKey}${_ID};`
} else if (_actionType === 'delete') { // 鐗╃悊鍒犻櫎
let _msg = ''
- if (data && columns && columns.length > 0) {
+ if (data && columns && columns.length > 0 && btn.Ot !== 'notRequired') {
let _index = 0
columns.forEach(col => {
- if (col.Hide !== 'true' && col.type !== 'colspan' && col.type !== 'old_colspan' && _index < 4) {
- _msg += col.label + '=' + data[col.field] + ','
- _index++
- }
+ if (!col.field || col.Hide === 'true' || _index >= 4) return
+ _msg += col.label + '=' + data[col.field] + ','
+ _index++
})
}
@@ -1971,7 +2124,7 @@
_sql += `
/* 榛樿sql */
- insert into snote (remark,createuserid,CreateUser,CreateStaff) select left('鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${_msg}${primaryKey}='+@ID@,200),@userid@,@username,@fullname
+ insert into snote (remark,createuserid,CreateUser,CreateStaff,typename) select left('鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${_msg}${primaryKey}='+@ID@,200),@userid@,@username,@fullname,@typename@
delete ${btn.sql} where ${primaryKey}${_ID};`
} else if (_actionType === 'insertOrUpdate') {
_sql += `
@@ -1994,6 +2147,20 @@
_sql += _backCustomScript
}
+ if (window.GLOB.breakpoint) {
+ let start = new RegExp('\\/\\*\\$breakpoint_begin_' + window.GLOB.breakpoint + '@', 'ig')
+ let end = new RegExp('@breakpoint_end_' + window.GLOB.breakpoint + '\\$\\*\\/', 'ig')
+
+ if (window.GLOB.breakpoint === 'all') {
+ start = /\/\*\$breakpoint_begin_[0-9a-z_]+@/ig
+ end = /@breakpoint_end_[0-9a-z_]+\$\*\//ig
+ }
+
+ _sql = _sql.replace(start, '').replace(end, '').replace(/\$breakpoint_proc@/ig, window.GLOB.breakpoint)
+ _sql += `
+ z_debug_end: select @ErrorCode='E',@retmsg='debug_end' goto aaa`
+ }
+
if (retmsg) {
_sql += `
aaa: if @ErrorCode!=''
@@ -2006,12 +2173,40 @@
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
}
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ _sql = _sql.replace(/@ID@/ig, `'${primaryId || ''}'`)
+ _sql = _sql.replace(/@BID@/ig, `'${BID}'`)
+ _sql = _sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ _sql = _sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ _sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+ _sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ _sql = _sql.replace(/@typename@/ig, `'admin'`)
+
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+ _sql = _sql.replace(/@datam@/ig, '\'Y\'')
+ } else {
+ _sql = _sql.replace(/@datam@/ig, '\'\'')
+ }
+
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
// _sql = _sql.replace(/\n\s{8}/ig, '\n')
console.info(_sql)
}
if (retmsg) {
+ _callbacksql = _callbacksql.replace(/@ID@/ig, `'${primaryId || ''}'`)
+ _callbacksql = _callbacksql.replace(/@BID@/ig, `'${BID}'`)
+ _callbacksql = _callbacksql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ _callbacksql = _callbacksql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ _callbacksql = _callbacksql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+ _callbacksql = _callbacksql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ _callbacksql = _callbacksql.replace(/@typename@/ig, `'admin'`)
+
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+ _callbacksql = _callbacksql.replace(/@datam@/ig, '\'Y\'')
+ } else {
+ _callbacksql = _callbacksql.replace(/@datam@/ig, '\'\'')
+ }
+
return {
sql: _sql,
callbacksql: _callbacksql
@@ -2022,40 +2217,107 @@
}
/**
+ * @description 鑾峰彇鏍囪淇℃伅
+ */
+export function getMark (marks, record, style = {}) {
+ let icon = null
+ let innerStyle = null
+ let position = null
+ let signType = ''
+ style = JSON.parse(JSON.stringify(style))
+
+ marks.some(mark => {
+ let originVal = record[mark.field[0]]
+ let contrastVal = ''
+ let result = false
+
+ if (mark.field[1] === 'static') {
+ contrastVal = mark.contrastValue
+ originVal = originVal + ''
+ } else {
+ contrastVal = record[mark.field[2]]
+ }
+
+ if (originVal === undefined || contrastVal === undefined) return false
+
+ if (mark.match === '=') {
+ result = originVal === contrastVal
+ } else if (mark.match === '!=') {
+ result = originVal !== contrastVal
+ } else if (mark.match === 'like') {
+ originVal = originVal + ''
+ contrastVal = contrastVal + ''
+ result = originVal.indexOf(contrastVal) > -1
+ } else if (mark.match === '>') {
+ result = parseFloat(originVal) > parseFloat(contrastVal)
+ } else if (mark.match === '<') {
+ result = parseFloat(originVal) < parseFloat(contrastVal)
+ }
+
+ if (!result) return false
+
+ let type = mark.signType[0]
+
+ if (type === 'font') {
+ style.color = mark.color
+ innerStyle = {color: mark.color}
+ signType = ' sign-font'
+ } else if (type === 'background') {
+ style.backgroundColor = mark.color
+ if (mark.fontColor) {
+ style.color = mark.fontColor
+ innerStyle = {color: mark.fontColor}
+ }
+ } else if (type === 'underline') {
+ style.textDecoration = 'underline'
+ style.color = mark.color
+ innerStyle = {color: mark.color, textDecoration: 'underline'}
+ } else if (type === 'line-through') {
+ style.textDecoration = 'line-through'
+ style.color = mark.color
+ innerStyle = {color: mark.color, textDecoration: 'line-through'}
+ } else if (type.indexOf('icon') > -1) {
+ icon = mark.signType[mark.signType.length - 1]
+ innerStyle = {color: mark.color}
+ if (type === 'iconfront' || mark.signType[1] === 'front') {
+ position = 'front'
+ } else {
+ position = 'back'
+ }
+ }
+
+ return true
+ })
+
+ return {
+ style,
+ icon,
+ innerStyle,
+ position,
+ signType
+ }
+}
+
+/**
* @description 鐢熸垚鏇挎崲鍑芥暟鍒楄〃
*/
export function setGLOBFuncs () {
window.GLOB.funcs = []
- if (!window.GLOB.WebSql && !window.GLOB.IndexDB) {
+ if (!window.GLOB.IndexDB) {
return
}
- if (window.GLOB.WebSql) {
- window.GLOB.WebSql.transaction(tx => {
- tx.executeSql("SELECT * FROM FUNCS", [], (tx, results) => {
- let rows = results.rows
- if (!rows || rows.length === 0) return
- for (let i = 0; i < rows.length; i++) {
- window.GLOB.funcs.push({
- func_code: rows[i].func_code,
- key_sql: window.decodeURIComponent(window.atob(rows[i].key_sql))
- })
- }
+ let objectStore = window.GLOB.IndexDB.transaction('funcs').objectStore('funcs')
+
+ objectStore.openCursor().onsuccess = (event) => {
+ let cursor = event.target.result
+
+ if (cursor) {
+ window.GLOB.funcs.push({
+ func_code: cursor.value.func_code,
+ key_sql: window.decodeURIComponent(window.atob(cursor.value.key_sql))
})
- })
- } else {
- let objectStore = window.GLOB.IndexDB.transaction('funcs').objectStore('funcs')
-
- objectStore.openCursor().onsuccess = (event) => {
- let cursor = event.target.result
-
- if (cursor) {
- window.GLOB.funcs.push({
- func_code: cursor.value.func_code,
- key_sql: window.decodeURIComponent(window.atob(cursor.value.key_sql))
- })
- cursor.continue()
- }
+ cursor.continue()
}
}
}
@@ -2076,7 +2338,7 @@
* @description 鍒涘缓椤甸潰瀛樺偍杩囩▼
* @return {String}
*/
- static getTableFunc (param, menu, config) {
+ static getTableFunc (func = 'func', menu, config) {
let form = ''
let formParam = ''
let _vars = ['bid', 'pageindex', 'pagesize', 'ordercol', 'ordertype', 'exceltype', 'septmenuno', 'lang', 'debug', 'loginuid', 'sessionuid', 'userid', 'errorcode', 'retmsg']
@@ -2131,7 +2393,7 @@
`
}
- let Ltext = `create proc ${param.innerFunc}
+ let Ltext = `create proc ${func}
( /*${menu.MenuName}*/
@appkey nvarchar(50)='',
@BID nvarchar(50)='',${formParam}
@@ -2146,6 +2408,7 @@
@LoginUID nvarchar(50)='',
@SessionUid nvarchar(50)='',
@UserID nvarchar(50),
+ @dataM nvarchar(50),
@ErrorCode nvarchar(50) out,
@retmsg nvarchar(4000) out
)
@@ -2241,6 +2504,8 @@
type = 'datetime=null'
} else if (item.type === 'number') {
type = `decimal(18,${item.decimal})=0`
+ } else if (item.type === 'rate') {
+ type = `decimal(18,2)=0`
} else {
type = 'nvarchar(50)=\'\''
}
@@ -2266,7 +2531,7 @@
form = `
insert into ${param.name} (${field1},createuserid) select ${field2},@UserID
- update ${param.name} set ${field3},modifydate=getdate(),modifyuserid=@UserID
+ update ${param.name} set ${field3},modifydate=getdate(),modifyuser=@username,modifyuserid=@UserID
`
} else if (btn.OpenType === 'prompt' || btn.OpenType === 'exec') {
form = `
@@ -2365,9 +2630,9 @@
@ErrorSeverity=ERROR_SEVERITY(),
@ErrorState=ERROR_STATE();
- RAISERROR(@ErrorMessage, /*-- Message text.*/
- @ErrorSeverity, /*-- Severity.*/
- @ErrorState /*-- State.*/
+ RAISERROR(@ErrorMessage, /* Message text.*/
+ @ErrorSeverity, /* Severity.*/
+ @ErrorState /* State.*/
);
END CATCH
@@ -2506,9 +2771,9 @@
@ErrorSeverity=ERROR_SEVERITY(),
@ErrorState=ERROR_STATE();
- RAISERROR(@ErrorMessage, /*-- Message text.*/
- @ErrorSeverity, /*-- Severity.*/
- @ErrorState /*-- State.*/
+ RAISERROR(@ErrorMessage, /* Message text.*/
+ @ErrorSeverity, /* Severity.*/
+ @ErrorState /* State.*/
);
END CATCH
--
Gitblit v1.8.0