Merge remote-tracking branch 'origin/master'

2023-07-28 18:12:06 +08:00
parent 4e5f9ce946 e790882ab6
commit eea5cdadfe
6 changed files with 725 additions and 693 deletions
--- 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/';

--- a/web/src/views/system/dept/components/DeptFormCom.vue
+++ b/web/src/views/system/dept/components/DeptFormCom.vue
@@ -1,9 +1,5 @@
 <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 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" />
@@ -18,21 +14,14 @@
 		<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 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-button @click="handleClose">取消 </el-button>
 		</el-form-item>
 	</el-form>
 </template>
@@ -56,29 +45,26 @@ const rules = reactive<FormRules>({

 const props = withDefaults(defineProps<IProps>(), {
 	initFormData: () => null,
-})
-const emit = defineEmits(['drawerClose'])
+});
+const emit = defineEmits(['drawerClose']);

 let deptAllList = ref<DeptListType[]>([]);
 let deptFormData = reactive<DeptFormDataType>({
-  id: '',
 	key: '',
 	parent: '',
 	name: '',
 	owner: '',
-  phone: '',
-  email: '',
-  sort: 0,
+	remark: '',
 	is_catalog: true,
-})
-let deptBtnLoading = ref(false)
+});
+let deptBtnLoading = ref(false);

 const getData = async () => {
 	const res = await getAllDeptList();
 	if (res?.code === 2000) {
-    deptAllList.value = res.data
-  }
+		deptAllList.value = res.data;
 	}
+};

 const setDeptFormData = () => {
 	if (props.initFormData?.id) {
@@ -87,42 +73,39 @@ const setDeptFormData = () => {
 		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;
-  }
 	}
+};

 const handleUpdateMenu = () => {
 	formRef.value?.validate(async (valid) => {
-    if (!valid) return
+		if (!valid) return;
 		try {
 			let res;
-      deptBtnLoading.value = true
+			deptBtnLoading.value = true;
 			if (deptFormData.id) {
 				res = await UpdateObj(deptFormData);
 			} else {
-        res = await AddObj(deptFormData)
+				res = await AddObj(deptFormData);
 			}
 			if (res?.code === 2000) {
 				successNotification(res.msg as string);
 				handleClose('submit');
 			}
 		} finally {
-      deptBtnLoading.value = false
+			deptBtnLoading.value = false;
 		}
-  })
+	});
 };

 const handleClose = (type: string = '') => {
-  emit('drawerClose', type)
+	emit('drawerClose', type);
 	formRef.value?.resetFields();
 };

 onMounted(async () => {
-  await getData()
-  setDeptFormData()
-})
+	await getData();
+	setDeptFormData();
+});
 </script>

 <style lang="scss" scoped>
--- a/web/src/views/system/dept/components/TreeCom.vue
+++ b/web/src/views/system/dept/components/TreeCom.vue
@@ -6,23 +6,31 @@
 				<HomeFilled />
 			</el-icon>
 			<span class="tc-head-txt">部门架构</span>
-      <el-icon size="16" color="#606266" @click="() => showTotalNum = !showTotalNum" class="tc-head-icon">
+			<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>
+		<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>
+					<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>
@@ -64,7 +72,7 @@
 <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';
@@ -84,12 +92,12 @@ const treeProps = {

 withDefaults(defineProps<IProps>(), {
 	treeData: () => [],
-})
-const emit = defineEmits(['treeClick', 'deleteDept', 'updateDept'])
+});
+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) => {
@@ -119,8 +127,8 @@ const handleLoadNode = (node: Node, resolve: Function) => {
 * 部门的点击事件
 */
 const handleNodeClick = (data: TreeItemType) => {
-  treeSelectDept.value = data
-  emit('treeClick', data.id)
+	treeSelectDept.value = data;
+	emit('treeClick', data.id);
 };

 /**
@@ -129,10 +137,10 @@ const handleNodeClick = (data: TreeItemType) => {
 const handleUpdateMenu = (type: string) => {
 	if (type === 'update') {
 		if (!treeSelectDept.value.id) {
-      warningNotification('请选择菜单！')
-      return
+			warningNotification('请选择菜单！');
+			return;
 		}
-    emit('updateDept', type, treeSelectDept.value)
+		emit('updateDept', type, treeSelectDept.value);
 	} else {
 		emit('updateDept', type);
 	}
@@ -143,18 +151,18 @@ const handleUpdateMenu = (type: string) => {
 */
 const handleDeleteDept = () => {
 	if (!treeSelectDept.value.id) {
-    warningNotification('请选择菜单！')
-    return
+		warningNotification('请选择菜单！');
+		return;
 	}
 	emit('deleteDept', treeSelectDept.value.id, () => {
-    treeSelectDept.value = {}
-  })
+		treeSelectDept.value = {};
+	});
 };

 /**
 * 部门上下移动操作
 */
