From 0f86f5c6fc8eb08843bcb30710bf5f3fbade2fa7 Mon Sep 17 00:00:00 2001
From: sheng <15292050171@163.com>
Date: Fri, 28 Jul 2023 17:09:41 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=20=E8=8F=9C=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=96=B0=E5=A2=9E=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/views/system/dept/api.ts              |   2 +-
 .../system/dept/components/DeptFormCom.vue    | 175 ++++-----
 .../views/system/dept/components/TreeCom.vue  | 344 +++++++++---------
 web/src/views/system/dept/types.ts            |   6 +-
 .../menu/components/menuButton/crud.tsx       |  12 +-
 web/src/views/system/menu/index.vue           | 221 ++++++-----
 6 files changed, 397 insertions(+), 363 deletions(-)

diff --git a/web/src/views/system/dept/api.ts b/web/src/views/system/dept/api.ts
index 0779ffe..41b2c7f 100644
--- a/web/src/views/system/dept/api.ts
+++ b/web/src/views/system/dept/api.ts
@@ -1,5 +1,5 @@
 import { request } from '/@/utils/service';
-import { UserPageQuery, AddReq, DelReq, EditReq, InfoReq, PageQuery } from '@fast-crud/fast-crud';
+import { UserPageQuery, AddReq, EditReq, InfoReq, PageQuery } from '@fast-crud/fast-crud';
 
 export const apiPrefix = '/api/system/dept/';
 
diff --git a/web/src/views/system/dept/components/DeptFormCom.vue b/web/src/views/system/dept/components/DeptFormCom.vue
index b19fb56..989c0f6 100644
--- a/web/src/views/system/dept/components/DeptFormCom.vue
+++ b/web/src/views/system/dept/components/DeptFormCom.vue
@@ -1,40 +1,29 @@
 <template>
-  <el-form ref="formRef" :rules="rules" :model="deptFormData" label-width="100px" label-position="right"
-    class="dept-form-com">
-    <el-form-item label="部门ID" prop="id">
-      <el-input v-model="deptFormData.id" disabled />
-    </el-form-item>
-    <el-form-item label="父级部门" prop="parent">
-      <el-select v-model="deptFormData.parent" style="width: 100%">
-        <el-option v-for="item in deptAllList" :key="item.id" :label="item.name" :value="item.id" />
-      </el-select>
-    </el-form-item>
-    <el-form-item required label="部门名称" prop="name">
-      <el-input v-model="deptFormData.name" />
-    </el-form-item>
-    <el-form-item required label="部门标识" prop="key">
-      <el-input v-model="deptFormData.key" />
-    </el-form-item>
-    <el-form-item label="负责人" prop="owner">
-      <el-input v-model="deptFormData.owner" />
-    </el-form-item>
-    <el-form-item label="联系电话" prop="phone">
-      <el-input v-model="deptFormData.phone" />
-    </el-form-item>
-    <el-form-item label="邮箱" prop="email">
-      <el-input v-model="deptFormData.email" />
-    </el-form-item>
-    <el-form-item label="排序" prop="sort">
-      <el-input-number v-model="deptFormData.sort" controls-position="right" />
-    </el-form-item>
-    <el-form-item>
-      <el-button @click="handleUpdateMenu" type="primary" :disabled="deptBtnLoading">
-        {{ deptFormData.id ? '保存' : '新增' }}
-      </el-button>
-      <el-button @click="handleClose">取消
-      </el-button>
-    </el-form-item>
-  </el-form>
+	<el-form ref="formRef" :rules="rules" :model="deptFormData" label-width="100px" label-position="right" class="dept-form-com">
+		<el-form-item label="父级部门" prop="parent">
+			<el-select v-model="deptFormData.parent" style="width: 100%">
+				<el-option v-for="item in deptAllList" :key="item.id" :label="item.name" :value="item.id" />
+			</el-select>
+		</el-form-item>
+		<el-form-item required label="部门名称" prop="name">
+			<el-input v-model="deptFormData.name" />
+		</el-form-item>
+		<el-form-item required label="部门标识" prop="key">
+			<el-input v-model="deptFormData.key" />
+		</el-form-item>
+		<el-form-item label="负责人" prop="owner">
+			<el-input v-model="deptFormData.owner" />
+		</el-form-item>
+		<el-form-item label="备注" prop="remark">
+			<el-input v-model="deptFormData.remark" maxlength="200" show-word-limit type="textarea" />
+		</el-form-item>
+		<el-form-item>
+			<el-button @click="handleUpdateMenu" type="primary" :disabled="deptBtnLoading">
+				{{ deptFormData.id ? '保存' : '新增' }}
+			</el-button>
+			<el-button @click="handleClose">取消 </el-button>
+		</el-form-item>
+	</el-form>
 </template>
 
 <script lang="ts" setup>
