From a94b0a4d15b26ecf8fe99f0a1c3e60d60b97766d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 15 八月 2023 14:22:03 +0800
Subject: [PATCH] 2023-08-15
---
src/tabviews/custom/index.jsx | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 561fc5d..c859a83 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -168,11 +168,6 @@
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
- if (window.GLOB.mkHS) {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
-
let regs = [
{ reg: /@userName@/ig, value: `'${userName}'` },
{ reg: /@fullName@/ig, value: `'${fullName}'` }
@@ -321,7 +316,6 @@
let _shortcut = `${preKey}+${keyCode}`
if (window.GLOB.breakpoint && _shortcut === 'ctrl+67') {
- window.debugger = false
window.GLOB.breakpoint = false
sessionStorage.removeItem('breakpoint')
@@ -443,16 +437,22 @@
let _searchId = searchId
- tab.components.forEach(cell => {
- if (cell.type !== 'search') return
- _searchId = cell.uuid
- window.GLOB.SearchBox.set(cell.uuid, cell.$searches)
- if (cell.$s_req) {
- window.GLOB.SearchBox.set(cell.uuid + 'required', true)
- }
- })
+ if (tab.components.findIndex(cell => cell.type === 'search') > -1) {
+ _searchId = tab.uuid
+ }
tab.components = this.filterComponent(tab.components, roleId, permAction, balMap, skip, urlparam, pageId, interfaces, popview, cache, time, MenuName, _searchId, tab.uuid)
+
+ if (_searchId === tab.uuid) {
+ tab.components.forEach(cell => {
+ if (cell.type !== 'search') return
+ window.GLOB.SearchBox.set(_searchId, cell.$searches)
+ if (cell.$s_req) {
+ window.GLOB.SearchBox.set(_searchId + 'required', true)
+ }
+ })
+ }
+
return tab
})
@@ -498,9 +498,7 @@
}
// 鎼滅储鏉′欢鍒濆鍖�
- if (item.type === 'search' && item.search.length === 0) {
- return false
- } else if (item.search) {
+ if (item.search) {
Utils.initSearchVal(item)
item.$searches = Utils.initMainSearch(item.search)
@@ -1132,7 +1130,7 @@
if (config.$cache && config.$time) {
Api.getLCacheConfig(params[0].uuid, config.$time).then(res => {
- if (!res) {
+ if (!res.valid) {
this.getMainData(param, params, config.MenuID)
} else {
this.setState({
--
Gitblit v1.8.0