From 92b2b489a40121a98417cabcfe644ddf80d039cd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 14 九月 2023 17:22:36 +0800
Subject: [PATCH] fix 修复 自定义字典样式不生效的问题
---
src/views/demo/tree/index.vue | 338 ++++++++++++++++++++++++++------------------------------
1 files changed, 158 insertions(+), 180 deletions(-)
diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue
index e46f3c5..162ddf6 100644
--- a/src/views/demo/tree/index.vue
+++ b/src/views/demo/tree/index.vue
@@ -1,88 +1,71 @@
<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 class="mb-[10px]" v-show="showSearch">
+ <el-card shadow="hover">
+ <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+ <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-card shadow="never">
+ <el-card shadow="hover">
<template #header>
- <el-row :gutter="10">
+ <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="handleToggleExpandAll">灞曞紑/鎶樺彔</el-button>
</el-col>
- <right-toolbar :columns="columns" v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar 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"
+ :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+ ref="treeTableRef"
>
- <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">
+ <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 link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['demo:tree:edit']"></el-button>
+ <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['demo:tree:edit']" />
</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-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['demo:tree:add']" />
</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-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['demo:tree:remove']" />
</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 ref="treeFormRef" :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"
+ 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>
@@ -106,188 +89,183 @@
</template>
<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';
+import { listTree, getTree, delTree, addTree, updateTree } from "@/api/demo/tree";
+import { TreeVO, TreeQuery, TreeForm } from '@/api/demo/tree/types';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const treeList = ref<DemoTreeVO[]>([]);
+type TreeOption = {
+ id: number;
+ treeName: string;
+ children?: TreeOption[];
+}
+
+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 isExpandAll = ref(true);
-const refreshTable = ref(true);
-const treeOptions = ref<DemoTreeOptionsType[]>([]);
-const daterangeCreateTime = ref<[DateModelType, DateModelType]>(['', '']);
+const loading = ref(false);
-const treeRef = ref(ElTree);
-const qeuryFormRef = ref(ElForm);
-const demoTreeTableRef = ref(ElTable)
+const queryFormRef = ref<ElFormInstance>();
+const treeFormRef = ref<ElFormInstance>();
+const treeTableRef = ref<ElTableInstance>()
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
-// 鍒楁樉闅愪俊鎭�
-const columns = ref<FieldOption[]>([
- { 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 initFormData = {
+const initFormData: TreeForm = {
id: undefined,
parentId: undefined,
deptId: undefined,
userId: undefined,
- treeName: ''
+ treeName: undefined,
}
-const data = reactive<PageData<DemoTreeForm, DemoTreeQuery>>({
- // 鏌ヨ鍙傛暟
- queryParams: {
- treeName: '',
- createTime: '',
- },
- // 琛ㄥ崟鍙傛暟
- form: {...initFormData},
- // 琛ㄥ崟鏍￠獙
- rules: {
- treeName: [{ required: true, message: "鏍戣妭鐐瑰悕涓嶈兘涓虹┖", trigger: "blur" }],
- }
+const data = reactive<PageData<TreeForm, TreeQuery>>({
+ form: {...initFormData},
+ queryParams: {
+ parentId: undefined,
+ deptId: undefined,
+ userId: undefined,
+ treeName: undefined,
+ },
+ rules: {
+ 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);
-/** 鏌ヨ娴嬭瘯鏍戣〃鍒楄〃 */
-const getList = () => {
- loading.value = true;
- 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;
- });
+
+/** 鏌ヨ娴嬭瘯鏍戝垪琛� */
+const getList = async () => {
+ loading.value = true;
+ const res = await listTree(queryParams.value);
+ const data = proxy?.handleTree<TreeVO>(res.data, "id", "parentId");
+ if (data) {
+ treeList.value = data;
+ loading.value = false;
+ }
}
-/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
-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);
- });
+/** 鏌ヨ娴嬭瘯鏍戜笅鎷夋爲缁撴瀯 */
+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();
- dialog.visible = false;
+ reset();
+ dialog.visible = false;
}
-/** 琛ㄥ崟閲嶇疆 */
+
+// 琛ㄥ崟閲嶇疆
const reset = () => {
- form.value = {...initFormData}
- treeRef.value.resetFields();
+ form.value = {...initFormData}
+ treeFormRef.value?.resetFields();
}
+
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
- getList();
+ getList();
}
+
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- daterangeCreateTime.value = ['', ''];
- qeuryFormRef.value.resetFields();
- handleQuery();
+ queryFormRef.value?.resetFields();
+ handleQuery();
}
+
/** 鏂板鎸夐挳鎿嶄綔 */
-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;
- }
- })
+const handleAdd = (row?: TreeVO) => {
+ reset();
+ getTreeselect();
+ if (row && row.id) {
+ form.value.parentId = row.id;
+ } else {
+ form.value.parentId = 0;
+ }
+ dialog.visible = true;
+ dialog.title = "娣诲姞娴嬭瘯鏍�";
}
/** 灞曞紑/鎶樺彔鎿嶄綔 */
const handleToggleExpandAll = () => {
- isExpandAll.value = !isExpandAll.value;
- toggleExpandAll(treeList.value, isExpandAll.value)
+ isExpandAll.value = !isExpandAll.value;
+ 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)
- })
+
+/** 灞曞紑/鎶樺彔鎿嶄綔 */
+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)
+ })
}
/** 淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = async (row: DemoTreeVO) => {
- loading.value = true;
- 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;
-
- });
- })
+const handleUpdate = async (row: TreeVO) => {
+ reset();
+ await getTreeselect();
+ if (row) {
+ form.value.parentId = row.id;
+ }
+ const res = await getTree(row.id);
+ Object.assign(form.value, res.data);
+ dialog.visible = true;
+ dialog.title = "淇敼娴嬭瘯鏍�";
}
+
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- treeRef.value.validate((valid: boolean) => {
- if (valid) {
- buttonLoading.value = true;
- 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(() => {
- proxy?.$modal.msgSuccess("鏂板鎴愬姛");
- dialog.visible = false;
- getList();
- }).finally(() => {
- buttonLoading.value = false;
- });
- }
- }
- });
+ treeFormRef.value?.validate(async (valid: boolean) => {
+ if (valid) {
+ buttonLoading.value = true;
+ if (form.value.id) {
+ await updateTree(form.value).finally(() => buttonLoading.value = false);
+ } else {
+ await addTree(form.value).finally(() => buttonLoading.value = false);
+ }
+ proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ dialog.visible = false;
+ await getList();
+ }
+ });
}
+
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
-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("鍒犻櫎鎴愬姛");
- }).finally(() => {
- loading.value = false;
- });
+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()
-})
+ getList();
+});
</script>
--
Gitblit v1.9.3