@@ -45,90 +34,84 @@ import { successNotification } from '../../../../utils/message';
 import { DeptFormDataType, TreeItemType, DeptListType } from '../types';
 
 interface IProps {
-  initFormData: TreeItemType | null;
+	initFormData: TreeItemType | null;
 }
 
 const formRef = ref<InstanceType<typeof ElForm>>();
 const rules = reactive<FormRules>({
-  name: [{ required: true, message: '部门名称必填', trigger: 'blur' }],
-  key: [{ required: true, message: '部门标识必填', trigger: 'blur' }],
+	name: [{ required: true, message: '部门名称必填', trigger: 'blur' }],
+	key: [{ required: true, message: '部门标识必填', trigger: 'blur' }],
 });
 
 const props = withDefaults(defineProps<IProps>(), {
-  initFormData: () => null,
-})
-const emit = defineEmits(['drawerClose'])
+	initFormData: () => null,
+});
+const emit = defineEmits(['drawerClose']);
 
 let deptAllList = ref<DeptListType[]>([]);
 let deptFormData = reactive<DeptFormDataType>({
-  id: '',
-  key: '',
-  parent: '',
-  name: '',
-  owner: '',
-  phone: '',
-  email: '',
-  sort: 0,
-  is_catalog: true,
-})
-let deptBtnLoading = ref(false)
+	key: '',
+	parent: '',
+	name: '',
+	owner: '',
+	remark: '',
+	is_catalog: true,
+});
+let deptBtnLoading = ref(false);
 
 const getData = async () => {
-  const res = await getAllDeptList();
-  if (res?.code === 2000) {
-    deptAllList.value = res.data
-  }
-}
+	const res = await getAllDeptList();
+	if (res?.code === 2000) {
+		deptAllList.value = res.data;
+	}
+};
 
 const setDeptFormData = () => {
-  if (props.initFormData?.id) {
-    deptFormData.id = props.initFormData?.id;
-    deptFormData.key = props.initFormData.key || '';
-    deptFormData.parent = props.initFormData.parent || '';
-    deptFormData.name = props.initFormData.name || '';
-    deptFormData.owner = props.initFormData.owner || '';
-    deptFormData.phone = props.initFormData.phone || '';
-    deptFormData.email = props.initFormData.email || '';
-    deptFormData.sort = props.initFormData.sort || 0;
-  }
-}
+	if (props.initFormData?.id) {
+		deptFormData.id = props.initFormData?.id;
+		deptFormData.key = props.initFormData.key || '';
+		deptFormData.parent = props.initFormData.parent || '';
+		deptFormData.name = props.initFormData.name || '';
+		deptFormData.owner = props.initFormData.owner || '';
+	}
+};
 
 const handleUpdateMenu = () => {
-  formRef.value?.validate(async (valid) => {
-    if (!valid) return
-    try {
-      let res;
-      deptBtnLoading.value = true
-      if (deptFormData.id) {
-        res = await UpdateObj(deptFormData);
-      } else {
-        res = await AddObj(deptFormData)
-      }
-      if (res?.code === 2000) {
-        successNotification(res.msg as string);
-        handleClose('submit');
-      }
-    } finally {
-      deptBtnLoading.value = false
-    }
-  })
+	formRef.value?.validate(async (valid) => {
+		if (!valid) return;
+		try {
+			let res;
+			deptBtnLoading.value = true;
+			if (deptFormData.id) {
+				res = await UpdateObj(deptFormData);
+			} else {
+				res = await AddObj(deptFormData);
+			}
+			if (res?.code === 2000) {
+				successNotification(res.msg as string);
+				handleClose('submit');
+			}
+		} finally {
+			deptBtnLoading.value = false;
+		}
+	});
 };
 
 const handleClose = (type: string = '') => {
-  emit('drawerClose', type)
-  formRef.value?.resetFields();
+	emit('drawerClose', type);
+	formRef.value?.resetFields();
 };
 
 onMounted(async () => {
-  await getData()
-  setDeptFormData()
-})
+	await getData();
+	setDeptFormData();
+});
 </script>
 
 <style lang="scss" scoped>
 .dept-form-com {
-  height: 100%;
-  padding: 20px;
-  box-sizing: border-box;
+	height: 100%;
+	padding: 20px;
+	box-sizing: border-box;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/web/src/views/system/dept/components/TreeCom.vue b/web/src/views/system/dept/components/TreeCom.vue
index ef869c6..1c16edb 100644
--- a/web/src/views/system/dept/components/TreeCom.vue
+++ b/web/src/views/system/dept/components/TreeCom.vue
@@ -1,70 +1,78 @@
 <template>
-  <el-input v-model="filterVal" :prefix-icon="Search" placeholder="请输入部门名称" />
-  <div class="tree-com">
-    <div class="tc-head">
-      <el-icon size="16" color="#606266" class="tc-head-icon">
-        <HomeFilled />
-      </el-icon>
-      <span class="tc-head-txt">部门架构</span>
-      <el-icon size="16" color="#606266" @click="() => showTotalNum = !showTotalNum" class="tc-head-icon">
-        <View v-show="!showTotalNum" />
-        <Hide v-show="showTotalNum" />
-      </el-icon>
-    </div>
+	<el-input v-model="filterVal" :prefix-icon="Search" placeholder="请输入部门名称" />
+	<div class="tree-com">
+		<div class="tc-head">
+			<el-icon size="16" color="#606266" class="tc-head-icon">
+				<HomeFilled />
+			</el-icon>
+			<span class="tc-head-txt">部门架构</span>
+			<el-icon size="16" color="#606266" @click="() => (showTotalNum = !showTotalNum)" class="tc-head-icon">
+				<View v-show="!showTotalNum" />
+				<Hide v-show="showTotalNum" />
+			</el-icon>
+		</div>
 
-    <el-tree ref="treeRef" :data="treeData" :props="treeProps" :filter-node-method="handleFilterTreeNode"
-      :load="handleLoadNode" lazy :indent="38" @node-click="handleNodeClick" highlight-current default-expand-all>
-      <template #default="{ node, data }">
-        <element-tree-line :node="node" :showLabelLine="false" :indent="32">
-          <span v-if="data.status" class="text-center font-black font-normal">
-            <SvgIcon name="iconfont icon-shouye" />&nbsp;{{ node.label }}
-            <span v-show="showTotalNum">（10人）</span>
-          </span>
-          <span v-else class="text-center font-black font-normal text-red-700">
-            <SvgIcon name="iconfont icon-shouye" />&nbsp;{{ node.label }}
-          </span>
-        </element-tree-line>
-      </template>
-    </el-tree>
+		<el-tree
+			ref="treeRef"
+			:data="treeData"
+			:props="treeProps"
+			:filter-node-method="handleFilterTreeNode"
+			:load="handleLoadNode"
+			lazy
+			:indent="38"
+			@node-click="handleNodeClick"
+			highlight-current
+			default-expand-all
+		>
+			<template #default="{ node, data }">
+				<element-tree-line :node="node" :showLabelLine="false" :indent="32">
+					<span v-if="data.status" class="text-center font-black font-normal">
+						<SvgIcon name="iconfont icon-shouye" />&nbsp;{{ node.label }}
+						<span v-show="showTotalNum">（10人）</span>
+					</span>
+					<span v-else class="text-center font-black font-normal text-red-700"> <SvgIcon name="iconfont icon-shouye" />&nbsp;{{ node.label }} </span>
+				</element-tree-line>
+			</template>
+		</el-tree>
 
-    <div class="tree-tags">
-      <el-tooltip effect="dark" content="新增">
-        <el-icon size="16" @click="handleUpdateMenu('create')" class="mlt-icon">
-          <Plus />
-        </el-icon>
-      </el-tooltip>
+		<div class="tree-tags">
+			<el-tooltip effect="dark" content="新增">
+				<el-icon size="16" @click="handleUpdateMenu('create')" class="mlt-icon">
+					<Plus />
+				</el-icon>
+			</el-tooltip>
 
-      <el-tooltip effect="dark" content="编辑">
-        <el-icon size="16" @click="handleUpdateMenu('update')" class="mlt-icon">
-          <Edit />
-        </el-icon>
-      </el-tooltip>
+			<el-tooltip effect="dark" content="编辑">
+				<el-icon size="16" @click="handleUpdateMenu('update')" class="mlt-icon">
+					<Edit />
+				</el-icon>
+			</el-tooltip>
 
-      <el-tooltip effect="dark" content="上移">
-        <el-icon size="16" @click="handleSort('up')" class="mlt-icon">
-          <Top />
-        </el-icon>
-      </el-tooltip>
+			<el-tooltip effect="dark" content="上移">
+				<el-icon size="16" @click="handleSort('up')" class="mlt-icon">
+					<Top />
+				</el-icon>
+			</el-tooltip>
 
-      <el-tooltip effect="dark" content="下移">
-        <el-icon size="16" @click="handleSort('down')" class="mlt-icon">
-          <Bottom />
-        </el-icon>
-      </el-tooltip>
+			<el-tooltip effect="dark" content="下移">
+				<el-icon size="16" @click="handleSort('down')" class="mlt-icon">
+					<Bottom />
+				</el-icon>
+			</el-tooltip>
 
-      <el-tooltip effect="dark" content="删除">
-        <el-icon size="16" @click="handleDeleteDept" class="mlt-icon">
-          <Delete />
-        </el-icon>
-      </el-tooltip>
-    </div>
-  </div>
+			<el-tooltip effect="dark" content="删除">
+				<el-icon size="16" @click="handleDeleteDept" class="mlt-icon">
+					<Delete />
+				</el-icon>
+			</el-tooltip>
+		</div>
+	</div>
 </template>
 
 <script lang="ts" setup>
 import { ref, watch, toRaw, h } from 'vue';
 import { ElTree } from 'element-plus';
-import { getElementLabelLine } from "element-tree-line";
+import { getElementLabelLine } from 'element-tree-line';
 import { Search } from '@element-plus/icons-vue';
 import { lazyLoadDept } from '../api';
 import { warningNotification } from '../../../../utils/message';
@@ -72,189 +80,189 @@ import { TreeItemType, APIResponseData } from '../types';
 import type Node from 'element-plus/es/components/tree/src/model/node';
 
 interface IProps {
-  treeData: TreeItemType[];
+	treeData: TreeItemType[];
 }
 
 const ElementTreeLine = getElementLabelLine(h);
 
 const treeProps = {
-  children: 'children',
-  label: 'name',
+	children: 'children',
+	label: 'name',
 };
 
 withDefaults(defineProps<IProps>(), {
-  treeData: () => [],
-})
-const emit = defineEmits(['treeClick', 'deleteDept', 'updateDept'])
+	treeData: () => [],
+});
+const emit = defineEmits(['treeClick', 'deleteDept', 'updateDept']);
 
 let filterVal = ref('');
