From 251d2411f235e23209d57173857e05b637729ce8 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: 星期日, 02 四月 2023 01:01:56 +0800
Subject: [PATCH] refactor ts
---
src/views/demo/tree/index.vue | 410 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 211 insertions(+), 199 deletions(-)
diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue
index 4fa8ffd..f3f13e1 100644
--- a/src/views/demo/tree/index.vue
+++ b/src/views/demo/tree/index.vue
@@ -1,131 +1,31 @@
-<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>
+<script setup name="Tree" lang="ts">
+import { listTree, getTree, delTree, addTree, updateTree } from '@/api/demo/tree';
+import { DemoTreeVO, DemoTreeForm, DemoTreeOptionsType, DemoTreeQuery } from '@/api/demo/types';
+import { ComponentInternalInstance } from 'vue';
+import { ElTree, ElForm, ElTable, DateModelType } from 'element-plus';
- <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>
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
- <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-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-form-item>
- <el-form-item label="閮ㄩ棬id" prop="deptId">
- <el-input v-model="form.deptId" placeholder="璇疯緭鍏ラ儴闂╥d" />
- </el-form-item>
- <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>
- </el-form>
- <template #footer>
- <div class="dialog-footer">
- <el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </template>
- </el-dialog>
- </div>
-</template>
-
-<script setup name="Tree">
-import { listTree, getTree, delTree, addTree, updateTree } from "@/api/demo/tree";
-
-const { proxy } = getCurrentInstance();
-
-const treeList = ref([]);
-const open = ref(false);
+const treeList = ref<DemoTreeVO[]>([]);
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 treeOptions = ref<DemoTreeOptionsType[]>([]);
+const daterangeCreateTime = ref<[DateModelType, DateModelType]>(['', '']);
+
+const treeRef = ref(ElTree);
+const qeuryFormRef = ref(ElForm);
+const demoTreeTableRef = ref(ElTable)
+
+const dialog = reactive<DialogOption>({
+ visible: false,
+ title: ''
+});
// 鍒楁樉闅愪俊鎭�
-const columns = ref([
+const columns = ref<FieldOption[]>([
{ key: 0, label: `鐖秈d`, visible: false },
{ key: 1, label: `閮ㄩ棬id`, visible: true },
{ key: 2, label: `鐢ㄦ埛id`, visible: true },
@@ -133,128 +33,132 @@
{ key: 4, label: `鍒涘缓鏃堕棿`, visible: true }
]);
-const data = reactive({
+const initFormData = {
+ id: undefined,
+ parentId: undefined,
+ deptId: undefined,
+ userId: undefined,
+ treeName: ''
+}
+
+const data = reactive<PageData<DemoTreeForm, DemoTreeQuery>>({
// 鏌ヨ鍙傛暟
queryParams: {
- treeName: null,
- createTime: null,
+ treeName: '',
+ createTime: '',
},
// 琛ㄥ崟鍙傛暟
- form: {},
+ form: {...initFormData},
// 琛ㄥ崟鏍￠獙
rules: {
- treeName: [
- { required: true, message: "鏍戣妭鐐瑰悕涓嶈兘涓虹┖", trigger: "blur" }
- ],
+ treeName: [{ required: true, message: "鏍戣妭鐐瑰悕涓嶈兘涓虹┖", trigger: "blur" }],
}
});
const { queryParams, form, rules } = toRefs(data);
-
/** 鏌ヨ娴嬭瘯鏍戣〃鍒楄〃 */
-function getList() {
+const getList = () => {
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;
+ listTree(proxy?.addDateRange(queryParams.value, daterangeCreateTime.value, "CreateTime")).then(res => {
+ const data = proxy?.handleTree<DemoTreeVO>(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);
+const getTreeSelect = async () => {
+ listTree(proxy?.addDateRange(queryParams.value, daterangeCreateTime.value, "CreateTime")).then(res => {
+ const topData: DemoTreeOptionsType = { id: 0, treeName: '椤剁骇鑺傜偣', children: [] };
+ topData.children = proxy?.handleTree<DemoTreeOptionsType>(res.data, "id", "parentId");
+ treeOptions.value.push(topData);
});
}
/** 鍙栨秷鎸夐挳 */
-function cancel() {
- open.value = false;
+const cancel = () => {
reset();
+ dialog.visible = false;
}
/** 琛ㄥ崟閲嶇疆 */
-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");
+const reset = () => {
+ form.value = {...initFormData}
+ treeRef.value.resetFields();
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
-function handleQuery() {
+const handleQuery = () => {
getList();
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
-function resetQuery() {
- daterangeCreateTime.value = [];
- proxy.resetForm("queryRef");
+const resetQuery = () => {
+ daterangeCreateTime.value = ['', ''];
+ qeuryFormRef.value.resetFields();
handleQuery();
}
/** 鏂板鎸夐挳鎿嶄綔 */
-async function handleAdd(row) {
- reset();
- await getTreeselect();
- if (row != null && row.id) {
- form.value.parentId = row.id;
- } else {
- form.value.parentId = 0;
- }
- open.value = true;
- title.value = "娣诲姞娴嬭瘯鏍戣〃";
+const handleAdd = (row?: DemoTreeVO) => {
+ dialog.visible = true;
+ dialog.title = "娣诲姞娴嬭瘯鏍戣〃";
+ nextTick(() => {
+ reset();
+ getTreeSelect();
+ if (row != null && row.id) {
+ form.value.parentId = row.id;
+ } else {
+ form.value.parentId = 0;
+ }
+ })
}
/** 灞曞紑/鎶樺彔鎿嶄綔 */
-function toggleExpandAll() {
- refreshTable.value = false;
+const handleToggleExpandAll = () => {
isExpandAll.value = !isExpandAll.value;
- nextTick(() => {
- refreshTable.value = true;
- });
+ toggleExpandAll(treeList.value, isExpandAll.value)
+}
+/** 灞曞紑/鎶樺彔鎵�鏈� */
+const toggleExpandAll = (data: DemoTreeVO[], status: boolean) => {
+ data.forEach((item) => {
+ demoTreeTableRef.value.toggleRowExpansion(item, status)
+ if(item.children && item.children.length > 0) toggleExpandAll(item.children, status)
+ })
}
/** 淇敼鎸夐挳鎿嶄綔 */
-async function handleUpdate(row) {
+const handleUpdate = async (row: DemoTreeVO) => {
loading.value = true;
- reset();
- await getTreeselect();
- if (row != null) {
- form.value.parentId = row.id;
- }
- getTree(row.id).then((response) => {
- loading.value = false;
- form.value = response.data;
- open.value = true;
- title.value = "淇敼娴嬭瘯鏍戣〃";
- });
+ dialog.visible = true;
+ dialog.title = "淇敼娴嬭瘯鏍戣〃";
+ nextTick(async () => {
+ reset();
+ getTreeSelect();
+ if (row) {
+ form.value.parentId = row.id;
+ }
+ getTree(row.id).then((response) => {
+ loading.value = false;
+ form.value = response.data;
+
+ });
+ })
}
/** 鎻愪氦鎸夐挳 */
-function submitForm() {
- proxy.$refs["treeRef"].validate(valid => {
+const submitForm = () => {
+ treeRef.value.validate((valid: boolean) => {
if (valid) {
buttonLoading.value = true;
- if (form.value.ossConfigId != null) {
- updateTree(form.value).then(response => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- open.value = false;
+ if (form.value.id != null) {
+ updateTree(form.value).then(() => {
+ proxy?.$modal.msgSuccess("淇敼鎴愬姛");
+ dialog.visible = false;
getList();
}).finally(() => {
buttonLoading.value = false;
});
} else {
- addTree(form.value).then(response => {
- proxy.$modal.msgSuccess("鏂板鎴愬姛");
- open.value = false;
+ addTree(form.value).then(() => {
+ proxy?.$modal.msgSuccess("鏂板鎴愬姛");
+ dialog.visible = false;
getList();
}).finally(() => {
buttonLoading.value = false;
@@ -264,18 +168,126 @@
});
}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
-function handleDelete(row) {
- proxy.$modal.confirm('鏄惁纭鍒犻櫎娴嬭瘯鍗曡〃缂栧彿涓�"' + row.id + '"鐨勬暟鎹」?').then(() => {
+const handleDelete = (row: DemoTreeVO) => {
+ proxy?.$modal.confirm('鏄惁纭鍒犻櫎娴嬭瘯鍗曡〃缂栧彿涓�"' + row.id + '"鐨勬暟鎹」?').then(() => {
loading.value = true;
return delTree(row.id);
}).then(() => {
loading.value = false;
getList();
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).finally(() => {
loading.value = false;
});
}
-
-getList()
+onMounted(() => {
+ getList()
+})
</script>
+
+<template>
+ <div class="p-2">
+ <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+ <div class="search" v-show="showSearch">
+ <el-form :model="queryParams" ref="qeuryFormRef" :inline="true" label-width="68px">
+ <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>
+ </transition>
+
+ <el-card shadow="never">
+ <template #header>
+ <el-row :gutter="10">
+ <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="handleToggleExpandAll">灞曞紑/鎶樺彔</el-button>
+ </el-col>
+ <right-toolbar :columns="columns" v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+ </template>
+
+ <el-table
+ v-if="refreshTable"
+ v-loading="loading"
+ :data="treeList"
+ row-key="id"
+ :default-expand-all="isExpandAll"
+ :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+ ref="demoTreeTableRef"
+ >
+ <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="鎿嶄綔" fixed="right" align="center" width="150" class-name="small-padding fixed-width">
+ <template #default="scope">
+ <el-tooltip content="淇敼" placement="top">
+ <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['demo:tree:edit']"></el-button>
+ </el-tooltip>
+ <el-tooltip content="鏂板" placement="top">
+ <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['demo:tree:add']"></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒犻櫎" placement="top">
+ <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['demo:tree:remove']"></el-button>
+ </el-tooltip>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-card>
+
+ <!-- 娣诲姞鎴栦慨鏀规祴璇曟爲琛ㄥ璇濇 -->
+ <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+ <el-form ref="treeRef" :model="form" :rules="rules" label-width="80px">
+ <el-form-item label="鐖秈d" prop="parentId">
+ <el-tree-select
+ v-model="form.parentId"
+ :data="treeOptions"
+ :props="{ value: 'id', label: 'treeName', children: 'children' }"
+ value-key="id"
+ check-strictly
+ placeholder="璇烽�夋嫨鐖秈d"
+ />
+ </el-form-item>
+ <el-form-item label="閮ㄩ棬id" prop="deptId">
+ <el-input v-model="form.deptId" placeholder="璇疯緭鍏ラ儴闂╥d" />
+ </el-form-item>
+ <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>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ </div>
+</template>
--
Gitblit v1.9.3