From 5e440a7dc434c43eb828fa62cf9c12b0078b8565 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 一月 2025 11:36:18 +0800
Subject: [PATCH] !173 发布 5.3.0-BETA 公测版本 Merge pull request !173 from 疯狂的狮子Li/dev
---
src/views/demo/tree/index.vue | 399 ++++++++++++++++++++++++++------------------------------
1 files changed, 188 insertions(+), 211 deletions(-)
diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue
index 4fa8ffd..566d071 100644
--- a/src/views/demo/tree/index.vue
+++ b/src/views/demo/tree/index.vue
@@ -1,88 +1,71 @@
<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
- <el-form-item label="鏍戣妭鐐瑰悕" prop="treeName">
- <el-input
- v-model="queryParams.treeName"
- placeholder="璇疯緭鍏ユ爲鑺傜偣鍚�"
- clearable
- style="width: 200px"
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
- <el-date-picker
- v-model="daterangeCreateTime"
- value-format="YYYY-MM-DD HH:mm:ss"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
- ></el-date-picker>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="search" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
+ <div class="p-2">
+ <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+ <div v-show="showSearch" class="mb-[10px]">
+ <el-card shadow="hover">
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+ <el-form-item label="鏍戣妭鐐瑰悕" prop="treeName">
+ <el-input v-model="queryParams.treeName" placeholder="璇疯緭鍏ユ爲鑺傜偣鍚�" clearable @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ </el-card>
+ </div>
+ </transition>
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="Plus"
- @click="handleAdd"
- v-hasPermi="['demo:tree:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="info"
- plain
- icon="Sort"
- @click="toggleExpandAll"
- >灞曞紑/鎶樺彔</el-button>
- </el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table
- v-if="refreshTable"
- v-loading="loading"
- :data="treeList"
- row-key="id"
- :default-expand-all="isExpandAll"
- :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
- >
- <el-table-column label="鐖秈d" prop="parentId" v-if="columns[0].visible" />
- <el-table-column label="閮ㄩ棬id" align="center" prop="deptId" v-if="columns[1].visible" />
- <el-table-column label="鐢ㄦ埛id" align="center" prop="userId" v-if="columns[2].visible" />
- <el-table-column label="鏍戣妭鐐瑰悕" align="center" prop="treeName" v-if="columns[3].visible" />
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" v-if="columns[4].visible" width="180">
- <template #default="scope">
- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="150" class-name="small-padding fixed-width">
- <template #default="scope">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['demo:tree:edit']">淇敼</el-button>
- <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['demo:tree:add']">鏂板</el-button>
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['demo:tree:remove']">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <!-- 娣诲姞鎴栦慨鏀规祴璇曟爲琛ㄥ璇濇 -->
- <el-dialog :title="title" v-model="open" width="500px" append-to-body>
- <el-form ref="treeRef" :model="form" :rules="rules" label-width="80px">
+ <el-card shadow="hover">
+ <template #header>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button v-hasPermi="['demo:tree:add']" type="primary" plain icon="Plus" @click="handleAdd()">鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">灞曞紑/鎶樺彔</el-button>
+ </el-col>
+ <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
+ </el-row>
+ </template>
+ <el-table
+ ref="treeTableRef"
+ v-loading="loading"
+ :data="treeList"
+ row-key="id"
+ :default-expand-all="isExpandAll"
+ :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+ >
+ <el-table-column label="鐖秈d" align="center" prop="parentId" />
+ <el-table-column label="閮ㄩ棬id" align="center" prop="deptId" />
+ <el-table-column label="鐢ㄦ埛id" align="center" prop="userId" />
+ <el-table-column label="鏍戣妭鐐瑰悕" align="center" prop="treeName" />
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <template #default="scope">
+ <el-tooltip content="淇敼" placement="top">
+ <el-button v-hasPermi="['demo:tree:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)" />
+ </el-tooltip>
+ <el-tooltip content="鏂板" placement="top">
+ <el-button v-hasPermi="['demo:tree:add']" link type="primary" icon="Plus" @click="handleAdd(scope.row)" />
+ </el-tooltip>
+ <el-tooltip content="鍒犻櫎" placement="top">
+ <el-button v-hasPermi="['demo:tree:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)" />
+ </el-tooltip>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-card>
+ <!-- 娣诲姞鎴栦慨鏀规祴璇曟爲瀵硅瘽妗� -->
+ <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
+ <el-form ref="treeFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="鐖秈d" prop="parentId">
- <treeselect
- v-model:value="form.parentId"
- :options="treeOptions"
- :objMap="{ value: 'id', label: 'true_name', children: 'children' }"
- placeholder="璇烽�夋嫨鐖秈d"
+ <el-tree-select
+ v-model="form.parentId"
+ :data="treeOptions"
+ :props="{ value: 'id', label: 'treeName', children: 'children' }"
+ value-key="id"
+ placeholder="璇烽�夋嫨鐖秈d"
+ check-strictly
/>
</el-form-item>
<el-form-item label="閮ㄩ棬id" prop="deptId">
@@ -91,8 +74,8 @@
<el-form-item label="鐢ㄦ埛id" prop="userId">
<el-input v-model="form.userId" placeholder="璇疯緭鍏ョ敤鎴穒d" />
</el-form-item>
- <el-form-item label="鏍戣妭鐐瑰悕" prop="treeName">
- <el-input v-model="form.treeName" placeholder="璇疯緭鍏ユ爲鑺傜偣鍚�" />
+ <el-form-item label="鍊�" prop="treeName">
+ <el-input v-model="form.treeName" placeholder="璇疯緭鍏ュ��" />
</el-form-item>
</el-form>
<template #footer>
@@ -105,177 +88,171 @@
</div>
</template>
-<script setup name="Tree">
-import { listTree, getTree, delTree, addTree, updateTree } from "@/api/demo/tree";
+<script setup name="Tree" lang="ts">
+import { listTree, getTree, delTree, addTree, updateTree } from '@/api/demo/tree';
+import { TreeVO, TreeQuery, TreeForm } from '@/api/demo/tree/types';
-const { proxy } = getCurrentInstance();
+type TreeOption = {
+ id: number;
+ treeName: string;
+ children?: TreeOption[];
+};
-const treeList = ref([]);
-const open = ref(false);
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const treeList = ref<TreeVO[]>([]);
+const treeOptions = ref<TreeOption[]>([]);
const buttonLoading = ref(false);
-const loading = ref(true);
const showSearch = ref(true);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-const title = ref("");
const isExpandAll = ref(true);
-const refreshTable = ref(true);
-const treeOptions = ref(undefined);
-const daterangeCreateTime = ref([]);
+const loading = ref(false);
-// 鍒楁樉闅愪俊鎭�
-const columns = ref([
- { key: 0, label: `鐖秈d`, visible: false },
- { key: 1, label: `閮ㄩ棬id`, visible: true },
- { key: 2, label: `鐢ㄦ埛id`, visible: true },
- { key: 3, label: `鏍戣妭鐐瑰悕`, visible: true },
- { key: 4, label: `鍒涘缓鏃堕棿`, visible: true }
-]);
+const queryFormRef = ref<ElFormInstance>();
+const treeFormRef = ref<ElFormInstance>();
+const treeTableRef = ref<ElTableInstance>();
-const data = reactive({
- // 鏌ヨ鍙傛暟
+const dialog = reactive<DialogOption>({
+ visible: false,
+ title: ''
+});
+
+const initFormData: TreeForm = {
+ id: undefined,
+ parentId: undefined,
+ deptId: undefined,
+ userId: undefined,
+ treeName: undefined
+};
+
+const data = reactive<PageData<TreeForm, TreeQuery>>({
+ form: { ...initFormData },
queryParams: {
- treeName: null,
- createTime: null,
+ parentId: undefined,
+ deptId: undefined,
+ userId: undefined,
+ treeName: undefined
},
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
rules: {
- treeName: [
- { required: true, message: "鏍戣妭鐐瑰悕涓嶈兘涓虹┖", trigger: "blur" }
- ],
+ id: [{ required: true, message: '涓婚敭涓嶈兘涓虹┖', trigger: 'blur' }],
+ parentId: [{ required: true, message: '鐖秈d涓嶈兘涓虹┖', trigger: 'blur' }],
+ deptId: [{ required: true, message: '閮ㄩ棬id涓嶈兘涓虹┖', trigger: 'blur' }],
+ userId: [{ required: true, message: '鐢ㄦ埛id涓嶈兘涓虹┖', trigger: 'blur' }],
+ treeName: [{ required: true, message: '鍊间笉鑳戒负绌�', trigger: 'blur' }]
}
});
const { queryParams, form, rules } = toRefs(data);
-/** 鏌ヨ娴嬭瘯鏍戣〃鍒楄〃 */
-function getList() {
+/** 鏌ヨ娴嬭瘯鏍戝垪琛� */
+const getList = async () => {
loading.value = true;
- listTree(proxy.addDateRange(queryParams.value, daterangeCreateTime.value, "CreateTime")).then(response => {
- treeList.value = proxy.handleTree(response.data, "id", "parentId");
- total.value = response.total;
+ const res = await listTree(queryParams.value);
+ const data = proxy?.handleTree<TreeVO>(res.data, 'id', 'parentId');
+ if (data) {
+ treeList.value = data;
loading.value = false;
- });
-}
-/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
-async function getTreeselect() {
- await listTree().then(response => {
- treeOptions.value = [];
- const data = { id: 0, treeName: '椤剁骇鑺傜偣', children: [] };
- data.children = proxy.handleTree(response.data, "id", "parentId");
- treeOptions.value.push(data);
- });
-}
-/** 鍙栨秷鎸夐挳 */
-function cancel() {
- open.value = false;
+ }
+};
+
+/** 鏌ヨ娴嬭瘯鏍戜笅鎷夋爲缁撴瀯 */
+const getTreeselect = async () => {
+ const res = await listTree();
+ treeOptions.value = [];
+ const data: TreeOption = { id: 0, treeName: '椤剁骇鑺傜偣', children: [] };
+ data.children = proxy?.handleTree<TreeOption>(res.data, 'id', 'parentId');
+ treeOptions.value.push(data);
+};
+
+// 鍙栨秷鎸夐挳
+const cancel = () => {
reset();
-}
-/** 琛ㄥ崟閲嶇疆 */
-function reset() {
- form.value = {
- id: undefined,
- parentId: undefined,
- deptId: undefined,
- userId: undefined,
- treeName: undefined,
- version: undefined,
- createTime: undefined,
- createBy: undefined,
- updateTime: undefined,
- updateBy: undefined,
- delFlag: undefined
- };
- proxy.resetForm("treeRef");
-}
+ dialog.visible = false;
+};
+
+// 琛ㄥ崟閲嶇疆
+const reset = () => {
+ form.value = { ...initFormData };
+ treeFormRef.value?.resetFields();
+};
+
/** 鎼滅储鎸夐挳鎿嶄綔 */
-function handleQuery() {
+const handleQuery = () => {
getList();
-}
+};
+
/** 閲嶇疆鎸夐挳鎿嶄綔 */
-function resetQuery() {
- daterangeCreateTime.value = [];
- proxy.resetForm("queryRef");
+const resetQuery = () => {
+ queryFormRef.value?.resetFields();
handleQuery();
-}
+};
+
/** 鏂板鎸夐挳鎿嶄綔 */
-async function handleAdd(row) {
+const handleAdd = (row?: TreeVO) => {
reset();
- await getTreeselect();
- if (row != null && row.id) {
+ getTreeselect();
+ if (row && row.id) {
form.value.parentId = row.id;
} else {
form.value.parentId = 0;
}
- open.value = true;
- title.value = "娣诲姞娴嬭瘯鏍戣〃";
-}
+ dialog.visible = true;
+ dialog.title = '娣诲姞娴嬭瘯鏍�';
+};
/** 灞曞紑/鎶樺彔鎿嶄綔 */
-function toggleExpandAll() {
- refreshTable.value = false;
+const handleToggleExpandAll = () => {
isExpandAll.value = !isExpandAll.value;
- nextTick(() => {
- refreshTable.value = true;
+ toggleExpandAll(treeList.value, isExpandAll.value);
+};
+
+/** 灞曞紑/鎶樺彔鎿嶄綔 */
+const toggleExpandAll = (data: TreeVO[], status: boolean) => {
+ data.forEach((item) => {
+ treeTableRef.value?.toggleRowExpansion(item, status);
+ if (item.children && item.children.length > 0) toggleExpandAll(item.children, status);
});
-}
+};
/** 淇敼鎸夐挳鎿嶄綔 */
-async function handleUpdate(row) {
- loading.value = true;
+const handleUpdate = async (row: TreeVO) => {
reset();
await getTreeselect();
- if (row != null) {
+ if (row) {
form.value.parentId = row.id;
}
- getTree(row.id).then((response) => {
- loading.value = false;
- form.value = response.data;
- open.value = true;
- title.value = "淇敼娴嬭瘯鏍戣〃";
- });
-}
+ const res = await getTree(row.id);
+ Object.assign(form.value, res.data);
+ dialog.visible = true;
+ dialog.title = '淇敼娴嬭瘯鏍�';
+};
+
/** 鎻愪氦鎸夐挳 */
-function submitForm() {
- proxy.$refs["treeRef"].validate(valid => {
+const submitForm = () => {
+ treeFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
- if (form.value.ossConfigId != null) {
- updateTree(form.value).then(response => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- open.value = false;
- getList();
- }).finally(() => {
- buttonLoading.value = false;
- });
+ if (form.value.id) {
+ await updateTree(form.value).finally(() => (buttonLoading.value = false));
} else {
- addTree(form.value).then(response => {
- proxy.$modal.msgSuccess("鏂板鎴愬姛");
- open.value = false;
- getList();
- }).finally(() => {
- buttonLoading.value = false;
- });
+ await addTree(form.value).finally(() => (buttonLoading.value = false));
}
+ proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ dialog.visible = false;
+ await getList();
}
});
-}
-/** 鍒犻櫎鎸夐挳鎿嶄綔 */
-function handleDelete(row) {
- proxy.$modal.confirm('鏄惁纭鍒犻櫎娴嬭瘯鍗曡〃缂栧彿涓�"' + row.id + '"鐨勬暟鎹」?').then(() => {
- loading.value = true;
- return delTree(row.id);
- }).then(() => {
- loading.value = false;
- getList();
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).finally(() => {
- loading.value = false;
- });
-}
+};
-getList()
+/** 鍒犻櫎鎸夐挳鎿嶄綔 */
+const handleDelete = async (row: TreeVO) => {
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎娴嬭瘯鏍戠紪鍙蜂负"' + row.id + '"鐨勬暟鎹」锛�');
+ loading.value = true;
+ await delTree(row.id).finally(() => (loading.value = false));
+ await getList();
+ proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
+};
+
+onMounted(() => {
+ getList();
+});
</script>
--
Gitblit v1.9.3