From 67918cc3e5fcf924177ce910e03b2891e40c2388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=89=E6=9D=A5=E6=8A=80=E6=9C=AF?= <1490493387@qq.com>
Date: Fri, 17 Dec 2021 00:13:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=82=B9=E5=87=BB=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E8=A1=8C=E9=BB=98=E8=AE=A4=E5=9B=9E=E6=98=BE=E7=88=B6=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SvgIcon/index.vue          |  1 +
 src/views/system/menu/components/Menu.vue | 13 ++++++++-----
 src/views/system/menu/components/Perm.vue |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue
index 28e6f198..aa454156 100644
--- a/src/components/SvgIcon/index.vue
+++ b/src/components/SvgIcon/index.vue
@@ -36,5 +36,6 @@ export default defineComponent({
   height: 1em;
   vertical-align: -0.15em;
   overflow: hidden;
+  fill: currentColor;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/system/menu/components/Menu.vue b/src/views/system/menu/components/Menu.vue
index e58300be..481cbec4 100644
--- a/src/views/system/menu/components/Menu.vue
+++ b/src/views/system/menu/components/Menu.vue
@@ -169,12 +169,11 @@
 import {listTableMenus, getMenuDetail, listTreeSelectMenus, addMenu, deleteMenus, updateMenu} from "@/api/system/menu";
 import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons'
 import {ElForm, ElMessage, ElMessageBox} from "element-plus";
-import {defineEmits, reactive, ref, unref, onMounted, getCurrentInstance} from "vue";
+import {defineEmits, reactive, ref, unref, onMounted, watch, getCurrentInstance, computed} from "vue";
 import SvgIcon from '@/components/SvgIcon/index.vue';
 import TreeSelect from '@/components/TreeSelect/index.vue';
 import IconSelect from '@/components/IconSelect/index.vue';
 
-
 const emit = defineEmits(['menuClick'])
 const showChooseIcon = ref(false);
 const iconSelectRef = ref(null);
@@ -275,15 +274,19 @@ async function handleAdd(row: any) {
     title: '添加菜单',
     visible: true,
   }
-  console.log('点击新增', row.id)
   if (row.id) {
     // 行点击新增
     state.formData.parentId = row.id
-    state.formData.component = ''
+    if (row.id == 0) {
+      state.formData.component = 'Layout'
+    } else {
+      state.formData.component = ''
+    }
+
   } else {
     if (state.currentRow) {
       // 工具栏新增
-      state.formData.parentId = state.currentRow.id
+      state.formData.parentId = (state.currentRow as any).id
       state.formData.component = ''
     } else {
       state.formData.parentId = 0
diff --git a/src/views/system/menu/components/Perm.vue b/src/views/system/menu/components/Perm.vue
index b4ccd6d7..7b99f6ff 100644
--- a/src/views/system/menu/components/Perm.vue
+++ b/src/views/system/menu/components/Perm.vue
@@ -19,7 +19,7 @@
             @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item>
-        <el-button :icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" :icon="Search" @click="handleQuery">搜索</el-button>
         <el-button :icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>