From 71139fa69a7939efc23f09bde73859eef639150b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 02 一月 2025 16:40:26 +0800
Subject: [PATCH] 2025-01-02

---
 src/tabviews/custom/popview/index.jsx     |    7 +++++++
 src/tabviews/custom/index.jsx             |    7 +++++++
 src/views/rolemanage/filtermenu/index.jsx |    4 ++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index e1871a4..639042b 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -830,6 +830,13 @@
 
           group.subButton = this.resetButton(item, group.subButton)
 
+          if (group.subButton.linkmenu) {
+            if (Array.isArray(group.subButton.linkmenu) && group.subButton.linkmenu.length > 0) {
+              group.subButton.openmenu = group.subButton.linkmenu
+            }
+            delete group.subButton.linkmenu
+          }
+
           if (item.$cache && item.$time) { // 琛ㄥ崟缂撳瓨
             group.$cache = item.$cache
             group.$time = item.$time
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index 57197b5..778c090 100644
--- a/src/tabviews/custom/popview/index.jsx
+++ b/src/tabviews/custom/popview/index.jsx
@@ -537,6 +537,13 @@
 
           group.subButton = this.resetButton(item, group.subButton, Tab)
 
+          if (group.subButton.linkmenu) {
+            if (Array.isArray(group.subButton.linkmenu) && group.subButton.linkmenu.length > 0) {
+              group.subButton.openmenu = group.subButton.linkmenu
+            }
+            delete group.subButton.linkmenu
+          }
+
           group.fields = group.fields.map(cell => {
             // 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗�
             if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(cell.type) && cell.resourceType === '1') {
diff --git a/src/views/rolemanage/filtermenu/index.jsx b/src/views/rolemanage/filtermenu/index.jsx
index 7a53875..8eb325d 100644
--- a/src/views/rolemanage/filtermenu/index.jsx
+++ b/src/views/rolemanage/filtermenu/index.jsx
@@ -372,8 +372,8 @@
         item.cols && loopCol(item.cols)
       } else if (item.type === 'form') {
         item.subcards.forEach(cell => {
-          if (cell.subButton && cell.subButton.openmenu && typeof(cell.subButton.openmenu) === 'string') {
-            menus.push(cell.subButton.openmenu)
+          if (cell.subButton && cell.subButton.linkmenu && typeof(cell.subButton.linkmenu) === 'string') {
+            menus.push(cell.subButton.linkmenu)
           }
         })
       } else if (item.type === 'login') {

--
Gitblit v1.8.0