From 12d591d4ed4880ee87bdda444424b9acaa73d9f7 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 20 二月 2024 18:12:11 +0800 Subject: [PATCH] 2024-02-20 --- src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx index 73f4f11..7df803d 100644 --- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx +++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx @@ -49,20 +49,6 @@ if (/\s/.test(_dataresource)) { _dataresource = '(' + _dataresource + ') tb' } - - _dataresource = _dataresource.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'1949-10-01 15:00:00'`) - _customScript = _customScript.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'1949-10-01 15:00:00'`) - _tailScript = _tailScript.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'1949-10-01 15:00:00'`) - _dataresource = _dataresource.replace(/@\$|\$@/ig, '') - _customScript = _customScript.replace(/@\$|\$@/ig, '') - _tailScript = _tailScript.replace(/@\$|\$@/ig, '') - - // 澶栬仈鏁版嵁搴撴浛鎹� - if (window.GLOB.externalDatabase !== null) { - _dataresource = _dataresource.replace(/@db@/ig, window.GLOB.externalDatabase) - _customScript = _customScript.replace(/@db@/ig, window.GLOB.externalDatabase) - _tailScript = _tailScript.replace(/@db@/ig, window.GLOB.externalDatabase) - } let custompage = /@pageSize@|@orderBy@/i.test(_dataresource + _customScript) @@ -76,6 +62,15 @@ }, { reg: new RegExp('@pageIndex@', 'ig'), value: 1 + }, { + reg: /@datam@/ig, + value: `''` + }, { + reg: /@typename@/ig, + value: `'debug'` + }, { + reg: /@\$|\$@/ig, + value: '' }) regoptions.forEach(item => { -- Gitblit v1.8.0