From 4a5c6b86316d203e5bcb914d353886ff066c0007 Mon Sep 17 00:00:00 2001
From: moon <2623532423@qq.com>
Date: Tue, 29 Jul 2025 15:32:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=8F=9C=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=86=85=E5=AE=B9=E7=9A=84=E6=B7=BB=E5=8A=A0=E5=AD=90?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=92=8C=E6=B7=BB=E5=8A=A0=E8=B7=9F=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E4=BB=A5=E5=8F=8A=E5=88=A0=E9=99=A4=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/menuManage/components/edit.vue   |  7 ++++---
 .../src/views/permission/menuManage/index.vue   | 17 ++++++++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/chat-client/src/views/permission/menuManage/components/edit.vue b/chat-client/src/views/permission/menuManage/components/edit.vue
index 38556fb..f2f998b 100644
--- a/chat-client/src/views/permission/menuManage/components/edit.vue
+++ b/chat-client/src/views/permission/menuManage/components/edit.vue
@@ -143,11 +143,12 @@
     } else {
       // 编辑
       menuForm.definedFrom = { ...row }
-      const { data } = await queryById(row.id)
+      const data = await queryById(row.id)
+      console.log("definedFrom",menuForm.definedFrom)
       //查询附加信息
       if (data) {
-        menuForm.apendixForm = data
-
+        menuForm.apendixForm = {...data}
+        console.log("menuForm.apendixForm",menuForm.apendixForm)
         if (menuForm.apendixForm.iscustomsvg == '1') {
           menuForm.apendixForm.iscustomsvg = true
         } else {
diff --git a/chat-client/src/views/permission/menuManage/index.vue b/chat-client/src/views/permission/menuManage/index.vue
index ceffb99..11de56b 100644
--- a/chat-client/src/views/permission/menuManage/index.vue
+++ b/chat-client/src/views/permission/menuManage/index.vue
@@ -16,7 +16,7 @@
               <span>添加根菜单</span>
             </el-button>
             <el-badge :value="state.menuIconImgs.length > 99 ? '99+' : state.menuIconImgs.length" style="margin-right: 30px; margin-top: -2px" type="danger">
-              <el-button type="warning" size="mini">
+              <el-button type="warning" size="mini" @click="handleMenuIconImgView()">
                 <vab-icon icon="image-line" />
                 <span>菜单图片资源库</span>
               </el-button>
@@ -121,6 +121,8 @@
     <edit ref="editRef" @refresh="getMenuTree" />
     <access ref="accessRef" />
     <verb ref="verbRef" />
+<!--    <iconimage ref="menuIconImgsRef" />-->
+
   </div>
 </template>
 <script setup>
@@ -128,6 +130,7 @@
   import edit from './components/edit.vue'
   import access from './components/access.vue'
   import verb from './components/verb.vue'
+
   defineOptions({
     name: 'MenuManage',
   })
@@ -175,14 +178,22 @@
       editRef.value.showEdit('add', '添加根菜单')
     }
   }
+  const menuIconImgsRef = ref(null)
+  // const handleMenuIconImgView = () => {
+  //   //TODO: 跳转到菜单图标页面
+  //   menuIconImgsRef.value.showMenuIconImgs()
+  // }
   const handleEditView = (data) => {
     //TODO: 跳转到编辑菜单页面
     editRef.value.showEdit('edit', '编辑菜单', data)
   }
   const handleRemove = (data) => {
     $baseConfirm('你确定要删除当前菜单吗', '菜单删除', async () => {
-      await removeMenu({ menuId: data.id })
-      getMenuTree()
+      await removeMenu({ menuId: data.id }).then(()=>{
+        getMenuTree()
+      }).catch(() => {
+        getMenuTree()
+      })
     })
   }
   const handleNodeClick = (data) => {