From d84fee9319f3377fb9bc6cd394bb211fc7b06767 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 16 十一月 2023 12:24:52 +0800
Subject: [PATCH] !58 修复vite环境变量类型原因导致websocket关闭失效问题 Merge pull request !58 from Lau/N/A
---
src/views/system/menu/index.vue | 175 +++++++++++++++++++++++++++------------------------------
1 files changed, 83 insertions(+), 92 deletions(-)
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 25e8384..e889876 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -5,7 +5,7 @@
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
<el-form-item label="鑿滃崟鍚嶇О" prop="menuName">
- <el-input v-model="queryParams.menuName" placeholder="璇疯緭鍏ヨ彍鍗曞悕绉�" clearable @keyup.enter="handleQuery" />
+ <el-input v-model="queryParams.menuName" placeholder="璇疯緭鍏ヨ彍鍗曞悕绉�" clearable style="width: 240px" @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="鐘舵��" prop="status">
<el-select v-model="queryParams.status" placeholder="鑿滃崟鐘舵��" clearable>
@@ -39,7 +39,6 @@
:data="menuList"
row-key="menuId"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
- border
ref="menuTableRef"
:default-expand-all="isExpandAll"
>
@@ -182,7 +181,7 @@
</el-col>
<el-col :span="12" v-if="form.menuType === 'C'">
<el-form-item>
- <el-input v-model="form.query" placeholder="璇疯緭鍏ヨ矾鐢卞弬鏁�" maxlength="255" />
+ <el-input v-model="form.queryParam" placeholder="璇疯緭鍏ヨ矾鐢卞弬鏁�" maxlength="255" />
<template #label>
<span>
<el-tooltip content='璁块棶璺敱鐨勯粯璁や紶閫掑弬鏁帮紝濡傦細`{"id": 1, "name": "ry"}`' placement="top">
@@ -230,7 +229,7 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="12" v-if="form.menuType !== 'F'">
+ <el-col :span="12">
<el-form-item>
<template #label>
<span>
@@ -264,14 +263,12 @@
<script setup name="Menu" lang="ts">
import { addMenu, delMenu, getMenu, listMenu, updateMenu } from '@/api/system/menu';
import { MenuForm, MenuQuery, MenuVO } from '@/api/system/menu/types';
-import { ComponentInternalInstance } from 'vue';
import { MenuTypeEnum } from '@/enums/MenuTypeEnum';
-import { ElTable, ElForm } from 'element-plus';
interface MenuOptionsType {
- menuId: number;
- menuName: string;
- children: MenuOptionsType[] | undefined;
+ menuId: number;
+ menuName: string;
+ children: MenuOptionsType[] | undefined;
}
const { proxy } = getCurrentInstance() as ComponentInternalInstance
@@ -284,136 +281,130 @@
const isExpandAll = ref(false)
const dialog = reactive<DialogOption>({
- visible: false,
- title: ''
+ visible: false,
+ title: ''
});
-const queryFormRef = ref(ElForm);
-const menuFormRef = ref(ElForm);
+const queryFormRef = ref<ElFormInstance>();
+const menuFormRef = ref<ElFormInstance>();
const initFormData = {
- path: '',
- menuId: undefined,
- parentId: 0,
- menuName: '',
- icon: '',
- menuType: MenuTypeEnum.M,
- orderNum: 1,
- isFrame: "1",
- isCache: "0",
- visible: "0",
- status: "0"
+ path: '',
+ menuId: undefined,
+ parentId: 0,
+ menuName: '',
+ icon: '',
+ menuType: MenuTypeEnum.M,
+ orderNum: 1,
+ isFrame: "1",
+ isCache: "0",
+ visible: "0",
+ status: "0"
}
const data = reactive<PageData<MenuForm, MenuQuery>>({
- form: { ...initFormData },
- queryParams: {
- menuName: undefined,
- status: undefined
- },
- rules: {
- menuName: [{ required: true, message: "鑿滃崟鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
- orderNum: [{ required: true, message: "鑿滃崟椤哄簭涓嶈兘涓虹┖", trigger: "blur" }],
- path: [{ required: true, message: "璺敱鍦板潃涓嶈兘涓虹┖", trigger: "blur" }]
- },
+ form: { ...initFormData },
+ queryParams: {
+ menuName: undefined,
+ status: undefined
+ },
+ rules: {
+ menuName: [{ required: true, message: "鑿滃崟鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+ orderNum: [{ required: true, message: "鑿滃崟椤哄簭涓嶈兘涓虹┖", trigger: "blur" }],
+ path: [{ required: true, message: "璺敱鍦板潃涓嶈兘涓虹┖", trigger: "blur" }]
+ },
})
-const menuTableRef = ref(ElTable);
+const menuTableRef = ref<ElTableInstance>();
const { queryParams, form, rules } = toRefs<PageData<MenuForm, MenuQuery>>(data)
/** 鏌ヨ鑿滃崟鍒楄〃 */
const getList = async () => {
- loading.value = true
- const res = await listMenu(queryParams.value);
- const data = proxy?.handleTree<MenuVO>(res.data, "menuId")
- if (data) {
- menuList.value = data
- }
- loading.value = false
+ loading.value = true
+ const res = await listMenu(queryParams.value);
+ const data = proxy?.handleTree<MenuVO>(res.data, "menuId")
+ if (data) {
+ menuList.value = data
+ }
+ loading.value = false
}
/** 鏌ヨ鑿滃崟涓嬫媺鏍戠粨鏋� */
const getTreeselect = async () => {
- menuOptions.value = []
- const response = await listMenu();
- const menu: MenuOptionsType = { menuId: 0, menuName: "涓荤被鐩�", children: [] }
- menu.children = proxy?.handleTree<MenuOptionsType>(response.data, "menuId")
- menuOptions.value.push(menu)
+ menuOptions.value = []
+ const response = await listMenu();
+ const menu: MenuOptionsType = { menuId: 0, menuName: "涓荤被鐩�", children: [] }
+ menu.children = proxy?.handleTree<MenuOptionsType>(response.data, "menuId")
+ menuOptions.value.push(menu)
}
/** 鍙栨秷鎸夐挳 */
const cancel = () => {
- reset()
- dialog.visible = false
+ reset()
+ dialog.visible = false
}
/** 琛ㄥ崟閲嶇疆 */
const reset = () => {
- form.value = { ...initFormData };
- menuFormRef.value.resetFields();
+ form.value = { ...initFormData };
+ menuFormRef.value?.resetFields();
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
- getList();
+ getList();
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- queryFormRef.value.resetFields();
- handleQuery();
+ queryFormRef.value?.resetFields();
+ handleQuery();
}
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = (row?: MenuVO) => {
- dialog.visible = true;
- dialog.title = "娣诲姞鑿滃崟";
- getTreeselect();
- nextTick(() => {
- reset();
- row && row.menuId ? form.value.parentId = row.menuId : form.value.parentId = 0;
- })
-
+ reset();
+ getTreeselect();
+ row && row.menuId ? form.value.parentId = row.menuId : form.value.parentId = 0;
+ dialog.visible = true;
+ dialog.title = "娣诲姞鑿滃崟";
}
/** 灞曞紑/鎶樺彔鎿嶄綔 */
const handleToggleExpandAll = () => {
- isExpandAll.value = !isExpandAll.value;
- toggleExpandAll(menuList.value, isExpandAll.value)
+ isExpandAll.value = !isExpandAll.value;
+ toggleExpandAll(menuList.value, isExpandAll.value)
}
/** 灞曞紑/鎶樺彔鎵�鏈� */
const toggleExpandAll = (data: MenuVO[], status: boolean) => {
- data.forEach((item: MenuVO) => {
- menuTableRef.value.toggleRowExpansion(item, status)
- if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
- })
+ data.forEach((item: MenuVO) => {
+ menuTableRef.value?.toggleRowExpansion(item, status)
+ if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
+ })
}
/** 淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = async (row: MenuVO) => {
- await getTreeselect();
- dialog.visible = true;
- dialog.title = "淇敼鑿滃崟";
- await nextTick(async () => {
- if (row.menuId) {
- const { data } = await getMenu(row.menuId);
- reset();
- form.value = data;
- }
- })
-
+ reset();
+ await getTreeselect();
+ if (row.menuId) {
+ const { data } = await getMenu(row.menuId);
+ form.value = data;
+ }
+ dialog.visible = true;
+ dialog.title = "淇敼鑿滃崟";
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- menuFormRef.value.validate(async (valid: boolean) => {
- if (valid) {
- form.value.menuId ? await updateMenu(form.value) : await addMenu(form.value);
- proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
- dialog.visible = false;
- getList();
- }
- })
+ menuFormRef.value?.validate(async (valid: boolean) => {
+ if (valid) {
+ form.value.menuId ? await updateMenu(form.value) : await addMenu(form.value);
+ proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ dialog.visible = false;
+ await getList();
+ }
+ })
}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row: MenuVO) => {
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.menuName + '"鐨勬暟鎹」?');
- await delMenu(row.menuId);
- getList();
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.menuName + '"鐨勬暟鎹」?');
+ await delMenu(row.menuId);
+ await getList();
+ proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}
onMounted(() => {
- getList();
+ getList();
});
</script>
--
Gitblit v1.9.3