From 064ee2c47a85274663a12d4d1d72a552f37c1533 Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Wed, 16 Aug 2023 10:41:32 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=20=E8=B7=AF=E7=94=B1BUG=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=202.=20=E8=B7=AF=E7=94=B1=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=203.=20=E8=8F=9C=E5=8D=95BUG=E8=B0=83=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/components/Menu.vue     | 12 ++++++++----
 admin/src/pages/config/router.vue | 13 +++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/admin/src/components/Menu.vue b/admin/src/components/Menu.vue
index 8630015..7aa9ca3 100644
--- a/admin/src/components/Menu.vue
+++ b/admin/src/components/Menu.vue
@@ -53,13 +53,15 @@ const menuItemClick = (name) => {
           <el-sub-menu v-if="i.children.length > 1" :index="i.name" :disabled="i.status === 2">
             <template #title>
               <el-icon>
-                <Icon :type="i.icon"></Icon>
+                <Icon v-if="!!i.icon" :type="i.icon"></Icon>
+                <Icon v-else type="minus"></Icon>
               </el-icon>
               <span>{{ i.title }}</span>
             </template>
             <el-menu-item v-for="(ii,kk) in i.children" :index="ii.name" :key="kk" :disabled="ii.status === 2">
               <el-icon>
-                <Icon :type="ii.icon"></Icon>
+                <Icon v-if="!!ii.icon" :type="ii.icon"></Icon>
+                <Icon v-else type="minus"></Icon>
               </el-icon>
               <span>{{ ii.title }}</span>
             </el-menu-item>
@@ -67,13 +69,15 @@ const menuItemClick = (name) => {
           <el-menu-item v-if="i.children.length === 1" :index="i.children[0].name"
                         :disabled="i.status === 2 || i.children[0].status === 2">
             <el-icon>
-              <Icon :type="i.children[0].icon"></Icon>
+              <Icon v-if="!!i.children[0].icon" :type="i.children[0].icon"></Icon>
+              <Icon v-else type="minus"></Icon>
             </el-icon>
             <span>{{ i.children[0].title }}</span>
           </el-menu-item>
           <el-menu-item v-if="i.children.length === 0" :index="i.name" :disabled="i.status === 2">
             <el-icon>
-              <Icon :type="i.icon"></Icon>
+              <Icon v-if="!!i.icon" :type="i.icon"></Icon>
+              <Icon v-else type="minus"></Icon>
             </el-icon>
             <span>{{ i.title }}</span>
           </el-menu-item>
diff --git a/admin/src/pages/config/router.vue b/admin/src/pages/config/router.vue
index 5386f1d..a364756 100644
--- a/admin/src/pages/config/router.vue
+++ b/admin/src/pages/config/router.vue
@@ -189,6 +189,7 @@ const editDoneClick = async () => {
         })
       } else {
         const index = table_list.value.findIndex(item => item.id === data.pid)
+        if (!('children' in table_list.value[index])) table_list.value[index].children = []
         table_list.value[index].children.unshift(response.data.info)
       }
     } else {
@@ -210,10 +211,8 @@ const editDoneClick = async () => {
         if ('children' in table_list.value[index]) {
           response.data.info.children = JSON.parse(JSON.stringify(table_list.value[index].children));
         }
-        if (data.type === 1) {
-          select_index = admin_auth_select.value.findIndex(item => item.id === data.id);
-          admin_auth_select.value.splice(select_index, 1)
-        }
+        select_index = admin_auth_select.value.findIndex(item => item.id === data.id);
+        if (select_index !== -1) admin_auth_select.value.splice(select_index, 1)
         table_list.value.splice(index, 1);
       }
       nextTick(() => {
@@ -233,7 +232,8 @@ const editDoneClick = async () => {
             table_list.value.splice(index, 0, response.data.info);
           }
         } else {
-          index = table_list.value.findIndex(item => item.id === data.pid);
+          if (index !== -1) index = table_list.value.findIndex(item => item.id === data.pid);
+          children_index = table_list.value[index].children.findIndex(item => item.id === data.id);
           if (children_index === -1) {
             table_list.value[index].children.unshift(response.data.info);
           } else {
@@ -242,6 +242,7 @@ const editDoneClick = async () => {
         }
       })
     }
+    console.log(table_list.value)
     edit_data.value = JSON.parse(JSON.stringify(default_data))
   })
 }
@@ -338,7 +339,7 @@ const iconChooseShowClick = () => {
             <el-select v-model="edit_data.pid"
                        class="input_line_input_wrapper"
                        placeholder="请选择分组">
-              <el-option v-for="(i,k) in [
+              <el-option :disabled="edit_data.id === i.id" v-for="(i,k) in [
                   {id:0,title:'根节点'},
                   ...admin_auth_select,
                 ]" :key="k" :label="i.title" :value="i.id"/>