From 3ea79ec7e08e70144970d9761d86e564a3f0e806 Mon Sep 17 00:00:00 2001
From: Billy <378012098@qq.com>
Date: Thu, 24 Jul 2025 10:06:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E9=A1=B9=E6=9D=83=E9=99=90=E6=A0=87=E8=AF=86=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dict/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index a15cdc4..1e831e3 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -24,11 +24,11 @@
             </a-button>
           </template>
           <template #toolbar-right>
-            <a-button v-permission="['system:dict:item:create']" type="primary" @click="onAdd">
+            <a-button v-permission="['system:dictItem:create']" type="primary" @click="onAdd">
               <template #icon><icon-plus /></template>
               <template #default>新增</template>
             </a-button>
-            <a-button v-permission="['system:dict:item:clearCache']" type="outline" status="warning" @click="onClearCache">
+            <a-button v-permission="['system:dictItem:clearCache']" type="outline" status="warning" @click="onClearCache">
               <template #icon><icon-delete /></template>
               <template #default>清除缓存</template>
             </a-button>
@@ -46,9 +46,9 @@
           </template>
           <template #action="{ record }">
             <a-space>
-              <a-link v-permission="['system:dict:item:update']" title="修改" @click="onUpdate(record)">修改</a-link>
+              <a-link v-permission="['system:dictItem:update']" title="修改" @click="onUpdate(record)">修改</a-link>
               <a-link
-                v-permission="['system:dict:item:delete']"
+                v-permission="['system:dictItem:delete']"
                 status="danger"
                 title="删除"
                 @click="onDelete(record)"
@@ -119,7 +119,7 @@ const columns: TableInstance['columns'] = [
     width: 130,
     align: 'center',
     fixed: !isMobile() ? 'right' : undefined,
-    show: has.hasPermOr(['system:dict:item:update', 'system:dict:item:delete']),
+    show: has.hasPermOr(['system:dictItem:update', 'system:dictItem:delete']),
   },
 ]
 

From 900a2afdb7b369a14c914dcbb08ed48f094af1e9 Mon Sep 17 00:00:00 2001
From: Billy <378012098@qq.com>
Date: Thu, 24 Jul 2025 12:46:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86):?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E8=B7=AF=E7=94=B1=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E5=92=8C=E6=9D=83=E9=99=90=E6=A0=87=E8=AF=86=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在菜单管理页面添加路由地址和权限标识的搜索输入框，并修改过滤逻辑以支持多条件搜索
---
 src/views/system/menu/index.vue | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index a9b2949..095a228 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -19,6 +19,10 @@
         <a-input v-model="title" placeholder="搜索菜单标题" allow-clear>
           <template #prefix><icon-search /></template>
         </a-input>
+        <a-input v-model="path" placeholder="搜索路由地址" allow-clear>
+        </a-input>
+        <a-input v-model="permission" placeholder="搜索权限标识" allow-clear>
+        </a-input>
         <a-button @click="reset">
           <template #icon><icon-refresh /></template>
           <template #default>重置</template>
@@ -110,11 +114,15 @@ const {
 } = useTable(() => listMenu(queryForm), { immediate: true })
 
 // 过滤树
-const searchData = (title: string) => {
+const searchData = (title: string, path: string, permission: string) => {
   const loop = (data: MenuResp[]) => {
     const result = [] as MenuResp[]
     data.forEach((item: MenuResp) => {
-      if (item.title?.toLowerCase().includes(title.toLowerCase())) {
+      if (
+        (!title || item.title?.toLowerCase().includes(title.toLowerCase()))
+        && (!path || item.path?.toLowerCase().includes(path.toLowerCase()))
+        && (!permission || item.permission?.toLowerCase().includes(permission.toLowerCase()))
+      ) {
         result.push({ ...item })
       } else if (item.children) {
         const filterData = loop(item.children)
@@ -132,9 +140,11 @@ const searchData = (title: string) => {
 }
 
 const title = ref('')
+const path = ref('')
+const permission = ref('')
 const dataList = computed(() => {
-  if (!title.value) return tableData.value
-  return searchData(title.value)
+  if (!title.value && !path.value && !permission.value) return tableData.value
+  return searchData(title.value, path.value, permission.value)
 })
 
 const columns: TableInstance['columns'] = [