From d91fa969e6044f6b22554a80c8c0e8aeb22820bb Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 01 八月 2023 09:50:21 +0800 Subject: [PATCH] Merge branch 'master' into positec --- src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx index 306c80d..bd4d39b 100644 --- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx +++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx @@ -45,8 +45,8 @@ _dataresource = '' } - _dataresource = _dataresource.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${timestamp}'`) - _customScript = _customScript.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${timestamp}'`) + _dataresource = _dataresource.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'${timestamp}'`) + _customScript = _customScript.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'${timestamp}'`) _dataresource = _dataresource.replace(/@\$|\$@/ig, '') _customScript = _customScript.replace(/@\$|\$@/ig, '') -- Gitblit v1.8.0