From 8afa82f911802b237e74b024918b578ea6756eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Sun, 13 Apr 2025 22:45:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:bug:=20pageSearch=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C=E4=B8=8D=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageSearch.vue | 14 ++++++++------
 src/components/CURD/types.ts       |  2 +-
 src/directive/permission/index.ts  |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index e1573e7e..9f5d15c0 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -1,5 +1,10 @@
 <template>
-  <el-card v-show="visible" v-bind="cardAttrs" class="mb-2.5!">
+  <el-card
+    v-show="visible"
+    v-hasPerm="searchConfig?.pageName ? `${searchConfig.pageName}:query` : '*:*:*'"
+    v-bind="cardAttrs"
+    class="mb-2.5!"
+  >
     <el-form ref="queryFormRef" :model="queryParams" :inline="true" :class="isGrid">
       <template v-for="(item, index) in formItems" :key="item.prop">
         <el-form-item
@@ -94,12 +99,9 @@ const showNumber = computed(() =>
 );
 // 卡片组件自定义属性（累名、阴影、权限等）
 const cardAttrs = computed<IObject>(() => {
-  let auth = props.searchConfig?.pageName
-    ? { "v-hasPerm": [`${props.searchConfig.pageName}:query`] }
-    : {};
   return props.searchConfig?.cardAttrs && props.searchConfig.cardAttrs instanceof Object
-    ? { shadow: "never", ...auth, ...props.searchConfig.cardAttrs }
-    : { shadow: "never", ...auth };
+    ? { shadow: "never", ...props.searchConfig.cardAttrs }
+    : { shadow: "never" };
 });
 // 是否使用自适应网格布局
 const isGrid = computed(() =>
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 01ab1243..7881b9a4 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -41,7 +41,7 @@ export type ComponentType =
   | "cascader";
 
 export interface ISearchConfig {
-  // 页面名称(参与组成权限标识,如sys:user:xxx)
+  // 页面名称(参与组成权限标识,如sys:user:xxx),不填则不进行权限校验
   pageName?: string;
   // 标签冒号(默认：false)
   colon?: boolean;
diff --git a/src/directive/permission/index.ts b/src/directive/permission/index.ts
index 6dd29950..2683d22e 100644
--- a/src/directive/permission/index.ts
+++ b/src/directive/permission/index.ts
@@ -18,8 +18,8 @@ export const hasPerm: Directive = {
 
     const { roles, perms } = useUserStore().userInfo;
 
-    // 超级管理员拥有所有权限
-    if (roles.includes("ROOT")) {
+    // 超级管理员拥有所有权限，如果是”*:*:*”权限标识，则不需要进行权限校验
+    if (roles.includes("ROOT") || requiredPerms.includes("*:*:*")) {
       return;
     }