From 82b3a70c8ced18db76475aacfeb43c86e052907f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 30 十一月 2022 13:08:40 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
index 830d0d1..f288e7d 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
@@ -183,8 +183,9 @@
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
-
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/\$check@|@check\$/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
+ param.LText = param.LText.replace(/\n/g, ' ')
+
// 澶栬仈鏁版嵁搴撴浛鎹�
if (window.GLOB.externalDatabase !== null) {
param.LText = param.LText.replace(/@db@/ig, window.GLOB.externalDatabase)
--
Gitblit v1.8.0