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; } \ 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"/> - 搜索 + 搜索 重置