-let showTotalNum = ref(false)
-let treeSelectDept = ref<TreeItemType>({})
+let showTotalNum = ref(false);
+let treeSelectDept = ref<TreeItemType>({});
 const treeRef = ref<InstanceType<typeof ElTree>>();
 
 watch(filterVal, (val) => {
-  treeRef.value!.filter(val);
+	treeRef.value!.filter(val);
 });
 
 /**
  * 部门树的搜索事件
  */
 const handleFilterTreeNode = (value: string, data: TreeItemType) => {
-  if (!value) return true;
-  return toRaw(data).name?.indexOf(value) !== -1;
+	if (!value) return true;
+	return toRaw(data).name?.indexOf(value) !== -1;
 };
 
 /**
  * 部门树的懒加载
  */
 const handleLoadNode = (node: Node, resolve: Function) => {
-  if (node.level !== 0) {
-    lazyLoadDept({ parent: node.data.id }).then((res: APIResponseData) => {
-      resolve(res.data);
-    });
-  }
+	if (node.level !== 0) {
+		lazyLoadDept({ parent: node.data.id }).then((res: APIResponseData) => {
+			resolve(res.data);
+		});
+	}
 };
 
 /**
  * 部门的点击事件
  */
 const handleNodeClick = (data: TreeItemType) => {
-  treeSelectDept.value = data
-  emit('treeClick', data.id)
+	treeSelectDept.value = data;
+	emit('treeClick', data.id);
 };
 
 /**
  * 新增 or 编辑 操作
  */
 const handleUpdateMenu = (type: string) => {
-  if (type === 'update') {
-    if (!treeSelectDept.value.id) {
-      warningNotification('请选择菜单！')
-      return
-    }
-    emit('updateDept', type, treeSelectDept.value)
-  } else {
-    emit('updateDept', type);
-  }
+	if (type === 'update') {
+		if (!treeSelectDept.value.id) {
+			warningNotification('请选择菜单！');
+			return;
+		}
+		emit('updateDept', type, treeSelectDept.value);
+	} else {
+		emit('updateDept', type);
+	}
 };
 
 /**
  * 删除部门
  */
 const handleDeleteDept = () => {
-  if (!treeSelectDept.value.id) {
-    warningNotification('请选择菜单！')
-    return
-  }
-  emit('deleteDept', treeSelectDept.value.id, () => {
-    treeSelectDept.value = {}
-  })
+	if (!treeSelectDept.value.id) {
+		warningNotification('请选择菜单！');
+		return;
+	}
+	emit('deleteDept', treeSelectDept.value.id, () => {
+		treeSelectDept.value = {};
+	});
 };
 
 /**
  * 部门上下移动操作
  */