-const handleSort = (type: string) => { }
+const handleSort = (type: string) => {};
 </script>

 <style lang="scss" scoped>
@@ -229,11 +237,11 @@ const handleSort = (type: string) => { }
 	}

 	.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;
@@ -241,7 +249,7 @@ const handleSort = (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;
--- 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;
 }

--- 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: {
--- a/web/src/views/system/menu/index.vue
+++ b/web/src/views/system/menu/index.vue
@@ -10,17 +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"
+						<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>
+						>
 							<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">
@@ -76,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 />
@@ -86,49 +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-form>
+
+					<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>
+
 				<div class="menus-btns">
 					<el-button @click="saveMenu()" type="primary">保存</el-button>
 					<!-- <el-button @click="newMenu()" type="primary" round :disabled="!form.id">新建</el-button>
@@ -145,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';
@@ -160,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);
@@ -233,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>>();
@@ -286,7 +341,7 @@ const saveMenu = () => {
 				api.UpdateObj(form).then((res: APIResponseData) => {
 					successMessage(res.msg as string);
 					getData();
-                    handleDrawerClose()
+					handleDrawerClose();
 				});
 			} else {
 				// 新增菜单
@@ -294,7 +349,7 @@ const saveMenu = () => {
 				api.AddObj(form).then((res: APIResponseData) => {
 					successMessage(res.msg as string);
 					getData();
-                    handleDrawerClose()
+					handleDrawerClose();
 				});
 			}
 		} else {
@@ -306,7 +361,7 @@ const saveMenu = () => {
 const newMenu = () => {
 	formRef.value?.resetFields();
 	isAddNewMenu.value = true;
-    handleDrawerClose()
+	handleDrawerClose();
 };

 const addChildMenu = () => {
@@ -332,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
-    }
-    drawerVisible.value = true
+		warningMessage('请选择菜单！');
+		return;
 	}
+	drawerVisible.value = true;
+};
 const handleDrawerClose = () => {
-    drawerVisible.value = false
-}
+	drawerVisible.value = false;
+};

 /**
 * 删除菜单
 */
 const handleDeleteMenu = () => {
 	if (!form.id) {
-        warningMessage('请选择菜单！')
-        return
+		warningMessage('请选择菜单！');
+		return;
 	}
-    ElMessageBox.confirm(
-        '您确认删除该菜单项吗?',
-        '温馨提示',
-        {
+	ElMessageBox.confirm('您确认删除该菜单项吗?', '温馨提示', {
 		confirmButtonText: '确认',
 		cancelButtonText: '取消',
 		type: 'warning',
-        }
-    ).then(() => {
+	}).then(() => {
 		api.DelObj(form).then((res: APIResponseData) => {
 			successMessage(res.msg as string);
 			getData();
 			handleDrawerClose();
 		});
-    })
+	});
 };

 /**
@@ -375,27 +426,27 @@ 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
-        api.moveUp({'menu_id': form.id}).then((res: APIResponseData) => {
+		if (index === 0) return;
+		api.moveUp({ menu_id: form.id }).then((res: APIResponseData) => {
 			getData();
 			successMessage(res.msg as string);
 		});
 	}
 	if (type === 'down') {
-        api.moveDown({'menu_id': form.id}).then((res: APIResponseData) => {
+		api.moveDown({ menu_id: form.id }).then((res: APIResponseData) => {
 			getData();
 			successMessage(res.msg as string);
 		});
 	}
-}
+};

 // 页面打开后获取列表数据
 onMounted(() => {
@@ -529,11 +580,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;
@@ -541,7 +592,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;