From f8c3c53f9e29541f8c0e3fcbf682c301fd17e06a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 23 十一月 2020 17:49:23 +0800
Subject: [PATCH] 2020-11-23
---
src/tabviews/custom/index.jsx | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index e9aae8a..9392a96 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -103,7 +103,6 @@
// 鏁版嵁缂撳瓨璁剧疆
if (config.cacheUseful === 'true') {
- config.diffUser = config.diffUser !== 'false'
if (!['day', 'hour'].includes(config.timeUnit)) {
config.timeUnit = 'day'
}
@@ -156,7 +155,6 @@
inherit.cacheUseful = config.cacheUseful
inherit.timeUnit = config.timeUnit
inherit.cacheTime = config.cacheTime
- inherit.diffUser = config.diffUser
}
config.components = this.formatSetting(config.components, params, mainSearch, permAction, inherit)
@@ -375,8 +373,8 @@
loadmaindata = (params) => {
const { config } = this.state
let LText_field = []
+ let diffUser = false
let LText = params.map((item, index) => {
- let _sql = item.sql
let _script = item.script
if (index === 0) {
@@ -384,11 +382,14 @@
${_script}
`
}
+ if (!diffUser && (/@userid@/ig.test(item.sql) || /@userid@/ig.test(_script))) {
+ diffUser = true
+ }
item.columns.forEach(cell => {
LText_field.push(`Select '${item.name}' as tablename,'${cell.field}' as fieldname,'${cell.datatype}' as field_type`)
})
- return `Select '${item.name}' as tablename,'${window.btoa(window.encodeURIComponent(_sql))}' as LText,'${window.btoa(window.encodeURIComponent(_script))}' as Lcustomize,'${item.type}' as table_type,'${item.primaryKey}' as primary_key,'${item.par_tablename}' as par_tablename,'${item.foreign_key}' as foreign_key,'${index}' as Sort`
+ return `Select '${item.name}' as tablename,'${window.btoa(window.encodeURIComponent(item.sql))}' as LText,'${window.btoa(window.encodeURIComponent(_script))}' as Lcustomize,'${item.type}' as table_type,'${item.primaryKey}' as primary_key,'${item.par_tablename}' as par_tablename,'${item.foreign_key}' as foreign_key,'${index}' as Sort`
})
let param = {
@@ -404,7 +405,7 @@
if (config.cacheUseful === 'true') {
param.time_type = config.timeUnit
param.time_limit = config.cacheTime
- if (config.diffUser) {
+ if (diffUser) {
param.userid = sessionStorage.getItem('UserID')
}
param.data_md5 = md5(JSON.stringify(param))
--
Gitblit v1.8.0