From 6ee201b2f734c9e704fb989aca0dabd09890c724 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 23 二月 2024 18:07:18 +0800 Subject: [PATCH] Merge branch 'positec' into dms --- src/menu/debug/index.jsx | 76 ++----------------------------------- 1 files changed, 5 insertions(+), 71 deletions(-) diff --git a/src/menu/debug/index.jsx b/src/menu/debug/index.jsx index adc227a..9b48dde 100644 --- a/src/menu/debug/index.jsx +++ b/src/menu/debug/index.jsx @@ -74,13 +74,7 @@ { reg: /@\$/ig, value: '' }, { reg: /@datam@/ig, value: `''` }, ] - - if (window.GLOB.externalDatabase !== null) { - regs.push({ - reg: /@db@/ig, - value: window.GLOB.externalDatabase - }) - } + if (config.urlFields) { config.urlFields.forEach(field => { regs.push({ @@ -423,12 +417,6 @@ aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg` } - backSql = backSql.replace(/@ID@/ig, `'id'`) - backSql = backSql.replace(/@BID@/ig, `'bid'`) - backSql = backSql.replace(/@LoginUID@/ig, `'LoginUID'`) - backSql = backSql.replace(/@SessionUid@/ig, `'SessionUid'`) - backSql = backSql.replace(/@UserID@/ig, `'UserID'`) - backSql = backSql.replace(/@Appkey@/ig, `'appkey'`) backSql = backSql.replace(/@typename@/ig, `'typename'`) backSql = backSql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, `''`) } @@ -462,13 +450,6 @@ { reg: /@\$/ig, value: '' }, { reg: /@datam@/ig, value: `''` }, ] - - if (window.GLOB.externalDatabase !== null) { - regs.push({ - reg: /@db@/ig, - value: window.GLOB.externalDatabase - }) - } if (process) { regs.push({ reg: /@works_flow_code@/ig, value: `'1949-10-01 15:00:00'` }) @@ -566,8 +547,8 @@ } getSysDefaultSql = (btn, component, process, group, retmsg) => { - let primaryId = 'id' - let BID = 'bid' + let primaryId = Utils.getuuid() + let BID = Utils.getuuid() let verify = btn.verify || {} let _actionType = null let setting = component.setting @@ -1344,10 +1325,6 @@ _sql = _sql.replace(/@ID@/ig, `'${primaryId || ''}'`) _sql = _sql.replace(/@BID@/ig, `'${BID}'`) - _sql = _sql.replace(/@LoginUID@/ig, `'LoginUID'`) - _sql = _sql.replace(/@SessionUid@/ig, `'SessionUid'`) - _sql = _sql.replace(/@UserID@/ig, `'UserID'`) - _sql = _sql.replace(/@Appkey@/ig, `'appkey'`) _sql = _sql.replace(/@typename@/ig, `'typename'`) _sql = _sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, `''`) @@ -1377,19 +1354,8 @@ let sheet = _sheet.replace(/(.*)\.(.*)\./ig, '') database = database ? (database[0] || '') : '' - - let getuuid = () => { - let uuid = [] - let timestamp = new Date().getTime() - let _options = '0123456789abcdefghigklmnopqrstuv' - for (let i = 0; i < 19; i++) { - uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1)) - } - uuid = timestamp + uuid.join('') - return uuid - } - let upId = getuuid() + let upId = Utils.getuuid() let vals = [] btn.columns.forEach(col => { @@ -1433,21 +1399,11 @@ {reg: new RegExp('(^|\\s)@' + sheet + '(\\s|$)', 'ig'), value: ` #${sheet} `}, {reg: new RegExp('(^|\\s)@' + sheet + '\\(', 'ig'), value: ` #${sheet}(`}, {reg: new RegExp('(^|\\s)@' + sheet + '\\)', 'ig'), value: ` #${sheet})`}, - {reg: /@ID@/ig, value: `'id'`}, - {reg: /@BID@/ig, value: `'bid'`}, - {reg: /@LoginUID@/ig, value: `'LoginUID'`}, - {reg: /@SessionUid@/ig, value: `'SessionUid'`}, - {reg: /@UserID@/ig, value: `'UserID'`}, - {reg: /@Appkey@/ig, value: `'appkey'`}, {reg: /@typename@/ig, value: `'admin'`}, {reg: /\$@/ig, value: ''}, {reg: /@\$/ig, value: ''}, {reg: /@datam@/ig, value: `''`}, ] - - if (window.GLOB.externalDatabase !== null) { - regs.push({reg: /@db@/ig, value: window.GLOB.externalDatabase}) - } btn.scripts && btn.scripts.forEach(script => { if (script.status === 'false') return @@ -1635,20 +1591,11 @@ {reg: new RegExp('(^|\\s)@' + sheet + '(\\s|$)', 'ig'), value: ` #${sheet} `}, {reg: new RegExp('(^|\\s)@' + sheet + '\\(', 'ig'), value: ` #${sheet}(`}, {reg: new RegExp('(^|\\s)@' + sheet + '\\)', 'ig'), value: ` #${sheet})`}, - {reg: /@BID@/ig, value: `'${BID}'`}, - {reg: /@LoginUID@/ig, value: `'${sessionStorage.getItem('LoginUID') || ''}'`}, - {reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`}, - {reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID') || ''}'`}, - {reg: /@Appkey@/ig, value: `'${window.GLOB.appkey || ''}'`}, {reg: /@typename@/ig, value: `'admin'`}, {reg: /\$@/ig, value: isDM ? '/*' : ''}, {reg: /@\$/ig, value: isDM ? '*/' : ''}, {reg: /@datam@/ig, value: isDM ? `'Y'` : `''`}, ] - - if (window.GLOB.externalDatabase !== null) { - regs.push({reg: /@db@/ig, value: window.GLOB.externalDatabase}) - } btn.scripts && btn.scripts.forEach(script => { if (script.status === 'false') return @@ -1792,13 +1739,6 @@ { reg: /@\$/ig, value: '' }, { reg: /@datam@/ig, value: `''` }, ] - - if (window.GLOB.externalDatabase !== null) { - regs.push({ - reg: /@db@/ig, - value: window.GLOB.externalDatabase - }) - } let sql = this.formatDataSource(item, regs) @@ -1914,17 +1854,11 @@ { reg: /@orderBy@/ig, value: item.setting.order || '' }, { reg: /@pageSize@/ig, value: 9999 }, { reg: /@pageIndex@/ig, value: 1}, - { reg: /@ID@/ig, value: `''`}, - { reg: /@BID@/ig, value: `''`}, - { reg: /@LoginUID@/ig, value: `'${sessionStorage.getItem('LoginUID') || ''}'`}, - { reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`}, - { reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID') || ''}'`}, - { reg: /@Appkey@/ig, value: `'${window.GLOB.appkey || ''}'`}, { reg: /@typename@/ig, value: `'admin'`}, ) if (item.type === 'calendar') { - regoptions.push({ reg: /@mk_year@/ig, value: '2023' }) + regoptions.push({ reg: /@mk_year@/ig, value: '2024' }) } regoptions.forEach(cell => { -- Gitblit v1.8.0