From ecbe0dc46ce2b8f607b9afd063104adeb7f10fe8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 30 三月 2021 15:19:31 +0800
Subject: [PATCH] 2021-03-30
---
src/templates/sharecomponent/settingcomponent/settingform/utils.jsx | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
index 4298827..8e159b0 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
@@ -43,11 +43,18 @@
let _regoptions = regoptions.map(item => {
return {
reg: new RegExp('@' + item.key + '@', 'ig'),
- value: `'0'`
+ value: `'0'`,
+ type: item.type || ''
}
})
_regoptions.push({
+ reg: new RegExp('@userName@', 'ig'),
+ value: `''`
+ }, {
+ reg: new RegExp('@fullName@', 'ig'),
+ value: `''`
+ }, {
reg: new RegExp('@orderBy@', 'ig'),
value: setting.order
}, {
@@ -65,6 +72,11 @@
_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)
+ })
}
if (_customScript) {
@@ -124,6 +136,7 @@
}
_customScript = _customScript.replace(/@\$|\$@/ig, '')
+ _customScript = _customScript.replace(/@userName@|@fullName@/ig, `''`)
// 澶栬仈鏁版嵁搴撴浛鎹�
if (window.GLOB.externalDatabase !== null) {
_customScript = _customScript.replace(/@db@/ig, window.GLOB.externalDatabase)
--
Gitblit v1.8.0