From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 06 二月 2025 21:11:56 +0800 Subject: [PATCH] Merge branch 'positec' into dms --- src/utils/utils-custom.js | 1629 +++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 1,341 insertions(+), 288 deletions(-) diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js index 2d86e2d..59eee91 100644 --- a/src/utils/utils-custom.js +++ b/src/utils/utils-custom.js @@ -451,11 +451,7 @@ card.elements = card.elements.map(cell => { if (cell.eleType === 'button') { cell.uuid = md5(commonId + cell.uuid) - if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) { - cell.pageTemplate = '' - cell.linkmenu = '' - } - this.resetBtn(cell, commonId) + this.resetBtn(cell, commonId, clear) } else { cell.uuid = this.getuuid() } @@ -467,11 +463,7 @@ card.backElements = card.backElements.map(cell => { if (cell.eleType === 'button') { cell.uuid = md5(commonId + cell.uuid) - if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) { - cell.pageTemplate = '' - cell.linkmenu = '' - } - this.resetBtn(cell, commonId) + this.resetBtn(cell, commonId, clear) } else { cell.uuid = this.getuuid() } @@ -491,11 +483,7 @@ item.elements = item.elements.map(cell => { if (cell.eleType === 'button') { cell.uuid = md5(commonId + cell.uuid) - if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) { - cell.pageTemplate = '' - cell.linkmenu = '' - } - this.resetBtn(cell, commonId) + this.resetBtn(cell, commonId, clear) } else { cell.uuid = this.getuuid() } @@ -528,12 +516,7 @@ cell.uuid = md5(commonId + cell.uuid) if (cell.eleType === 'button') { - if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) { - cell.pageTemplate = '' - cell.linkmenu = '' - } - - this.resetBtn(cell, commonId) + this.resetBtn(cell, commonId, clear) } return cell @@ -572,11 +555,15 @@ }) if (cell.subButton) { - this.resetBtn(cell.subButton, commonId) + this.resetBtn(cell.subButton, commonId, clear) } return cell }) + } else if (item.type === 'login') { + if (clear) { + item.wrap.linkmenu = '' + } } if (item.btnlog) { @@ -587,12 +574,7 @@ item.action = item.action.map(cell => { cell.uuid = md5(commonId + cell.uuid) - if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) { - cell.pageTemplate = '' - cell.linkmenu = '' - } - - this.resetBtn(cell, commonId) + this.resetBtn(cell, commonId, clear) return cell }) @@ -650,15 +632,25 @@ /** * @description 鎸夐挳閲嶇疆 */ - static resetBtn (btn, commonId) { + static resetBtn (btn, commonId, clear = false) { 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 }) } } + + if (clear) { + if (btn.pageTemplate === 'linkpage') { + btn.pageTemplate = '' + } + delete btn.linkmenu + delete btn.openmenu + delete btn.refreshTab + } + if (btn.switchTab && btn.switchTab.length > 0) { btn.switchTab = btn.switchTab.map(m => md5(commonId + m)) } @@ -666,6 +658,15 @@ btn.anchors = btn.anchors.map(m => md5(commonId + m)) } if (btn.syncComponent && btn.syncComponent[0] === 'multiComponent' && btn.syncComponents) { + if (btn.syncComponents[0] && Array.isArray(btn.syncComponents[0])) { + btn.syncComponents = btn.syncComponents.map((item, i) => { + return { + syncComId: item, + label: '', + uuid: 'fixed' + i + } + }) + } btn.syncComponents = btn.syncComponents.map(m => { m.syncComId = m.syncComId.map(n => { if (/\$focus/.test(n)) { @@ -684,6 +685,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 +776,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 +790,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 +810,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 +836,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 +881,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 +1705,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' } @@ -1742,6 +1715,115 @@ traversal(config.components) return inters +} + +/** + * @description 鑾峰彇鍙戦�佸閮ㄦ秷鎭� + */ +export function getOutMessage (config) { + let message = 'false' + + let filterBtn = (cell) => { + if (['pop', 'exec', 'form', 'prompt', 'formSubmit'].includes(cell.OpenType) && cell.verify) { + if (cell.verify.noteEnable === 'true' || cell.verify.wxNote === 'true' || cell.verify.emailEnable === 'true') { + message = 'true' + } + } + } + + let traversal = (components) => { + if (!components || message === 'true') return + + components.forEach(item => { + if (item.type === 'tabs') { + item.subtabs.forEach(tab => { + traversal(tab.components) + }) + } else if (item.type === 'group') { + traversal(item.components) + } else { + if (item.action) { + item.action.forEach(cell => { + if (cell.OpenType === 'popview') { + if (cell.config) { + traversal(cell.config.components) + } + } else { + filterBtn(cell) + } + }) + } + + if (item.type === 'card' || item.type === 'carousel' || item.type === 'timeline') { + item.subcards.forEach(card => { + card.elements && card.elements.forEach(cell => { + if (cell.eleType !== 'button') return + + if (cell.OpenType === 'popview') { + if (cell.config) { + traversal(cell.config.components) + } + } else { + filterBtn(cell) + } + }) + card.backElements && card.backElements.forEach(cell => { + if (cell.eleType !== 'button') return + + if (cell.OpenType === 'popview') { + if (cell.config) { + traversal(cell.config.components) + } + } else { + filterBtn(cell) + } + }) + }) + } else if (item.type === 'balcony') { + item.elements && item.elements.forEach(cell => { + if (cell.eleType !== 'button') return + + if (cell.OpenType === 'popview') { + if (cell.config) { + traversal(cell.config.components) + } + } else { + filterBtn(cell) + } + }) + } else if (item.type === 'table') { + let loopCol = (cols) => { + cols.forEach(col => { + if (col.type === 'colspan') { + loopCol(col.subcols) + } else if (col.type === 'custom') { + col.elements.forEach(cell => { + if (cell.eleType !== 'button') return + + if (cell.OpenType === 'popview') { + if (cell.config) { + traversal(cell.config.components) + } + } else { + filterBtn(cell) + } + }) + } + }) + } + loopCol(item.cols) + } else if (item.type === 'form') { + item.subcards.forEach(group => { + filterBtn(group.subButton) + }) + } + } + }) + } + + traversal(config.components) + + return message } /** @@ -1841,17 +1923,52 @@ } if (['exec', 'prompt', 'pop', 'form', 'formSubmit'].includes(cell.OpenType)) { + if (cell.Ot !== 'requiredOnce' && ['pop', 'form'].includes(cell.OpenType) && cell.verify && cell.verify.uniques && cell.verify.uniques.length > 0) { + let forms = ['BID'] + + if (cell.OpenType === 'form') { + forms.push(cell.field) + } else if (cell.modal && cell.modal.fields.length > 0) { + cell.modal.fields.forEach(n => { + if (!n.field) return + forms.push(n.field) + }) + } + let emptys = [] + if (cell.Ot !== 'notRequired') { + forms.push(...columns) + } + + cell.verify.uniques.forEach(m => { + if (m.status === 'false') return + + m.field.split(',').forEach(n => { + if (!forms.includes(n)) { + emptys.push(n) + } + }) + }) + + if (emptys.length) { + if (cell.Ot === 'notRequired') { + errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濆敮涓�鎬ч獙璇佸瓧娈�${emptys.join('銆�')}锛屽湪琛ㄥ崟涓笉瀛樺湪锛乣}) + } else { + errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濆敮涓�鎬ч獙璇佸瓧娈�${emptys.join('銆�')}锛屽湪琛ㄥ崟涓庡瓧娈甸泦涓笉瀛樺湪锛乣}) + } + } + } + if (cell.OpenType === 'form' && cell.formType === 'count_line') return if (cell.intertype === 'system') { - if (cell.Ot === 'notRequired' && cell.verify && cell.verify.voucher && cell.verify.voucher.enabled) { - errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鍒涘缓鍑瘉鍑芥暟锛岄渶瑕侀�夋嫨琛岋紒`}) - } + // if (cell.Ot === 'notRequired' && cell.verify && cell.verify.voucher && cell.verify.voucher.enabled) { + // errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鍒涘缓鍑瘉鍑芥暟锛岄渶瑕侀�夋嫨琛岋紒`}) + // } } else if (cell.intertype === 'custom' || cell.intertype === 'outer') { if (cell.callbackType === 'script' && (!cell.verify || !cell.verify.cbScripts || cell.verify.cbScripts.filter(item => item.status !== 'false').length === 0)) { errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鑷畾涔夎剼鏈洖璋冿紝鍥炶皟鑴氭湰涓嶅彲涓虹┖锛乣}) - } else if (cell.procMode === 'system' && cell.Ot === 'notRequired' && cell.verify && cell.verify.voucher && cell.verify.voucher.enabled) { - errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鍒涘缓鍑瘉鍑芥暟锛岄渶瑕侀�夋嫨琛岋紒`}) + // } else if (cell.procMode === 'system' && cell.Ot === 'notRequired' && cell.verify && cell.verify.voucher && cell.verify.voucher.enabled) { + // errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鍒涘缓鍑瘉鍑芥暟锛岄渶瑕侀�夋嫨琛岋紒`}) } } } else if (cell.OpenType === 'funcbutton') { @@ -2057,6 +2174,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 @@ -2884,16 +3035,47 @@ let urlFields = config.urlFields let appType = sessionStorage.getItem('appType') let process = config.process === 'true' + let sysVars = ['loginuid', 'sessionuid', 'userid', 'appkey', 'lang', 'username', 'fullname', 'menuname'] if (urlFields) { urlFields = urlFields.map(n => n.toLowerCase()) } - let filterComponent = (components, mainSearch) => { +let 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: +select @ErrorCode as ErrorCode,@retmsg as retmsg +GOTO_RETURN: + ROLLBACK TRAN` + + let filterComponent = (components, mainSearch, label = '', ispop) => { components.forEach(item => { - item.$menuname = (config.MenuName || '') + '-' + (item.name || '') + 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 || [] @@ -2904,10 +3086,11 @@ _mainSearch = com.search || [] }) } - filterComponent(tab.components, _mainSearch) + + filterComponent(tab.components, _mainSearch, label, ispop) }) } else if (item.type === 'group') { - filterComponent(item.components, mainSearch) + filterComponent(item.components, mainSearch, label, ispop) } else { if (item.wrap && item.setting) { if (item.wrap.datatype === 'public' || item.wrap.datatype === 'static') { @@ -2921,9 +3104,9 @@ if (appType !== 'mob' && item.search && item.search.length > 0) { item.search.forEach(cell => { if (['select', 'link', 'multiselect', 'checkcard', 'radio'].includes(cell.type) && cell.resourceType === '1' && cell.dataSource) { - let msg = getFormSql(cell) + let msg = getFormSql(cell, '鎼滅储') - sqls.push({uuid: cell.uuid, type: 'sForm', ...msg}) + sqls.push({uuid: md5(item.uuid + cell.uuid), type: 'sForm', ...msg}) } }) } @@ -2937,10 +3120,19 @@ item.setting.laypage = 'false' item.setting.$top = true } + 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) { @@ -2952,7 +3144,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') { @@ -2967,11 +3159,11 @@ 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') { - let msg = getFormSql(col) + let msg = getFormSql(col, '琛ㄥ崟') sqls.push({uuid: col.uuid, type: 'tbForm', ...msg}) } else if (col.editType === 'popSelect') { @@ -2994,7 +3186,8 @@ getCols(item.cols) if (item.subtype === 'editable' && item.submit.intertype === 'system') { - let msg = getEditTableSql(item.submit, item.cols, item.columns) + item.submit.logLabel = item.$menuname + '-鎻愪氦' + let msg = getEditTableSql(item.submit, item.cols, item.columns, item.setting) sqls.push({uuid: 'submit_' + item.uuid, type: 'editable', ...msg}) } @@ -3003,7 +3196,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 @@ -3011,14 +3204,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 => { @@ -3031,16 +3224,55 @@ 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') { // 绯荤粺鎺ュ彛 + if (cell.verify && cell.verify.linkEnable === 'true' && /@/.test(cell.verify.linkUrl)) { + cell.returnValue = 'true' + } if (item.subtype === 'dualdatacard' && isback) { let _item = fromJS(item).toJS() _item.columns = _item.subColumns || [] @@ -3048,11 +3280,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) { @@ -3073,13 +3305,13 @@ cell.modal.fields.forEach(form => { // 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗� if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(form.type) && form.resourceType === '1') { - let msg = getFormSql(form) - - sqls.push({uuid: form.uuid, type: 'form', ...msg}) + let msg = getFormSql(form, '琛ㄥ崟') + + sqls.push({uuid: md5(cell.uuid + form.uuid), type: 'form', ...msg}) } 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}) } }) } @@ -3087,48 +3319,58 @@ 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) + 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 => { // 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗� if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(form.type) && form.resourceType === '1') { - let msg = getFormSql(form) + let msg = getFormSql(form, '琛ㄥ崟') - sqls.push({uuid: form.uuid, type: 'form', ...msg}) + sqls.push({uuid: md5(cell.uuid + form.uuid), type: 'form', ...msg}) } 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') { @@ -3152,7 +3394,9 @@ }) } - filterComponent(cell.config.components, _mainSearch) + let label = (item.name ? '-' + item.name : '') + '-' + cell.label + + filterComponent(cell.config.components, _mainSearch, label, true) } } } @@ -3288,7 +3532,12 @@ type: item.type, isconst: item.constant === 'true' } - + + if (item.type === 'linkMain' && item.verifyVal === 'true') { + _item.$verify = true + _item.label = item.label + } + if (_item.type === 'datemonth') { _item.type = 'text' } else if (_item.type === 'number' || _item.type === 'rate') { @@ -3327,8 +3576,19 @@ formdata.push(item) } + let verifyValSql = '' // 鑾峰彇瀛楁閿�煎 formdata && formdata.forEach(form => { + if (form.$verify) { + verifyValSql += ` + if @${form.key}=${form.type === 'number' ? 0 : `''`} + begin + select @errorcode='E',@retmsg='${form.label}锛屽叧鑱斾富琛ㄥけ鏁�' + goto aaa + end + ` + } + let _key = form.key.toLowerCase() if (!formkeys.includes(_key)) { @@ -3503,22 +3763,21 @@ if (formdata && verify.billcodes && verify.billcodes.length > 0) { verify.billcodes.forEach(item => { let _key = item.field.toLowerCase() - let _linkKey = item.linkField ? item.linkField.toLowerCase() : '' if (!formkeys.includes(_key)) return // 琛ㄥ崟涓笉鍚崟鍙风敓鎴愬瓧娈� let _lpline = '' if (item.TypeCharOne === 'Lp') { - if (_linkKey === 'bid' && BID) { // 鏇挎崲bid + if (/^BID$/ig.test(item.linkField)) { _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@BID@,48)` } else { - _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${_linkKey},48)` + _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${item.linkField},48)` } } else if (item.TypeCharOne === 'BN') { - if (_linkKey === 'bid' && BID) { // 鏇挎崲bid + if (/^BID$/ig.test(item.linkField)) { _lpline = `set @ModularDetailCode= 'BN'+ right(@BID@,48)` } else { - _lpline = `set @ModularDetailCode= 'BN'+ right(@${_linkKey},48)` + _lpline = `set @ModularDetailCode= 'BN'+ right(@${item.linkField},48)` } } else { _lpline = `set @ModularDetailCode= right('${item.ModularDetailCode}',50)` @@ -3558,19 +3817,29 @@ item.field.split(',').forEach((_field, index) => { let _key = _field.toLowerCase() let _val = '' + 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}`) - _value.push(`${_labels[index] || ''}锛�${_val || ''}`) + + if (_key === 'bid') { + _val2 = `' + ${BID} + '` + } else { + // _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}`) } @@ -3621,15 +3890,20 @@ let hasvoucher = false // 鍑瘉-鏄剧ず鍒椾腑閫夊彇,蹇呴』閫夎 - if (verify.voucher && verify.voucher.enabled && btn.Ot !== 'requiredOnce') { + if (verify.voucher && verify.voucher.enabled) { let _voucher = verify.voucher + let linkField = `@${_voucher.linkField}` + + if (/^BID$/ig.test(_voucher.linkField)) { + linkField = BID + } hasvoucher = true _sql += ` /* 鍒涘缓鍑瘉 */ exec s_BVoucher_Create - @Bill ='0', + @Bill = ${linkField}, @BVoucherType ='${_voucher.BVoucherType}', @VoucherTypeOne ='${_voucher.VoucherTypeOne}', @VoucherTypeTwo ='${_voucher.VoucherTypeTwo}', @@ -3657,7 +3931,7 @@ let _key = item.key.toLowerCase() keys.push(_key) - values.push('@mk_' + _key + '_mk@') + values.push('@' + _key) }) if (!keys.includes(primaryKey.toLowerCase())) { @@ -3701,7 +3975,7 @@ let _key = item.key.toLowerCase() _arr.push(_key) - _form.push(_key + '=@mk_' + _key + '_mk@') + _form.push(_key + '=@' + _key) }) if (_actionType === 'audit') { @@ -3824,7 +4098,9 @@ _sql += ` /* 宸ヤ綔娴佸紓甯竤ql */ if @works_flow_error@ != '' - select @ErrorCode='E',@retmsg=@works_flow_error@ goto aaa + begin + select @ErrorCode='E',@retmsg=@works_flow_error@ goto aaa + end /* 宸ヤ綔娴侀粯璁ql */ insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff,upid) @@ -3843,11 +4119,40 @@ _sql += ` /* 宸ヤ綔娴佸紓甯竤ql */ if @works_flow_error@ != '' - select @ErrorCode='E',@retmsg=@works_flow_error@ goto aaa + begin + select @ErrorCode='E',@retmsg=@works_flow_error@ goto aaa + end 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='' @@ -3904,11 +4209,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 @@ -3918,18 +4223,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: @@ -3942,7 +4260,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 @@ -3979,37 +4297,71 @@ _sql += _backCustomScript } + if (verifyValSql) { + _sql += verifyValSql + } + if (verify.workFlow === 'true' && process) { if (verify.flowType === 'start') { + _sql = _sql.replace(/@start_type@/ig, `'寮�濮�'`) // works_flow_error 娴佺▼閿欒 - let worksReFields = ['works_flow_error', 'works_flow_code', 'works_flow_name', 'works_flow_param', 'works_flow_detail_id', 'status', 'statusname', 'work_group', 'work_grade', 'start_type'] + let worksReFields = ['works_flow_error', 'works_flow_code', 'works_flow_name', 'works_flow_param', 'works_flow_detail_id', 'status', 'statusname', 'work_group', 'work_grade'] worksReFields.forEach(n => { _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`) }) } else { + _sql = _sql.replace(/@check_type@/ig, verify.flowType === 'reject' ? `'椹冲洖'` : `'瀹℃牳'`) + _sql = _sql.replace(/@notice_type@/ig, `'鎶勯��'`) // works_flow_error 娴佺▼閿欒 // works_flow_countersign 浼氱/鎴栫鏍囪 浼氱涓� Y // works_begin_branch 椹冲洖鑷冲紑濮嬪垎鏀紙line.mknode === 'startEdge'锛� // works_flow_sign_field 浼氱 鏍囪瀛楁 statuscharone/statuschartwo/statuscharthree/statuscharfour/statuscharfive // works_flow_sign_label 浼氱 鏍囪鍊� ***/***/宸插鏍� // works_flow_sign_values 浼氱鏍囪鎷兼帴鍊硷紙闄ゆ湰浜哄锛� - let worksReFields = ['works_flow_error', 'works_flow_countersign', 'works_flow_sign_values', 'works_begin_branch', 'works_flow_sign_label', 'works_flow_code', 'works_flow_name', 'works_flow_param', 'works_flow_detail_id', 'status', 'statusname', 'work_group', 'work_grade', 'check_type', 'notice_type', 'check_userids', 'notice_userids', 'works_flow_sign'] + let worksReFields = ['works_flow_error', 'works_flow_countersign', 'works_flow_sign_values', 'works_begin_branch', 'works_flow_sign_label', 'works_flow_code', 'works_flow_name', 'works_flow_param', 'works_flow_detail_id', 'status', 'statusname', 'work_group', 'work_grade', 'check_userids', 'notice_userids', 'works_flow_sign'] worksReFields.forEach(n => { _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`) }) } } - if (btn.procMode === 'system') { + // if (btn.procMode === 'system' || btn.returnValue === 'true') { + // _sql += ` + // aaa: if @ErrorCode!='' + // insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@` + // } else if (btn.output) { + // _sql += ` + // aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id` + // } else { + // _sql += ` + // aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg` + // } + + if (/@ErrorCode='(ENT|NNT|FNT|NMNT|CNT|-2NT)'/ig.test(_sql)) { + _sql = _sql.replace(/@ErrorCode='(ENT|NNT|FNT|NMNT|CNT|-2NT)'[\S\s]+\sgoto\s+aaa($|\s)/ig, (word) => { + return word.replace(/goto aaa/, 'goto mk_ent') + }) _sql += ` - aaa: if @ErrorCode!='' - insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@` + if 1=2 + begin + mk_ent: + set @ErrorCode=left(@ErrorCode,1) + end + ` + } + + if (btn.procMode === 'system' || btn.returnValue === 'true') { + _sql += callback } else if (btn.output) { _sql += ` - aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id` + select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id + ${callback} + ` } else { _sql += ` - aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg` + select @ErrorCode as ErrorCode,@retmsg as retmsg + ${callback} + ` } let syses = ['UserName', 'FullName', 'RoleID', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address'] @@ -4020,8 +4372,8 @@ columns.forEach(col => { let _key = col.field.toLowerCase() - if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_]', 'ig').test(_sql)) return - if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(_sql)) return + if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_@]', 'ig').test(_sql)) return + // if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(_sql)) return colreps.push(col.field) @@ -4049,7 +4401,7 @@ let reps = [] let decSql = [`@tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50),@ModularDetailCode nvarchar(50),@mk_deleted int,@bid nvarchar(50)`] - let secSql = [`@ErrorCode='',@retmsg='', @BillCode='',@BVoucher='',@FIBVoucherDate='',@FiYear='',@ModularDetailCode='', @mk_deleted=1, @bid=@BID@`] + let secSql = [`@ErrorCode='S',@retmsg='', @BillCode='',@BVoucher='',@FIBVoucherDate='',@FiYear='',@ModularDetailCode='', @mk_deleted=1, @bid=@BID@`] syses.forEach(s => { if (new RegExp('@' + s + '[^0-9a-z_]', 'ig').test(_sql)) { @@ -4065,17 +4417,27 @@ } }) + 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] - _sql = `Declare ${decSql.join(',')} + // INSERT INTO s_paas_api_log (appkey,api_name,api_count,menuname,createuserid,createuser,createstaff,cdefine1,cdefine2) + // SELECT @appkey@,'sPC_TableData_InUpDe',1,@menuname@,@UserID@,@username@,@fullname@,@SessionUid@,@LoginUID@ + _sql = `/* ${btn.logLabel} */ + BEGIN TRY + begin TRAN + + Declare ${decSql.join(',')} /* 鍑瘉鍙婄敤鎴蜂俊鎭垵濮嬪寲璧嬪�� */ select ${secSql.join(',')} ${_sql} ` - _sql = _sql.replace(/\n\s{8,10}/g, '\n') - _sql = _sql.replace(/\n\s+\/\*/g, `\n/*`) - let regs = ['ID', 'BID', 'time_id', 'datam', 'LoginUID', 'SessionUid', 'UserID', 'Appkey', 'lang', 'typename'] + let regs = ['ID', 'BID', 'time_id', 'datam', 'typename'] regs.forEach(s => { if (new RegExp('@' + s + '@', 'ig').test(_sql)) { @@ -4083,26 +4445,55 @@ } }) - reps.forEach(n => { - _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`) + let map = new Map() + reps.push(...sysVars) + reps = reps.filter(n => { + if (map.has(n.toLowerCase())) { + return false + } + + map.set(n.toLowerCase(), true) + + return true }) 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@') - reps.push('mk_check_begin', 'mk_check_end') + if (btn.procMode === 'system') { + if (/\$check@|@check\$/ig.test(_sql)) { + _sql = _sql.replace(/\$check@|@check\$/ig, '') + } + } else { + if (/\$check@|@check\$/ig.test(_sql)) { + _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') } - reps = Array.from(new Set([...reps, ...colreps])) + _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())) { + return false + } + + return true + }) + + colreps = Array.from(new Set(colreps)) + reps = [...reps, ...colreps] - return { LText: _sql, reps } + return { LText: _sql, md5: md5(_sql), reps } } let getSysBackSql = (btn, component) => { @@ -4246,7 +4637,7 @@ ` } - let testSql = _prev + _back + let testSql = _prev + _back + (btn.output || '') // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃) if (btn.Ot !== 'notRequired' && columns.length > 0) { @@ -4254,8 +4645,8 @@ columns.forEach(col => { let _key = col.field.toLowerCase() - if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_]', 'ig').test(testSql)) return - if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(testSql)) return + if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_@]', 'ig').test(testSql)) return + // if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(testSql)) return colreps.push(col.field) @@ -4280,23 +4671,46 @@ } _sql += ` - ${_prev} - /* 澶栭儴鎺ュ彛鍏ュ弬 */ - @mk_outer_params@ - ${_back} - ` + ${_prev} + /* 澶栭儴鎺ュ彛鍏ュ弬 */ + @mk_outer_params@ + ${_back} + ` + // if (btn.output) { + // _sql += ` + // aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id` + // } else { + // _sql += ` + // aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg` + // } + if (/@ErrorCode='(ENT|NNT|FNT|NMNT|CNT|-2NT)'/ig.test(_sql)) { + _sql = _sql.replace(/@ErrorCode='(ENT|NNT|FNT|NMNT|CNT|-2NT)'[\S\s]+\sgoto\s+aaa($|\s)/ig, (word) => { + return word.replace(/goto aaa/, 'goto mk_ent') + }) + _sql += ` + if 1=2 + begin + mk_ent: + set @ErrorCode=left(@ErrorCode,1) + end + ` + } if (btn.output) { _sql += ` - aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id` + select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id + ${callback} + ` } else { _sql += ` - aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg` + select @ErrorCode as ErrorCode,@retmsg as retmsg + ${callback} + ` } let syses = ['tbid', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'ModularDetailCode', 'mk_deleted', 'bid', 'UserName', 'FullName', 'RoleID', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address'] let decSql = [`@ErrorCode nvarchar(50),@retmsg nvarchar(4000)`] - let secSql = [`@ErrorCode='',@retmsg=''`] + let secSql = [`@ErrorCode='S',@retmsg=''`] syses.forEach(s => { if (new RegExp('@' + s + '[^0-9a-z_]', 'ig').test(_sql)) { @@ -4305,7 +4719,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)`) } @@ -4322,18 +4736,25 @@ } }) + 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] - _sql = `Declare ${decSql.join(',')} + _sql = `/* ${btn.logLabel}(鍥炶皟) */ + BEGIN TRY + begin TRAN + + Declare ${decSql.join(',')} /* 鍒濆鍖栬祴鍊� */ select ${secSql.join(',')} ${_sql} ` - _sql = _sql.replace(/\n\s{8,10}/g, '\n') - _sql = _sql.replace(/\n\s+\/\*/g, `\n/*`) - - let regs = ['ID', 'BID', 'time_id', 'datam', 'LoginUID', 'SessionUid', 'UserID', 'Appkey', 'lang', 'typename'] + let regs = ['ID', 'BID', 'time_id', 'datam', 'typename'] regs.forEach(s => { if (new RegExp('@' + s + '@', 'ig').test(_sql)) { @@ -4341,26 +4762,47 @@ } }) - reps.forEach(n => { - _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`) + let map = new Map() + reps.push(...sysVars) + reps = reps.filter(n => { + if (map.has(n.toLowerCase())) { + return false + } + + map.set(n.toLowerCase(), true) + + return true }) 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 = Array.from(new Set([...reps, ...colreps])) + _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ') - return { LText: _sql, reps, tbs: tables } + reps = reps.filter(n => { + if (sysVars.includes(n.toLowerCase())) { + return false + } + + return true + }) + + reps = [...reps, ...colreps] + + return { LText: _sql, md5: md5(_sql), reps, tbs: tables } } - let getDataSource = (item, mainSearch = []) => { - if (!item.setting || item.setting.interType !== 'system') return - + let getDataSource = (item, mainSearch = [], type) => { let searches = item.search || [] if (item.setting.useMSearch === 'true' && mainSearch.length > 0) { searches = [...searches, ...mainSearch] @@ -4393,13 +4835,13 @@ } }) - if (_customScript || _tailScript) { - _tailScript += `${_tailScript} - aaa: - if @ErrorCode!='' - insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@ - ` - } + // if (_customScript || _tailScript) { + // _tailScript += `${_tailScript} + // aaa: + // if @ErrorCode!='' + // insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@ + // ` + // } let _search = '' if (item.setting.execute !== 'false') { @@ -4407,7 +4849,11 @@ _search = '@mk_search@' } - if (/\s/.test(_dataresource)) { + if (type === 'print') { + _search = '' + } + + if (/\s/.test(_dataresource) && !/\)\s+tb$/.test(_dataresource)) { _dataresource = '(' + _dataresource + ') tb' } @@ -4417,7 +4863,7 @@ let testSql = _dataresource + _customScript + _tailScript let decSql = [`@ErrorCode nvarchar(50),@retmsg nvarchar(4000)`] - let secSql = [`@ErrorCode='',@retmsg =''`] + let secSql = [`@ErrorCode='S',@retmsg =''`] let reps = [] @@ -4436,11 +4882,11 @@ } }) - decSql = `declare ${decSql.join(',')} - select ${secSql.join(',')}` + decSql = `declare ${decSql.join(',')}${type === 'print' ? '@mk_print_declare@' : ''} + select ${secSql.join(',')}${type === 'print' ? '@mk_print_select@' : ''}` // 涓嶉渶瑕佸崟寮曞彿锛歰rderBy銆乸ageSize銆乸ageIndex銆乨b - let regs = [...sFields, 'orderBy', 'pageSize', 'pageIndex', 'ID', 'BID', 'time_id', 'LoginUID', 'SessionUid', 'UserID', 'Appkey', 'lang', 'datam', 'typename'] + let regs = [...sFields, 'orderBy', 'pageSize', 'pageIndex', 'ID', 'BID', 'time_id', 'datam', 'typename'] if (item.hasExtend) { regs.push('mk_time') @@ -4468,7 +4914,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 ` @@ -4485,6 +4931,8 @@ } else { LText = `select top 1 ${arr_field} from ${_dataresource} ${_search} ` } + } else if (item.setting.$fixOrder) { + LText = `select ${arr_field} from ${_dataresource} ${_search} order by ${item.setting.order} ` } else if (item.setting.order) { LText = `select ${arr_field} from ${_dataresource} ${_search} order by @orderBy@ ` reps.push('orderBy') @@ -4492,8 +4940,6 @@ LText = `select ${arr_field} from ${_dataresource} ${_search} ` } } - - reps = Array.from(new Set(reps)) let sub_name = '' let tabid = '' @@ -4508,9 +4954,71 @@ sub_field = item.subColumns.map(col => col.field).join(',') } - let sql = `SELECT obj_name='@mk_obj_name@',prm_field='',str_field='', - arr_field='${arr_field}',tabid='${tabid}',parid='${parid}',sub_name='${sub_name}',sub_field='${sub_field}' + // 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' && !/BEGIN\s+TRY\s+begin\s+TRAN/.test(_customScript)) { + sql = `/* ${item.setting.$name} */ + BEGIN TRY + begin TRAN + + SELECT obj_name='@mk_obj_name@',prm_field='',str_field='', + arr_field='${arr_field}',tabid='${tabid}',parid='${parid}',sub_name='${sub_name}',sub_field='${sub_field}' + ` + + _tailScript = `${_tailScript} + select @ErrorCode as ErrorCode,@retmsg as retmsg + + 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} */ + SELECT obj_name='@mk_obj_name@',prm_field='',str_field='', + 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} + ${tail} + select @ErrorCode as ErrorCode,@retmsg as retmsg + ` + } if (DateCount) { sql += `UNION ALL @@ -4518,7 +5026,10 @@ arr_field='',tabid='',parid='',sub_name='',sub_field='' ` } - + // sql += `UNION ALL + // SELECT obj_name='mk_error_code',prm_field='ErrorCode,retmsg',str_field='', + // arr_field='',tabid='',parid='',sub_name='',sub_field='' + // ` sql += ` ${decSql} ${_customScript} @@ -4527,23 +5038,43 @@ ${_tailScript} ` + let map = new Map() + reps.push(...sysVars) + reps = reps.filter(n => { + if (map.has(n.toLowerCase())) { + return false + } + + map.set(n.toLowerCase(), true) + + 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, '') + 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, reps} + reps = reps.filter(n => { + if (sysVars.includes(n.toLowerCase())) { + return false + } + + return true + }) + + return {LText: sql, md5: md5(sql), reps, luser: /@userid@/ig.test(testSql)} } let getExcelInSql = (item) => { @@ -4691,10 +5222,14 @@ ` } - sql = `create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),BID nvarchar(50)) + sql = `/* ${item.logLabel} */ + BEGIN TRY + begin TRAN + + create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),BID nvarchar(50)) Declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)@mk_init_declare@ - Select @ErrorCode='',@retmsg=''@mk_init_select@ + Select @ErrorCode='S',@retmsg=''@mk_init_select@ ${_initCustomScript} Insert into #${sheet} (${fields},jskey,BID) @@ -4706,12 +5241,25 @@ ${_prevCustomScript} ${_insert}` + let mk_ent = '' + if (/@ErrorCode='(ENT|NNT|FNT|NMNT|CNT|-2NT)'/ig.test(sql + _backCustomScript)) { + mk_ent = ` + if 1=2 + begin + mk_ent: + set @ErrorCode=left(@ErrorCode,1) + end + ` + } + if (btn.workFlow === 'true' && process) { if (btn.flowSql === 'true') { sql += ` /* 宸ヤ綔娴佸紓甯竤ql */ if @works_flow_error@ != '' - select @ErrorCode='E',@retmsg=@works_flow_error@ goto aaa + begin + select @ErrorCode='E',@retmsg=@works_flow_error@ goto aaa + end /* 宸ヤ綔娴侀粯璁ql */ insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff,upid) @@ -4736,11 +5284,13 @@ ${_backCustomScript} drop table #${sheet} + ${mk_ent} + select @ErrorCode as ErrorCode,@retmsg as retmsg + ${callback}` - aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg` - + sql = sql.replace(/@start_type@/ig, `'寮�濮�'`) // works_flow_error 娴佺▼閿欒 - let worksReFields = ['works_flow_error', 'works_flow_code', 'works_flow_name', 'works_flow_param', 'works_flow_detail_id', 'status', 'statusname', 'work_group', 'work_grade', 'start_type'] + let worksReFields = ['works_flow_error', 'works_flow_code', 'works_flow_name', 'works_flow_param', 'works_flow_detail_id', 'status', 'statusname', 'work_group', 'work_grade'] worksReFields.forEach(n => { sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`) }) @@ -4749,8 +5299,15 @@ ${_backCustomScript} drop table #${sheet} + ${mk_ent} + select @ErrorCode as ErrorCode,@retmsg as retmsg + ${callback}` + } - aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg` + if (/@ErrorCode='(ENT|NNT|FNT|NMNT|CNT|-2NT)'/ig.test(sql)) { + sql = sql.replace(/@ErrorCode='(ENT|NNT|FNT|NMNT|CNT|-2NT)'[\S\s]+\sgoto\s+aaa($|\s)/ig, (word) => { + return word.replace(/goto aaa/, 'goto mk_ent') + }) } let reps = [] @@ -4778,7 +5335,7 @@ sql = sql.replace(/@mk_init_declare@/ig, decSql) sql = sql.replace(/@mk_init_select@/ig, secSql) - let regs = ['ID', 'BID', 'time_id', 'datam', 'LoginUID', 'SessionUid', 'UserID', 'Appkey', 'lang', 'typename'] + let regs = ['ID', 'BID', 'time_id', 'datam', 'typename'] regs.forEach(s => { if (new RegExp('@' + s + '@', 'ig').test(sql)) { @@ -4786,25 +5343,50 @@ } }) - reps.forEach(n => { - sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`) + let map = new Map() + reps.push(...sysVars) + reps = reps.filter(n => { + if (map.has(n.toLowerCase())) { + return false + } + + map.set(n.toLowerCase(), true) + + return true }) - sql = sql.replace(/\n\s{6,10}/g, '\n') - sql = sql.replace(/\n\s+\/\*/g, `\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@ ') + 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') } - return {LText: sql, reps} + 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())) { + return false + } + + return true + }) + + return {LText: sql, md5: md5(sql), reps} } - let getEditTableSql = (btn, cols, columns) => { + let getEditTableSql = (btn, cols, columns, setting) => { let sheet = btn.sheet.replace(/@db@/ig, '') let database = '' if (/@db@/ig.test(btn.sheet)) { @@ -4812,28 +5394,42 @@ } let forms = [] - let _fields = {} - - columns.forEach(col => { - _fields[col.field] = col.datatype - }) + let _forms = {} + let index = 0 let getColumns = (cols) => { cols.forEach(item => { if (item.type === 'colspan') { getColumns(item.subcols) } else if (item.editable === 'true') { - forms.push({ - field: item.field, - type: item.type, - datatype: _fields[item.field] || 'nvarchar(50)' - }) + item.$sort = index + _forms[item.field] = item + index++ } }) } getColumns(cols) - + + columns.forEach(item => { + if (item.field === setting.primaryKey) return + + if (_forms[item.field]) { + let _item = {..._forms[item.field]} + if (_item.editType === 'date') { + _item.datatype = _item.declareType || 'datetime' + } else { + _item.datatype = item.datatype + } + + forms.push(_item) + } else { + forms.push({...item, $sort: 999}) + } + }) + + forms.sort((a, b) => a.$sort - b.$sort) + let sql = '' let _initCustomScript = '' // 鍒濆鍖栬剼鏈� @@ -4892,6 +5488,7 @@ let _fields = unique.field.split(',') let _fields_ = _fields.map(_field => `a.${_field}=b.${_field}`) _fields_ = _fields_.join(' and ') + _fields_ += ` and a.jskey != b.${setting.primaryKey || 'id'}` let _where = [] _fields.forEach(f => { @@ -4948,6 +5545,7 @@ let declarefields = [] let fields = [] + let upFields = [] forms.forEach(col => { let key = col.field.toLowerCase() @@ -4955,22 +5553,38 @@ declarefields.push(`${col.field} ${col.datatype}`) fields.push(col.field) + upFields.push(`${col.field}=t.${col.field}`) }) fields = fields.join(',') + upFields = upFields.join(',') let _insert = '' if (btn.default !== 'false') { _insert = ` /* 榛樿sql */ - Insert into ${database}${sheet} (${fields},createuserid,createuser,createstaff,bid) + update a set ${upFields},modifydate=getdate(),modifyuserid=@UserID@,modifyuser=@username,modifystaff=@fullname,deleted=0 + from (select * from #${sheet} where data_type='upt') t + inner join ${database}${sheet} a on t.jskey=a.${setting.primaryKey || 'id'} + + update a set deleted=1,modifydate=getdate(),modifyuserid=@UserID@,modifyuser=@username,modifystaff=@fullname + from (select * from #${sheet} where data_type='del') t + inner join ${database}${sheet} a on t.jskey=a.${setting.primaryKey || 'id'} + + delete t from #${sheet} t inner join ${database}${sheet} a on t.jskey=a.${setting.primaryKey || 'id'} + + Insert into ${database}${sheet} (${fields},createuserid,createuser,createstaff,bid) Select ${fields},@UserID@,@username,@fullname,@BID@ From #${sheet} ` } - sql = `create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(256)) + sql = `/* ${btn.logLabel} */ + BEGIN TRY + begin TRAN + + create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(256)) Declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)@mk_init_declare@ - Select @ErrorCode='',@retmsg=''@mk_init_select@ + Select @ErrorCode='S',@retmsg=''@mk_init_select@ ${_initCustomScript} Insert into #${sheet} (${fields},jskey,data_type,BID) @@ -4985,7 +5599,8 @@ drop table #${sheet} - aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg` + select @ErrorCode as ErrorCode,@retmsg as retmsg + ${callback}` let reps = [] let decSql = [] @@ -5012,7 +5627,7 @@ sql = sql.replace(/@mk_init_declare@/ig, decSql) sql = sql.replace(/@mk_init_select@/ig, secSql) - let regs = ['BID', 'time_id', 'datam', 'LoginUID', 'SessionUid', 'UserID', 'Appkey', 'lang', 'typename'] + let regs = ['BID', 'time_id', 'datam', 'typename'] regs.forEach(s => { if (new RegExp('@' + s + '@', 'ig').test(sql)) { @@ -5020,22 +5635,42 @@ } }) - reps.forEach(n => { - sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`) + let map = new Map() + reps.push(...sysVars) + reps = reps.filter(n => { + if (map.has(n.toLowerCase())) { + return false + } + + map.set(n.toLowerCase(), true) + + return true }) - sql = sql.replace(/\n\s{6,10}/g, '\n') - sql = sql.replace(/\n\s+\/\*/g, `\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') } - return {LText: sql, reps} + 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())) { + return false + } + + return true + }) + + return {LText: sql, md5: md5(sql), reps} } let getExcelOutSql = (btn, component) => { @@ -5058,6 +5693,7 @@ item.setting.queryType = btn.verify.queryType item.setting.laypage = btn.pagination item.setting.order = btn.verify.order || '' + item.setting.$name = btn.logLabel || '' if (btn.Ot === 'requiredOnce') { item.setting.primaryKey = btn.verify.primaryKey || component.setting.primaryKey || 'ID' @@ -5070,7 +5706,24 @@ return msg } - let getPrintSql = (btn) => { + 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, []) + + return msg + } + + let getPrintSql = (btn, component) => { let item = {setting: {}, columns: btn.verify.columns || [], search: [], useMSearch: 'false'} item.setting.interType = 'system' @@ -5079,18 +5732,121 @@ item.setting.queryType = btn.verify.setting.queryType item.setting.laypage = 'false' item.setting.order = btn.verify.setting.order || '' + item.setting.$name = btn.logLabel || '' + item.setting.transact = 'true' + item.setting.$fixOrder = true item.scripts = btn.verify.scripts || [] - let msg = getDataSource(item, []) + let msg = getDataSource(item, [], 'print') + + msg.LText = msg.LText.replace(/@mk_obj_name@/ig, 'data') + msg.reps = msg.reps.filter(n => n !== 'mk_obj_name') + + let formkeys = [] + let colreps = [] + let _declares = [] + let _init = [] + if (btn.execMode === 'pop' && btn.modal && btn.modal.fields) { + btn.modal.fields.forEach(item => { + if (!item.field) return + let _key = item.field.toLowerCase() + + if (!new RegExp('@' + _key + '[^0-9a-z_]', 'ig').test(msg.LText)) return + + formkeys.push(_key) + colreps.push(item.field) + + let _item = { + key: item.field, + fieldlen: item.fieldlength || 50, + writein: item.writein !== 'false', + type: item.type, + isconst: item.constant === 'true' + } + + if (_item.type === 'datemonth') { + _item.type = 'text' + } else if (_item.type === 'number' || _item.type === 'rate') { + _item.fieldlen = item.decimal || 0 + } else if (_item.type === 'date') { + _item.type = item.declareType === 'nvarchar(50)' ? 'text' : 'date' + } else if (_item.type === 'datetime') { + _item.type = 'date' + } else if (item.declare === 'decimal') { + _item.type = 'number' + _item.fieldlen = item.decimal || 0 + } + + if (_item.type === 'number' || _item.type === 'rate') { + _init.push(`@${_key}=@mk_${_key}_mk@`) + } else if (_item.type === 'date') { + _init.push(`@${_key}='@mk_${_key}_mk@'`) + } else if (_item.type === 'select' || _item.type === 'link' || _item.type === 'radio') { + _init.push(`@${_key}='@mk_${_key}_mk@'`) + } else if (_item.isconst) { + _init.push(`@${_key}=N'@mk_${_key}_mk@'`) + } else { + _init.push(`@${_key}='@mk_${_key}_mk@'`) + } + + if (_item.fieldlen && _item.fieldlen > 4000) { + _item.fieldlen = 'max' + } + + let _type = `nvarchar(${_item.fieldlen})` + + if (_item.type.match(/date/ig)) { + _type = 'datetime' + } else if (_item.type === 'number') { + _type = `decimal(18,${_item.fieldlen})` + } else if (_item.type === 'rate') { + _type = `decimal(18,2)` + } + + _declares.push(`@${_key} ${_type}`) + }) + } + + // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃) + if (btn.Ot !== 'notRequired' && component.columns.length > 0) { + component.columns.forEach(col => { + let _key = col.field.toLowerCase() + + if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_@]', 'ig').test(msg.LText)) return + // if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(msg.LText)) return + + colreps.push(col.field) + + if (col.type === 'number') { + _init.push(`@${_key}=@mk_${_key}_mk@`) + } else { + _init.push(`@${_key}='@mk_${_key}_mk@'`) + } + + _declares.push(`@${_key} ${col.datatype || 'nvarchar(50)'}`) + }) + } + + _declares = _declares.length ? ',' + _declares.join(',') : '' + _init = _init.length ? ',' + _init.join(',') : '' + + msg.LText = msg.LText.replace('@mk_print_declare@', _declares) + msg.LText = msg.LText.replace('@mk_print_select@', _init) + + msg.reps = [...msg.reps, ...colreps] return msg } let getPaySql = (btn, component) => { - let _sql = `Declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid nvarchar(50)@mk_init_declare@ - Select @ErrorCode='',@retmsg=''@mk_init_select@ - ` + let _sql = `/* ${btn.logLabel} */ + BEGIN TRY + begin TRAN + + Declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid nvarchar(50)@mk_init_declare@ + Select @ErrorCode='S',@retmsg=''@mk_init_select@ + ` btn.verify.scripts.forEach(item => { if (item.status === 'false') return @@ -5102,10 +5858,12 @@ if (btn.output) { _sql += ` - aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id` + select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id + ${callback}` } else { _sql += ` - aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg` + select @ErrorCode as ErrorCode,@retmsg as retmsg + ${callback}` } let reps = [] @@ -5127,7 +5885,7 @@ } }) - let regs = ['ID', 'time_id', 'datam', 'LoginUID', 'SessionUid', 'UserID', 'Appkey', 'lang', 'typename'] + let regs = ['ID', 'time_id', 'datam', 'typename'] regs.forEach(s => { if (new RegExp('@' + s + '@', 'ig').test(_sql)) { @@ -5142,8 +5900,8 @@ component.columns.forEach(col => { let _key = col.field.toLowerCase() - if (syses.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_]', 'ig').test(_sql)) return - if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(_sql)) return + if (syses.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_@]', 'ig').test(_sql)) return + // if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(_sql)) return colreps.push(col.field) @@ -5162,26 +5920,47 @@ _sql = _sql.replace(/@mk_init_declare@/ig, decSql) _sql = _sql.replace(/@mk_init_select@/ig, secSql) - reps.forEach(n => { - _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`) + let map = new Map() + reps.push(...sysVars) + reps = reps.filter(n => { + if (map.has(n.toLowerCase())) { + return false + } + + map.set(n.toLowerCase(), true) + + return true }) - reps = [...reps, ...colreps] - - _sql = _sql.replace(/\n\s{6,8}/g, '\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') } - return {LText: _sql, reps} + _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 + }) + + reps = [...reps, ...colreps] + + return {LText: _sql, md5: md5(_sql), reps} } - let getFormSql = (item) => { + let getFormSql = (item, tname) => { let arrfield = [item.valueField, item.valueText] if (item.type === 'checkcard') { @@ -5245,14 +6024,19 @@ decSql = decSql.join(',') secSql = secSql.join(',') + decSql = decSql ? `Declare ${decSql} select ${secSql}` : '' - if (decSql) { - sql = `Declare ${decSql} select ${secSql} - ${sql} - ` - } + sql = `/* ${item.label}锛�${tname}锛� */ + SELECT obj_name='${item.field}',prm_field='',str_field='', + arr_field='${arrfield}',tabid='',parid='',sub_name='',sub_field='' - let regs = ['ID', 'BID', 'datam', 'LoginUID', 'SessionUid', 'UserID', 'Appkey', 'lang'] + ${decSql} + ${sql} + + select 'S' as ErrorCode,'' as retmsg + ` + + let regs = ['ID', 'BID', 'datam'] regs.forEach(s => { if (new RegExp('@' + s + '@', 'ig').test(sql)) { @@ -5260,19 +6044,34 @@ } }) - reps.forEach(n => { - sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`) - }) + reps.push(...sysVars) 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') } - return {LText: sql, reps} + // 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, ' ') + + reps = reps.filter(n => { + if (sysVars.includes(n.toLowerCase())) { + return false + } + + return true + }) + + return {LText: sql, md5: md5(sql), reps} } let getPopSelectSql = (item) => { @@ -5303,7 +6102,7 @@ } // 涓嶉渶瑕佸崟寮曞彿锛歰rderBy銆乸ageSize銆乸ageIndex銆乨b - let regs = [...sFields, 'orderBy', 'pageSize', 'pageIndex', 'ID', 'BID', 'time_id', 'LoginUID', 'SessionUid', 'UserID', 'Appkey', 'lang', 'datam'] + let regs = [...sFields, 'orderBy', 'pageSize', 'pageIndex', 'ID', 'BID', 'time_id', 'datam'] regs.forEach(s => { if (new RegExp('@' + s + '@', 'ig').test(item.dataSource)) { @@ -5329,10 +6128,7 @@ decSql = decSql.join(',') secSql = secSql.join(',') - - if (decSql) { - decSql = `Declare ${decSql} select ${secSql}` - } + decSql = decSql ? `Declare ${decSql} select ${secSql}` : '' if (item.laypage === 'true') { /*system_query*/ @@ -5360,24 +6156,253 @@ ${decSql} ${LText} ${DateCount} + + select 'S' as ErrorCode,'' as retmsg ` + let map = new Map() + reps.push(...sysVars) + reps = reps.filter(n => { + if (map.has(n.toLowerCase())) { + return false + } + + map.set(n.toLowerCase(), true) + + 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, '') + 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, reps} + reps = reps.filter(n => { + if (sysVars.includes(n.toLowerCase())) { + return false + } + + return true + }) + + 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(',') + + // 闇�瑕佸0鏄庣殑鍙橀噺闆� + + 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 = [] @@ -5418,7 +6443,7 @@ if (search.length > 0) { search.forEach(cell => { if (['select', 'link', 'multiselect', 'checkcard', 'radio'].includes(cell.type) && cell.resourceType === '1' && cell.dataSource) { - let msg = getFormSql(cell) + let msg = getFormSql(cell, '鎼滅储') sqls.push({uuid: cell.uuid, type: 'sForm', ...msg}) } @@ -5443,6 +6468,7 @@ m.setting.laypage = 'false' m.setting.$top = true + m.setting.$name = (config.MenuName || '') + '-' + (m.name || '') let msg = getDataSource(m, _mainSearch) @@ -5452,5 +6478,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