From a524137e18f019e07aaf77ca49d5054ad14f7024 Mon Sep 17 00:00:00 2001
From: sheng <15292050171@163.com>
Date: Mon, 31 Jul 2023 17:58:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=20=E7=88=B6=E7=BA=A7=E8=8F=9C=E5=8D=95=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index.vue}                                |  6 +-
 .../{TreeCom.vue => DeptTreeCom/index.vue}    | 10 ++--
 web/src/views/system/dept/index.vue           |  6 +-
 .../menu/components/MenuFormCom/index.vue     | 55 ++++++++++++++++---
 .../menu/components/MenuTreeCom/index.vue     |  2 +-
 web/src/views/system/menu/index.vue           |  8 +--
 6 files changed, 63 insertions(+), 24 deletions(-)
 rename web/src/views/system/dept/components/{DeptFormCom.vue => DeptFormCom/index.vue} (96%)
 rename web/src/views/system/dept/components/{TreeCom.vue => DeptTreeCom/index.vue} (94%)

diff --git a/web/src/views/system/dept/components/DeptFormCom.vue b/web/src/views/system/dept/components/DeptFormCom/index.vue
similarity index 96%
rename from web/src/views/system/dept/components/DeptFormCom.vue
rename to web/src/views/system/dept/components/DeptFormCom/index.vue
index 0971fea..c4ebf56 100644
--- a/web/src/views/system/dept/components/DeptFormCom.vue
+++ b/web/src/views/system/dept/components/DeptFormCom/index.vue
@@ -35,9 +35,9 @@
 <script lang="ts" setup>
 import { reactive, ref, onMounted } from 'vue';
 import { ElForm, FormRules } from 'element-plus';