-const handleSort = (type: string) => { }
+const handleSort = (type: string) => {};
 </script>
 
 <style lang="scss" scoped>
 .tc-head {
-  display: flex;
-  align-items: center;
-  margin-left: -8px;
-  color: #606266;
-  font-weight: 600;
+	display: flex;
+	align-items: center;
+	margin-left: -8px;
+	color: #606266;
+	font-weight: 600;
 
-  .tc-head-txt {
-    margin: 0 8px;
-  }
+	.tc-head-txt {
+		margin: 0 8px;
+	}
 
-  .tc-head-icon {
-    position: relative;
-    top: -1px;
-    cursor: pointer;
-  }
+	.tc-head-icon {
+		position: relative;
+		top: -1px;
+		cursor: pointer;
+	}
 }
 
 .tree-tags {
-  height: 40px;
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  padding: 0 20px;
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-  box-sizing: border-box;
+	height: 40px;
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	padding: 0 20px;
+	display: flex;
+	align-items: center;
+	justify-content: space-around;
+	box-sizing: border-box;
 
-  .mlt-icon {
-    cursor: pointer;
-    color: var(--el-color-primary);
-  }
+	.mlt-icon {
+		cursor: pointer;
+		color: var(--el-color-primary);
+	}
 }
 </style>
 
 <style lang="scss">
 .tree-com {
-  height: calc(100% - 60px);
-  padding: 20px;
-  box-sizing: border-box;
-  overflow-y: auto;
+	height: calc(100% - 60px);
+	padding: 20px;
+	box-sizing: border-box;
+	overflow-y: auto;
 
-  .el-tree-node__content {
-    height: 32px !important;
-  }
+	.el-tree-node__content {
+		height: 32px !important;
+	}
 
-  .el-tree .el-tree-node__expand-icon svg {
-    display: none !important;
-    height: 0;
-    width: 0;
-  }
+	.el-tree .el-tree-node__expand-icon svg {
+		display: none !important;
+		height: 0;
+		width: 0;
+	}
 
-  .el-tree-node__expand-icon {
-    font-size: 16px;
-  }
+	.el-tree-node__expand-icon {
+		font-size: 16px;
+	}
 
-  .el-tree-node__content>.el-tree-node__expand-icon {
-    padding: 0;
-    box-sizing: border-box;
-    margin-right: 5px;
-    margin-left: 18px;
-  }
+	.el-tree-node__content > .el-tree-node__expand-icon {
+		padding: 0;
+		box-sizing: border-box;
+		margin-right: 5px;
+		margin-left: 18px;
+	}
 
-  .el-tree .el-tree-node__expand-icon.expanded {
-    -webkit-transform: rotate(0deg);
-    transform: rotate(0deg);
-  }
+	.el-tree .el-tree-node__expand-icon.expanded {
+		-webkit-transform: rotate(0deg);
+		transform: rotate(0deg);
+	}
 
-  .el-tree .el-tree-node__expand-icon.is-leaf {
-    margin-left: 0
-  }
+	.el-tree .el-tree-node__expand-icon.is-leaf {
+		margin-left: 0;
+	}
 
-  .el-tree .el-tree-node__expand-icon:before {
-    background: url("../../../../assets/img/menu-tree-show-icon.png") no-repeat center / 100%;
-    content: '';
-    display: block;
-    width: 24px;
-    height: 24px;
-  }
+	.el-tree .el-tree-node__expand-icon:before {
+		background: url('../../../../assets/img/menu-tree-show-icon.png') no-repeat center / 100%;
+		content: '';
+		display: block;
+		width: 24px;
+		height: 24px;
+	}
 
-  .el-tree .el-tree-node__expand-icon.expanded:before {
-    background: url("../../../../assets/img/menu-tree-hidden-icon.png") no-repeat center / 100%;
-    content: '';
-    display: block;
-    width: 24px;
-    height: 24px;
-  }
+	.el-tree .el-tree-node__expand-icon.expanded:before {
+		background: url('../../../../assets/img/menu-tree-hidden-icon.png') no-repeat center / 100%;
+		content: '';
+		display: block;
+		width: 24px;
+		height: 24px;
+	}
 
-  .el-tree .is-leaf.el-tree-node__expand-icon::before {
-    display: block;
-    background: none !important;
-    content: '';
-    width: 18px;
-    height: 18px;
-    border: none;
-  }
+	.el-tree .is-leaf.el-tree-node__expand-icon::before {
+		display: block;
+		background: none !important;
+		content: '';
+		width: 18px;
+		height: 18px;
+		border: none;
+	}
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/web/src/views/system/dept/types.ts b/web/src/views/system/dept/types.ts
index 6b0c30f..90d1653 100644
--- a/web/src/views/system/dept/types.ts
+++ b/web/src/views/system/dept/types.ts
@@ -40,14 +40,12 @@ export interface TreeItemType {
 }
 
 export interface DeptFormDataType {
-  id: string | number;
+  id?: string | number;
   key: string;
   parent: string | number;
   name: string;
   owner: string;
-  phone: string;
-  email: string;
-  sort: number;
+  remark: string;
   is_catalog?: boolean;
 }
 
diff --git a/web/src/views/system/menu/components/menuButton/crud.tsx b/web/src/views/system/menu/components/menuButton/crud.tsx
index 512952c..e70e8ab 100644
--- a/web/src/views/system/menu/components/menuButton/crud.tsx
+++ b/web/src/views/system/menu/components/menuButton/crud.tsx
@@ -1,12 +1,4 @@
-import {
-	AddReq,
-	DelReq,
-	EditReq,
-	dict,
-	CreateCrudOptionsRet,
-	CreateCrudOptionsProps,
-	UserPageQuery,
-} from '@fast-crud/fast-crud';
+import { AddReq, DelReq, EditReq, dict, CreateCrudOptionsRet, CreateCrudOptionsProps, UserPageQuery } from '@fast-crud/fast-crud';
 import * as api from './api';
 
 import { request } from '/@/utils/service';
@@ -185,7 +177,7 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 						},
 					}),
 					column: {
-						minWidth: 200,
+						minWidth: 250,
 						sortable: true,
 					},
 					form: {
diff --git a/web/src/views/system/menu/index.vue b/web/src/views/system/menu/index.vue
index 8fd3e37..173b19e 100644
--- a/web/src/views/system/menu/index.vue
+++ b/web/src/views/system/menu/index.vue
@@ -10,16 +10,28 @@
 								<Menu />
 							</el-icon>
 							菜单列表
-							<el-tooltip effect="dark" placement="right"
-								content="1.红色菜单代表状态禁用; 2.添加菜单，如果是目录，组件地址为空即可; 3.添加根节点菜单，父级ID为空即可; 4.支持拖拽菜单;">
+							<el-tooltip
+								effect="dark"
+								placement="right"
+								content="1.红色菜单代表状态禁用; 2.添加菜单，如果是目录，组件地址为空即可; 3.添加根节点菜单，父级ID为空即可; 4.支持拖拽菜单;"
+							>
 								<el-icon size="16" color="var(--el-color-primary)" class="mlt-tooltip">
 									<QuestionFilled />
 								</el-icon>
 							</el-tooltip>
 						</div>
-						<el-tree ref="treeRef" :data="data" :props="defaultTreeProps" :filter-node-method="filterNode"
-							:load="loadNode" @node-drop="nodeDrop" lazy :indent="45" @node-click="handleNodeClick" highlight-current
-							default-expand-all>
+						<el-tree
+							ref="treeRef"
+							:data="data"
+							:props="defaultTreeProps"
+							:filter-node-method="filterNode"
+							:load="loadNode"
+							@node-drop="nodeDrop"
+							lazy
+							:indent="45"
+							@node-click="handleNodeClick"
+							highlight-current
+						>
 							<template #default="{ node, data }">
 								<element-tree-line :node="node" :showLabelLine="false" :indent="32">
 									<span v-if="data.status" class="text-center font-black font-normal">
@@ -75,8 +87,7 @@
 			</el-col>
 		</el-row>
 
-		<el-drawer v-model="drawerVisible" title="菜单配置" direction="rtl" size="500px" :close-on-click-modal="false"
-			:before-close="handleDrawerClose">
+		<el-drawer v-model="drawerVisible" title="菜单配置" direction="rtl" size="500px" :close-on-click-modal="false" :before-close="handleDrawerClose">
 			<div class="menu-box menu-drawer-box">
 				<div class="mcb-alert">
 					1.红色菜单代表状态禁用;<br />
@@ -85,48 +96,76 @@
 					4.支持拖拽菜单;
 				</div>
 				<el-form ref="formRef" :rules="rules" :model="form" label-width="80px" label-position="right">
-					<el-form-item label="菜单ID" prop="id">
-						<el-input v-model="form.id" disabled />
+					<el-form-item label="菜单名称" prop="name">
+						<el-input v-model="formData.name" />
 					</el-form-item>
-					<el-form-item label="父级ID" prop="parent">
-						<el-input v-model="form.parent" />
-					</el-form-item>
-					<el-form-item required label="菜单名称" prop="name">
-						<el-input v-model="form.name" />
-					</el-form-item>
-					<el-form-item label="组件地址" prop="component">
-						<el-autocomplete class="w-full" v-model="form.component" :fetch-suggestions="querySearch"
-							:trigger-on-focus="false" clearable :debounce="100" placeholder="输入组件地址" />
-					</el-form-item>
-					<el-form-item required label="Url" prop="web_path">
-						<el-input v-model="form.web_path" />
-					</el-form-item>
-					<el-form-item label="排序" prop="sort">
-						<el-input-number v-model="form.sort" controls-position="right" />
-					</el-form-item>
-					<el-form-item label="状态">
-						<el-radio-group v-model="form.status">
-							<el-radio :label="true">启用</el-radio>
-							<el-radio :label="false">禁用</el-radio>
-						</el-radio-group>
-					</el-form-item>
-					<el-form-item label="侧边可见">
-						<el-radio-group v-model="form.visible">
-							<el-radio :label="true">启用</el-radio>
-							<el-radio :label="false">禁用</el-radio>
-						</el-radio-group>
-					</el-form-item>
-					<el-form-item label="缓存">
-						<el-radio-group v-model="form.cache">
-							<el-radio :label="true">启用</el-radio>
-							<el-radio :label="false">禁用</el-radio>
-						</el-radio-group>
+					<el-form-item label="父级菜单" prop="parent">
+						<el-input v-model="formData.parent" />
 					</el-form-item>
 					<el-form-item label="图标" prop="icon">
-						<IconSelector clearable v-model="form.icon" />
+						<IconSelector clearable v-model="formData.icon" />
 					</el-form-item>
+
+					<el-row>
+						<el-col :span="12">
+							<el-form-item label="状态">
+								<el-switch v-model="formData.show_status" width="60" inline-prompt active-text="启用" inactive-text="禁用" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item v-if="formData.show_status" label="侧边显示">
+								<el-switch v-model="formData.slider_show" width="60" inline-prompt active-text="显示" inactive-text="隐藏" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+
+					<el-form-item label="菜单状态">
+						<el-radio-group v-model="formData.menu_status">
+							<el-radio-button label="1" class="aaa">常规</el-radio-button>
+							<el-radio-button label="2">目录</el-radio-button>
+							<el-radio-button label="3">外链接</el-radio-button>
+						</el-radio-group>
+					</el-form-item>
+
+					<el-form-item label="备注" prop="remark">
+						<el-input v-model="formData.remark" maxlength="200" show-word-limit type="textarea" />
+					</el-form-item>
+
+					<el-divider></el-divider>
+
+					<div style="min-height: 184px">
+						<el-form-item v-if="formData.menu_status === '3'" required label="Url" prop="web_path">
+							<el-input v-model="formData.web_path" />
+						</el-form-item>
+
+						<el-form-item v-if="formData.menu_status === '1'" label="路由地址" prop="route_path">
+							<el-input v-model="formData.route_path" />
+						</el-form-item>
+
+						<el-form-item v-if="formData.menu_status === '1'" label="组件名称" prop="route_name">
+							<el-input v-model="formData.route_name" />
+						</el-form-item>
+
+						<el-form-item v-if="formData.menu_status === '1'" label="组件地址" prop="component">
+							<el-autocomplete
+								class="w-full"
+								v-model="formData.component"
+								:fetch-suggestions="querySearch"
+								:trigger-on-focus="false"
+								clearable
+								:debounce="100"
+								placeholder="输入组件地址"
+							/>
+						</el-form-item>
+
+						<el-form-item v-if="formData.menu_status === '1'" label="缓存">
+							<el-switch v-model="formData.cache" width="60" inline-prompt active-text="启用" inactive-text="禁用" />
+						</el-form-item>
+					</div>
+
+					<el-divider></el-divider>
 				</el-form>
-				<el-divider></el-divider>
+
 				<div class="menus-btns">
 					<el-button @click="saveMenu()" type="primary">保存</el-button>
 					<!-- <el-button @click="newMenu()" type="primary" round :disabled="!form.id">新建</el-button>
@@ -143,7 +182,7 @@
 import { ref, onMounted, watch, reactive, toRaw, defineAsyncComponent, h } from 'vue';
 import XEUtils from 'xe-utils';
 import { ElForm, ElTree, FormRules, ElMessageBox } from 'element-plus';
-import { getElementLabelLine } from "element-tree-line";
+import { getElementLabelLine } from 'element-tree-line';
 import * as api from './api';
 import { Search } from '@element-plus/icons-vue';
 import { errorMessage, successMessage, warningMessage } from '../../../utils/message';
@@ -158,8 +197,23 @@ const ElementTreeLine = getElementLabelLine(h);
 
 const filterText = ref('');
 const treeRef = ref<InstanceType<typeof ElTree>>();
-let drawerVisible = ref(false)
-let treeSelectNode = ref<Node | null>(null)
+let drawerVisible = ref(false);
+let treeSelectNode = ref<Node | null>(null);
+
+let formData = reactive({
+	name: '',
+	parent: '',
+	icon: '',
+	show_status: true,
+	slider_show: true,
+	menu_status: '1',
+	remark: '',
+	component: '',
+	web_path: '',
+	route_path: '',
+	route_name: '',
+	cache: true,
+});
 
 watch(filterText, (val) => {
 	treeRef.value!.filter(val);
@@ -231,9 +285,12 @@ let form: FormTypes<any> = reactive({
 	visible: true,
 	cache: true,
 });
+
 const rules = reactive<FormRules>({
 	// @ts-ignore
 	web_path: [{ validator: validateWebPath, trigger: 'blur' }],
+	name: [{ required: true, message: '菜单名称必填', trigger: 'blur' }],
+	parent: [{ required: true, message: '父级菜单必选', trigger: ['blur', 'change'] }],
 });
 
 const formRef = ref<InstanceType<typeof ElForm>>();
@@ -284,7 +341,7 @@ const saveMenu = () => {
 				api.UpdateObj(form).then((res: APIResponseData) => {
 					successMessage(res.msg as string);
 					getData();
-					handleDrawerClose()
+					handleDrawerClose();
 				});
 			} else {
 				// 新增菜单
@@ -292,7 +349,7 @@ const saveMenu = () => {
 				api.AddObj(form).then((res: APIResponseData) => {
 					successMessage(res.msg as string);
 					getData();
-					handleDrawerClose()
+					handleDrawerClose();
 				});
 			}
 		} else {
@@ -304,7 +361,7 @@ const saveMenu = () => {
 const newMenu = () => {
 	formRef.value?.resetFields();
 	isAddNewMenu.value = true;
-	handleDrawerClose()
+	handleDrawerClose();
 };
 
 const addChildMenu = () => {
@@ -330,42 +387,38 @@ const handleNodeClick = (record: any, node: Node) => {
  */
 const handleUpdateMenu = (type: string) => {
 	if (type === 'create') {
-		drawerVisible.value = true
-		return
+		drawerVisible.value = true;
+		return;
 	}
 	if (!form.id) {
-		warningMessage('请选择菜单！')
-		return
+		warningMessage('请选择菜单！');
+		return;
 	}
-	drawerVisible.value = true
-}
+	drawerVisible.value = true;
+};
 const handleDrawerClose = () => {
-	drawerVisible.value = false
-}
+	drawerVisible.value = false;
+};
 
 /**
  * 删除菜单
  */
 const handleDeleteMenu = () => {
 	if (!form.id) {
-		warningMessage('请选择菜单！')
-		return
+		warningMessage('请选择菜单！');
+		return;
 	}
-	ElMessageBox.confirm(
-		'您确认删除该菜单项吗?',
-		'温馨提示',
-		{
-			confirmButtonText: '确认',
-			cancelButtonText: '取消',
-			type: 'warning',
-		}
-	).then(() => {
+	ElMessageBox.confirm('您确认删除该菜单项吗?', '温馨提示', {
+		confirmButtonText: '确认',
+		cancelButtonText: '取消',
+		type: 'warning',
+	}).then(() => {
 		api.DelObj(form).then((res: APIResponseData) => {
 			successMessage(res.msg as string);
 			getData();
 			handleDrawerClose();
 		});
-	})
+	});
 };
 
 /**
@@ -373,23 +426,23 @@ const handleDeleteMenu = () => {
  */
 const handleSort = (type: string) => {
 	if (!form.id && treeSelectNode.value) {
-		warningMessage('请选择菜单！')
-		return
+		warningMessage('请选择菜单！');
+		return;
 	}
 	const parentList = treeSelectNode.value?.parent.childNodes || [];
-	const index = parentList.findIndex(i => i.data.id === form.id)
-	const record = parentList.find(i => i.data.id === form.id)
+	const index = parentList.findIndex((i) => i.data.id === form.id);
+	const record = parentList.find((i) => i.data.id === form.id);
 
 	if (type === 'up') {
-		if (index === 0) return
-		parentList.splice(index - 1, 0, record as any)
-		parentList.splice(index + 1, 1)
+		if (index === 0) return;
+		parentList.splice(index - 1, 0, record as any);
+		parentList.splice(index + 1, 1);
 	}
 	if (type === 'down') {
-		parentList.splice(index + 2, 0, record as any)
-		parentList.splice(index, 1)
+		parentList.splice(index + 2, 0, record as any);
+		parentList.splice(index, 1);
 	}
-}
+};
 
 // 页面打开后获取列表数据
 onMounted(() => {
@@ -510,7 +563,7 @@ onMounted(() => {
 		font-size: 16px;
 	}
 
-	.el-tree-node__content>.el-tree-node__expand-icon {
+	.el-tree-node__content > .el-tree-node__expand-icon {
 		padding: 0;
 		box-sizing: border-box;
 		margin-right: 5px;
@@ -523,11 +576,11 @@ onMounted(() => {
 	}
 
 	.el-tree .el-tree-node__expand-icon.is-leaf {
-		margin-left: 0
+		margin-left: 0;
 	}
 
 	.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;
@@ -535,7 +588,7 @@ onMounted(() => {
 	}
 
 	.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;