From 0bff15b120b3e3ff1f1c3d2ce4d9aa8d3ad3917e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 06 十一月 2020 13:49:44 +0800
Subject: [PATCH] 2020-11-06
---
src/utils/utils-datamanage.js | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 15e098a..d214736 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -86,7 +86,7 @@
arr_field: arrFields,
default_sql: setting.execute ? 'true' : 'false'
}
-
+
let _dataresource = setting.dataresource
let _customScript = ''
@@ -99,6 +99,13 @@
let regoptions = null
if (setting.queryType === 'statistics' || _customScript) {
let allSearch = Utils.getAllSearchOptions(search)
+ let userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+
+ if (sessionStorage.getItem('isEditState') === 'true') {
+ userName = sessionStorage.getItem('CloudUserName') || ''
+ fullName = sessionStorage.getItem('CloudFullName') || ''
+ }
regoptions = allSearch.map(item => {
return {
@@ -107,6 +114,12 @@
}
})
regoptions.push({
+ reg: new RegExp('@userName@', 'ig'),
+ value: userName
+ }, {
+ reg: new RegExp('@fullName@', 'ig'),
+ value: fullName
+ }, {
reg: new RegExp('@orderBy@', 'ig'),
value: orderBy
}, {
@@ -207,6 +220,13 @@
let regoptions = null
if (setting.queryType === 'statistics' || _customScript) {
let allSearch = Utils.getAllSearchOptions(search)
+ let userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+
+ if (sessionStorage.getItem('isEditState') === 'true') {
+ userName = sessionStorage.getItem('CloudUserName') || ''
+ fullName = sessionStorage.getItem('CloudFullName') || ''
+ }
regoptions = allSearch.map(item => {
return {
@@ -215,6 +235,12 @@
}
})
regoptions.push({
+ reg: new RegExp('@userName@', 'ig'),
+ value: userName
+ }, {
+ reg: new RegExp('@fullName@', 'ig'),
+ value: fullName
+ }, {
reg: new RegExp('@orderBy@', 'ig'),
value: orderBy
}, {
--
Gitblit v1.8.0