From dbdb4aa83f82e0b8fc797d36cb8d5dc01e39e6b6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 四月 2021 23:54:37 +0800
Subject: [PATCH] 2021-04-22
---
src/utils/utils-datamanage.js | 70 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index ec8689b..dd0c995 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -91,6 +91,7 @@
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
+ let city = sessionStorage.getItem('city') || ''
if (sessionStorage.getItem('isEditState') === 'true') {
userName = sessionStorage.getItem('CloudUserName') || ''
@@ -101,8 +102,8 @@
let _customScript = ''
if (setting.customScript) {
- _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50)
- Select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}'
+ _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@login_city nvarchar(50)
+ Select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @login_city='${city}'
${setting.customScript}
`
}
@@ -110,14 +111,6 @@
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 {
reg: new RegExp('@' + item.key + '@', 'ig'),
@@ -125,11 +118,14 @@
}
})
regoptions.push({
+ reg: new RegExp('@login_city@', 'ig'),
+ value: `'${city}'`
+ }, {
reg: new RegExp('@userName@', 'ig'),
- value: userName
+ value: `'${userName}'`
}, {
reg: new RegExp('@fullName@', 'ig'),
- value: fullName
+ value: `'${fullName}'`
}, {
reg: new RegExp('@orderBy@', 'ig'),
value: orderBy
@@ -194,8 +190,8 @@
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
- _customScript && console.info(`${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
- LText && console.info(LText)
+ _customScript && console.info(`${setting.$name ? `/*缁勪欢-${setting.$name} 鑷畾涔夎剼鏈�*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
+ LText && console.info(`${setting.$name ? `/*缁勪欢-${setting.$name} 鏁版嵁婧�*/\n` : ''}` + LText)
}
param.custom_script = Utils.formatOptions(_customScript)
@@ -228,9 +224,18 @@
let _dataresource = setting.dataresource
let _customScript = ''
+ let userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+ let city = sessionStorage.getItem('city') || ''
+
+ if (sessionStorage.getItem('isEditState') === 'true') {
+ userName = sessionStorage.getItem('CloudUserName') || ''
+ fullName = sessionStorage.getItem('CloudFullName') || ''
+ }
if (setting.customScript) {
- _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000) select @ErrorCode='',@retmsg =''
+ _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@login_city nvarchar(50)
+ Select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @login_city='${city}'
${setting.customScript}
`
}
@@ -238,13 +243,6 @@
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 {
@@ -253,11 +251,14 @@
}
})
regoptions.push({
+ reg: new RegExp('@login_city@', 'ig'),
+ value: `'${city}'`
+ }, {
reg: new RegExp('@userName@', 'ig'),
- value: userName
+ value: `'${userName}'`
}, {
reg: new RegExp('@fullName@', 'ig'),
- value: fullName
+ value: `'${fullName}'`
}, {
reg: new RegExp('@orderBy@', 'ig'),
value: orderBy
@@ -299,8 +300,8 @@
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
- _customScript && console.info(`${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
- LText && console.info(LText)
+ _customScript && console.info(`${setting.$name ? `/*缁勪欢-${setting.$name} 鑷畾涔夎剼鏈� 缁熻鏌ヨ*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
+ LText && console.info(`${setting.$name ? `/*缁勪欢-${setting.$name} 鏁版嵁婧� 缁熻鏌ヨ*/\n` : ''}` + LText)
}
param.custom_script = Utils.formatOptions(_customScript)
@@ -368,6 +369,7 @@
let sql = ''
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
+ let city = sessionStorage.getItem('city') || ''
if (sessionStorage.getItem('isEditState') === 'true') {
userName = sessionStorage.getItem('CloudUserName') || ''
@@ -382,8 +384,8 @@
if (sql) {
sql = `/*鍓嶇疆鑴氭湰*/
- declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50)
- Select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}'
+ declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@login_city nvarchar(50)
+ Select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @login_city='${city}'
${sql}
aaa:
if @ErrorCode!=''
@@ -398,11 +400,14 @@
}
})
regoptions.push({
+ reg: new RegExp('@login_city@', 'ig'),
+ value: `'${city}'`
+ }, {
reg: new RegExp('@userName@', 'ig'),
- value: userName
+ value: `'${userName}'`
}, {
reg: new RegExp('@fullName@', 'ig'),
- value: fullName
+ value: `'${fullName}'`
})
regoptions.forEach(item => {
@@ -446,14 +451,15 @@
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
+ let city = sessionStorage.getItem('city') || ''
if (sessionStorage.getItem('isEditState') === 'true') {
userName = sessionStorage.getItem('CloudUserName') || ''
fullName = sessionStorage.getItem('CloudFullName') || ''
}
- let _prevCustomScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50)
- Select @ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}'
+ let _prevCustomScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@login_city nvarchar(50)
+ Select @ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @login_city='${city}'
${errSql}
`
let _backCustomScript = `
--
Gitblit v1.8.0