From ec3cc73f8deaf0b83b0b517e65f949a5a5c496dc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 07 一月 2020 09:07:46 +0800
Subject: [PATCH] 2020-01-07
---
src/utils/utils.js | 197 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 137 insertions(+), 60 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 8b0a88f..46f7773 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -42,7 +42,11 @@
*/
static encrypt (str, timestamp) {
let salt = 'mingke' // 鐩愬��
- return md5(str + salt + timestamp)
+ let _str = str + salt + timestamp
+ if (_str.length > 8000) {
+ _str = _str.slice(_str.length - 8000)
+ }
+ return md5(_str)
}
/**
@@ -213,8 +217,18 @@
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') {
- item.value = item.value ? [moment().subtract(item.value, 'days').format('YYYY-MM-DD'),
- moment().subtract(item.value === 1 ? 1 : 0, 'days').format('YYYY-MM-DD')] : ''
+ 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)
})
@@ -234,17 +248,21 @@
searches.forEach(item => {
if (item.type === 'date') {
let timetail = ''
+ let _val = item.value
if (item.match === '<' || item.match === '<=') {
- timetail = ' 23:59:59.999'
+ timetail = ' 00:00:00.000'
+ if (_val) {
+ _val = moment(_val, 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ }
} else if (item.match === '>' || item.match === '>=') {
timetail = ' 00:00:00.000'
}
if (newsearches[item.key]) {
- newsearches[item.key + '1'] = item.value ? item.value + timetail : null
+ newsearches[item.key + '1'] = _val ? _val + timetail : null
} else {
- newsearches[item.key] = item.value ? item.value + timetail : null
+ newsearches[item.key] = _val ? _val + timetail : null
}
} else if (item.type === 'datemonth') {
// 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫
@@ -253,19 +271,33 @@
if (item.value) {
_startval = moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000'
- _endval = moment(item.value, 'YYYY-MM').endOf('month').format('YYYY-MM-DD') + ' 23:59:59.999'
+ _endval = moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
}
newsearches[item.key] = _startval
newsearches[item.key + '1'] = _endval
} else if (item.type === 'dateweek') {
+ let _endval = ''
+ if (item.value) {
+ _endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ }
newsearches[item.key] = item.value ? item.value[0] + ' 00:00:00.000' : null
- newsearches[item.key + '1'] = item.value ? item.value[1] + ' 23:59:59.999' : null
+ newsearches[item.key + '1'] = item.value ? _endval + ' 00:00:00.000' : null
} else if (item.type === 'daterange') {
+ let _endval = ''
+ if (item.value) {
+ _endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ }
newsearches[item.key] = item.value ? item.value[0] + ' 00:00:00.000' : null
- newsearches[item.key + '1'] = item.value ? item.value[1] + ' 23:59:59.999' : null
+ newsearches[item.key + '1'] = item.value ? _endval + ' 00:00:00.000' : null
+ } else if (item.type === 'text') {
+ 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
}
@@ -284,42 +316,57 @@
let searchText = ''
searches.forEach(item => {
- if (!item.value) return
- // eslint-disable-next-line
- searchText += (searchText !== '' ? ' ' + 'AND' + ' ' : '')
- if (item.type === 'text' || item.type === 'select') {
- // eslint-disable-next-line
+ if (!item.value || (item.type === 'multiselect' && item.value.length === 0)) return
+
+ searchText += (searchText !== '' ? ' AND ' : '')
+ if (item.type === 'text') {
let str = item.match === '=' ? '' : '%'
- // eslint-disable-next-line
- searchText += item.key + ' ' + item.match + ' ' + '\'' + str + item.value + str + '\''
+ let fields = item.key.split(',').map(field => { // 缁煎悎鎼滅储锛屾墍瀛楁鎷兼帴
+ return field + ' ' + item.match + ' \'' + str + item.value + str + '\''
+ })
+
+ searchText += '(' + fields.join(' OR ') + ')'
+ } else if (item.type === 'select') {
+ let str = item.match === '=' ? '' : '%'
+
+ searchText += item.key + ' ' + item.match + ' \'' + str + item.value + str + '\''
+ } else if (item.type === 'multiselect') {
+ let str = item.match === '=' ? '' : '%'
+ let options = item.value.map(val => {
+ return item.key + ' ' + item.match + ' \'' + str + val + str + '\''
+ })
+
+ searchText += '(' + options.join(' OR ') + ')'
} else if (item.type === 'date') {
+ let _val = item.value
let timetail = ' 00:00:00.000'
- if (item.match === '<' || item.match === '<=') {
- timetail = ' 23:59:59.999'
+ 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 === '=') {
timetail = ''
}
- // eslint-disable-next-line
- searchText += '(' + item.key + ' ' + item.match + ' ' + '\'' + item.value + timetail + '\')'
- } else if (item.type === 'datemonth') {
- // 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫
+
+ searchText += '(' + 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').format('YYYY-MM-DD') + ' 23:59:59.999'
- // eslint-disable-next-line
- searchText += '(' + item.key + ' ' + item.match + ' ' + '\'' + _startval + '\' AND \'' + _endval + '\')'
- } else if (item.type === 'dateweek') {
- let stimetail = ' 00:00:00.000'
- let etimetail = ' 23:59:59.999'
- // eslint-disable-next-line
- searchText += '(' + item.key + ' ' + item.match + ' ' + '\'' + item.value[0] + stimetail + '\' AND \'' + item.value[1] + etimetail + '\')'
+ 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 + '\')'
+ } 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'
+
+ searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
} else if (item.type === 'daterange') {
- let stimetail = ' 00:00:00.000'
- let etimetail = ' 23:59:59.999'
- // eslint-disable-next-line
- searchText += '(' + item.key + ' ' + item.match + ' ' + '\'' + item.value[0] + stimetail + '\' AND \'' + item.value[1] + etimetail + '\')'
+ 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'
+
+ searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
} else {
- // eslint-disable-next-line
- searchText += '(' + item.key + ' ' + item.match + ' ' + '\'' + item.value + '\')'
+ searchText += '(' + item.key + ' ' + item.match + ' \'' + item.value + '\')'
}
})
return searchText
@@ -335,24 +382,18 @@
let searchText = ''
searches.forEach(item => {
if (!item.value) return
- // eslint-disable-next-line
- searchText += (searchText !== '' ? ' ' + 'AND' + ' ' : '')
+ searchText += (searchText !== '' ? ' AND ' : '')
if (item.type === 'text') {
let options = item.key.split(',').map(op => {
// equal鏃朵笉娣诲姞%
- // eslint-disable-next-line
let str = item.op === 'equal' ? '' : '%'
- // eslint-disable-next-line
- return op + ' ' + item.op + ' ' + '"' + str + item.value + str + '"'
+ return op + ' ' + item.op + ' \'' + str + item.value + str + '\''
})
- // eslint-disable-next-line
- searchText += '(' + options.join(' ' + 'OR' + ' ') + ')'
+ searchText += '(' + options.join(' OR ') + ')'
} else if (item.type === 'date') {
- // eslint-disable-next-line
- searchText += '(' + item.key + ' ' + item.op + ' ' + '"' + item.value + '")'
+ searchText += '(' + item.key + ' ' + item.op + ' \'' + item.value + '\')'
} else {
- // eslint-disable-next-line
- searchText += '(' + item.key + ' ' + item.op + ' ' + '"' + item.value + '")'
+ searchText += '(' + item.key + ' ' + item.op + ' \'' + item.value + '\')'
}
})
return searchText
@@ -370,8 +411,36 @@
} else {
baseurl = 'http://qingqiumarket.cn/' + service
}
+ // if (!/Content\/images\/upload\//.test(url)) {
+ // baseurl = baseurl + 'Content/images/upload/'
+ // }
let realurl = url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
return realurl
+ }
+
+ /**
+ * @description 鑾峰彇涓嬫媺鎼滅储鏌ヨsql
+ * @return {String} item 鎼滅储鏉′欢淇℃伅
+ */
+ static getSelectQuerySql (item) {
+ let _datasource = item.dataSource
+ let sql = ''
+
+ if (/\s/.test(_datasource)) { // 鎷兼帴鍒悕
+ _datasource = '(' + _datasource + ') tb'
+ }
+
+ if (item.type === 'link') {
+ sql = 'select ' + item.valueField + ',' + item.valueText + ',' + item.linkField + ' from ' + _datasource
+ } else {
+ sql = 'select ' + item.valueField + ',' + item.valueText + ' from ' + _datasource
+ }
+
+ if (item.orderBy) {
+ sql = sql + ' order by ' + item.orderBy + ' ' + item.orderType
+ }
+
+ return sql
}
/**
@@ -379,8 +448,11 @@
* @return {String} type 鎵ц绫诲瀷
* @return {String} table 琛ㄥ悕
*/
- static getSysDefaultSql (btn, setting, formdata) {
+ static getSysDefaultSql (btn, setting, formdata, primaryId) {
+ let primaryKey = setting.primaryKey || 'id'
let _sql = ''
+
+ console.log(primaryId)
if (btn.OpenType === 'pop' && btn.sqlType === 'insert') {
let keys = []
let values = []
@@ -396,7 +468,7 @@
keys = keys.join(',')
values = values.join(',')
- _sql = `insert into ${btn.sql} (${keys}, createuserid) select ${values},@userid`
+ _sql = `insert into ${btn.sql} (${keys}, createuserid, BID) select ${values},@BID,@userid`
} else if (btn.OpenType === 'pop' && btn.sqlType === 'update') {
let _form = []
formdata.forEach(item => {
@@ -407,11 +479,11 @@
}
})
_form = _form.join(',')
- _sql = `update ${btn.sql} set ${_form},modifydate=getdate(),modifyuserid=@userid where ${setting.primaryKey}=@id`
+ _sql = `update ${btn.sql} set ${_form},modifydate=getdate(),modifyuserid=@userid where ${primaryKey}=@${primaryKey}`
} else if ((btn.OpenType === 'prompt' || btn.OpenType === 'exec') && btn.sqlType === 'LogicDelete') { // 閫昏緫鍒犻櫎
- _sql = `update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuserid=@userid where ${setting.primaryKey}=@id`
+ _sql = `update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuserid=@userid where ${primaryKey}=@${primaryKey}`
} else if ((btn.OpenType === 'prompt' || btn.OpenType === 'exec') && btn.sqlType === 'delete') {
- _sql = `insert into snote (remark,createuserid) select '鍒犻櫎琛�:${btn.sql} 鏁版嵁: id='+@id,@userid delete ${btn.sql} where ${setting.primaryKey}=@id`
+ _sql = `insert into snote (remark,createuserid) select '鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${primaryKey}='+@${primaryKey},@userid delete ${btn.sql} where ${primaryKey}=@${primaryKey}`
}
return _sql
@@ -433,6 +505,7 @@
let form = ''
let formParam = ''
let _columns = []
+ let primaryKey = config.setting.primaryKey || 'ID'
if (config.search && config.search.length > 0) {
let _fields = new Map()
@@ -474,11 +547,12 @@
let Ltext = `create proc ${param.innerFunc}
( /*${menu.MenuName}*/
@BID nvarchar(50)='',
- @ID nvarchar(50)='',${formParam}
+ @${primaryKey} nvarchar(50)='',${formParam}
@PageIndex nvarchar(50)='',
@PageSize nvarchar(50)='',
@OrderCol nvarchar(50)='',
@OrderType nvarchar(50)='',
+ @exceltype nvarchar(50)='',
@sEPTMenuNo nvarchar(50)='${menu.MenuNo}',
@lang nvarchar(50)='',
@debug nvarchar(50)='',
@@ -499,7 +573,7 @@
BEGIN TRAN
/*鍏蜂綋涓氬姟鎿嶄綔*/
- /*
+ /*
select top 10 * from sProcExcep order by id desc
declare @UserName nvarchar(50),@FullName nvarchar(50)
@@ -538,14 +612,14 @@
RAISERROR(@ErrorMessage, /*-- Message text.*/
@ErrorSeverity, /*-- Severity.*/
@ErrorState /*-- State.*/
- );
+ );
END CATCH
GOTO_RETURN:
ROLLBACK TRAN
END`
- console.log(Ltext)
+
Ltext = Ltext.replace(/\n\s{4}/ig, 'mchr13k')
return Ltext
@@ -555,9 +629,12 @@
* @description 鍒涘缓瀛樺偍杩囩▼
* @return {String}
*/
- static getfunc (param, btn, menu, columns) {
+ static getfunc (param, btn, menu, config) {
+ console.log(menu)
let form = ''
let formParam = ''
+ let columns = config.columns
+ let primaryKey = config.setting.primaryKey || 'ID'
if (param.fields && param.fields.length > 0) {
let _fields = []
@@ -621,7 +698,7 @@
let Ltext = `create proc ${param.funcName}
( /*${menu.MenuName} ${btn.label}*/
@BID nvarchar(50)='',
- @ID nvarchar(50)='',${formParam}
+ @${primaryKey} nvarchar(50)='',${formParam}
@sEPTMenuNo nvarchar(50)='${param.menuNo}',
@lang nvarchar(50)='',
@debug nvarchar(50)='',
@@ -642,7 +719,7 @@
BEGIN TRAN
/*鍏蜂綋涓氬姟鎿嶄綔*/
- /*
+ /*
select top 10 * from sProcExcep order by id desc
declare @UserName nvarchar(50),@FullName nvarchar(50)
@@ -681,7 +758,7 @@
RAISERROR(@ErrorMessage, /*-- Message text.*/
@ErrorSeverity, /*-- Severity.*/
@ErrorState /*-- State.*/
- );
+ );
END CATCH
GOTO_RETURN:
--
Gitblit v1.8.0