From 5ba94ec7b5ad34098ff9c5d21b4139b1b91c2865 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 29 五月 2020 18:24:11 +0800
Subject: [PATCH] 2020-05-29
---
src/templates/sharecomponent/settingcomponent/settingform/index.jsx | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
index 960fa2a..8c3361a 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
@@ -118,14 +118,6 @@
})
arr_field = arr_field.join(',')
- // 姝ｅ垯鏇挎崲
- let regoptions = allSearch.map(item => {
- return {
- reg: new RegExp('@' + item.key + '@', 'ig'),
- value: `'${item.value}'`
- }
- })
-
let _search = this.formatSearch(config.search)
_search = Utils.joinMainSearchkey(_search)
@@ -136,7 +128,7 @@
setting: _setting,
search: _search,
arr_field: arr_field,
- regoptions: regoptions,
+ regoptions: allSearch,
formlist: _formlist.map(item => {
if (interType === 'inner' && ['sysInterface', 'interface', 'outerFunc'].includes(item.key)) {
item.hidden = true
@@ -470,7 +462,14 @@
}
if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
- regoptions.forEach(item => {
+ // 姝ｅ垯鏇挎崲
+ let _regoptions = regoptions.map(item => {
+ return {
+ reg: new RegExp('@' + item.key + '@', 'ig'),
+ value: `'${item.value}'`
+ }
+ })
+ _regoptions.forEach(item => {
_dataresource = _dataresource.replace(item.reg, item.value)
})
--
Gitblit v1.8.0