From eb31b84962c192de57abbb473cb4733a09bf4363 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 14 五月 2020 18:09:40 +0800
Subject: [PATCH] 2020-05-14
---
src/utils/utils.js | 106 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 77 insertions(+), 29 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 0e1c3a1..2cff539 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -200,6 +200,7 @@
item.value = search.initval && search.initval[0] ? search.initval[0] : ''
item.match = '='
+ item.forbid = true
copy.type = 'daterange'
copy.match = 'between'
@@ -374,7 +375,7 @@
let searchText = ''
searches.forEach(item => {
- if (!item.value || (item.type === 'multiselect' && item.value.length === 0)) return
+ if (item.forbid || !item.value || (item.type === 'multiselect' && item.value.length === 0)) return
searchText += (searchText !== '' ? ' AND ' : '')
if (item.type === 'text') {
@@ -455,15 +456,15 @@
if (item.type === 'date') {
if (['>=', '>'].includes(item.match)) {
- item.value = item.value ? item.value + ' 00:00:00.000' : '1990-01-01 00:00:00.000'
+ 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' : '2030-01-01 00:00:00.000'
+ 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'
}
options.push(item)
} else if (item.type === 'datemonth') {
- let _startval = item.value ? moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000' : '1990-01-01 00:00:00.000'
- let _endval = item.value ? moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000' : '2030-01-01 00:00:00.000'
+ let _startval = item.value ? moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000' : '1970-01-01 00:00:00.000'
+ let _endval = item.value ? moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000' : '2050-01-01 00:00:00.000'
let copy = JSON.parse(JSON.stringify(item))
copy.key = copy.key + '1'
@@ -474,8 +475,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' : '1990-01-01 00:00:00.000'
- let _endval = item.value && item.value[1] ? moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000' : '2030-01-01 00:00:00.000'
+ let _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 copy = JSON.parse(JSON.stringify(item))
copy.key = copy.key + '1'
@@ -486,8 +487,8 @@
options.push(item)
options.push(copy)
} else if (item.type === 'daterange') {
- let _startval = item.value && item.value[0] ? item.value[0] + ' 00:00:00.000' : '1990-01-01 00:00:00.000'
- let _endval = item.value && item.value[1] ? moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000' : '2030-01-01 00:00:00.000'
+ let _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 copy = JSON.parse(JSON.stringify(item))
copy.key = copy.key + '1'
@@ -938,8 +939,8 @@
})
}
- // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鏃惰烦杩�)
- if (data && btn.Ot !== 'notRequired') {
+ // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
+ if (data && btn.Ot !== 'notRequired' && btn.Ot !== 'requiredOnce') {
_formFieldValue = {...data, ..._formFieldValue}
if (logcolumns && logcolumns.length > 0) {
@@ -1076,8 +1077,8 @@
})
}
- // 鍞竴鎬ч獙璇侊紝蹇呴』瀛樺湪琛ㄥ崟锛堣〃鍗曞瓨鍦ㄦ椂锛屼富閿潎涓哄崟鍊硷級,蹇呴』濉啓鏁版嵁婧�
- if (formdata && verify.uniques && verify.uniques.length > 0) {
+ // 鍞竴鎬ч獙璇侊紝蹇呴』瀛樺湪琛ㄥ崟锛堣〃鍗曞瓨鍦ㄦ椂锛屼富閿潎涓哄崟鍊硷級,蹇呴』濉啓鏁版嵁婧愶紝澶氳鎷兼帴鏃朵笉鍙敤
+ if (formdata && verify.uniques && verify.uniques.length > 0 && btn.Ot !== 'requiredOnce') {
let hasBid = false // 妫�楠岃〃鍗曞強鍒楀瓧娈典腑鏄惁鏈塨id
let _keys_ = Object.keys(_formFieldValue).map(key => key.toLowerCase())
if (_keys_.includes('bid')) {
@@ -1092,9 +1093,7 @@
item.field.split(',').forEach((_field, index) => {
let _fval = `'${_formFieldValue[_field]}'`
- // if (['id', 'bid', 'loginuid', 'sessionuid', 'userid', 'appkey'].includes(_field.toLowerCase())) {
- // _fval = '@' + _field + '@'
- // }
+
if (_field.toLowerCase() === 'bid' && !hasBid) { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
_fval = '@BID@'
}
@@ -1123,6 +1122,26 @@
goto aaa
end
`
+ })
+ } else if (verify.uniques && verify.uniques.length > 0 && btn.Ot === 'requiredOnce' && setting.dataresource) {
+ let datasource = setting.dataresource
+ if (/\s/.test(datasource)) { // 鎷兼帴鍒悕
+ datasource = '(' + datasource + ') tb'
+ }
+
+ verify.uniques.forEach(item => {
+ console.log(item)
+ // `鏈夊悓绫绘暟鎹獙璇侊細
+ // 涓庡敮涓�鎬ч獙璇佷竴鏍凤紝鍙互閫夊嚑涓瓧娈�
+ // Set @tbid=鈥欌��
+
+ // Select top 1 @tbid=鈥橷鈥� from (select 澶氫釜瀛楁閫楀彿鍒嗛殧,涓婚敭,1 an n from 鏁版嵁婧� ) tb inner join (select ID from dbo.SplitComma(@ID@)) sp on tb.涓婚敭=sp.ID group by 澶氫釜瀛楁閫楀彿鍒嗛殧 having sum(n)>1
+
+ // If @tbid!=鈥欌��
+ // Begin
+ // Set @errorcode=鈥橢鈥� ,Set @remsg=鈥欏涓瓧娈甸�楀彿鍒嗛殧 鍊间笉鍞竴鈥� goto aaa
+ // end
+ // `
})
}
@@ -1226,8 +1245,6 @@
`
}
- let primaryKeyName = ['id', 'bid', 'loginuid', 'sessionuid', 'userid', 'appkey'].includes(primaryKey.toLowerCase()) ? primaryKey + '@' : primaryKey
-
let _insertsql = ''
if (_actionType === 'insert' || _actionType === 'insertOrUpdate') { // 娣诲姞璇彞
let keys = []
@@ -1272,7 +1289,7 @@
}
let _updatesql = ''
- if (_actionType === 'update' || _actionType === 'insertOrUpdate') { // 淇敼璇彞
+ if (_actionType === 'update' || _actionType === 'audit' || _actionType === 'insertOrUpdate') { // 淇敼璇彞
let _form = []
let _arr = []
@@ -1281,12 +1298,22 @@
_form.push(item.key + '=@' + item.key)
})
- if (!_arr.includes('modifydate')) {
- _form.push('modifydate=getdate()')
+ if (_actionType === 'audit') {
+ if (!_arr.includes('submitdate')) {
+ _form.push('submitdate=getdate()')
+ }
+ if (!_arr.includes('submituserid')) {
+ _form.push('submituserid=@userid@')
+ }
+ } else {
+ if (!_arr.includes('modifydate')) {
+ _form.push('modifydate=getdate()')
+ }
+ if (!_arr.includes('modifyuserid')) {
+ _form.push('modifyuserid=@userid@')
+ }
}
- if (!_arr.includes('modifyuserid')) {
- _form.push('modifyuserid=@userid@')
- }
+
if (hasvoucher) {
if (!_arr.includes('bvoucher')) {
_form.push('BVoucher=@BVoucher')
@@ -1299,7 +1326,13 @@
}
}
_form = _form.join(',')
- _updatesql = `update ${btn.sql} set ${_form} where ${primaryKey}=@${primaryKeyName};`
+
+ let _ID = '=@ID@'
+ if (btn.Ot === 'requiredOnce') {
+ _ID = ' in (select ID from dbo.SplitComma(@ID@))'
+ }
+
+ _updatesql = `update ${btn.sql} set ${_form} where ${primaryKey}${_ID};`
}
if (_prevCustomScript) {
@@ -1311,14 +1344,19 @@
_sql += `
/* 榛樿sql */
${_insertsql}`
- } else if (_actionType === 'update') {
+ } else if (_actionType === 'update' || _actionType === 'audit') {
_sql += `
/* 榛樿sql */
${_updatesql}`
} else if (_actionType === 'LogicDelete') { // 閫昏緫鍒犻櫎
+ let _ID = '=@ID@'
+ if (btn.Ot === 'requiredOnce') {
+ _ID = ' in (select ID from dbo.SplitComma(@ID@))'
+ }
+
_sql += `
/* 榛樿sql */
- update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuserid=@userid@ where ${primaryKey}=@${primaryKeyName};`
+ update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuserid=@userid@ where ${primaryKey}${_ID};`
} else if (_actionType === 'delete') { // 鐗╃悊鍒犻櫎
let _msg = ''
@@ -1331,9 +1369,15 @@
}
})
}
+
+ let _ID = '=@ID@'
+ if (btn.Ot === 'requiredOnce') {
+ _ID = ' in (select ID from dbo.SplitComma(@ID@))'
+ }
+
_sql += `
/* 榛樿sql */
- insert into snote (remark,createuserid,CreateUser,CreateStaff) select left('鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${_msg}${primaryKey}='+@${primaryKeyName},200),@userid@,@username,@fullname delete ${btn.sql} where ${primaryKey}=@${primaryKeyName};`
+ insert into snote (remark,createuserid,CreateUser,CreateStaff) select left('鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${_msg}${primaryKey}='+@ID@,200),@userid@,@username,@fullname delete ${btn.sql} where ${primaryKey}${_ID};`
} else if (_actionType === 'insertOrUpdate') {
_sql += `
/* 榛樿sql */
@@ -1524,7 +1568,11 @@
if (!_vars.includes(primaryKey.toLowerCase())) {
_vars.push(primaryKey.toLowerCase())
- formParam = `mchr13k@${primaryKey} nvarchar(50)='',`
+ let _type = '50'
+ if (btn.Ot === 'requiredOnce') { // 澶氳鎷兼帴鏃讹紝涓婚敭璁句负max
+ _type = 'max'
+ }
+ formParam = `mchr13k@${primaryKey} nvarchar(${_type})='',`
}
if (param.fields && param.fields.length > 0) {
--
Gitblit v1.8.0