From 547e5fe219ee7bee309ecd67db74bc8df66b5433 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 23 八月 2023 11:47:45 +0800 Subject: [PATCH] 2023-08-23 --- src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx | 30 +++++++----------------------- 1 files changed, 7 insertions(+), 23 deletions(-) diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx index bd4d39b..6b955e5 100644 --- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx +++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx @@ -60,18 +60,11 @@ let _regoptions = regoptions.map(item => { return { reg: new RegExp('@' + item.key + '@', 'ig'), - value: `'0'`, - type: item.type || '' + value: `'0'` } }) _regoptions.push({ - reg: new RegExp('@userName@', 'ig'), - value: `''` - }, { - reg: new RegExp('@fullName@', 'ig'), - value: `''` - }, { reg: new RegExp('@orderBy@', 'ig'), value: verify.order }, { @@ -82,22 +75,13 @@ value: 1 }) - if (verify.queryType === 'statistics' && _dataresource) { - _regoptions.forEach(item => { - _dataresource = _dataresource.replace(item.reg, item.value) - }) - _search = '' - } else if (_dataresource) { - _regoptions.forEach(item => { - if (item.type !== 'url') return - _dataresource = _dataresource.replace(item.reg, item.value) - }) - } + _regoptions.forEach(item => { + _dataresource = _dataresource.replace(item.reg, item.value) + _customScript = _customScript.replace(item.reg, item.value) + }) - if (_customScript) { - _regoptions.forEach(item => { - _customScript = _customScript.replace(item.reg, item.value) - }) + if (verify.queryType === 'statistics' && _dataresource) { + _search = '' } // 鏁版嵁婧愬鐞�, 瀛樺湪鏄剧ず鍒楁椂 -- Gitblit v1.8.0