From 71b872aa44de6266a344646d0e535895620d57a7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 05 一月 2020 22:45:06 +0800
Subject: [PATCH] 2020-01-05
---
src/utils/utils.js | 61 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 2503f10..e4b03b9 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -227,6 +227,8 @@
}
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)
})
@@ -294,6 +296,8 @@
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
}
@@ -312,7 +316,8 @@
let searchText = ''
searches.forEach(item => {
- if (!item.value) return
+ if (!item.value || (item.type === 'multiselect' && item.value.length === 0)) return
+
searchText += (searchText !== '' ? ' AND ' : '')
if (item.type === 'text') {
let str = item.match === '=' ? '' : '%'
@@ -325,6 +330,13 @@
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'
@@ -399,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
}
/**
@@ -409,6 +449,7 @@
* @return {String} table 琛ㄥ悕
*/
static getSysDefaultSql (btn, setting, formdata) {
+ let primaryKey = setting.primaryKey || 'id'
let _sql = ''
if (btn.OpenType === 'pop' && btn.sqlType === 'insert') {
let keys = []
@@ -425,7 +466,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 => {
@@ -436,11 +477,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
@@ -462,6 +503,7 @@
let form = ''
let formParam = ''
let _columns = []
+ let primaryKey = config.setting.primaryKey || 'ID'
if (config.search && config.search.length > 0) {
let _fields = new Map()
@@ -503,7 +545,7 @@
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)='',
@@ -585,9 +627,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 = []
@@ -651,7 +696,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)='',
--
Gitblit v1.8.0