From 3356928138d6cdae8b1e7837ec911136241e9d8f Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Thu, 15 May 2025 22:44:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/custom/menu-tree-select.vue            | 4 ++--
 src/components/custom/menu-tree.vue                   | 4 ++--
 src/views/system/menu/index.vue                       | 4 ++--
 src/views/system/menu/modules/menu-operate-drawer.vue | 4 ++--
 src/views/system/user/index.vue                       | 2 ++
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/custom/menu-tree-select.vue b/src/components/custom/menu-tree-select.vue
index 99e72676..b2545131 100644
--- a/src/components/custom/menu-tree-select.vue
+++ b/src/components/custom/menu-tree-select.vue
@@ -38,9 +38,9 @@ async function getMenuList() {
 getMenuList();
 
 function renderPrefix({ option }: { option: TreeOption }) {
-  const renderLocalIcon = String(option.icon).startsWith('icon-');
+  const renderLocalIcon = String(option.icon).startsWith('local-icon-');
   const icon = renderLocalIcon ? undefined : String(option.icon);
-  const localIcon = renderLocalIcon ? String(option.icon).replace('icon-', 'menu-') : undefined;
+  const localIcon = renderLocalIcon ? String(option.icon).replace('local-icon-', 'menu-') : undefined;
   return <SvgIcon icon={icon} localIcon={localIcon} />;
 }
 </script>
diff --git a/src/components/custom/menu-tree.vue b/src/components/custom/menu-tree.vue
index 18531c73..7f9e52be 100644
--- a/src/components/custom/menu-tree.vue
+++ b/src/components/custom/menu-tree.vue
@@ -61,9 +61,9 @@ watch([expandAll, options], ([newVal]) => {
 });
 
 function renderPrefix({ option }: { option: TreeOption }) {
-  const renderLocalIcon = String(option.icon).startsWith('icon-');
+  const renderLocalIcon = String(option.icon).startsWith('local-icon-');
   let icon = renderLocalIcon ? undefined : String(option.icon ?? 'material-symbols:buttons-alt-outline-rounded');
-  const localIcon = renderLocalIcon ? String(option.icon).replace('icon-', 'menu-') : undefined;
+  const localIcon = renderLocalIcon ? String(option.icon).replace('local-icon-', 'menu-') : undefined;
   if (icon === '#') {
     icon = 'material-symbols:buttons-alt-outline-rounded';
   }
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 4c50a056..f66bc0d3 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -93,9 +93,9 @@ async function handleDeleteMenu(id?: CommonType.IdType) {
 }
 
 function renderPrefix({ option }: { option: TreeOption }) {
-  const renderLocalIcon = String(option.icon).startsWith('icon-');
+  const renderLocalIcon = String(option.icon).startsWith('local-icon-');
   const icon = renderLocalIcon ? undefined : String(option.icon);
-  const localIcon = renderLocalIcon ? String(option.icon).replace('icon-', 'menu-') : undefined;
+  const localIcon = renderLocalIcon ? String(option.icon).replace('local-icon-', 'menu-') : undefined;
   return <SvgIcon icon={icon} localIcon={localIcon} />;
 }
 
diff --git a/src/views/system/menu/modules/menu-operate-drawer.vue b/src/views/system/menu/modules/menu-operate-drawer.vue
index 28bd9a17..cc03177b 100644
--- a/src/views/system/menu/modules/menu-operate-drawer.vue
+++ b/src/views/system/menu/modules/menu-operate-drawer.vue
@@ -122,12 +122,12 @@ async function handleSubmit() {
     menuId,
     parentId,
     menuName,
-    icon,
     orderNum,
     queryParam,
     isFrame,
     isCache,
     menuType,
+    icon,
     visible: menuVisible,
     status,
     perms,
@@ -264,7 +264,7 @@ function onCreate() {
               </NInput>
             </template>
             <template v-if="iconType === '2'">
-              <NSelect v-model:value="model.icon" placeholder="请选择本地图标" :options="localIconOptions" />
+              <NSelect v-model:value="model.icon" placeholder="请选择本地图标" filterable :options="localIconOptions" />
             </template>
           </NFormItemGi>
           <NFormItemGi v-if="!isBtn" :span="24" path="path">
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 83091ce7..4f63cc66 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -123,6 +123,8 @@ const {
       align: 'center',
       width: 150,
       render: row => {
+        if (row.userId === 1) return null;
+
         const editBtn = () => {
           return (
             <ButtonIcon