From 18c0941817f246da29162df918cf056c36f2d249 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Wed, 8 Mar 2023 15:08:24 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E9=83=A8=E9=97=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/dept/form.vue  |   2 +-
 src/views/admin/menu/index.vue | 218 ++++++++++++++++-----------------
 2 files changed, 105 insertions(+), 115 deletions(-)

diff --git a/src/views/admin/dept/form.vue b/src/views/admin/dept/form.vue
index 8ab536bf..9da6428a 100644
--- a/src/views/admin/dept/form.vue
+++ b/src/views/admin/dept/form.vue
@@ -124,7 +124,7 @@ const getDeptData = async () => {
 	depttree().then((res) => {
 		parentData.value = [];
 		const dept = {
-			id: '-1',
+			id: '0',
 			name: '根部门',
 			children: [] as any[],
 		};
diff --git a/src/views/admin/menu/index.vue b/src/views/admin/menu/index.vue
index c202a021..95ed8e43 100644
--- a/src/views/admin/menu/index.vue
+++ b/src/views/admin/menu/index.vue
@@ -1,129 +1,119 @@
 <template>
-    <div class="layout-padding">
-        <div class="layout-padding-auto layout-padding-view">
-            <div class="mb15">
-                <el-form :inline="true" :model="state.queryForm" @keyup.enter="getDataList" ref="queryRef">
-                    <el-form-item :label="$t('sysmenu.name')" prop="menuName">
-                        <el-input :placeholder="$t('sysmenu.inputNameTip')" clearable style="max-width: 180px"
-                                  v-model="state.queryForm.menuName"/>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button @click="getDataList" class="ml10" icon="search" type="primary">
-                            {{ $t('common.queryBtn') }}
-                        </el-button>
-                        <el-button @click="onOpenAddMenu" class="ml10" icon="folder-add" type="primary"
-                                   v-auth="'sys_menu_add'">
-                            {{ $t('common.addBtn') }}
-                        </el-button>
-                    </el-form-item>
-                </el-form>
-            </div>
-            <el-table
-                    :data="state.dataList"
-                    :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-                    border
-                    max-height="450"
-                    row-key="path"
-                    style="width: 100%"
-                    v-loading="state.loading"
-            >
-                <el-table-column :label="$t('sysmenu.name')" fixed prop="name" show-overflow-tooltip></el-table-column>
-                <el-table-column :label="$t('sysmenu.sortOrder')" prop="sortOrder"
-                                 show-overflow-tooltip></el-table-column>
-                <el-table-column :label="$t('sysmenu.icon')" prop="icon" show-overflow-tooltip>
-                    <template #default="scope">
-                        <SvgIcon :name="scope.row.icon"/>
-                    </template>
-                </el-table-column>
-                <el-table-column :label="$t('sysmenu.path')" prop="path" show-overflow-tooltip></el-table-column>
-                <el-table-column :label="$t('sysmenu.menuType')" show-overflow-tooltip>
-                    <template #default="scope">
-                        <el-tag type="success" v-if="scope.row.menuType === '0'">左菜单</el-tag>
-                        <el-tag type="success" v-if="scope.row.menuType === '2'">顶菜单</el-tag>
-                        <el-tag type="info" v-if="scope.row.menuType === '1'">按钮</el-tag>
-                    </template>
-                </el-table-column>
-                <el-table-column :label="$t('sysmenu.keepAlive')" show-overflow-tooltip>
-                    <template #default="scope">
-                        <el-tag type="info" v-if="scope.row.keepAlive === '0'">关闭</el-tag>
-                        <el-tag type="success" v-if="scope.row.keepAlive === '1'">开启</el-tag>
-                    </template>
-                </el-table-column>
-                <el-table-column :label="$t('sysmenu.permission')" :show-overflow-tooltip="true"
-                                 prop="permission"></el-table-column>
-                <el-table-column :label="$t('common.action')" show-overflow-tooltip width="200">
-                    <template #default="scope">
-                        <el-button @click="onOpenAddMenu('add', scope.row)" text type="primary" v-auth="'sys_menu_add'">
-                            {{ $t('common.addBtn') }}
-                        </el-button>
-                        <el-button @click="onOpenEditMenu('edit', scope.row)" text type="primary"
-                                   v-auth="'sys_menu_edit'">{{ $t('common.editBtn') }}
-                        </el-button>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<div class="mb15">
+				<el-form :inline="true" :model="state.queryForm" @keyup.enter="getDataList" ref="queryRef">
+					<el-form-item :label="$t('sysmenu.name')" prop="menuName">
+						<el-input :placeholder="$t('sysmenu.inputNameTip')" clearable style="max-width: 180px" v-model="state.queryForm.menuName" />
+					</el-form-item>
+					<el-form-item>
+						<el-button @click="getDataList" class="ml10" icon="search" type="primary">
+							{{ $t('common.queryBtn') }}
+						</el-button>
+						<el-button @click="onOpenAddMenu" class="ml10" icon="folder-add" type="primary" v-auth="'sys_menu_add'">
+							{{ $t('common.addBtn') }}
+						</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+			<el-table
+				:data="state.dataList"
+				:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+				max-height="450"
+				row-key="path"
+				style="width: 100%"
+				v-loading="state.loading"
+			>
+				<el-table-column :label="$t('sysmenu.name')" fixed prop="name" show-overflow-tooltip></el-table-column>
+				<el-table-column :label="$t('sysmenu.sortOrder')" prop="sortOrder" show-overflow-tooltip></el-table-column>
+				<el-table-column :label="$t('sysmenu.icon')" prop="icon" show-overflow-tooltip>
+					<template #default="scope">
+						<SvgIcon :name="scope.row.icon" />
+					</template>
+				</el-table-column>
+				<el-table-column :label="$t('sysmenu.path')" prop="path" show-overflow-tooltip></el-table-column>
+				<el-table-column :label="$t('sysmenu.menuType')" show-overflow-tooltip>
+					<template #default="scope">
+						<el-tag type="success" v-if="scope.row.menuType === '0'">左菜单</el-tag>
+						<el-tag type="success" v-if="scope.row.menuType === '2'">顶菜单</el-tag>
+						<el-tag type="info" v-if="scope.row.menuType === '1'">按钮</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column :label="$t('sysmenu.keepAlive')" show-overflow-tooltip>
+					<template #default="scope">
+						<el-tag type="info" v-if="scope.row.keepAlive === '0'">关闭</el-tag>
+						<el-tag type="success" v-if="scope.row.keepAlive === '1'">开启</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column :label="$t('sysmenu.permission')" :show-overflow-tooltip="true" prop="permission"></el-table-column>
+				<el-table-column :label="$t('common.action')" show-overflow-tooltip width="200">
+					<template #default="scope">
+						<el-button @click="onOpenAddMenu('add', scope.row)" text type="primary" v-auth="'sys_menu_add'">
+							{{ $t('common.addBtn') }}
+						</el-button>
+						<el-button @click="onOpenEditMenu('edit', scope.row)" text type="primary" v-auth="'sys_menu_edit'">{{ $t('common.editBtn') }} </el-button>
 
-                        <el-tooltip :content="$t('sysmenu.deleteDisabledTip')"
-                                    :disabled="!deleteMenuDisabled(scope.row)" placement="top">
+						<el-tooltip :content="$t('sysmenu.deleteDisabledTip')" :disabled="!deleteMenuDisabled(scope.row)" placement="top">
 							<span style="margin-left: 12px">
-								<el-button :disabled="deleteMenuDisabled(scope.row)" @click="onTabelRowDel(scope.row)"
-                                           text
-                                           type="primary" v-auth="'sys_menu_del'">
+								<el-button :disabled="deleteMenuDisabled(scope.row)" @click="onTabelRowDel(scope.row)" text type="primary" v-auth="'sys_menu_del'">
 									{{ $t('common.delBtn') }}
 								</el-button>
 							</span>
-                        </el-tooltip>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-        <MenuDialog @refresh="getDataList()" ref="menuDialogRef"/>
-    </div>
+						</el-tooltip>
+					</template>
+				</el-table-column>
+			</el-table>
+		</div>
+		<MenuDialog @refresh="getDataList()" ref="menuDialogRef" />
+	</div>
 </template>
 
 <script lang="ts" name="systemMenu" setup>
-    import {delObj, pageList} from '/@/api/admin/menu';
-    import {BasicTableProps, useTable} from '/@/hooks/table';
-    import {useMessage, useMessageBox} from '/@/hooks/message';
-    // 引入组件
-    const MenuDialog = defineAsyncComponent(() => import('./form.vue'));
+import { delObj, pageList } from '/@/api/admin/menu';
+import { BasicTableProps, useTable } from '/@/hooks/table';
+import { useMessage, useMessageBox } from '/@/hooks/message';
+// 引入组件
+const MenuDialog = defineAsyncComponent(() => import('./form.vue'));
 
-    // 定义变量内容
-    const menuDialogRef = ref();
-    const state: BasicTableProps = reactive<BasicTableProps>({
-        pageList: pageList, // H
-        queryForm: {
-            menuName: '',
-        },
-        isPage: false,
-    });
+// 定义变量内容
+const menuDialogRef = ref();
+const state: BasicTableProps = reactive<BasicTableProps>({
+	pageList: pageList, // H
+	queryForm: {
+		menuName: '',
+	},
+	isPage: false,
+});
 
-    const {getDataList} = useTable(state);
+const { getDataList } = useTable(state);
 
-    // 打开新增菜单弹窗
-    const onOpenAddMenu = (type: string, row?: any) => {
-        menuDialogRef.value.openDialog(type, row);
-    };
-    // 打开编辑菜单弹窗
-    const onOpenEditMenu = (type: string, row: any) => {
-        menuDialogRef.value.openDialog(type, row);
-    };
+// 打开新增菜单弹窗
+const onOpenAddMenu = (type: string, row?: any) => {
+	menuDialogRef.value.openDialog(type, row);
+};
+// 打开编辑菜单弹窗
+const onOpenEditMenu = (type: string, row: any) => {
+	menuDialogRef.value.openDialog(type, row);
+};
 
-    //是否禁用删除
-    const deleteMenuDisabled = (row: any) => {
-        return (row.children || []).length > 0;
-    };
+//是否禁用删除
+const deleteMenuDisabled = (row: any) => {
+	return (row.children || []).length > 0;
+};
 
-    // 删除当前菜单
-    const onTabelRowDel = (row: any) => {
-        useMessageBox()
-            .confirm(`此操作将永久删除：${row.name}`)
-            .then(() => {
-                delObj(row.id)
-                    .then(() => {
-                        useMessage().success('删除成功');
-                        getDataList();
-                    })
-                    .catch((err: any) => {
-                        useMessage().error(err.msg);
-                    });
-            });
-    };
+// 删除当前菜单
+const onTabelRowDel = (row: any) => {
+	useMessageBox()
+		.confirm(`此操作将永久删除：${row.name}`)
+		.then(() => {
+			delObj(row.id)
+				.then(() => {
+					useMessage().success('删除成功');
+					getDataList();
+				})
+				.catch((err: any) => {
+					useMessage().error(err.msg);
+				});
+		});
+};
 </script>