From cce4ab076f3fa26f393fe4039ef5a891e2e8b2a1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 十二月 2024 10:49:28 +0800
Subject: [PATCH] 2024-12-31
---
src/utils/utils-custom.js | 341 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 217 insertions(+), 124 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 863e9c7..8058453 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'
}
@@ -2193,6 +2165,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 +3055,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 +3077,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') {
@@ -3105,6 +3119,8 @@
roleId = ''
} else if (item.setting.database === 'sso') {
roleId = ''
+ } else if (ispop) {
+ roleId = ''
}
sqls.push({uuid: item.uuid, roleId: roleId, type: 'datasource', ...msg})
@@ -3119,7 +3135,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') {
@@ -3134,7 +3150,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') {
@@ -3171,7 +3187,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
@@ -3179,14 +3195,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 => {
@@ -3199,7 +3215,7 @@
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') {
@@ -3230,7 +3246,7 @@
})
}
- 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') {
@@ -3238,6 +3254,8 @@
} else if (cell.hidden === 'true' || cell.permission === 'false') {
roleId = ''
} else if (cell.database === 'sso') {
+ roleId = ''
+ } else if (ispop) {
roleId = ''
}
@@ -3284,7 +3302,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})
}
})
}
@@ -3327,7 +3345,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})
}
})
}
@@ -3343,7 +3361,7 @@
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') {
@@ -3367,7 +3385,7 @@
})
}
- filterComponent(cell.config.components, _mainSearch, '-' + cell.label)
+ filterComponent(cell.config.components, _mainSearch, '-' + cell.label, true)
}
}
}
@@ -4071,6 +4089,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=''
@@ -4127,11 +4172,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@ and works_flow_detail_id =@works_flow_detail_id@
+ 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@
+ 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
@@ -4142,7 +4187,7 @@
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 and works_flow_detail_id =@works_flow_detail_id@
+ 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 != ''
begin
@@ -4152,7 +4197,7 @@
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@
+ 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
@@ -4178,7 +4223,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
@@ -4331,6 +4376,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)
@@ -4365,12 +4416,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') {
@@ -4379,15 +4426,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())) {
@@ -4626,7 +4678,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)`)
}
@@ -4642,6 +4694,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]
@@ -4675,19 +4733,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())) {
@@ -4814,7 +4873,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 `
@@ -4949,22 +5008,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())) {
@@ -5253,23 +5312,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())) {
@@ -5529,19 +5590,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())) {
@@ -5813,19 +5875,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())) {
@@ -5926,21 +5989,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())) {
@@ -6051,20 +6115,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())) {
@@ -6098,13 +6162,15 @@
}
})
- reps.forEach(n => {
- _script = _script.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
- })
if (/\$@/ig.test(_script)) {
- _script = _script.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+ _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')
}
@@ -6171,7 +6237,7 @@
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, '')
+ 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}
}
@@ -6220,15 +6286,17 @@
}
})
+ 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 (/\$@/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')
- }
if (/@db@/ig.test(testSql)) {
reps.push('db')
}
@@ -6267,7 +6335,7 @@
${callback}
`
- _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())) {
@@ -6353,5 +6421,30 @@
filterComponent(config.components, _mainSearch)
+ let keys = sqls.map(item => item.uuid)
+ if (keys.length > Array.from(new Set(keys)).length && !window.GLOB.syscheck) {
+ 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