update 优化 demo 界面代码

src/views/demo/tree/index.vue

@@ -2,23 +2,12 @@
   <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 :model="queryParams" ref="queryFormRef" :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-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 type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
@@ -27,62 +16,54 @@
 
     <el-card shadow="never">
       <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="父id" 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="父id" 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="父id" prop="parentId">
           <el-tree-select
             v-model="form.parentId"
             :data="treeOptions"
             :props="{ value: 'id', label: 'treeName', children: 'children' }"
             value-key="id"
-            check-strictly
             placeholder="请选择父id"
+            check-strictly
           />
         </el-form-item>
         <el-form-item label="部门id" prop="deptId">
@@ -91,8 +72,8 @@
         <el-form-item label="用户id" prop="userId">
           <el-input v-model="form.userId" placeholder="请输入用户id" />
         </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 +87,191 @@
 </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 { listTree, getTree, delTree, addTree, updateTree } from "@/api/demo/tree";
+import { TreeVO, TreeQuery, TreeForm } from '@/api/demo/tree/types';
 import { ComponentInternalInstance } from 'vue';
-import { ElTree, ElForm, ElTable, DateModelType } from 'element-plus';
+import { ElForm, ElTable } from 'element-plus';
 
-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(ElForm);
+const treeFormRef = ref(ElForm);
+const treeTableRef = ref(ElTable)
 
 const dialog = reactive<DialogOption>({
     visible: false,
     title: ''
 });
 
-// 列显隐信息
-const columns = ref<FieldOption[]>([
-    { key: 0, label: `父id`, 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: "父id不能为空", 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) => {
+  dialog.visible = true;
+  dialog.title = "添加测试树";
+  nextTick(() => {
+    reset();
+    getTreeselect();
+    if (row != null && row.id) {
+      form.value.parentId = row.id;
+    } else {
+      form.value.parentId = 0;
+    }
+  });
 }
 
 /** 展开/折叠操作 */
 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 = (row: TreeVO) => {
+  loading.value = true;
+  dialog.visible = true;
+  dialog.title = "修改测试树";
+  nextTick(async () => {
+    reset();
+    await getTreeselect();
+    if (row != null) {
+      form.value.parentId = row.id;
+    }
+    const res = await getTree(row.id);
+    loading.value = false;
+    Object.assign(form.value, res.data);
+  });
 }
+
 /** 提交按钮 */
 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((valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        updateTree(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        addTree(form.value).finally(() => buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      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>