-import { lazyLoadDept, AddObj, UpdateObj } from '../api';
-import { successNotification } from '../../../../utils/message';
-import { DeptFormDataType, TreeItemType, APIResponseData } from '../types';
+import { lazyLoadDept, AddObj, UpdateObj } from '../../api';
+import { successNotification } from '/@/utils/message';
+import { DeptFormDataType, TreeItemType, APIResponseData } from '../../types';
 import type Node from 'element-plus/es/components/tree/src/model/node';
 
 interface IProps {
diff --git a/web/src/views/system/dept/components/TreeCom.vue b/web/src/views/system/dept/components/DeptTreeCom/index.vue
similarity index 94%
rename from web/src/views/system/dept/components/TreeCom.vue
rename to web/src/views/system/dept/components/DeptTreeCom/index.vue
index ea8b688..e32861e 100644
--- a/web/src/views/system/dept/components/TreeCom.vue
+++ b/web/src/views/system/dept/components/DeptTreeCom/index.vue
@@ -73,9 +73,9 @@ import { ref, watch, toRaw, h } from 'vue';
 import { ElTree } from 'element-plus';
 import { getElementLabelLine } from 'element-tree-line';
 import { Search } from '@element-plus/icons-vue';
-import { lazyLoadDept, deptMoveUp, deptMoveDown } from '../api';
-import { warningNotification } from '../../../../utils/message';
-import { TreeItemType, APIResponseData } from '../types';
+import { lazyLoadDept, deptMoveUp, deptMoveDown } from '../../api';
+import { warningNotification } from '/@/utils/message';
+import { TreeItemType, APIResponseData } from '../../types';
 import type Node from 'element-plus/es/components/tree/src/model/node';
 
 interface IProps {
@@ -276,7 +276,7 @@ const handleSort = async (type: string) => {
 	}
 
 	.el-tree .el-tree-node__expand-icon:before {
-		background: url('../../../../assets/img/menu-tree-show-icon.png') no-repeat center / 100%;
+		background: url('../../../../../assets/img/menu-tree-show-icon.png') no-repeat center / 100%;
 		content: '';
 		display: block;
 		width: 24px;
@@ -284,7 +284,7 @@ const handleSort = async (type: string) => {
 	}
 
 	.el-tree .el-tree-node__expand-icon.expanded:before {
-		background: url('../../../../assets/img/menu-tree-hidden-icon.png') no-repeat center / 100%;
+		background: url('../../../../../assets/img/menu-tree-hidden-icon.png') no-repeat center / 100%;
 		content: '';
 		display: block;
 		width: 24px;
diff --git a/web/src/views/system/dept/index.vue b/web/src/views/system/dept/index.vue
index 5a2eef3..2de365a 100644
--- a/web/src/views/system/dept/index.vue
+++ b/web/src/views/system/dept/index.vue
@@ -3,7 +3,7 @@
 		<el-row class="dept-el-row">
 			<el-col :span="6">
 				<div class="dept-box dept-left">
-					<TreeCom :treeData="deptTreeData" @treeClick="handleTreeClick" @updateDept="handleUpdateMenu" @deleteDept="handleDeleteMenu" />
+					<DeptTreeCom :treeData="deptTreeData" @treeClick="handleTreeClick" @updateDept="handleUpdateMenu" @deleteDept="handleDeleteMenu" />
 				</div>
 			</el-col>
 
@@ -24,8 +24,8 @@
 import { ref, onMounted } from 'vue';
 import XEUtils from 'xe-utils';
 import { ElMessageBox } from 'element-plus';
-import TreeCom from './components/TreeCom.vue';
-import DeptFormCom from './components/DeptFormCom.vue';
+import DeptTreeCom from './components/DeptTreeCom/index.vue';
+import DeptFormCom from './components/DeptFormCom/index.vue';
 import DeptUserCom from './components/DeptUserCom/index.vue';
 import { GetList, DelObj } from './api';
 import { successNotification } from '../../../utils/message';
diff --git a/web/src/views/system/menu/components/MenuFormCom/index.vue b/web/src/views/system/menu/components/MenuFormCom/index.vue
index 2ffb2aa..c9466e4 100644
--- a/web/src/views/system/menu/components/MenuFormCom/index.vue
+++ b/web/src/views/system/menu/components/MenuFormCom/index.vue
@@ -8,10 +8,19 @@
 		</div>
 		<el-form ref="formRef" :rules="rules" :model="menuFormData" label-width="80px" label-position="right">
 			<el-form-item label="菜单名称" prop="name">
-				<el-input v-model="menuFormData.name" />
+				<el-input v-model="menuFormData.name" placeholder="菜单名称" />
 			</el-form-item>
 			<el-form-item label="父级菜单" prop="parent">
-				<el-input v-model="menuFormData.parent" />
+				<!-- <el-input v-model="menuFormData.parent" /> -->
+				<el-tree-select
+					v-model="menuFormData.parent"
+					:props="defaultTreeProps"
+					:data="deptDefaultList"
+					lazy
+					check-strictly
+					:load="handleTreeLoad"
+					style="width: 100%"
+				/>
 			</el-form-item>
 			<el-form-item label="图标" prop="icon">
 				<IconSelector clearable v-model="menuFormData.icon" />
@@ -39,22 +48,22 @@
 			</el-form-item>
 
 			<el-form-item label="备注">
-				<el-input v-model="menuFormData.description" maxlength="200" show-word-limit type="textarea" />
+				<el-input v-model="menuFormData.description" maxlength="200" show-word-limit type="textarea" placeholder="备注" />
 			</el-form-item>
 
 			<el-divider></el-divider>
 
 			<div style="min-height: 184px">
 				<el-form-item v-if="menuFormData.menu_status === '3'" label="Url">
-					<el-input v-model="menuFormData.web_path" />
+					<el-input v-model="menuFormData.web_path" placeholder="Url" />
 				</el-form-item>
 
 				<el-form-item v-if="menuFormData.menu_status === '1'" label="路由地址">
-					<el-input v-model="menuFormData.web_path" />
+					<el-input v-model="menuFormData.web_path" placeholder="路由地址" />
 				</el-form-item>
 
 				<el-form-item v-if="menuFormData.menu_status === '1'" label="组件名称">
-					<el-input v-model="menuFormData.component_name" />
+					<el-input v-model="menuFormData.component_name" placeholder="组件名称" />
 				</el-form-item>
 
 				<el-form-item v-if="menuFormData.menu_status === '1'" label="组件地址">
@@ -88,12 +97,27 @@
 import { ref, onMounted, reactive } from 'vue';
 import { ElForm, FormRules } from 'element-plus';
 import IconSelector from '/@/components/iconSelector/index.vue';
-import { MenuFormDataType, MenuTreeItemType, ComponentFileItem } from '../../types';
+import { lazyLoadMenu } from '../../api';
+import { MenuFormDataType, MenuTreeItemType, ComponentFileItem, APIResponseData } from '../../types';
+import type Node from 'element-plus/es/components/tree/src/model/node';
 
 interface IProps {
 	initFormData: Partial<MenuTreeItemType> | null;
+	treeData: MenuTreeItemType[];
 }
 
+const defaultTreeProps: any = {
+	children: 'children',
+	label: 'name',
+	value: 'id',
+	isLeaf: (data: MenuTreeItemType[], node: Node) => {
+		if (node?.data.hasChild) {
+			return false;
+		} else {
+			return true;
+		}
+	},
+};
 const validateWebPath = (rule: any, value: string, callback: Function) => {
 	let pattern = /^\/.*?/;
 	if (!pattern.test(value)) {
@@ -105,6 +129,7 @@ const validateWebPath = (rule: any, value: string, callback: Function) => {
 
 const props = withDefaults(defineProps<IProps>(), {
 	initFormData: () => null,
+	treeData: () => [],
 });
 const emit = defineEmits(['drawerClose']);
 
@@ -116,6 +141,7 @@ const rules = reactive<FormRules>({
 	parent: [{ required: true, message: '父级菜单必选', trigger: ['blur', 'change'] }],
 });
 
+let deptDefaultList = ref<MenuTreeItemType[]>([]);
 let menuFormData = reactive<MenuFormDataType>({
 	parent: '',
 	name: '',
@@ -170,6 +196,17 @@ const createFilter = (queryString: string) => {
 	};
 };
 
+/**
+ * 树的懒加载
+ */
+const handleTreeLoad = (node: Node, resolve: Function) => {
+	if (node.level !== 0) {
+		lazyLoadMenu({ parent: node.data.id }).then((res: APIResponseData) => {
+			resolve(res.data);
+		});
+	}
+};
+
 const handleSubmit = () => {};
 
 const handleCancel = (type: string = '') => {
@@ -178,13 +215,15 @@ const handleCancel = (type: string = '') => {
 };
 
 onMounted(async () => {
+	props.treeData.map((item) => {
+		deptDefaultList.value.push(item);
+	});
 	setMenuFormData();
 });
 </script>
 
 <style lang="scss" scoped>
 .menu-form-com {
-	border-radius: 8px;
 	margin: 10px;
 	overflow-y: auto;
 	.menu-form-alert {
diff --git a/web/src/views/system/menu/components/MenuTreeCom/index.vue b/web/src/views/system/menu/components/MenuTreeCom/index.vue
index 324c509..246338a 100644
--- a/web/src/views/system/menu/components/MenuTreeCom/index.vue
+++ b/web/src/views/system/menu/components/MenuTreeCom/index.vue
@@ -112,7 +112,7 @@ const emit = defineEmits(['treeClick', 'deleteDept', 'updateDept']);
 
 let filterVal = ref('');
 let sortDisable = ref(false);
-let treeSelectMenu = ref<TreeTypes>({});
+let treeSelectMenu = ref<Partial<MenuTreeItemType>>({});
 let treeSelectNode = ref<Node | null>(null);
 
 watch(filterVal, (val) => {
diff --git a/web/src/views/system/menu/index.vue b/web/src/views/system/menu/index.vue
index c4f03c7..2ac8bf1 100644
--- a/web/src/views/system/menu/index.vue
+++ b/web/src/views/system/menu/index.vue
@@ -15,7 +15,7 @@
 		</el-row>
 
 		<el-drawer v-model="drawerVisible" title="菜单配置" direction="rtl" size="500px" :close-on-click-modal="false" :before-close="handleDrawerClose">
-			<MenuFormCom v-if="drawerVisible" :initFormData="drawerFormData" @drawerClose="handleDrawerClose" />
+			<MenuFormCom v-if="drawerVisible" :initFormData="drawerFormData" :treeData="menuTreeData" @drawerClose="handleDrawerClose" />
 		</el-drawer>
 	</fs-page>
 </template>
@@ -27,7 +27,7 @@ import { ElMessageBox } from 'element-plus';
 import MenuTreeCom from './components/MenuTreeCom/index.vue';
 import MenuButtonCom from './components/MenuButtonCom/index.vue';
 import MenuFormCom from './components/MenuFormCom/index.vue';
-import * as api from './api';
+import { GetList, DelObj } from './api';
 import { successNotification } from '/@/utils/message';
 import { APIResponseData, MenuTreeItemType } from './types';
 
@@ -37,7 +37,7 @@ let drawerVisible = ref(false);
 let drawerFormData = ref<Partial<MenuTreeItemType>>({});
 
 const getData = () => {
-	api.GetList({}).then((ret: APIResponseData) => {
+	GetList({}).then((ret: APIResponseData) => {
 		const responseData = ret.data;
 		const result = XEUtils.toArrayTree(responseData, {
 			parentKey: 'parent',
@@ -81,7 +81,7 @@ const handleDeleteMenu = (id: string, callback: Function) => {
 		cancelButtonText: '取消',
 		type: 'warning',
 	}).then(async () => {
-		const res: APIResponseData = await api.DelObj(id);
+		const res: APIResponseData = await DelObj(id);
 		callback();
 		if (res?.code === 2000) {
 			successNotification(res.msg as string);