From 81e637182c8316a491914a252a67e52ea492039c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 06 十二月 2024 11:43:33 +0800
Subject: [PATCH] 2024-12-06

---
 src/utils/utils-custom.js |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 36ec3ff..0164b7c 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -3084,7 +3084,7 @@
 GOTO_RETURN:
   ROLLBACK TRAN`
 
-  let filterComponent = (components, mainSearch, label = '') => {
+  let filterComponent = (components, mainSearch, label = '', ispop) => {
     components.forEach(item => {
       item.$menuname = (config.MenuName || '') + label + '-' + (item.name || '')
 
@@ -3099,10 +3099,10 @@
               _mainSearch = com.search || []
             })
           }
-          filterComponent(tab.components, _mainSearch, label)
+          filterComponent(tab.components, _mainSearch, label, ispop)
         })
       } else if (item.type === 'group') {
-        filterComponent(item.components, mainSearch, label)
+        filterComponent(item.components, mainSearch, label, ispop)
       } else {
         if (item.wrap && item.setting) {
           if (item.wrap.datatype === 'public' || item.wrap.datatype === 'static') {
@@ -3140,6 +3140,8 @@
             roleId = ''
           } else if (item.setting.database === 'sso') {
             roleId = ''
+          } else if (ispop) {
+            roleId = ''
           }
 
           sqls.push({uuid: item.uuid, roleId: roleId, type: 'datasource', ...msg})
@@ -3154,7 +3156,7 @@
         item.action && item.action.forEach(cell => {
           if (cell.hidden === 'true') return false
           
-          resetButton(item, cell)
+          resetButton(item, cell, false, ispop)
         })
 
         if (item.type === 'table') {
@@ -3169,7 +3171,7 @@
                 col.elements.forEach(cell => {
                   if (cell.eleType !== 'button' || cell.hidden === 'true') return
                   
-                  resetButton(item, cell)
+                  resetButton(item, cell, false, ispop)
                 })
               } else if (item.subtype === 'editable' && col.editable === 'true') {
                 if (col.editType === 'select' && col.resourceType === '1') {
@@ -3206,7 +3208,7 @@
             card.elements && card.elements.forEach(cell => {
               if (cell.eleType !== 'button' || cell.hidden === 'true') return
               
-              resetButton(item, cell)
+              resetButton(item, cell, false, ispop)
             })
   
             if (!card.backElements || card.backElements.length === 0) return
@@ -3214,14 +3216,14 @@
             card.backElements.forEach(cell => {
               if (cell.eleType !== 'button' || cell.hidden === 'true') return
               
-              resetButton(item, cell, true)
+              resetButton(item, cell, true, ispop)
             })
           })
         } else if (item.type === 'balcony') {
           item.elements.forEach(cell => {
             if (cell.eleType !== 'button' || cell.hidden === 'true') return
             
-            resetButton(item, cell)
+            resetButton(item, cell, false, ispop)
           })
         } else if (item.type === 'form') {
           item.subcards.forEach(group => {
@@ -3234,7 +3236,7 @@
               fields: group.fields
             }
 
-            resetButton(item, group.subButton)
+            resetButton(item, group.subButton, false, ispop)
           })
         } else if (item.type === 'module' && item.subtype === 'invoice') {
           if (item.buyer.setting && item.buyer.setting.interType === 'system') {
@@ -3265,7 +3267,7 @@
     })
   }
 
-  let resetButton = (item, cell, isback) => {
+  let resetButton = (item, cell, isback, ispop) => {
     cell.logLabel = item.$menuname + '-' + cell.label
     let roleId = cell.uuid
     if (item.wrap && item.wrap.permission === 'false') {
@@ -3273,6 +3275,8 @@
     } else if (cell.hidden === 'true' || cell.permission === 'false') {
       roleId = ''
     } else if (cell.database === 'sso') {
+      roleId = ''
+    } else if (ispop) {
       roleId = ''
     }
 
@@ -3402,7 +3406,7 @@
           })
         }
 
-        filterComponent(cell.config.components, _mainSearch, '-' + cell.label)
+        filterComponent(cell.config.components, _mainSearch, '-' + cell.label, true)
       }
     }
   }

--
Gitblit v1.8.0