From 24e45df087aa0ae882b8a5c964fa12e056cb47c6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 24 五月 2022 19:12:07 +0800
Subject: [PATCH] 2022-05-24
---
src/utils/utils.js | 863 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 620 insertions(+), 243 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 2687da4..413aa1e 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -236,54 +236,82 @@
}
/**
- * @description 鍒濆鍖栨悳绱㈡潯浠�
+ * @description 鍒濆鍖栨悳绱㈡潯浠跺垵濮嬪��
* @param {Array} searches 鎼滅储鏉′欢
- * @return {String} searches 鏍煎紡鍖栧悗缁撴灉
*/
- static initMainSearch (searches) {
- if (!searches || searches.length === 0) return []
+ static initSearchVal (searches) {
+ if (!searches) return []
- let newsearches = []
- searches.forEach(search => {
- let item = {
- key: search.field,
- match: search.match,
- type: search.type,
- label: search.label,
- value: search.initval,
- required: search.required === 'true'
- }
+ let roleId = sessionStorage.getItem('role_id') || ''
- if (item.type === 'group') {
- let copy = JSON.parse(JSON.stringify(item))
- copy.key = search.datefield
+ return searches.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'
- item.value = search.initval && search.initval[0] ? search.initval[0] : ''
- item.match = '='
- item.forbid = true
-
- copy.type = 'daterange'
- copy.match = 'between'
- copy.value = ''
+ if (item.type === 'date') { // 鏃堕棿鎼滅储
+ let format = 'YYYY-MM-DD'
+ if (item.precision === 'day') {
- if (search.initval && search.initval.length > 0) {
- let _type = search.initval[0]
- let _val = search.initval[1]
+ } 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') {
+ 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) {
+ try {
+ let _initval = JSON.parse(item.initval)
+ let _vals = [moment().subtract(_initval[0], 'days').format(format), moment().subtract(_initval[1], 'days').format(format)]
+ item.initval = _vals.join(',')
+ } catch (e) {
+ item.initval = ''
+ }
+ }
+ } else if (item.type === 'group') {
+ if (item.initval && item.initval[0]) {
+ let _type = item.initval[0]
+ let _val = item.initval[1]
+ let _dateRange = ''
+
if (_type === 'day') {
- copy.value = [moment().subtract(_val, 'days').format('YYYY-MM-DD'),
+ _dateRange = [moment().subtract(_val, 'days').format('YYYY-MM-DD'),
moment().subtract(_val, 'days').format('YYYY-MM-DD')]
} else if (_type === 'week') {
- copy.value = [moment().subtract(_val * 7, 'days').startOf('week').format('YYYY-MM-DD'),
+ _dateRange = [moment().subtract(_val * 7, 'days').startOf('week').format('YYYY-MM-DD'),
moment().subtract(_val * 7, 'days').endOf('week').format('YYYY-MM-DD')]
} else if (_type === 'month') {
- copy.value = [moment().subtract(_val, 'month').startOf('month').format('YYYY-MM-DD'),
+ _dateRange = [moment().subtract(_val, 'month').startOf('month').format('YYYY-MM-DD'),
moment().subtract(_val, 'month').endOf('month').format('YYYY-MM-DD')]
} else if (_type === 'quarter') {
let _differ = parseInt(moment().format('MM')) % 3
let _pdiffer = 0
let _ndiffer = 0
-
+
// 宸�艰绠�
switch(_differ) {
case 0:
@@ -300,82 +328,118 @@
break
default:
}
-
- copy.value = [moment().subtract(_pdiffer + _val * 3, 'month').startOf('month').format('YYYY-MM-DD'),
+ _dateRange = [moment().subtract(_pdiffer + _val * 3, 'month').startOf('month').format('YYYY-MM-DD'),
moment().subtract(_ndiffer + _val * 3, 'month').endOf('month').format('YYYY-MM-DD')]
} else if (_type === 'year') {
let _year = parseInt(moment().format('YYYY')) - _val
- copy.value = [_year + '-01-01', _year + '-12-31']
+ _dateRange = [_year + '-01-01', _year + '-12-31']
} else if (_type === 'customized') {
try {
_val = JSON.parse(_val)
- } catch {
+ } catch (e) {
_val = [0, 0]
}
- copy.value = [moment().subtract(_val[0], 'days').format('YYYY-MM-DD'),
+ _dateRange = [moment().subtract(_val[0], 'days').format('YYYY-MM-DD'),
moment().subtract(_val[1], 'days').format('YYYY-MM-DD')]
}
- }
- if (search.transfer === 'true') {
- newsearches.push(item)
+ item.initval = _dateRange.join(',')
+ item.initType = _type
+ } else {
+ item.initval = ''
+ item.initType = ''
}
- newsearches.push(copy)
- return
- } else if (item.type === 'date') {
- item.value = item.value ? moment().subtract(item.value, 'days').format('YYYY-MM-DD') : ''
- } else if (item.type === 'datemonth') {
- item.value = item.value ? moment().subtract(item.value, 'month').format('YYYY-MM') : ''
- } else if (item.type === 'dateweek') {
- item.value = item.value ? [moment().subtract(item.value * 7, 'days').startOf('week').format('YYYY-MM-DD'),
- moment().subtract(item.value * 7, 'days').endOf('week').format('YYYY-MM-DD')] : ''
- } else if (item.type === 'daterange') {
- let _val = item.value
- if (_val) {
- try {
- _val = JSON.parse(_val)
- } catch {
- _val = ''
- }
- }
- item.value = _val ? [moment().subtract(_val[0], 'days').format('YYYY-MM-DD'),
- moment().subtract(_val[1], 'days').format('YYYY-MM-DD')] : ''
- } else if (item.type === 'multiselect') {
- item.value = item.value ? item.value.split(',').filter(Boolean) : []
}
- newsearches.push(item)
+
+ item.oriInitval = item.initval
+
+ if (item.blacklist && item.blacklist.length > 0 && !item.hidden) {
+ if (item.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
+ item.hidden = true
+ item.required = false
+ }
+ }
+
+ return item
})
-
- return newsearches
}
/**
* @description 鍒濆鍖栨悳绱㈡潯浠�
* @param {Array} searches 鎼滅储鏉′欢
- * @return {String} searches 鏍煎紡鍖栧悗缁撴灉
+ */
+ static initMainSearch (searches) {
+ if (!searches) return []
+
+ let values = []
+ searches.forEach(cell => {
+ let item = {
+ key: cell.field,
+ match: cell.match,
+ type: cell.type,
+ label: cell.label,
+ value: cell.initval,
+ required: cell.required,
+ precision: cell.precision || 'day',
+ forbid: cell.$forbid
+ }
+
+ if (cell.type === 'multiselect' || (cell.type === 'checkcard' && cell.multiple === 'true')) {
+ item.type = 'multi'
+ } else if (item.type === 'group') {
+ item.key = cell.datefield
+ item.type = 'daterange'
+ item.match = 'between'
+
+ values.push({
+ type: 'group',
+ key: cell.field,
+ value: cell.initType,
+ label: cell.label,
+ match: '=',
+ forbid: true,
+ required: cell.required
+ })
+ }
+
+ values.push(item)
+ })
+
+ return values
+ }
+
+ /**
+ * @description 鍒濆鍖栬嚜瀹氫箟鍑芥暟鎼滅储鏉′欢
+ * @param {Array} searches 鎼滅储鏉′欢
*/
static formatCustomMainSearch (searches) {
- if (!searches || searches.length === 0) return {}
+ if (!searches) return {}
let newsearches = {}
searches.forEach(item => {
if (item.type === 'date') {
- let timetail = ''
- let _val = item.value
+ let _val = item.value || ''
- if (item.match === '<' || item.match === '<=') {
- timetail = ' 00:00:00.000'
- if (_val) {
- _val = moment(_val, 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ if (_val) {
+ 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'
}
- } else if (item.match === '>' || item.match === '>=') {
- timetail = ' 00:00:00.000'
}
if (newsearches[item.key]) {
- newsearches[item.key + '1'] = _val ? _val + timetail : ''
+ newsearches[item.key + '1'] = _val
} else {
- newsearches[item.key] = _val ? _val + timetail : ''
+ newsearches[item.key] = _val
}
} else if (item.type === 'datemonth') {
// 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫
@@ -390,35 +454,44 @@
newsearches[item.key] = _startval
newsearches[item.key + '1'] = _endval
} else if (item.type === 'dateweek') {
+ let _startval = ''
let _endval = ''
if (item.value) {
- _endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ _startval = moment(item.value, 'YYYY-MM-DD' ).startOf('week').format('YYYY-MM-DD') + ' 00:00:00.000'
+ _endval = moment(item.value, 'YYYY-MM-DD').endOf('week').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
}
- newsearches[item.key] = item.value ? item.value[0] + ' 00:00:00.000' : ''
- newsearches[item.key + '1'] = item.value ? _endval + ' 00:00:00.000' : ''
+ newsearches[item.key] = _startval
+ newsearches[item.key + '1'] = _endval
} else if (item.type === 'daterange') {
+ let _startval = ''
let _endval = ''
if (item.value) {
- _endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ let val = item.value.split(',')
+
+ 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] = item.value ? item.value[0] + ' 00:00:00.000' : ''
- newsearches[item.key + '1'] = item.value ? _endval + ' 00:00:00.000' : ''
+ newsearches[item.key] = _startval
+ newsearches[item.key + '1'] = _endval
} else if (item.type === 'text' || item.type === 'select') {
item.key.split(',').forEach(field => { // 缁煎悎鎼滅储锛屾墍瀛楁鎷兼帴
newsearches[field] = item.value
})
- } else if (item.type === 'multiselect') {
- newsearches[item.key] = item.value.join(',')
} else {
newsearches[item.key] = item.value
- }
- })
-
- Object.keys(newsearches).forEach(key => {
- if (!newsearches[key]) {
- delete newsearches[key]
}
})
@@ -433,55 +506,87 @@
static joinMainSearchkey (searches) {
if (!searches || searches.length === 0) return ''
- let searchText = ''
+ let searchText = []
searches.forEach(item => {
- if (item.forbid || !item.value || (item.type === 'multiselect' && item.value.length === 0)) return
+ 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 ') + ')'
- } else if (item.type === 'multiselect') {
+ searchText.push('(' + fields.join(' OR ') + ')')
+ } else if (item.type === 'checkcard') {
+ let str = item.match === 'like' || item.match === 'not like' ? '%' : ''
- searchText += `'${item.value}' ` + item.match + ' \'%\'+' + item.key + '+\'%\''
+ searchText.push('(' + item.key + ' ' + item.match + ' \'' + str + item.value + str + '\')')
+ } else if (item.type === 'multi') {
+ 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 = item.value[0] + ' 00:00:00.000'
- let _endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+ 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 _startval = item.value[0] + ' 00:00:00.000'
- let _endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+ let val = item.value.split(',')
+ 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.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 ')
}
/**
@@ -509,10 +614,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)
@@ -529,8 +648,8 @@
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' : '1970-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' : '2050-01-01 00:00:00.000'
+ let _startval = item.value ? moment(item.value, 'YYYY-MM-DD').startOf('week').format('YYYY-MM-DD') + ' 00:00:00.000' : '1970-01-01 00:00:00.000'
+ let _endval = item.value ? moment(item.value, 'YYYY-MM-DD').endOf('week').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000' : '2050-01-01 00:00:00.000'
let copy = JSON.parse(JSON.stringify(item))
copy.key = copy.key + '1'
@@ -541,8 +660,26 @@
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' : '1970-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' : '2050-01-01 00:00:00.000'
+ 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(',')
+
+ 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))
copy.key = copy.key + '1'
@@ -552,10 +689,6 @@
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.type === 'select') {
item.key.split(',').forEach(field => { // 缁煎悎鎼滅储锛屾墍瀛楁鎷兼帴
let cell = JSON.parse(JSON.stringify(item))
@@ -569,88 +702,6 @@
})
return options
- }
-
- /**
- * @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.datefield,
- value: '0'
- })
- options.push({
- key: search.datefield + '1',
- value: '0'
- })
- if (search.transfer === 'true') {
- 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 鎷兼帴鎼滅储鏉′欢datamanage
- * @param {Array} searches 鎼滅储鏉′欢
- * @return {String} searchText 鎷兼帴缁撴灉
- */
- static jointsearchkey (searches) {
- if (!searches || searches.length === 0) return ''
- let searchText = ''
- searches.forEach(item => {
- if (!item.value) return
- searchText += (searchText !== '' ? ' AND ' : '')
- if (item.type === 'text') {
- let options = item.key.split(',').map(op => {
- // equal鏃朵笉娣诲姞%
- let str = item.op === 'equal' ? '' : '%'
- return op + ' ' + item.op + ' \'' + str + item.value + str + '\''
- })
- searchText += '(' + options.join(' OR ') + ')'
- } else if (item.type === 'date') {
- searchText += '(' + item.key + ' ' + item.op + ' \'' + item.value + '\')'
- } else {
- searchText += '(' + item.key + ' ' + item.op + ' \'' + item.value + '\')'
- }
- })
- return searchText
}
/**
@@ -696,16 +747,22 @@
static getSelectQueryOptions (item) {
let arrfield = [item.valueField, item.valueText]
- if (item.type === 'link') {
- arrfield.push(item.linkField)
- } else if ((item.type === 'select' || item.type === 'radio') && item.linkSubField && item.linkSubField.length > 0) {
- arrfield.push(...item.linkSubField)
- } else if (item.type === 'checkcard') {
+ if (item.type === 'checkcard') {
arrfield = item.fields.map(f => f.field)
arrfield.push(item.cardValField)
if (item.urlField) {
arrfield.push(item.urlField)
}
+ }
+
+ 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)
+ }
+ if (item.disableField) {
+ arrfield.push(item.disableField)
}
arrfield = Array.from(new Set(arrfield))
@@ -720,9 +777,11 @@
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 ${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 ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield} from ${_datasource}) a`
+ sql = `select distinct ${arrfield} from ${_datasource}`
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
@@ -737,7 +796,7 @@
sql = sql.replace(/@db@/ig, window.GLOB.externalDatabase)
}
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
console.info(sql)
}
@@ -760,15 +819,25 @@
let keys = ['delete', 'drop', 'insert', 'truncate', 'update']
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') || ''
+ let _sheet = item.sheet
if (sessionStorage.getItem('isEditState') === 'true') {
userName = sessionStorage.getItem('CloudUserName') || ''
fullName = sessionStorage.getItem('CloudFullName') || ''
}
- let database = item.sheet.match(/(.*)\.(.*)\./ig) || ''
- let sheet = item.sheet.replace(/(.*)\.(.*)\./ig, '')
+ if (window.GLOB.externalDatabase !== null) {
+ _sheet = _sheet.replace(/@db@/ig, window.GLOB.externalDatabase)
+ }
+
+ let database = _sheet.match(/(.*)\.(.*)\./ig)
+ let sheet = _sheet.replace(/(.*)\.(.*)\./ig, '')
+
+ database = database ? (database[0] || '') : ''
let getuuid = () => {
let uuid = []
@@ -814,6 +883,11 @@
// 鎺у埗鍙版墦鍗版暟鎹�
let conLtext = []
+ let cols = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
+ for (let i = 0; i < 26; i++) {
+ cols.push('A' + cols[i])
+ }
+
let _Ltext = data.map((item, lindex) => {
let vals = []
let convals = []
@@ -821,14 +895,15 @@
if (col.import === 'false') return
let val = item[col.Column] !== undefined ? item[col.Column] : ''
- let _position = (_topline + lindex + 1) + dict['main.excel.line'] + ' ' + (cindex + 1) + dict['main.excel.column'] + ' '
+ let _colindex = cols[cindex] || (cindex + 1)
+ let _position = (_topline + lindex + 1) + dict['main.excel.line'] + ' ' + _colindex + dict['main.excel.column'] + ' '
if (/^Nvarchar/ig.test(col.type)) {
if (typeof(val) === 'number') {
val = val.toString()
}
- 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'])
@@ -994,9 +1069,9 @@
_sql = `
/* 绯荤粺鐢熸垚 */
declare @${sheet} table (${declarefields.join(',')},jskey nvarchar(50),BID nvarchar(50) )
- Declare @UserName nvarchar(50),@FullName 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(50),@mk_organization nvarchar(50),@login_city nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
- Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @login_city='${city}'
+ Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @login_city='${city}'
${_initCustomScript}
`
_sqlInsert = `Insert into @${sheet} (${fields},jskey,BID)`
@@ -1013,7 +1088,7 @@
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
let fsql = `
${_sql}
${_sqlInsert}
@@ -1029,9 +1104,9 @@
_sql = `
/* 绯荤粺鐢熸垚 */
declare @${sheet} table (jskey nvarchar(50))
- Declare @UserName nvarchar(50),@FullName 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(50),@mk_organization nvarchar(50),@login_city nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
- Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @login_city='${city}'
+ Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @login_city='${city}'
`
}
@@ -1046,6 +1121,217 @@
insert: _sqlInsert,
bottom: _sqlBottom,
errors: errors.join('; ')
+ }
+}
+
+/**
+ * @description 鑾峰彇excel瀵煎叆鍙傛暟
+ * @return {Object} item 鎸夐挳淇℃伅
+ * @return {Array} data excel鏁版嵁
+ */
+export function getEditTableSql (verify, data, columns) {
+ let btn = verify
+ 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') || ''
+ 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)
+ }
+
+ let database = _sheet.match(/(.*)\.(.*)\./ig)
+ let sheet = _sheet.replace(/(.*)\.(.*)\./ig, '')
+
+ database = database ? (database[0] || '') : ''
+
+ let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
+ let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
+ let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
+
+ if (btn.scripts && btn.intertype === 'system') {
+ btn.scripts.forEach(script => {
+ if (script.status === 'false') return
+
+ if (script.position === 'init') {
+ _initCustomScript += `
+ /* 鑷畾涔夎剼鏈� */
+ ${script.sql}
+ `
+ } else if (script.position === 'front') {
+ _prevCustomScript += `
+ /* 鑷畾涔夎剼鏈� */
+ ${script.sql}
+ `
+ } else {
+ _backCustomScript += `
+ /* 鑷畾涔夎剼鏈� */
+ ${script.sql}
+ `
+ }
+ })
+ }
+
+ // 鎺у埗鍙版墦鍗版暟鎹�
+ let conLtext = []
+
+ let _Ltext = data.map(item => {
+ let vals = []
+ let convals = []
+ columns.forEach(col => {
+ let val = item[col.field]
+
+ vals.push(`'${val}'`)
+ convals.push(`'${val}' as ${col.field}`)
+ })
+
+ let key = item.$$uuid
+ let type = item.$type || 'upt'
+
+ vals.push(`'${key}'`)
+ vals.push(`'${type}'`)
+ vals.push(`'${BID}'`)
+
+ convals.push(`'${key}' as jskey`)
+ convals.push(`'${type}' as data_type`)
+ convals.push(`'${BID}' as BID`)
+ conLtext.push(`Select ${convals.join(',')}`)
+
+ return `Select ${vals.join(',')}`
+ })
+
+ let result = []
+ for(let i = 0; i < _Ltext.length; i += 20) {
+ result.push(_Ltext.slice(i, i + 20))
+ }
+
+ let _sql = ''
+ let _sqlInsert = ''
+ let _sqlBottom = ''
+
+ if (btn.intertype === 'system') {
+ let _uniquesql = ''
+ if (btn.uniques && btn.uniques.length > 0) {
+ btn.uniques.forEach(unique => {
+ if (unique.status === 'false') 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') {
+ _fields_ += ' and b.deleted=0'
+ }
+
+ _uniquesql += `
+ /* 閲嶅鎬ч獙璇� */
+ Set @tbid=''
+ Select top 1 @tbid=${_fields.join('+\' \'+')} from (select 1 as n,${unique.field} from @${sheet} ) a group by ${unique.field} having sum(n)>1
+
+ If @tbid!=''
+ Begin
+ select @ErrorCode='${unique.errorCode}',@retmsg=@tbid+' 閲嶅'
+ goto aaa
+ end
+
+ 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
+ `
+ })
+ }
+
+ let declarefields = []
+ let fields = []
+
+ columns.forEach(col => {
+ let key = col.field.toLowerCase()
+ if (key === 'jskey' || key === 'bid' || key === 'data_type') return
+
+ declarefields.push(`${col.field} ${col.datatype}`)
+ fields.push(col.field)
+ })
+
+ fields = fields.join(',')
+
+ let _insert = ''
+ if (btn.default !== 'false') {
+ _insert = `
+ /* 榛樿sql */
+ Insert into ${database}${sheet} (${fields},createuserid,createuser,createstaff,bid)
+ Select ${fields},@userid@,@username,@fullname,@BID@ From @${sheet}
+ `
+ }
+
+ _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),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
+
+ Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @login_city='${city}'
+ ${_initCustomScript}
+ `
+ _sqlInsert = `Insert into @${sheet} (${fields},jskey,data_type,BID)`
+ _sqlBottom = `
+ /* 榛樿sql */
+ delete tmp_excel_in where upid=@upid@
+
+ delete tmp_excel_in where datediff(day,createdate,getdate())>15
+ ${_uniquesql}
+ ${_prevCustomScript}
+ ${_insert}
+ ${_backCustomScript}
+ Delete @${sheet}
+
+ aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
+
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+ let fsql = `
+ ${_sql}
+ ${_sqlInsert}
+
+ /* table鏁版嵁 */
+ ${conLtext.join(' Union all \n')}
+ ${_sqlBottom}
+ `
+ fsql = fsql.replace(/\n\s{8}/ig, '\n')
+ console.info(fsql)
+ }
+ } else { // s_sDataDictb_excelIn 浜戠瀵嗛挜楠岃瘉鍙傛暟
+ _sql = `
+ /* 绯荤粺鐢熸垚 */
+ declare @${sheet} table (jskey nvarchar(50))
+ Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
+
+ Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @login_city='${city}'
+ `
+ }
+
+ return {
+ sql: _sql,
+ lines: result.map((list, index) => {
+ return {
+ Ltext: window.btoa(window.encodeURIComponent(list.join(' Union all '))),
+ Sort: (index + 1) * 10
+ }
+ }),
+ insert: _sqlInsert,
+ bottom: _sqlBottom
}
}
@@ -1099,7 +1385,7 @@
})
// 闇�瑕佸０鏄庣殑鍙橀噺闆�
- let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode']
+ let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode', 'roleid', 'mk_departmentcode', 'mk_organization', 'login_city', 'bid']
// 涓婚敭瀛楁
let primaryKey = setting.primaryKey || 'id'
@@ -1120,7 +1406,7 @@
if (!_initvars.includes(_key)) {
_initvars.push(_key)
- if (form.type === 'number') {
+ if (form.type === 'number' || form.type === 'rate') {
let val = form.value
if (typeof(val) !== 'number') {
val = parseFloat(val)
@@ -1129,6 +1415,8 @@
}
}
_initFormfields.push(`@${_key}=${val}`)
+ } else if (['date', 'datemonth', 'datetime'].includes(form.type)) {
+ _initFormfields.push(`@${_key}='${form.value || '1949-10-01'}'`)
} else {
_initFormfields.push(`@${_key}='${form.value}'`)
}
@@ -1147,6 +1435,8 @@
_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}`)
@@ -1169,6 +1459,10 @@
if (!_initvars.includes(_key)) {
let _val = datavars.hasOwnProperty(_key) ? datavars[_key] : ''
+
+ if (col.datatype && /^date/ig.test(col.datatype) && !_val) {
+ _val = '1949-10-01'
+ }
_initvars.push(_key)
_initColfields.push(`@${_key}='${_val}'`)
@@ -1217,8 +1511,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),@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), @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50),@bid nvarchar(50),@ModularDetailCode 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 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}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @login_city='${city}', @BillCode='', @ModularDetailCode=''
+ `
// 琛ㄥ崟鍙橀噺璧嬪��
if (_initFormfields.length > 0) {
@@ -1248,21 +1560,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 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}', @login_city='${city}', @BillCode='', @ModularDetailCode=''
- `
if (retmsg) {
_callbacksql = _sql
@@ -1637,9 +1934,15 @@
if (!_arr.includes('submituserid')) {
_form.push('submituserid=@userid@')
}
+ if (!_arr.includes('submituser')) {
+ _form.push('submituser=@username')
+ }
} else {
if (!_arr.includes('modifydate')) {
_form.push('modifydate=getdate()')
+ }
+ if (!_arr.includes('modifyuser')) {
+ _form.push('modifyuser=@username')
}
if (!_arr.includes('modifyuserid')) {
_form.push('modifyuserid=@userid@')
@@ -1688,7 +1991,7 @@
_sql += `
/* 榛樿sql */
- update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuserid=@userid@ where ${primaryKey}${_ID};`
+ update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuser=@username,modifyuserid=@userid@ where ${primaryKey}${_ID};`
} else if (_actionType === 'delete') { // 鐗╃悊鍒犻櫎
let _msg = ''
@@ -1736,12 +2039,15 @@
_sql += `
aaa: if @ErrorCode!=''
insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@`
+ } else if (btn.output) {
+ _sql += `
+ aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id`
} else {
_sql += `
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
}
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
// _sql = _sql.replace(/\n\s{8}/ig, '\n')
console.info(_sql)
}
@@ -1753,6 +2059,76 @@
}
} else {
return _sql
+ }
+}
+
+/**
+ * @description 鑾峰彇鏍囪淇℃伅
+ */
+export function getMark (marks, record, style = {}) {
+ let icon = null
+ let color = null
+ let position = null
+ 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 + ''
+ } else {
+ contrastVal = record[mark.field[2]] + ''
+ }
+
+ if (mark.match === '=') {
+ result = originVal === contrastVal
+ } else if (mark.match === '!=') {
+ result = originVal !== contrastVal
+ } else if (mark.match === 'like') {
+ 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
+ } else if (type === 'background') {
+ style.background = mark.color
+ if (mark.fontColor) {
+ style.color = mark.fontColor
+ }
+ } else if (type === 'underline') {
+ style.textDecoration = 'underline'
+ style.color = mark.color
+ } else if (type === 'line-through') {
+ style.textDecoration = 'line-through'
+ style.color = mark.color
+ } else if (type.indexOf('icon') > -1) {
+ icon = mark.signType[mark.signType.length - 1]
+ color = mark.color
+ if (type === 'iconfront' || mark.signType[1] === 'front') {
+ position = 'front'
+ } else {
+ position = 'back'
+ }
+ }
+
+ return true
+ })
+
+ return {
+ style,
+ icon,
+ color,
+ position
}
}
@@ -1793,7 +2169,6 @@
}
}
}
-
}
/**
@@ -1977,6 +2352,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)=\'\''
}
@@ -2002,7 +2379,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 = `
--
Gitblit v1.8.0