From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 21:11:56 +0800
Subject: [PATCH] Merge branch 'positec' into dms

---
 src/tabviews/custom/index.jsx |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 7e1cae0..61a6a47 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -69,7 +69,8 @@
     loading: false,       // 鍒楄〃鏁版嵁鍔犺浇涓�
     visible: false,       // 鏍囩椤垫帶鍒�
     shortcuts: null,      // 蹇嵎閿�
-    loadinginter: false
+    loadinginter: false,
+    noParam: false
   }
 
   stepInter = null
@@ -79,6 +80,7 @@
    */
   async loadconfig () {
     const { MenuID, MenuName, param } = this.props
+    const { noParam } = this.state
 
     let _param = {
       func: 'sPC_Get_LongParam',
@@ -209,13 +211,17 @@
       let skip = config.permission === 'false' || window.GLOB.mkHS
       let urlparam = {} // url鍙傛暟
       if (param) {
-        Object.keys(param).forEach(key => {
-          if (/^\$/.test(key)) {
-            urlparam[key] = param[key]
-          } else {
-            urlparam[key.toLowerCase()] = param[key]
-          }
-        })
+        if (!noParam) {
+          Object.keys(param).forEach(key => {
+            if (/^\$/.test(key)) {
+              urlparam[key] = param[key]
+            } else {
+              urlparam[key.toLowerCase()] = param[key]
+            }
+          })
+        } else {
+          urlparam.$BID = param.$BID
+        }
       }
 
       window.GLOB.CacheData.set(MenuID, urlparam)
@@ -1481,12 +1487,12 @@
     })
   }
 
-  reloadMenuView = (menuId) => {
+  reloadMenuView = (menuId, clear) => {
     const { MenuID } = this.props
 
     if (MenuID !== menuId) return
 
-    this.reloadview()
+    this.reloadview(clear)
   }
 
   resetActiveMenu = (menuId) => {
@@ -1581,7 +1587,7 @@
     })
   }
 
-  reloadview = () => {
+  reloadview = (clear) => {
     window.GLOB.CacheData.delete(this.props.MenuID)
     
     if (this.state.config) {
@@ -1599,7 +1605,8 @@
       viewlost: false,      // 椤甸潰涓㈠け锛�1銆佹湭鑾峰彇鍒伴厤缃�-椤甸潰涓㈠け锛�2銆侀〉闈㈡湭鍚敤
       config: null,         // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷粍浠剁瓑
       loading: false,       // 鍒楄〃鏁版嵁鍔犺浇涓�
-      shortcuts: null
+      shortcuts: null,
+      noParam: clear === true
     }, () => {
       this.loadconfig()
     })

--
Gitblit v1.8.0