From 7577100309d6d935dffc10e39562f328268775d4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 06 一月 2025 21:49:32 +0800
Subject: [PATCH] 2025-01-06
---
src/utils/utils-custom.js | 700 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 562 insertions(+), 138 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 156e414..660986e 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -652,7 +652,7 @@
*/
static resetBtn (btn, commonId) {
if (btn.OpenType === 'pop' || (btn.OpenType === 'funcbutton' && btn.execMode === 'pop')) {
- if (btn.modal && btn.modal.fields.length > 0) {
+ if (btn.modal && btn.modal.fields && btn.modal.fields.length > 0) {
btn.modal.fields = btn.modal.fields.map(m => {
m.uuid = this.getuuid()
return m
@@ -684,6 +684,10 @@
return md5(commonId + m)
})
+ }
+
+ if (btn.OpenType === 'popview' && btn.config && btn.config.components) {
+ btn.config.components = this.resetConfig(btn.config.components, commonId)
}
}
@@ -771,14 +775,7 @@
if (cell.eleType === 'button') {
cell.uuid = md5(commonId + cell.uuid)
- if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
- if (cell.modal && cell.modal.fields.length > 0) {
- cell.modal.fields = cell.modal.fields.map(m => {
- m.uuid = this.getuuid()
- return m
- })
- }
- }
+ this.resetBtn(cell, commonId)
} else {
cell.uuid = this.getuuid()
}
@@ -792,14 +789,8 @@
card.backElements = card.backElements.map(cell => {
if (cell.eleType === 'button') {
cell.uuid = md5(commonId + cell.uuid)
- if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
- if (cell.modal && cell.modal.fields.length > 0) {
- cell.modal.fields = cell.modal.fields.map(m => {
- m.uuid = this.getuuid()
- return m
- })
- }
- }
+
+ this.resetBtn(cell, commonId)
} else {
cell.uuid = this.getuuid()
}
@@ -818,14 +809,8 @@
item.elements = item.elements.map(cell => {
if (cell.eleType === 'button') {
cell.uuid = md5(commonId + cell.uuid)
- if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
- if (cell.modal && cell.modal.fields.length > 0) {
- cell.modal.fields = cell.modal.fields.map(m => {
- m.uuid = this.getuuid()
- return m
- })
- }
- }
+
+ this.resetBtn(cell, commonId)
} else {
cell.uuid = this.getuuid()
}
@@ -850,14 +835,7 @@
col.elements = col.elements.map(cell => {
cell.uuid = md5(commonId + cell.uuid)
if (cell.eleType === 'button') {
- if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
- if (cell.modal && cell.modal.fields.length > 0) {
- cell.modal.fields = cell.modal.fields.map(m => {
- m.uuid = this.getuuid()
- return m
- })
- }
- }
+ this.resetBtn(cell, commonId)
}
return cell
})
@@ -902,14 +880,7 @@
}
item.action = item.action.map(cell => {
cell.uuid = md5(commonId + cell.uuid)
- if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
- if (cell.modal && cell.modal.fields.length > 0) {
- cell.modal.fields = cell.modal.fields.map(m => {
- m.uuid = this.getuuid()
- return m
- })
- }
- }
+ this.resetBtn(cell, commonId)
return cell
})
@@ -1733,6 +1704,7 @@
if (config.interfaces) {
config.interfaces.forEach(item => {
+ if (item.status !== 'true') return
if (item.setting && item.setting.interType === 'outer' && item.setting.sysInterface !== 'true') {
inters = 'true'
}
@@ -1962,6 +1934,10 @@
})
}
let emptys = []
+ if (cell.Ot !== 'notRequired') {
+ forms.push(...columns)
+ }
+
cell.verify.uniques.forEach(m => {
if (m.status === 'false') return
@@ -1973,7 +1949,11 @@
})
if (emptys.length) {
- errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濆敮涓�鎬ч獙璇佸瓧娈�${emptys.join('銆�')}锛屽湪琛ㄥ崟涓笉瀛樺湪锛乣})
+ if (cell.Ot === 'notRequired') {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濆敮涓�鎬ч獙璇佸瓧娈�${emptys.join('銆�')}锛屽湪琛ㄥ崟涓笉瀛樺湪锛乣})
+ } else {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濆敮涓�鎬ч獙璇佸瓧娈�${emptys.join('銆�')}锛屽湪琛ㄥ崟涓庡瓧娈甸泦涓笉瀛樺湪锛乣})
+ }
}
}
@@ -2193,6 +2173,40 @@
notification.warning({
top: 92,
message: label + `${lines}锛屼笉鍙嚭鐜拌繛缁殑鑻辨枃閫楀彿,,`,
+ duration: 5
+ })
+ return false
+ } else if (/,\./ig.test(sql)) {
+ let lines = []
+ sql.split(/\n/).forEach((s, i) => {
+ if (/,\./ig.test(s)) {
+ lines.push(i + 1)
+ }
+ })
+
+ lines = lines.join('銆�')
+ lines = lines ? '(绗�' + lines + '琛�)' : ''
+
+ notification.warning({
+ top: 92,
+ message: label + `${lines}锛屼笉鍙嚭鐜拌嫳鏂囬�楀彿,.`,
+ duration: 5
+ })
+ return false
+ } else if (/\.,/ig.test(sql)) {
+ let lines = []
+ sql.split(/\n/).forEach((s, i) => {
+ if (/\.,/ig.test(s)) {
+ lines.push(i + 1)
+ }
+ })
+
+ lines = lines.join('銆�')
+ lines = lines ? '(绗�' + lines + '琛�)' : ''
+
+ notification.warning({
+ top: 92,
+ message: label + `${lines}锛屼笉鍙嚭鐜拌嫳鏂囬�楀彿.,`,
duration: 5
})
return false
@@ -3049,11 +3063,18 @@
GOTO_RETURN:
ROLLBACK TRAN`
- let filterComponent = (components, mainSearch, label = '') => {
+ let filterComponent = (components, mainSearch, label = '', ispop) => {
components.forEach(item => {
item.$menuname = (config.MenuName || '') + label + '-' + (item.name || '')
if (item.type === 'tabs') {
+ if (config.Template === 'BaseTable') {
+ item.subtabs.forEach(tab => {
+ if (tab.permission !== 'true' && tab.components[0] && tab.components[0].wrap) {
+ tab.components[0].wrap.permission = 'false'
+ }
+ })
+ }
item.subtabs.forEach(tab => {
let _mainSearch = mainSearch || []
@@ -3064,10 +3085,11 @@
_mainSearch = com.search || []
})
}
- filterComponent(tab.components, _mainSearch, label)
+
+ filterComponent(tab.components, _mainSearch, label, ispop)
})
} else if (item.type === 'group') {
- filterComponent(item.components, mainSearch, label)
+ filterComponent(item.components, mainSearch, label, ispop)
} else {
if (item.wrap && item.setting) {
if (item.wrap.datatype === 'public' || item.wrap.datatype === 'static') {
@@ -3083,7 +3105,7 @@
if (['select', 'link', 'multiselect', 'checkcard', 'radio'].includes(cell.type) && cell.resourceType === '1' && cell.dataSource) {
let msg = getFormSql(cell, '鎼滅储')
- sqls.push({uuid: cell.uuid, type: 'sForm', ...msg})
+ sqls.push({uuid: md5(item.uuid + cell.uuid), type: 'sForm', ...msg})
}
})
}
@@ -3100,8 +3122,16 @@
item.setting.$name = item.$menuname || ''
let msg = getDataSource(item, mainSearch)
+ let roleId = config.uuid
+ if (item.wrap && item.wrap.permission === 'false') {
+ roleId = ''
+ } else if (item.setting.database === 'sso') {
+ roleId = ''
+ } else if (ispop) {
+ roleId = ''
+ }
- sqls.push({uuid: item.uuid, type: 'datasource', ...msg})
+ sqls.push({uuid: item.uuid, roleId: roleId, type: 'datasource', ...msg})
} else if (item.setting && item.setting.useMSearch === 'true') {
let searches = item.search || []
if (mainSearch.length > 0) {
@@ -3113,7 +3143,7 @@
item.action && item.action.forEach(cell => {
if (cell.hidden === 'true') return false
- resetButton(item, cell)
+ resetButton(item, cell, false, ispop)
})
if (item.type === 'table') {
@@ -3128,7 +3158,7 @@
col.elements.forEach(cell => {
if (cell.eleType !== 'button' || cell.hidden === 'true') return
- resetButton(item, cell)
+ resetButton(item, cell, false, ispop)
})
} else if (item.subtype === 'editable' && col.editable === 'true') {
if (col.editType === 'select' && col.resourceType === '1') {
@@ -3165,7 +3195,7 @@
card.elements && card.elements.forEach(cell => {
if (cell.eleType !== 'button' || cell.hidden === 'true') return
- resetButton(item, cell)
+ resetButton(item, cell, false, ispop)
})
if (!card.backElements || card.backElements.length === 0) return
@@ -3173,14 +3203,14 @@
card.backElements.forEach(cell => {
if (cell.eleType !== 'button' || cell.hidden === 'true') return
- resetButton(item, cell, true)
+ resetButton(item, cell, true, ispop)
})
})
} else if (item.type === 'balcony') {
item.elements.forEach(cell => {
if (cell.eleType !== 'button' || cell.hidden === 'true') return
- resetButton(item, cell)
+ resetButton(item, cell, false, ispop)
})
} else if (item.type === 'form') {
item.subcards.forEach(group => {
@@ -3193,15 +3223,49 @@
fields: group.fields
}
- resetButton(item, group.subButton)
+ resetButton(item, group.subButton, false, ispop)
})
+ } else if (item.type === 'module' && item.subtype === 'invoice') {
+ if (item.buyer.setting && item.buyer.setting.interType === 'system') {
+ let msg = getDataSource(item.buyer, [])
+
+ sqls.push({uuid: item.uuid + 'buyer', type: 'datasource', ...msg})
+ }
+
+ if (item.detail.setting && item.detail.setting.interType === 'system') {
+ let _msg = getDataSource(item.detail, [])
+
+ sqls.push({uuid: item.uuid + 'detail', type: 'datasource', ..._msg})
+ }
+
+ let btnmsg = getInvoicePreSql(item.billSaveBtn, item.$menuname + '-' + item.billSaveBtn.label)
+
+ sqls.push({uuid: item.uuid + item.billSaveBtn.type, type: 'button', ...btnmsg})
+
+ let _btnmsg = getInvoicePreSql(item.billOutBtn, item.$menuname + '-' + item.billOutBtn.label)
+
+ sqls.push({uuid: item.uuid + item.billOutBtn.type, type: 'button', ..._btnmsg})
+
+ let backmsg = getInvoiceSysBackSql(item.billOutBtn, item.$menuname + '-' + item.billOutBtn.label + '(鍥炶皟)')
+
+ sqls.push({uuid: item.uuid + 'billback', type: 'btnCallBack', ...backmsg})
}
}
})
}
- let resetButton = (item, cell, isback) => {
+ let resetButton = (item, cell, isback, ispop) => {
cell.logLabel = item.$menuname + '-' + cell.label
+ let roleId = cell.uuid
+ if (item.wrap && item.wrap.permission === 'false') {
+ roleId = ''
+ } else if (cell.hidden === 'true' || cell.permission === 'false') {
+ roleId = ''
+ } else if (cell.database === 'sso') {
+ roleId = ''
+ } else if (ispop) {
+ roleId = ''
+ }
if (['exec', 'prompt', 'pop', 'form', 'formSubmit'].includes(cell.OpenType)) {
if (cell.intertype === 'system' || cell.procMode === 'system') { // 绯荤粺鎺ュ彛
@@ -3215,11 +3279,11 @@
let msg = getSysDefaultSql(cell, _item)
- sqls.push({uuid: cell.uuid, type: 'button', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'button', ...msg})
} else {
let msg = getSysDefaultSql(cell, item)
- sqls.push({uuid: cell.uuid, type: 'button', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'button', ...msg})
}
}
if (cell.callbackType === 'script' && cell.verify && cell.verify.cbScripts) {
@@ -3246,7 +3310,7 @@
} else if (form.type === 'popSelect') {
let msg = getPopSelectSql(form)
- sqls.push({uuid: form.uuid, type: 'popSource', ...msg})
+ sqls.push({uuid: md5(cell.uuid + form.uuid), type: 'popSource', ...msg})
}
})
}
@@ -3254,20 +3318,30 @@
if (cell.intertype === 'system') {
let msg = getExcelInSql(cell)
- sqls.push({uuid: cell.uuid, type: 'excelIn', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'excelIn', ...msg})
}
} else if (cell.OpenType === 'excelOut') {
if (cell.intertype === 'system' && cell.verify && cell.verify.dataType === 'custom') {
let msg = getExcelOutSql(cell, item)
- sqls.push({uuid: cell.uuid, type: 'excelOut', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'excelOut', ...msg})
+ } else if (cell.intertype === 'system' && cell.verify && item.setting && item.setting.interType === 'system') {
+ if (appType === 'mob') {
+ cell.pagination = 'false'
+ }
+ if (item.subtype === 'dualdatacard' || item.setting.laypage !== cell.pagination) {
+ let msg = getDoubleExcelOutSql(cell, item)
+
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'excelOut', ...msg})
+ }
}
+
} else if (cell.OpenType === 'funcbutton') {
if (cell.funcType === 'print') {
if (cell.intertype === 'system' && cell.verify && cell.verify.dataType === 'custom') {
let msg = getPrintSql(cell, item)
- sqls.push({uuid: cell.uuid, type: 'print', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'print', ...msg})
}
if (cell.execMode === 'pop' && cell.modal && cell.modal.fields) {
cell.modal.fields.forEach(form => {
@@ -3279,23 +3353,23 @@
} else if (form.type === 'popSelect') {
let msg = getPopSelectSql(form)
- sqls.push({uuid: form.uuid, type: 'popSource', ...msg})
+ sqls.push({uuid: md5(cell.uuid + form.uuid), type: 'popSource', ...msg})
}
})
}
} else if ((cell.funcType === 'refund' || cell.funcType === 'pay') && cell.payMode === 'system') {
let msg = getPaySql(cell, item)
- sqls.push({uuid: cell.uuid, type: 'pay', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'pay', ...msg})
}
} else if (cell.OpenType === 'innerpage' || cell.OpenType === 'outerpage') {
if (cell.pageTemplate === 'pay' && cell.payMode === 'system') {
let msg = getPaySql(cell, item)
- sqls.push({uuid: cell.uuid, type: 'pay', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'pay', ...msg})
}
} else if (cell.OpenType === 'popview') {
- if (cell.config && cell.config.components) {
+ if (cell.config && cell.config.components && cell.config.enabled) {
let _mainSearch = []
if (appType === 'mob') {
@@ -3319,7 +3393,9 @@
})
}
- filterComponent(cell.config.components, _mainSearch, '-' + cell.label)
+ let label = (item.name ? '-' + item.name : '') + '-' + cell.label
+
+ filterComponent(cell.config.components, _mainSearch, label, true)
}
}
}
@@ -3728,24 +3804,26 @@
let _val2 = ''
arr.push(_key)
- if (_key === 'bid') { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
+ if (_key === 'bid') {
_val = BID
} else {
- _val = `'@mk_${_key}_mk@'`
+ // _val = `'@mk_${_key}_mk@'`
+ _val = `@${_field}`
}
_fieldValue.push(`${_key}=${_val}`)
- if (_key === 'bid') { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
+ if (_key === 'bid') {
_val2 = `' + ${BID} + '`
} else {
- _val2 = `@mk_${_key}_mk@`
+ // _val2 = `@mk_${_key}_mk@`
+ _val2 = `' + @${_field} + '`
}
_value.push(`${_labels[index] || ''}锛�${_val2}`)
})
- if (!arr.includes(primaryKey.toLowerCase())) {
+ if (!arr.includes(primaryKey.toLowerCase()) && btn.Ot !== 'notRequired') {
_fieldValue.push(`${primaryKey} !=${primaryId}`)
}
@@ -4023,6 +4101,33 @@
if @works_flow_countersign@ = 'Y'
begin
/* 宸ヤ綔娴侀粯璁ql锛堜細绛撅級 */
+ set @retmsg =''
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@ and works_flow_detail_id =@works_flow_detail_id
+
+ if @retmsg =''
+ begin
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@ and works_flow_detail_id =@works_flow_detail_id
+ if @retmsg !=''
+ begin
+ select @ErrorCode='E', @retmsg='褰撳墠鍗曟嵁宸插鏍革紝璇峰埛鏂板悗閲嶈瘯'
+ goto aaa
+ end
+
+ set @retmsg =''
+ select @retmsg=userid from s_my_works_flow_role where works_flow_id=@id@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
+
+ if @retmsg !=''
+ begin
+ select @retmsg=workerCode+workerName from BD_workers where id=@retmsg
+
+ select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺锛岃鑱旂郴'+@retmsg+'鎿嶄綔'
+ goto aaa
+ end
+
+ select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺'
+ goto aaa
+ end
+
declare @works_flow_statuscharone nvarchar(50),@works_flow_statuschartwo nvarchar(50),@works_flow_statuscharthree nvarchar(50),@works_flow_statuscharfour nvarchar(50),@works_flow_statuscharfive nvarchar(50),@works_flow_key_id nvarchar(50),@works_flow_key_status nvarchar(20),@s_my_works_flow_log_param nvarchar(max),@s_my_works_flow_log_status int,@s_my_works_flow_log_statusname nvarchar(50),@s_my_works_flow_log_detail_id nvarchar(50)
select @works_flow_statuscharone='',@works_flow_statuschartwo='',@works_flow_statuscharthree='',@works_flow_statuscharfour='',@works_flow_statuscharfive='',@works_flow_key_id='',@works_flow_key_status ='',@s_my_works_flow_log_param='',@s_my_works_flow_log_status=0,@s_my_works_flow_log_statusname='',@s_my_works_flow_log_detail_id=''
@@ -4079,11 +4184,11 @@
begin
/* 宸ヤ綔娴侀粯璁ql锛堟垨绛撅級 */
set @retmsg =''
- select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@ and works_flow_detail_id =@works_flow_detail_id
if @retmsg =''
begin
- select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@ and works_flow_detail_id =@works_flow_detail_id
if @retmsg !=''
begin
@@ -4093,18 +4198,31 @@
if @dataM@ !=''
begin
- set @retmsg =''
- select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
+ set @retmsg =''
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
- if @retmsg != ''
+ if @retmsg != ''
+ begin
+ goto goto_mk
+ end
+ end
+ else
+ begin
+ set @retmsg =''
+ select @retmsg=userid from s_my_works_flow_role where works_flow_id=@id@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
+
+ if @retmsg !=''
begin
- goto goto_mk
+ select @retmsg=workerCode+workerName from BD_workers where id=@retmsg
+
+ select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺锛岃鑱旂郴'+@retmsg+'鎿嶄綔'
+ goto aaa
end
end
-
+
select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺'
goto aaa
- end
+ end
goto_mk:
@@ -4117,7 +4235,7 @@
if @works_begin_branch@ = 'Y'
begin
- update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
+ update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname,works_flow_detail_id=@works_flow_detail_id@
where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and typecharone='begin'
end
else
@@ -4270,6 +4388,12 @@
}
})
+ if (new RegExp('@mk_submit_type[^0-9a-z_]', 'ig').test(_sql)) {
+ decSql.push(`@mk_submit_type nvarchar(50)`)
+ secSql.push(`@mk_submit_type=@mk_submit_type@`)
+ reps.push('mk_submit_type')
+ }
+
decSql = [...decSql, ..._declares]
// INSERT INTO s_paas_api_log (appkey,api_name,api_count,menuname,createuserid,createuser,createstaff,cdefine1,cdefine2)
@@ -4304,12 +4428,8 @@
return true
})
- reps.forEach(n => {
- _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
- })
-
if (/\$@/ig.test(_sql)) {
- _sql = _sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+ _sql = _sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
reps.push('datam_begin', 'datam_end')
}
if (btn.procMode === 'system') {
@@ -4318,15 +4438,20 @@
}
} else {
if (/\$check@|@check\$/ig.test(_sql)) {
- _sql = _sql.replace(/\$check@/ig, '@mk_check_begin@').replace(/@check\$/ig, '@mk_check_end@')
+ _sql = _sql.replace(/\$check@/ig, ' @mk_check_begin@ ').replace(/@check\$/ig, ' @mk_check_end@ ')
reps.push('mk_check_begin', 'mk_check_end')
}
}
+ reps.forEach(n => {
+ if (['datam_begin', 'datam_end', 'mk_check_begin', 'mk_check_end'].includes(n)) return
+
+ _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+ })
if (/@db@/ig.test(_sql)) {
reps.push('db')
}
- _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -4565,7 +4690,7 @@
} else if (['mk_address'].includes(s)) {
decSql.push(`@mk_address nvarchar(100)`)
} else if (['mk_deleted'].includes(s)) {
- secSql.push(`@mk_deleted int`)
+ decSql.push(`@mk_deleted int`)
} else {
decSql.push(`@${s} nvarchar(50)`)
}
@@ -4581,6 +4706,12 @@
}
}
})
+
+ if (new RegExp('@mk_submit_type[^0-9a-z_]', 'ig').test(_sql)) {
+ decSql.push(`@mk_submit_type nvarchar(50)`)
+ secSql.push(`@mk_submit_type=@mk_submit_type@`)
+ reps.push('mk_submit_type')
+ }
decSql = [...decSql, ..._declares]
@@ -4614,19 +4745,20 @@
return true
})
- reps.forEach(n => {
- _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
- })
-
if (/\$@/ig.test(_sql)) {
- _sql = _sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+ _sql = _sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
reps.push('datam_begin', 'datam_end')
}
+ reps.forEach(n => {
+ if (['datam_begin', 'datam_end'].includes(n)) return
+
+ _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+ })
if (/@db@/ig.test(_sql)) {
reps.push('db')
}
- _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -4642,8 +4774,6 @@
}
let getDataSource = (item, mainSearch = [], type) => {
- if (!item.setting || item.setting.interType !== 'system') return
-
let searches = item.search || []
if (item.setting.useMSearch === 'true' && mainSearch.length > 0) {
searches = [...searches, ...mainSearch]
@@ -4694,7 +4824,7 @@
_search = ''
}
- if (/\s/.test(_dataresource)) {
+ if (/\s/.test(_dataresource) && !/\)\s+tb$/.test(_dataresource)) {
_dataresource = '(' + _dataresource + ') tb'
}
@@ -4755,7 +4885,7 @@
let DateCount = ''
if (_dataresource) {
/*system_query*/
- if (/@pageSize@|@orderBy@|@mk_total/i.test(testSql)) {
+ if (/@pageSize@|@orderBy@|@mk_total/i.test(testSql) || (item.wrap && item.wrap.tree === 'true')) {
LText = `select ${arr_field} from ${_dataresource} ${_search} `
} else if (item.setting.laypage === 'true' && item.setting.order) {
LText = `select top @pageSize@ ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by @orderBy@) as rows from ${_dataresource} ${_search}) tmptable where rows > @pageSize@ * (@pageIndex@ - 1) order by tmptable.rows `
@@ -4798,8 +4928,14 @@
// INSERT INTO s_paas_api_log (appkey,api_name,api_count,menuname,createuserid,createuser,createstaff,cdefine1,cdefine2)
// SELECT @appkey@,'sPC_Get_TableData',1,@menuname@,@UserID@,@username@,@fullname@,@SessionUid@,@LoginUID@
let sql = ''
+ let e_sql = `select ${_columns.map(col => col.field).join(',')} from (select ${_columns.map(col => /date/ig.test(col.datatype) ? `'1949-10-01' as ${col.field}` : `'0' as ${col.field}`).join(',')}) a where ${item.setting.primaryKey || 'ID'} != '0'`
+ if (DateCount) {
+ e_sql += `
+ select 0 as total
+ `
+ }
- if (item.setting.transact === 'true') {
+ if (item.setting.transact === 'true' && !/BEGIN\s+TRY\s+begin\s+TRAN/.test(_customScript)) {
sql = `/* ${item.setting.$name} */
BEGIN TRY
begin TRAN
@@ -4810,7 +4946,29 @@
_tailScript = `${_tailScript}
select @ErrorCode as ErrorCode,@retmsg as retmsg
- ${callback}
+
+ COMMIT TRAN
+ set NOCOUNT ON
+ RETURN
+ END TRY
+ BEGIN CATCH
+ ROLLBACK TRAN
+ DECLARE @ErrorMessage NVARCHAR(4000);
+ DECLARE @ErrorSeverity INT;
+ DECLARE @ErrorState INT;
+
+ set @ErrorCode=cast(ERROR_NUMBER() as nvarchar(50))
+ set @retmsg=ERROR_MESSAGE();
+ select @ErrorMessage=ERROR_MESSAGE(), @ErrorSeverity=ERROR_SEVERITY(), @ErrorState=ERROR_STATE();
+
+ RAISERROR(@ErrorMessage, @ErrorSeverity, @ErrorState);
+ END CATCH
+
+ aaa:
+ ${e_sql}
+ select @ErrorCode as ErrorCode,@retmsg as retmsg
+ GOTO_RETURN:
+ ROLLBACK TRAN
`
} else {
sql = `/* ${item.setting.$name} */
@@ -4818,8 +4976,18 @@
arr_field='${arr_field}',tabid='${tabid}',parid='${parid}',sub_name='${sub_name}',sub_field='${sub_field}'
`
+ let tail = 'aaa:'
+ if (/\sgoto\s+aaa([^0-9a-z_]|$)/ig.test(_customScript) && !/BEGIN\s+TRY\s+begin\s+TRAN/.test(_customScript)) {
+ tail = `if 1=2
+ begin
+ aaa:
+ ${e_sql}
+ end`
+ }
+
_tailScript = `${_tailScript}
- select @ErrorCode as ErrorCode,@retmsg as retmsg
+ ${tail}
+ select @ErrorCode as ErrorCode,@retmsg as retmsg
`
}
@@ -4852,22 +5020,22 @@
return true
})
-
+
+ if (/\$@/ig.test(sql)) {
+ sql = sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
+ reps.push('datam_begin', 'datam_end')
+ }
reps.forEach(n => {
- if (['orderBy', 'pageSize', 'pageIndex'].includes(n)) return
+ if (['orderBy', 'pageSize', 'pageIndex', 'datam_begin', 'datam_end'].includes(n)) return
sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
})
- if (/\$@/ig.test(sql)) {
- sql = sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
- reps.push('datam_begin', 'datam_end')
- }
if (/@db@/ig.test(sql)) {
reps.push('db')
}
reps.push('mk_obj_name')
- sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -5156,23 +5324,25 @@
return true
})
- reps.forEach(n => {
- sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
- })
-
if (/\$@/ig.test(sql)) {
- sql = sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+ sql = sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
reps.push('datam_begin', 'datam_end')
}
if (/\$check@|@check\$/ig.test(sql)) {
- sql = sql.replace(/\$check@/ig, '@mk_check_begin@').replace(/@check\$/ig, '@mk_check_end@')
+ sql = sql.replace(/\$check@/ig, ' @mk_check_begin@ ').replace(/@check\$/ig, ' @mk_check_end@ ')
reps.push('mk_check_begin', 'mk_check_end')
}
+ reps.forEach(n => {
+ if (['datam_begin', 'datam_end', 'mk_check_begin', 'mk_check_end'].includes(n)) return
+
+ sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+ })
+
if (/@db@/ig.test(sql)) {
reps.push('db')
}
- sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -5432,19 +5602,20 @@
return true
})
- reps.forEach(n => {
- sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
- })
-
if (/\$@/ig.test(sql)) {
- sql = sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+ sql = sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
reps.push('datam_begin', 'datam_end')
}
+ reps.forEach(n => {
+ if (['datam_begin', 'datam_end'].includes(n)) return
+
+ sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+ })
if (/@db@/ig.test(sql)) {
reps.push('db')
}
- sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -5484,6 +5655,23 @@
}
item.scripts = btn.verify.scripts || []
+
+ let msg = getDataSource(item, [])
+
+ return msg
+ }
+
+ let getDoubleExcelOutSql = (btn, component) => {
+ let item = fromJS(component).toJS()
+ item.search = item.$searches || []
+
+ if (item.subtype === 'dualdatacard') {
+ item.columns = [...item.columns, ...item.subColumns]
+ }
+ item.subtype = 'datacard'
+
+ item.setting.laypage = btn.pagination
+ item.setting.$name = btn.logLabel || ''
let msg = getDataSource(item, [])
@@ -5699,19 +5887,20 @@
return true
})
- reps.forEach(n => {
- _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
- })
-
if (/\$@/ig.test(_sql)) {
- _sql = _sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+ _sql = _sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
reps.push('datam_begin', 'datam_end')
}
+ reps.forEach(n => {
+ if (['datam_begin', 'datam_end'].includes(n)) return
+
+ _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+ })
if (/@db@/ig.test(_sql)) {
reps.push('db')
}
- _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -5812,21 +6001,22 @@
reps.push(...sysVars)
- reps.forEach(n => {
- sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
- })
-
if (/\$@/ig.test(sql)) {
- sql = sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+ sql = sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
reps.push('datam_begin', 'datam_end')
}
+ reps.forEach(n => {
+ if (['datam_begin', 'datam_end'].includes(n)) return
+
+ sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+ })
if (/@db@/ig.test(sql)) {
reps.push('db')
}
// reps.push('mk_obj_name')
- sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -5937,20 +6127,20 @@
return true
})
+ if (/\$@/ig.test(sql)) {
+ sql = sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
+ reps.push('datam_begin', 'datam_end')
+ }
reps.forEach(n => {
- if (['orderBy', 'pageSize', 'pageIndex'].includes(n)) return
+ if (['orderBy', 'pageSize', 'pageIndex', 'datam_begin', 'datam_end'].includes(n)) return
sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
})
- if (/\$@/ig.test(sql)) {
- sql = sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
- reps.push('datam_begin', 'datam_end')
- }
if (/@db@/ig.test(sql)) {
reps.push('db')
}
- sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+ sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
reps = reps.filter(n => {
if (sysVars.includes(n.toLowerCase())) {
@@ -5961,6 +6151,213 @@
})
return {LText: sql, md5: md5(sql), reps}
+ }
+
+ let getInvoicePreSql = (btn, logLabel) => {
+ let reps = []
+ let sysVars = ['loginuid', 'sessionuid', 'userid', 'appkey', 'lang', 'username', 'fullname', 'menuname']
+ let _script = ''
+ btn.scripts.forEach(item => {
+ if (item.status === 'false') return
+ _script += `
+ ${item.sql}
+ `
+ })
+
+ _script = _script.replace(/@typename@/ig, `'admin'`)
+
+ let regs = ['ID', 'BID', 'time_id', 'datam', ...sysVars]
+
+ regs.forEach(s => {
+ if (new RegExp('@' + s + '@', 'ig').test(_script)) {
+ reps.push(s)
+ }
+ })
+
+ if (/\$@/ig.test(_script)) {
+ _script = _script.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
+ reps.push('datam_begin', 'datam_end')
+ }
+ reps.forEach(n => {
+ if (['datam_begin', 'datam_end'].includes(n)) return
+
+ _script = _script.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+ })
+ if (/@db@/ig.test(_script)) {
+ reps.push('db')
+ }
+
+ let syses = ['UserName', 'FullName', 'RoleID', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'bid']
+ let decSql = []
+ let secSql = []
+
+ syses.forEach(s => {
+ if (new RegExp('@' + s + '[^0-9a-z_]', 'ig').test(_script)) {
+ if (['RoleID', 'mk_departmentcode', 'mk_organization'].includes(s)) {
+ decSql.push(`@${s} nvarchar(512)`)
+ } else if (['mk_address'].includes(s)) {
+ decSql.push(`@mk_address nvarchar(100)`)
+ } else {
+ decSql.push(`@${s} nvarchar(50)`)
+ }
+ secSql.push(`@${s}='@${s}@'`)
+ reps.push(s)
+ }
+ })
+ decSql = decSql.join(',')
+ secSql = secSql.join(',')
+
+ let sql = `/* ${logLabel} */
+ BEGIN TRY
+ begin TRAN
+
+ Declare @ErrorCode nvarchar(50), @retmsg nvarchar(4000), @account_id nvarchar(50), @account_year_id nvarchar(50), @account_code nvarchar(50), @account_year_code nvarchar(50), @tbid nvarchar(50)${decSql ? ',' + decSql : ''}
+
+ Select @ErrorCode='S', @retmsg='', @account_id='@account_id@', @account_year_id='@account_year_id@', @account_code='@account_code@', @account_year_code='@account_year_code@'${secSql ? ',' + secSql : ''}
+
+ /* 鍙戠エ涓昏〃瀛楁 */
+ Declare @invoice_type Nvarchar(50), @from_to_name Nvarchar(50), @from_to_tax_no Nvarchar(50), @from_to_addr Nvarchar(100), @from_to_tel Nvarchar(50), @from_to_bank_name Nvarchar(50), @from_to_account_no Nvarchar(50), @from_to_mob Nvarchar(50), @from_to_email Nvarchar(50), @from_to_code Nvarchar(50), @orgname Nvarchar(50), @tax_no Nvarchar(50), @addr Nvarchar(100), @tel Nvarchar(50), @bank_name Nvarchar(50), @account_no Nvarchar(50), @remark Nvarchar(512), @payee Nvarchar(50), @reviewer Nvarchar(50), @drawer Nvarchar(50), @io Nvarchar(50), @orgcode Nvarchar(50), @total_net_amount Decimal(18,2), @total_tax Decimal(18,2), @total_amount Decimal(18,2), @business_type Nvarchar(20)
+
+ Select @invoice_type='@invoice_type@', @from_to_name='@from_to_name@', @from_to_tax_no='@from_to_tax_no@', @from_to_addr='@from_to_addr@', @from_to_tel='@from_to_tel@', @from_to_bank_name='@from_to_bank_name@', @from_to_account_no='@from_to_account_no@', @from_to_mob='@from_to_mob@', @from_to_email='@from_to_email@', @from_to_code='@from_to_code@', @orgname='@orgname@', @tax_no='@tax_no@', @addr='@addr@', @tel='@tel@', @bank_name='@bank_name@', @account_no='@account_no@', @remark='@remark@', @payee='@payee@', @reviewer='@reviewer@', @drawer='@drawer@', @io='@io@', @orgcode='@orgcode@', @total_net_amount=@total_net_amount@, @total_tax=@total_tax@, @total_amount=@total_amount@, @business_type='@business_type@'
+
+ /* 鍙戠エ鏄庣粏涓存椂琛� */
+
+ Declare @details_list table (productcode Nvarchar(50), productname Nvarchar(50), spec Nvarchar(50), unit Nvarchar(50), bill_count Decimal(18,10), unitprice Decimal(18,10), amount_line Decimal(18,2), tax_classify_code Nvarchar(50), tax_classify_name Nvarchar(50), tax_rate Decimal(18,2), tax_amount Decimal(18,2), free_tax_mark Nvarchar(50), vat_special_management Nvarchar(50), invoice_lp Nvarchar(50), tax_item Nvarchar(50), tax_method Nvarchar(50), jskey Nvarchar(50), data_type Nvarchar(50))
+
+ Insert into @details_list (productcode, productname, spec, unit, bill_count, unitprice, amount_line, tax_classify_code, tax_classify_name, tax_rate, tax_amount, free_tax_mark, vat_special_management, invoice_lp, tax_item, tax_method, jskey, data_type)
+
+ @mk_excel_data@
+
+ /* 鑷畾涔夎剼鏈� */
+ ${_script}
+ `
+
+ if (btn.type === 'billout') {
+ sql += callback
+ } else {
+ sql += `
+ select @ErrorCode as ErrorCode,@retmsg as retmsg
+ ${callback}
+ `
+ }
+
+ reps = reps.filter(n => {
+ if (sysVars.includes(n.toLowerCase())) {
+ return false
+ }
+
+ return true
+ })
+
+ sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
+
+ return {LText: sql, md5: md5(sql), reps}
+ }
+
+ let getInvoiceSysBackSql = (btn, logLabel) => {
+ let _prev = ''
+ let _back = ''
+ let tables = []
+ let reps = []
+
+ btn.cbScripts.forEach(script => {
+ if (script.status === 'false') return
+
+ if (/\s#[a-z0-9_]+(\s|\()/ig.test(script.sql)) {
+ tables.push(...script.sql.match(/\s#[a-z0-9_]+(\s|\()/ig))
+ }
+
+ if (script.position === 'front') {
+ _prev += `
+ /* 鑷畾涔夎剼鏈� */
+ ${script.sql}
+ `
+ } else {
+ _back += `
+ /* 鑷畾涔夎剼鏈� */
+ ${script.sql}
+ `
+ }
+ })
+
+ tables = tables.map(tb => tb.replace(/\s|\(/g, ''))
+
+ let syses = ['UserName', 'FullName', 'RoleID', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'bid']
+ let decSql = []
+ let secSql = []
+ let testSql = _prev + _back
+
+ _prev = _prev.replace(/@typename@/ig, `'admin'`)
+ _back = _back.replace(/@typename@/ig, `'admin'`)
+
+ let regs = ['ID', 'BID', 'time_id', 'datam', ...sysVars]
+
+ regs.forEach(s => {
+ if (new RegExp('@' + s + '@', 'ig').test(testSql)) {
+ reps.push(s)
+ }
+ })
+
+ if (/\$@/ig.test(testSql)) {
+ _prev = _prev.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
+ _back = _back.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
+ reps.push('datam_begin', 'datam_end')
+ }
+ reps.forEach(n => {
+ if (['datam_begin', 'datam_end'].includes(n)) return
+
+ _prev = _prev.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+ _back = _back.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+ })
+ if (/@db@/ig.test(testSql)) {
+ reps.push('db')
+ }
+
+ syses.forEach(s => {
+ if (new RegExp('@' + s + '[^0-9a-z_]', 'ig').test(testSql)) {
+ if (['RoleID', 'mk_departmentcode', 'mk_organization'].includes(s)) {
+ decSql.push(`@${s} nvarchar(512)`)
+ } else if (['mk_address'].includes(s)) {
+ decSql.push(`@mk_address nvarchar(100)`)
+ } else {
+ decSql.push(`@${s} nvarchar(50)`)
+ }
+ secSql.push(`@${s}='@${s}@'`)
+ reps.push(s)
+ }
+ })
+ decSql = decSql.join(',')
+ secSql = secSql.join(',')
+
+ // 闇�瑕佸０鏄庣殑鍙橀噺闆�
+
+ let _sql = `/* ${logLabel} */
+ BEGIN TRY
+ begin TRAN
+
+ Declare @ErrorCode nvarchar(50), @retmsg nvarchar(4000), @account_id nvarchar(50), @account_year_id nvarchar(50), @account_code nvarchar(50), @account_year_code nvarchar(50), @tbid nvarchar(50)${decSql ? ',' + decSql : ''}
+
+ Select @ErrorCode='S', @retmsg='', @account_id='@account_id@', @account_year_id='@account_year_id@', @account_code='@account_code@', @account_year_code='@account_year_code@'${secSql ? ',' + secSql : ''}
+
+ ${_prev}
+ /* 澶栭儴鎺ュ彛鍏ュ弬 */
+ @mk_outer_params@
+ ${_back}
+ select @ErrorCode as ErrorCode,@retmsg as retmsg
+ ${callback}
+ `
+
+ _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
+
+ reps = reps.filter(n => {
+ if (sysVars.includes(n.toLowerCase())) {
+ return false
+ }
+
+ return true
+ })
+
+ return { LText: _sql, md5: md5(_sql), reps, tbs: tables }
}
let _mainSearch = []
@@ -6036,5 +6433,32 @@
filterComponent(config.components, _mainSearch)
+ let keys = sqls.map(item => item.uuid)
+ if (keys.length > Array.from(new Set(keys)).length) {
+ if (window.backend) {
+ let m = new Map()
+ let n = new Map()
+ sqls.forEach(item => {
+ if (m.has(item.uuid)) {
+ if (!n.has(item.uuid)) {
+ window.mkInfo(m.get(item.uuid))
+ n.set(item.uuid, true)
+ }
+ window.mkInfo(item)
+ } else {
+ m.set(item.uuid, item)
+ }
+ })
+
+ notification.warning({
+ top: 92,
+ message: '瀛樺湪閲嶅鐨勫悗绔剼鏈琁D锛�',
+ duration: 5
+ })
+ }
+
+ return []
+ }
+
return sqls
}
\ No newline at end of file
--
Gitblit v1.8.0