From 8a0b3081ecacbb844ea639ccc53ffd2c151cec1e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 28 三月 2021 02:13:53 +0800
Subject: [PATCH] 2021-03-28

---
 src/templates/sharecomponent/settingcomponent/settingform/utils.jsx |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
index 09f0df4..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) {

--
Gitblit v1.8.0