From 667ef266a9905547eecad7115d4ff32d828b736a Mon Sep 17 00:00:00 2001
From: "DESKTOP-IGCH756\\PC" <921509429@qq.com>
Date: Wed, 27 Sep 2023 16:32:06 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=88=97=E7=9A=84=E6=98=BE=E7=A4=BA=E5=92=8C?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/demo/demo/index.ts            | 18 +++++++-
 src/api/demo/demo/types.ts            | 39 +++++++++++++++-
 src/components/RightToolbar/index.vue | 53 +++++++++++----------
 src/types/global.d.ts                 |  1 +
 src/views/demo/demo/index.vue         | 66 +++++++++++++--------------
 src/views/system/user/index.vue       | 14 +++---
 src/views/tool/gen/index.vue          |  2 +-
 7 files changed, 125 insertions(+), 68 deletions(-)

diff --git a/src/api/demo/demo/index.ts b/src/api/demo/demo/index.ts
index 74417205..6882b9d8 100644
--- a/src/api/demo/demo/index.ts
+++ b/src/api/demo/demo/index.ts
@@ -1,13 +1,14 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { DemoVO, DemoForm, DemoQuery } from '@/api/demo/demo/types';
+import { DemoVO, DemoForm, DemoPageQuery, DemoCountQuery } from '@/api/demo/demo/types';
 
 /**
  * 查询测试单列表
  * @param query
  * @returns {*}
  */
-export const listDemo = (query?: DemoQuery): AxiosPromise<DemoVO[]> => {
+
+export const listDemo = (query?: DemoPageQuery): AxiosPromise<DemoVO[]> => {
   return request({
     url: '/demo/demo/list',
     method: 'get',
@@ -15,6 +16,19 @@ export const listDemo = (query?: DemoQuery): AxiosPromise<DemoVO[]> => {
   });
 };
 
+/**
+ * 查询测试单数量
+ * @param query
+ * @returns {*}
+ */
+
+export const countDemo = (query?: DemoCountQuery): AxiosPromise<number> => {
+  return request({
+    url: '/demo/demo/count',
+    method: 'get',
+    params: query
+  });
+};
 /**
  * 查询测试单详细
  * @param id
diff --git a/src/api/demo/demo/types.ts b/src/api/demo/demo/types.ts
index ea51d32e..c7a8d771 100644
--- a/src/api/demo/demo/types.ts
+++ b/src/api/demo/demo/types.ts
@@ -62,7 +62,7 @@ export interface DemoForm extends BaseEntity {
   value?: string;
 }
 
-export interface DemoQuery extends PageQuery {
+export interface DemoPageQuery extends PageQuery {
   /**
    * 部门id
    */
@@ -87,4 +87,41 @@ export interface DemoQuery extends PageQuery {
    * 值
    */
   value?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
+
+export interface DemoCountQuery {
+  /**
+   * 部门id
+   */
+  deptId?: string | number;
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  /**
+   * 排序号
+   */
+  orderNum?: number;
+
+  /**
+   * key键
+   */
+  testKey?: string;
+
+  /**
+   * 值
+   */
+  value?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
 }
diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue
index 09036b72..0f4219f3 100644
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@@ -7,13 +7,23 @@
       <el-tooltip class="item" effect="dark" content="刷新" placement="top">
         <el-button circle icon="Refresh" @click="refresh()" />
       </el-tooltip>
-      <el-tooltip class="item" effect="dark" content="显隐列" placement="top" v-if="columns">
-        <el-button circle icon="Menu" @click="showColumn()" />
+      <el-tooltip class="item" effect="dark" content="显示/隐藏列" placement="top" v-if="columns">
+        <el-popover placement="bottom" trigger="click">
+          <div class="tree-header">显示/隐藏列</div>
+          <el-tree
+            ref="columnRef"
+            :data="columns"
+            show-checkbox
+            @check="columnChange"
+            node-key="key"
+            :props="{ label: 'label', children: 'children' }"
+          ></el-tree>
+          <template #reference>
+            <el-button circle icon="Menu" />
+          </template>
+        </el-popover>
       </el-tooltip>
     </el-row>
-    <el-dialog :title="title" v-model="open" append-to-body>
-      <el-transfer :titles="['显示', '隐藏']" v-model="value" :data="columns" @change="dataChange"></el-transfer>
-    </el-dialog>
   </div>
 </template>
 
@@ -29,15 +39,9 @@ const props = defineProps({
     gutter: propTypes.number.def(10),
 })
 
+const columnRef = ref<ElTreeInstance>();
 const emits = defineEmits(['update:showSearch', 'queryTable']);
 
-// 显隐数据
-const value = ref<Array<number>>([]);
-// 弹出层标题
-const title = ref("显示/隐藏");
-// 是否显示弹出层
-const open = ref(false);
-
 const style = computed(() => {
     const ret: any = {};
     if (props.gutter) {
@@ -56,23 +60,19 @@ function refresh() {
     emits("queryTable");
 }
 
-// 右侧列表元素变化
-function dataChange(data: TransferKey[]) {
-    props.columns?.forEach((item) => {
-        item.visible = !data.includes(item.key);
-    })
-}
-
-// 打开显隐列dialog
-const showColumn = () => {
-    open.value = true;
+// 更改数据列的显示和隐藏
+function columnChange(...args: any[]) {
+  props.columns?.forEach((item) => {
+    item.visible = args[1].checkedKeys.includes(item.key);
+  })
 }
 
 // 显隐列初始默认隐藏列
 onMounted(() => {
     props.columns?.forEach((item) => {
-        if (!item.visible) {
-            value.value.push(item.key);
+        if (item.visible) {
+          columnRef.value?.setChecked(item.key, true, false);
+            // value.value.push(item.key);
         }
     })
 })
@@ -91,4 +91,9 @@ onMounted(() => {
 .my-el-transfer {
   text-align: center;
 }
+.tree-header{
+  width: 100%;
+  line-height: 24px;
+  text-align: center;
+}
 </style>
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index b9bc5f4b..130f8553 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -13,6 +13,7 @@ declare global {
     key: number;
     label: string;
     visible: boolean;
+    children: Array<FieldOption>;
   }
 
   /**
diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
index a7f3bd76..b7a1f183 100644
--- a/src/views/demo/demo/index.vue
+++ b/src/views/demo/demo/index.vue
@@ -1,34 +1,32 @@
 <template>
   <div class="p-2">
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <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="部门id" prop="deptId">
-              <el-input v-model="queryParams.deptId" placeholder="请输入部门id" clearable style="width: 240px" @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="用户id" prop="userId">
-              <el-input v-model="queryParams.userId" placeholder="请输入用户id" clearable style="width: 240px" @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="排序号" prop="orderNum">
-              <el-input v-model="queryParams.orderNum" placeholder="请输入排序号" clearable style="width: 240px" @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="key键" prop="testKey">
-              <el-input v-model="queryParams.testKey" placeholder="请输入key键" clearable style="width: 240px" @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="值" prop="value">
-              <el-input v-model="queryParams.value" placeholder="请输入值" clearable style="width: 240px" @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 class="search" v-show="showSearch">
+        <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+          <el-form-item label="部门id" prop="deptId">
+            <el-input v-model="queryParams.deptId" placeholder="请输入部门id" clearable style="width: 240px" @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="用户id" prop="userId">
+            <el-input v-model="queryParams.userId" placeholder="请输入用户id" clearable style="width: 240px" @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="排序号" prop="orderNum">
+            <el-input v-model="queryParams.orderNum" placeholder="请输入排序号" clearable style="width: 240px" @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="key键" prop="testKey">
+            <el-input v-model="queryParams.testKey" placeholder="请输入key键" clearable style="width: 240px" @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="值" prop="value">
+            <el-input v-model="queryParams.value" placeholder="请输入值" clearable style="width: 240px" @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>
       </div>
     </transition>
 
-    <el-card shadow="hover">
+    <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
@@ -69,7 +67,7 @@
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改测试单对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@@ -101,8 +99,8 @@
 </template>
 
 <script setup name="Demo" lang="ts">
-import { listDemo, getDemo, delDemo, addDemo, updateDemo } from '@/api/demo/demo';
-import { DemoVO, DemoQuery, DemoForm } from '@/api/demo/demo/types';
+import { listDemo, getDemo, delDemo, addDemo, updateDemo } from "@/api/demo/demo";
+import { DemoVO, DemoPageQuery, DemoForm } from '@/api/demo/demo/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -131,8 +129,8 @@ const initFormData: DemoForm = {
   testKey: undefined,
   value: undefined,
 }
-const data = reactive<PageData<DemoForm, DemoQuery>>({
-  form: { ...initFormData },
+const data = reactive<PageData<DemoForm, DemoPageQuery>>({
+  form: {...initFormData},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -141,6 +139,8 @@ const data = reactive<PageData<DemoForm, DemoQuery>>({
     orderNum: undefined,
     testKey: undefined,
     value: undefined,
+    params: {
+    }
   },
   rules: {
     id: [
@@ -183,7 +183,7 @@ const cancel = () => {
 
 /** 表单重置 */
 const reset = () => {
-  form.value = { ...initFormData };
+  form.value = {...initFormData};
   demoFormRef.value?.resetFields();
 }
 
@@ -229,9 +229,9 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.id) {
-        await updateDemo(form.value).finally(() => buttonLoading.value = false);
+        await updateDemo(form.value).finally(() =>  buttonLoading.value = false);
       } else {
-        await addDemo(form.value).finally(() => buttonLoading.value = false);
+        await addDemo(form.value).finally(() =>  buttonLoading.value = false);
       }
       proxy?.$modal.msgSuccess("修改成功");
       dialog.visible = false;
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 9a6d82cf..284d941b 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -340,13 +340,13 @@ const upload = reactive<ImportOption>({
 })
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-  { key: 0, label: `用户编号`, visible: false },
-  { key: 1, label: `用户名称`, visible: true },
-  { key: 2, label: `用户昵称`, visible: true },
-  { key: 3, label: `部门`, visible: true },
-  { key: 4, label: `手机号码`, visible: true },
-  { key: 5, label: `状态`, visible: true },
-  { key: 6, label: `创建时间`, visible: true }
+  { key: 0, label: `用户编号`, visible: false,children: [] },
+  { key: 1, label: `用户名称`, visible: true,children: [] },
+  { key: 2, label: `用户昵称`, visible: true,children: [] },
+  { key: 3, label: `部门`, visible: true,children: [] },
+  { key: 4, label: `手机号码`, visible: true,children: [] },
+  { key: 5, label: `状态`, visible: true,children: [] },
+  { key: 6, label: `创建时间`, visible: true,children: [] }
 ])
 
 
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 82d52287..f1038a2c 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -193,7 +193,7 @@ const handleGenTable = async (row?: TableVO) => {
     await genCode(row.tableId);
     proxy?.$modal.msgSuccess('成功生成到自定义路径：' + row.genPath);
   } else {
-    proxy?.$download.zip('/tool/gen/batchGenCode?tableIdStr=' + tbIds, 'ruoyi.zip');
+    proxy?.$download.zip('/tool/gen/batchGenCode?tableIdStr=' + tbIds, 'codegen-ruoyi.zip');
   }
 }
 /** 同步数据库操作 */
-- 
Gitee


From 613b879e94e49b81e6c55b9d72299511d5252102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A3=AE=E7=88=B7?= <17701509727@163.com>
Date: Wed, 27 Sep 2023 09:30:07 +0000
Subject: [PATCH 02/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20sr?=
 =?UTF-8?q?c/api/demo/demo/index.ts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/demo/demo/index.ts | 76 --------------------------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 src/api/demo/demo/index.ts

diff --git a/src/api/demo/demo/index.ts b/src/api/demo/demo/index.ts
deleted file mode 100644
index 6882b9d8..00000000
--- a/src/api/demo/demo/index.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { DemoVO, DemoForm, DemoPageQuery, DemoCountQuery } from '@/api/demo/demo/types';
-
-/**
- * 查询测试单列表
- * @param query
- * @returns {*}
- */
-
-export const listDemo = (query?: DemoPageQuery): AxiosPromise<DemoVO[]> => {
-  return request({
-    url: '/demo/demo/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询测试单数量
- * @param query
- * @returns {*}
- */
-
-export const countDemo = (query?: DemoCountQuery): AxiosPromise<number> => {
-  return request({
-    url: '/demo/demo/count',
-    method: 'get',
-    params: query
-  });
-};
-/**
- * 查询测试单详细
- * @param id
- */
-export const getDemo = (id: string | number): AxiosPromise<DemoVO> => {
-  return request({
-    url: '/demo/demo/' + id,
-    method: 'get'
-  });
-};
-
-/**
- * 新增测试单
- * @param data
- */
-export const addDemo = (data: DemoForm) => {
-  return request({
-    url: '/demo/demo',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 修改测试单
- * @param data
- */
-export const updateDemo = (data: DemoForm) => {
-  return request({
-    url: '/demo/demo',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 删除测试单
- * @param id
- */
-export const delDemo = (id: string | number | Array<string | number>) => {
-  return request({
-    url: '/demo/demo/' + id,
-    method: 'delete'
-  });
-};
-- 
Gitee


From ea8b54764fb0230be0cfc2128a47903956f7883c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A3=AE=E7=88=B7?= <17701509727@163.com>
Date: Wed, 27 Sep 2023 09:30:42 +0000
Subject: [PATCH 03/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20sr?=
 =?UTF-8?q?c/api/demo/demo/types.ts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/demo/demo/types.ts | 127 -------------------------------------
 1 file changed, 127 deletions(-)
 delete mode 100644 src/api/demo/demo/types.ts

diff --git a/src/api/demo/demo/types.ts b/src/api/demo/demo/types.ts
deleted file mode 100644
index c7a8d771..00000000
--- a/src/api/demo/demo/types.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-export interface DemoVO {
-  /**
-   * 主键
-   */
-  id: string | number;
-
-  /**
-   * 部门id
-   */
-  deptId: string | number;
-
-  /**
-   * 用户id
-   */
-  userId: string | number;
-
-  /**
-   * 排序号
-   */
-  orderNum: number;
-
-  /**
-   * key键
-   */
-  testKey: string;
-
-  /**
-   * 值
-   */
-  value: string;
-}
-
-export interface DemoForm extends BaseEntity {
-  /**
-   * 主键
-   */
-  id?: string | number;
-
-  /**
-   * 部门id
-   */
-  deptId?: string | number;
-
-  /**
-   * 用户id
-   */
-  userId?: string | number;
-
-  /**
-   * 排序号
-   */
-  orderNum?: number;
-
-  /**
-   * key键
-   */
-  testKey?: string;
-
-  /**
-   * 值
-   */
-  value?: string;
-}
-
-export interface DemoPageQuery extends PageQuery {
-  /**
-   * 部门id
-   */
-  deptId?: string | number;
-
-  /**
-   * 用户id
-   */
-  userId?: string | number;
-
-  /**
-   * 排序号
-   */
-  orderNum?: number;
-
-  /**
-   * key键
-   */
-  testKey?: string;
-
-  /**
-   * 值
-   */
-  value?: string;
-
-  /**
-   * 日期范围参数
-   */
-  params?: any;
-}
-
-export interface DemoCountQuery {
-  /**
-   * 部门id
-   */
-  deptId?: string | number;
-
-  /**
-   * 用户id
-   */
-  userId?: string | number;
-
-  /**
-   * 排序号
-   */
-  orderNum?: number;
-
-  /**
-   * key键
-   */
-  testKey?: string;
-
-  /**
-   * 值
-   */
-  value?: string;
-
-  /**
-   * 日期范围参数
-   */
-  params?: any;
-}
-- 
Gitee


From 0249cca774d536b94fbccf9f0ec747726980ecbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A3=AE=E7=88=B7?= <17701509727@163.com>
Date: Wed, 27 Sep 2023 09:31:01 +0000
Subject: [PATCH 04/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20sr?=
 =?UTF-8?q?c/views/demo/demo/index.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/demo/index.vue | 262 ----------------------------------
 1 file changed, 262 deletions(-)
 delete mode 100644 src/views/demo/demo/index.vue

diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
deleted file mode 100644
index b7a1f183..00000000
--- a/src/views/demo/demo/index.vue
+++ /dev/null
@@ -1,262 +0,0 @@
-<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="queryFormRef" :inline="true" label-width="68px">
-          <el-form-item label="部门id" prop="deptId">
-            <el-input v-model="queryParams.deptId" placeholder="请输入部门id" clearable style="width: 240px" @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item label="用户id" prop="userId">
-            <el-input v-model="queryParams.userId" placeholder="请输入用户id" clearable style="width: 240px" @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item label="排序号" prop="orderNum">
-            <el-input v-model="queryParams.orderNum" placeholder="请输入排序号" clearable style="width: 240px" @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item label="key键" prop="testKey">
-            <el-input v-model="queryParams.testKey" placeholder="请输入key键" clearable style="width: 240px" @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item label="值" prop="value">
-            <el-input v-model="queryParams.value" placeholder="请输入值" clearable style="width: 240px" @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>
-      </div>
-    </transition>
-
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['demo:demo:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['demo:demo:edit']">修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['demo:demo:remove']"
-              >删除</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['demo:demo:export']">导出</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
-
-      <el-table v-loading="loading" :data="demoList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="主键" align="center" prop="id" v-if="true" />
-        <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="orderNum" />
-        <el-table-column label="key键" align="center" prop="testKey" />
-        <el-table-column label="值" align="center" prop="value" />
-        <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:demo:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['demo:demo:remove']"></el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-    </el-card>
-    <!-- 添加或修改测试单对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="demoFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="用户id" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户id" />
-        </el-form-item>
-        <el-form-item label="排序号" prop="orderNum">
-          <el-input v-model="form.orderNum" placeholder="请输入排序号" />
-        </el-form-item>
-        <el-form-item label="key键" prop="testKey">
-          <el-input v-model="form.testKey" placeholder="请输入key键" />
-        </el-form-item>
-        <el-form-item label="值" prop="value">
-          <el-input v-model="form.value" 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="Demo" lang="ts">
-import { listDemo, getDemo, delDemo, addDemo, updateDemo } from "@/api/demo/demo";
-import { DemoVO, DemoPageQuery, DemoForm } from '@/api/demo/demo/types';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
-const demoList = ref<DemoVO[]>([]);
-const buttonLoading = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-
-const queryFormRef = ref<ElFormInstance>();
-const demoFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-
-const initFormData: DemoForm = {
-  id: undefined,
-  deptId: undefined,
-  userId: undefined,
-  orderNum: undefined,
-  testKey: undefined,
-  value: undefined,
-}
-const data = reactive<PageData<DemoForm, DemoPageQuery>>({
-  form: {...initFormData},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    deptId: undefined,
-    userId: undefined,
-    orderNum: undefined,
-    testKey: undefined,
-    value: undefined,
-    params: {
-    }
-  },
-  rules: {
-    id: [
-      { required: true, message: "主键不能为空", trigger: "blur" }
-    ],
-    deptId: [
-      { required: true, message: "部门id不能为空", trigger: "blur" }
-    ],
-    userId: [
-      { required: true, message: "用户id不能为空", trigger: "blur" }
-    ],
-    orderNum: [
-      { required: true, message: "排序号不能为空", trigger: "blur" }
-    ],
-    testKey: [
-      { required: true, message: "key键不能为空", trigger: "blur" }
-    ],
-    value: [
-      { required: true, message: "值不能为空", trigger: "blur" }
-    ],
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询测试单列表 */
-const getList = async () => {
-  loading.value = true;
-  const res = await listDemo(queryParams.value);
-  demoList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
-}
-
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-}
-
-/** 表单重置 */
-const reset = () => {
-  form.value = {...initFormData};
-  demoFormRef.value?.resetFields();
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  handleQuery();
-}
-
-/** 多选框选中数据 */
-const handleSelectionChange = (selection: DemoVO[]) => {
-  ids.value = selection.map(item => item.id);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-}
-
-/** 新增按钮操作 */
-const handleAdd = () => {
-  reset();
-  dialog.visible = true;
-  dialog.title = "添加测试单";
-}
-
-/** 修改按钮操作 */
-const handleUpdate = async (row?: DemoVO) => {
-  reset();
-  const _id = row?.id || ids.value[0]
-  const res = await getDemo(_id);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = "修改测试单";
-}
-
-/** 提交按钮 */
-const submitForm = () => {
-  demoFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      if (form.value.id) {
-        await updateDemo(form.value).finally(() =>  buttonLoading.value = false);
-      } else {
-        await addDemo(form.value).finally(() =>  buttonLoading.value = false);
-      }
-      proxy?.$modal.msgSuccess("修改成功");
-      dialog.visible = false;
-      await getList();
-    }
-  });
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: DemoVO) => {
-  const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除测试单编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
-  await delDemo(_ids);
-  proxy?.$modal.msgSuccess("删除成功");
-  await getList();
-}
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download('demo/demo/export', {
-    ...queryParams.value
-  }, `demo_${new Date().getTime()}.xlsx`)
-}
-
-onMounted(() => {
-  getList();
-});
-</script>
-- 
Gitee


From b366d9c5b39a0069db1ff83e94b63f8dab253e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A3=AE=E7=88=B7?= <17701509727@163.com>
Date: Wed, 27 Sep 2023 09:31:29 +0000
Subject: [PATCH 05/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20sr?=
 =?UTF-8?q?c/views/tool/gen/index.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/gen/index.vue | 251 -----------------------------------
 1 file changed, 251 deletions(-)
 delete mode 100644 src/views/tool/gen/index.vue

diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
deleted file mode 100644
index f1038a2c..00000000
--- a/src/views/tool/gen/index.vue
+++ /dev/null
@@ -1,251 +0,0 @@
-<template>
-  <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <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="dataName">
-              <el-select v-model="queryParams.dataName" filterable clearable placeholder="请选择/输入数据源名称" style="width: 200px">
-                <el-option key="" label="全部" value="" />
-                <el-option v-for="item in dataNameList" :key="item" :label="item" :value="item"> </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="表名称" prop="tableName">
-              <el-input v-model="queryParams.tableName" placeholder="请输入表名称" clearable style="width: 200px" @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="表描述" prop="tableComment">
-              <el-input v-model="queryParams.tableComment" placeholder="请输入表描述" clearable style="width: 200px" @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="创建时间" style="width: 308px">
-              <el-date-picker
-                v-model="dateRange"
-                value-format="YYYY-MM-DD"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              ></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>
-        </el-card>
-      </div>
-    </transition>
-
-    <el-card shadow="hover">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Download" @click="handleGenTable()" v-hasPermi="['tool:gen:code']">生成</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="info" plain icon="Upload" @click="openImportTable" v-hasPermi="['tool:gen:import']">导入</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleEditTable()" v-hasPermi="['tool:gen:edit']">修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['tool:gen:remove']">
-              删除
-            </el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
-
-      <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" align="center" width="55"></el-table-column>
-        <el-table-column label="序号" type="index" width="50" align="center">
-          <template #default="scope">
-            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="数据源" align="center" prop="dataName" :show-overflow-tooltip="true" />
-        <el-table-column label="表名称" align="center" prop="tableName" :show-overflow-tooltip="true" />
-        <el-table-column label="表描述" align="center" prop="tableComment" :show-overflow-tooltip="true" />
-        <el-table-column label="实体" align="center" prop="className" :show-overflow-tooltip="true" />
-        <el-table-column label="创建时间" align="center" prop="createTime" width="160" />
-        <el-table-column label="更新时间" align="center" prop="updateTime" width="160" />
-        <el-table-column label="操作" align="center" width="330" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="预览" placement="top">
-              <el-button link type="primary" icon="View" @click="handlePreview(scope.row)" v-hasPermi="['tool:gen:preview']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="编辑" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleEditTable(scope.row)" v-hasPermi="['tool:gen:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['tool:gen:remove']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="同步" placement="top">
-              <el-button link type="primary" icon="Refresh" @click="handleSynchDb(scope.row)" v-hasPermi="['tool:gen:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="生成代码" placement="top">
-              <el-button link type="primary" icon="Download" @click="handleGenTable(scope.row)" v-hasPermi="['tool:gen:code']"></el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-    </el-card>
-
-    <!-- 预览界面 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="80%" top="5vh" append-to-body class="scrollbar">
-      <el-tabs v-model="preview.activeName">
-        <el-tab-pane
-          v-for="(value, key) in preview.data"
-          :label="(key as any).substring((key as any).lastIndexOf('/') + 1, (key as any).indexOf('.vm'))"
-          :name="(key as any).substring((key as any).lastIndexOf('/') + 1, (key as any).indexOf('.vm'))"
-          :key="value"
-        >
-          <el-link :underline="false" icon="DocumentCopy" v-copyText="value" v-copyText:callback="copyTextSuccess" style="float:right">
-            &nbsp;复制
-          </el-link>
-          <pre>{{ value }}</pre>
-        </el-tab-pane>
-      </el-tabs>
-    </el-dialog>
-    <import-table ref="importRef" @ok="handleQuery" />
-  </div>
-</template>
-
-<script setup name="Gen" lang="ts">
-import { listTable, previewTable, delTable, genCode, synchDb, getDataNames } from '@/api/tool/gen';
-import { TableQuery, TableVO } from '@/api/tool/gen/types';
-import router from '@/router';
-import ImportTable from './importTable.vue';
-
-const route = useRoute();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
-const tableList = ref<TableVO[]>([]);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
-const uniqueId = ref("");
-const dataNameList = ref<Array<string>>([]);
-
-const queryFormRef = ref<ElFormInstance>();
-const importRef = ref<InstanceType<typeof ImportTable>>();
-
-const queryParams = ref<TableQuery>({
-  pageNum: 1,
-  pageSize: 10,
-  tableName: '',
-  tableComment: '',
-  dataName: ""
-})
-
-const preview = ref<any>({
-  data: {},
-  activeName: 'domain.java'
-})
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: '代码预览'
-});
-
-onActivated(() => {
-  const time = route.query.t;
-  if (time != null && time != uniqueId.value) {
-    uniqueId.value = time as string;
-    queryParams.value.pageNum = Number(route.query.pageNum);
-    dateRange.value = ['', ''];
-    queryFormRef.value?.resetFields();
-    getList();
-  }
-})
-
-/** 查询多数据源名称 */
-const getDataNameList = async () => {
-  const res = await getDataNames()
-  dataNameList.value = res.data;
-}
-
-/** 查询表集合 */
-const getList = async () => {
-  loading.value = true;
-  const res = await listTable(proxy?.addDateRange(queryParams.value, dateRange.value));
-  tableList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
-}
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-}
-/** 生成代码操作 */
-const handleGenTable = async (row?: TableVO) => {
-  const tbIds = row?.tableId || ids.value;
-  if (tbIds == "") {
-    proxy?.$modal.msgError('请选择要生成的数据');
-    return;
-  }
-  if (row?.genType === "1") {
-    await genCode(row.tableId);
-    proxy?.$modal.msgSuccess('成功生成到自定义路径：' + row.genPath);
-  } else {
-    proxy?.$download.zip('/tool/gen/batchGenCode?tableIdStr=' + tbIds, 'codegen-ruoyi.zip');
-  }
-}
-/** 同步数据库操作 */
-const handleSynchDb = async (row: TableVO) => {
-  const tableId = row.tableId;
-  await proxy?.$modal.confirm('确认要强制同步"' + row.tableName + '"表结构吗？');
-  await synchDb(tableId);
-  proxy?.$modal.msgSuccess('同步成功');
-}
-/** 打开导入表弹窗 */
-const openImportTable = () => {
-  importRef.value?.show(queryParams.value.dataName);
-}
-/** 重置按钮操作 */
-const resetQuery = () => {
-  dateRange.value = ['', ''];
-  queryFormRef.value?.resetFields();
-  handleQuery();
-}
-/** 预览按钮 */
-const handlePreview = async (row: TableVO) => {
-  const res = await previewTable(row.tableId);
-  preview.value.data = res.data;
-  dialog.visible = true;
-  preview.value.activeName = 'domain.java';
-}
-/** 复制代码成功 */
-const copyTextSuccess = () => {
-  proxy?.$modal.msgSuccess('复制成功');
-}
-// 多选框选中数据
-const handleSelectionChange = (selection: TableVO[]) => {
-  ids.value = selection.map(item => item.tableId);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-}
-/** 修改按钮操作 */
-const handleEditTable = (row?: TableVO) => {
-  const tableId = row?.tableId || ids.value[0];
-  router.push({ path: '/tool/gen-edit/index/' + tableId, query: { pageNum: queryParams.value.pageNum } });
-}
-/** 删除按钮操作 */
-const handleDelete = async (row?: TableVO) => {
-  const tableIds = row?.tableId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除表编号为"' + tableIds + '"的数据项？');
-  await delTable(tableIds);
-  await getList();
-  proxy?.$modal.msgSuccess('删除成功');
-}
-
-onMounted(() => {
-  getList();
-  getDataNameList();
-})
-</script>
-- 
Gitee


From bad992d57f7f8258883e2d0ad5eb4991893b33c4 Mon Sep 17 00:00:00 2001
From: "DESKTOP-IGCH756\\PC" <921509429@qq.com>
Date: Wed, 27 Sep 2023 17:37:59 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E6=96=87=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/demo/demo/index.ts    | 18 ++--------
 src/api/demo/demo/types.ts    | 39 +--------------------
 src/views/demo/demo/index.vue | 66 +++++++++++++++++------------------
 src/views/tool/gen/index.vue  |  2 +-
 4 files changed, 37 insertions(+), 88 deletions(-)

diff --git a/src/api/demo/demo/index.ts b/src/api/demo/demo/index.ts
index 6882b9d8..74417205 100644
--- a/src/api/demo/demo/index.ts
+++ b/src/api/demo/demo/index.ts
@@ -1,14 +1,13 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { DemoVO, DemoForm, DemoPageQuery, DemoCountQuery } from '@/api/demo/demo/types';
+import { DemoVO, DemoForm, DemoQuery } from '@/api/demo/demo/types';
 
 /**
  * 查询测试单列表
  * @param query
  * @returns {*}
  */
-
-export const listDemo = (query?: DemoPageQuery): AxiosPromise<DemoVO[]> => {
+export const listDemo = (query?: DemoQuery): AxiosPromise<DemoVO[]> => {
   return request({
     url: '/demo/demo/list',
     method: 'get',
@@ -16,19 +15,6 @@ export const listDemo = (query?: DemoPageQuery): AxiosPromise<DemoVO[]> => {
   });
 };
 
-/**
- * 查询测试单数量
- * @param query
- * @returns {*}
- */
-
-export const countDemo = (query?: DemoCountQuery): AxiosPromise<number> => {
-  return request({
-    url: '/demo/demo/count',
-    method: 'get',
-    params: query
-  });
-};
 /**
  * 查询测试单详细
  * @param id
diff --git a/src/api/demo/demo/types.ts b/src/api/demo/demo/types.ts
index c7a8d771..ea51d32e 100644
--- a/src/api/demo/demo/types.ts
+++ b/src/api/demo/demo/types.ts
@@ -62,7 +62,7 @@ export interface DemoForm extends BaseEntity {
   value?: string;
 }
 
-export interface DemoPageQuery extends PageQuery {
+export interface DemoQuery extends PageQuery {
   /**
    * 部门id
    */
@@ -87,41 +87,4 @@ export interface DemoPageQuery extends PageQuery {
    * 值
    */
   value?: string;
-
-  /**
-   * 日期范围参数
-   */
-  params?: any;
-}
-
-export interface DemoCountQuery {
-  /**
-   * 部门id
-   */
-  deptId?: string | number;
-
-  /**
-   * 用户id
-   */
-  userId?: string | number;
-
-  /**
-   * 排序号
-   */
-  orderNum?: number;
-
-  /**
-   * key键
-   */
-  testKey?: string;
-
-  /**
-   * 值
-   */
-  value?: string;
-
-  /**
-   * 日期范围参数
-   */
-  params?: any;
 }
diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
index b7a1f183..a7f3bd76 100644
--- a/src/views/demo/demo/index.vue
+++ b/src/views/demo/demo/index.vue
@@ -1,32 +1,34 @@
 <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="queryFormRef" :inline="true" label-width="68px">
-          <el-form-item label="部门id" prop="deptId">
-            <el-input v-model="queryParams.deptId" placeholder="请输入部门id" clearable style="width: 240px" @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item label="用户id" prop="userId">
-            <el-input v-model="queryParams.userId" placeholder="请输入用户id" clearable style="width: 240px" @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item label="排序号" prop="orderNum">
-            <el-input v-model="queryParams.orderNum" placeholder="请输入排序号" clearable style="width: 240px" @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item label="key键" prop="testKey">
-            <el-input v-model="queryParams.testKey" placeholder="请输入key键" clearable style="width: 240px" @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item label="值" prop="value">
-            <el-input v-model="queryParams.value" placeholder="请输入值" clearable style="width: 240px" @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>
+      <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="部门id" prop="deptId">
+              <el-input v-model="queryParams.deptId" placeholder="请输入部门id" clearable style="width: 240px" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="用户id" prop="userId">
+              <el-input v-model="queryParams.userId" placeholder="请输入用户id" clearable style="width: 240px" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="排序号" prop="orderNum">
+              <el-input v-model="queryParams.orderNum" placeholder="请输入排序号" clearable style="width: 240px" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="key键" prop="testKey">
+              <el-input v-model="queryParams.testKey" placeholder="请输入key键" clearable style="width: 240px" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="值" prop="value">
+              <el-input v-model="queryParams.value" placeholder="请输入值" clearable style="width: 240px" @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" class="mb8">
           <el-col :span="1.5">
@@ -67,7 +69,7 @@
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改测试单对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@@ -99,8 +101,8 @@
 </template>
 
 <script setup name="Demo" lang="ts">
-import { listDemo, getDemo, delDemo, addDemo, updateDemo } from "@/api/demo/demo";
-import { DemoVO, DemoPageQuery, DemoForm } from '@/api/demo/demo/types';
+import { listDemo, getDemo, delDemo, addDemo, updateDemo } from '@/api/demo/demo';
+import { DemoVO, DemoQuery, DemoForm } from '@/api/demo/demo/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -129,8 +131,8 @@ const initFormData: DemoForm = {
   testKey: undefined,
   value: undefined,
 }
-const data = reactive<PageData<DemoForm, DemoPageQuery>>({
-  form: {...initFormData},
+const data = reactive<PageData<DemoForm, DemoQuery>>({
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -139,8 +141,6 @@ const data = reactive<PageData<DemoForm, DemoPageQuery>>({
     orderNum: undefined,
     testKey: undefined,
     value: undefined,
-    params: {
-    }
   },
   rules: {
     id: [
@@ -183,7 +183,7 @@ const cancel = () => {
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   demoFormRef.value?.resetFields();
 }
 
@@ -229,9 +229,9 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.id) {
-        await updateDemo(form.value).finally(() =>  buttonLoading.value = false);
+        await updateDemo(form.value).finally(() => buttonLoading.value = false);
       } else {
-        await addDemo(form.value).finally(() =>  buttonLoading.value = false);
+        await addDemo(form.value).finally(() => buttonLoading.value = false);
       }
       proxy?.$modal.msgSuccess("修改成功");
       dialog.visible = false;
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index f1038a2c..82d52287 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -193,7 +193,7 @@ const handleGenTable = async (row?: TableVO) => {
     await genCode(row.tableId);
     proxy?.$modal.msgSuccess('成功生成到自定义路径：' + row.genPath);
   } else {
-    proxy?.$download.zip('/tool/gen/batchGenCode?tableIdStr=' + tbIds, 'codegen-ruoyi.zip');
+    proxy?.$download.zip('/tool/gen/batchGenCode?tableIdStr=' + tbIds, 'ruoyi.zip');
   }
 }
 /** 同步数据库操作 */
-- 
Gitee


From cc930ddc8ad6199d935780459f356015b47de38c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A3=AE=E7=88=B7?= <17701509727@163.com>
Date: Wed, 27 Sep 2023 09:49:03 +0000
Subject: [PATCH 07/10] =?UTF-8?q?Revert=20"=E5=88=A0=E9=99=A4=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20src/views/tool/gen/index.vue"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b366d9c5b39a0069db1ff83e94b63f8dab253e77.
---
 src/views/tool/gen/index.vue | 251 +++++++++++++++++++++++++++++++++++
 1 file changed, 251 insertions(+)
 create mode 100644 src/views/tool/gen/index.vue

diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
new file mode 100644
index 00000000..f1038a2c
--- /dev/null
+++ b/src/views/tool/gen/index.vue
@@ -0,0 +1,251 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <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="dataName">
+              <el-select v-model="queryParams.dataName" filterable clearable placeholder="请选择/输入数据源名称" style="width: 200px">
+                <el-option key="" label="全部" value="" />
+                <el-option v-for="item in dataNameList" :key="item" :label="item" :value="item"> </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="表名称" prop="tableName">
+              <el-input v-model="queryParams.tableName" placeholder="请输入表名称" clearable style="width: 200px" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="表描述" prop="tableComment">
+              <el-input v-model="queryParams.tableComment" placeholder="请输入表描述" clearable style="width: 200px" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="创建时间" style="width: 308px">
+              <el-date-picker
+                v-model="dateRange"
+                value-format="YYYY-MM-DD"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></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>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="hover">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Download" @click="handleGenTable()" v-hasPermi="['tool:gen:code']">生成</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="info" plain icon="Upload" @click="openImportTable" v-hasPermi="['tool:gen:import']">导入</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleEditTable()" v-hasPermi="['tool:gen:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['tool:gen:remove']">
+              删除
+            </el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" align="center" width="55"></el-table-column>
+        <el-table-column label="序号" type="index" width="50" align="center">
+          <template #default="scope">
+            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="数据源" align="center" prop="dataName" :show-overflow-tooltip="true" />
+        <el-table-column label="表名称" align="center" prop="tableName" :show-overflow-tooltip="true" />
+        <el-table-column label="表描述" align="center" prop="tableComment" :show-overflow-tooltip="true" />
+        <el-table-column label="实体" align="center" prop="className" :show-overflow-tooltip="true" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="160" />
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="160" />
+        <el-table-column label="操作" align="center" width="330" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="预览" placement="top">
+              <el-button link type="primary" icon="View" @click="handlePreview(scope.row)" v-hasPermi="['tool:gen:preview']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="编辑" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleEditTable(scope.row)" v-hasPermi="['tool:gen:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['tool:gen:remove']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="同步" placement="top">
+              <el-button link type="primary" icon="Refresh" @click="handleSynchDb(scope.row)" v-hasPermi="['tool:gen:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="生成代码" placement="top">
+              <el-button link type="primary" icon="Download" @click="handleGenTable(scope.row)" v-hasPermi="['tool:gen:code']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 预览界面 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="80%" top="5vh" append-to-body class="scrollbar">
+      <el-tabs v-model="preview.activeName">
+        <el-tab-pane
+          v-for="(value, key) in preview.data"
+          :label="(key as any).substring((key as any).lastIndexOf('/') + 1, (key as any).indexOf('.vm'))"
+          :name="(key as any).substring((key as any).lastIndexOf('/') + 1, (key as any).indexOf('.vm'))"
+          :key="value"
+        >
+          <el-link :underline="false" icon="DocumentCopy" v-copyText="value" v-copyText:callback="copyTextSuccess" style="float:right">
+            &nbsp;复制
+          </el-link>
+          <pre>{{ value }}</pre>
+        </el-tab-pane>
+      </el-tabs>
+    </el-dialog>
+    <import-table ref="importRef" @ok="handleQuery" />
+  </div>
+</template>
+
+<script setup name="Gen" lang="ts">
+import { listTable, previewTable, delTable, genCode, synchDb, getDataNames } from '@/api/tool/gen';
+import { TableQuery, TableVO } from '@/api/tool/gen/types';
+import router from '@/router';
+import ImportTable from './importTable.vue';
+
+const route = useRoute();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const tableList = ref<TableVO[]>([]);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+const uniqueId = ref("");
+const dataNameList = ref<Array<string>>([]);
+
+const queryFormRef = ref<ElFormInstance>();
+const importRef = ref<InstanceType<typeof ImportTable>>();
+
+const queryParams = ref<TableQuery>({
+  pageNum: 1,
+  pageSize: 10,
+  tableName: '',
+  tableComment: '',
+  dataName: ""
+})
+
+const preview = ref<any>({
+  data: {},
+  activeName: 'domain.java'
+})
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: '代码预览'
+});
+
+onActivated(() => {
+  const time = route.query.t;
+  if (time != null && time != uniqueId.value) {
+    uniqueId.value = time as string;
+    queryParams.value.pageNum = Number(route.query.pageNum);
+    dateRange.value = ['', ''];
+    queryFormRef.value?.resetFields();
+    getList();
+  }
+})
+
+/** 查询多数据源名称 */
+const getDataNameList = async () => {
+  const res = await getDataNames()
+  dataNameList.value = res.data;
+}
+
+/** 查询表集合 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listTable(proxy?.addDateRange(queryParams.value, dateRange.value));
+  tableList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+/** 生成代码操作 */
+const handleGenTable = async (row?: TableVO) => {
+  const tbIds = row?.tableId || ids.value;
+  if (tbIds == "") {
+    proxy?.$modal.msgError('请选择要生成的数据');
+    return;
+  }
+  if (row?.genType === "1") {
+    await genCode(row.tableId);
+    proxy?.$modal.msgSuccess('成功生成到自定义路径：' + row.genPath);
+  } else {
+    proxy?.$download.zip('/tool/gen/batchGenCode?tableIdStr=' + tbIds, 'codegen-ruoyi.zip');
+  }
+}
+/** 同步数据库操作 */
+const handleSynchDb = async (row: TableVO) => {
+  const tableId = row.tableId;
+  await proxy?.$modal.confirm('确认要强制同步"' + row.tableName + '"表结构吗？');
+  await synchDb(tableId);
+  proxy?.$modal.msgSuccess('同步成功');
+}
+/** 打开导入表弹窗 */
+const openImportTable = () => {
+  importRef.value?.show(queryParams.value.dataName);
+}
+/** 重置按钮操作 */
+const resetQuery = () => {
+  dateRange.value = ['', ''];
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+/** 预览按钮 */
+const handlePreview = async (row: TableVO) => {
+  const res = await previewTable(row.tableId);
+  preview.value.data = res.data;
+  dialog.visible = true;
+  preview.value.activeName = 'domain.java';
+}
+/** 复制代码成功 */
+const copyTextSuccess = () => {
+  proxy?.$modal.msgSuccess('复制成功');
+}
+// 多选框选中数据
+const handleSelectionChange = (selection: TableVO[]) => {
+  ids.value = selection.map(item => item.tableId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+/** 修改按钮操作 */
+const handleEditTable = (row?: TableVO) => {
+  const tableId = row?.tableId || ids.value[0];
+  router.push({ path: '/tool/gen-edit/index/' + tableId, query: { pageNum: queryParams.value.pageNum } });
+}
+/** 删除按钮操作 */
+const handleDelete = async (row?: TableVO) => {
+  const tableIds = row?.tableId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除表编号为"' + tableIds + '"的数据项？');
+  await delTable(tableIds);
+  await getList();
+  proxy?.$modal.msgSuccess('删除成功');
+}
+
+onMounted(() => {
+  getList();
+  getDataNameList();
+})
+</script>
-- 
Gitee


From d7746c371ca598e92fef062fb920916baa01b7d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A3=AE=E7=88=B7?= <17701509727@163.com>
Date: Wed, 27 Sep 2023 09:49:27 +0000
Subject: [PATCH 08/10] =?UTF-8?q?Revert=20"=E5=88=A0=E9=99=A4=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20src/api/demo/demo/index.ts"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 613b879e94e49b81e6c55b9d72299511d5252102.
---
 src/api/demo/demo/index.ts | 76 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 src/api/demo/demo/index.ts

diff --git a/src/api/demo/demo/index.ts b/src/api/demo/demo/index.ts
new file mode 100644
index 00000000..6882b9d8
--- /dev/null
+++ b/src/api/demo/demo/index.ts
@@ -0,0 +1,76 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DemoVO, DemoForm, DemoPageQuery, DemoCountQuery } from '@/api/demo/demo/types';
+
+/**
+ * 查询测试单列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDemo = (query?: DemoPageQuery): AxiosPromise<DemoVO[]> => {
+  return request({
+    url: '/demo/demo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询测试单数量
+ * @param query
+ * @returns {*}
+ */
+
+export const countDemo = (query?: DemoCountQuery): AxiosPromise<number> => {
+  return request({
+    url: '/demo/demo/count',
+    method: 'get',
+    params: query
+  });
+};
+/**
+ * 查询测试单详细
+ * @param id
+ */
+export const getDemo = (id: string | number): AxiosPromise<DemoVO> => {
+  return request({
+    url: '/demo/demo/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增测试单
+ * @param data
+ */
+export const addDemo = (data: DemoForm) => {
+  return request({
+    url: '/demo/demo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改测试单
+ * @param data
+ */
+export const updateDemo = (data: DemoForm) => {
+  return request({
+    url: '/demo/demo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除测试单
+ * @param id
+ */
+export const delDemo = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/demo/demo/' + id,
+    method: 'delete'
+  });
+};
-- 
Gitee


From 748a531d2695e0611cc824890f2e440df1b456a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A3=AE=E7=88=B7?= <17701509727@163.com>
Date: Wed, 27 Sep 2023 09:49:48 +0000
Subject: [PATCH 09/10] =?UTF-8?q?Revert=20"=E5=88=A0=E9=99=A4=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20src/views/demo/demo/index.vue"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0249cca774d536b94fbccf9f0ec747726980ecbb.
---
 src/views/demo/demo/index.vue | 262 ++++++++++++++++++++++++++++++++++
 1 file changed, 262 insertions(+)
 create mode 100644 src/views/demo/demo/index.vue

diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
new file mode 100644
index 00000000..b7a1f183
--- /dev/null
+++ b/src/views/demo/demo/index.vue
@@ -0,0 +1,262 @@
+<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="queryFormRef" :inline="true" label-width="68px">
+          <el-form-item label="部门id" prop="deptId">
+            <el-input v-model="queryParams.deptId" placeholder="请输入部门id" clearable style="width: 240px" @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="用户id" prop="userId">
+            <el-input v-model="queryParams.userId" placeholder="请输入用户id" clearable style="width: 240px" @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="排序号" prop="orderNum">
+            <el-input v-model="queryParams.orderNum" placeholder="请输入排序号" clearable style="width: 240px" @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="key键" prop="testKey">
+            <el-input v-model="queryParams.testKey" placeholder="请输入key键" clearable style="width: 240px" @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="值" prop="value">
+            <el-input v-model="queryParams.value" placeholder="请输入值" clearable style="width: 240px" @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>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['demo:demo:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['demo:demo:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['demo:demo:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['demo:demo:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="demoList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键" align="center" prop="id" v-if="true" />
+        <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="orderNum" />
+        <el-table-column label="key键" align="center" prop="testKey" />
+        <el-table-column label="值" align="center" prop="value" />
+        <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:demo:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['demo:demo:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改测试单对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="demoFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="部门id" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入部门id" />
+        </el-form-item>
+        <el-form-item label="用户id" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id" />
+        </el-form-item>
+        <el-form-item label="排序号" prop="orderNum">
+          <el-input v-model="form.orderNum" placeholder="请输入排序号" />
+        </el-form-item>
+        <el-form-item label="key键" prop="testKey">
+          <el-input v-model="form.testKey" placeholder="请输入key键" />
+        </el-form-item>
+        <el-form-item label="值" prop="value">
+          <el-input v-model="form.value" 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="Demo" lang="ts">
+import { listDemo, getDemo, delDemo, addDemo, updateDemo } from "@/api/demo/demo";
+import { DemoVO, DemoPageQuery, DemoForm } from '@/api/demo/demo/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const demoList = ref<DemoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const demoFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: DemoForm = {
+  id: undefined,
+  deptId: undefined,
+  userId: undefined,
+  orderNum: undefined,
+  testKey: undefined,
+  value: undefined,
+}
+const data = reactive<PageData<DemoForm, DemoPageQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    deptId: undefined,
+    userId: undefined,
+    orderNum: undefined,
+    testKey: undefined,
+    value: undefined,
+    params: {
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "主键不能为空", trigger: "blur" }
+    ],
+    deptId: [
+      { required: true, message: "部门id不能为空", trigger: "blur" }
+    ],
+    userId: [
+      { required: true, message: "用户id不能为空", trigger: "blur" }
+    ],
+    orderNum: [
+      { required: true, message: "排序号不能为空", trigger: "blur" }
+    ],
+    testKey: [
+      { required: true, message: "key键不能为空", trigger: "blur" }
+    ],
+    value: [
+      { required: true, message: "值不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询测试单列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDemo(queryParams.value);
+  demoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  demoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DemoVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加测试单";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DemoVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getDemo(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改测试单";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  demoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateDemo(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addDemo(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("修改成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DemoVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除测试单编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await delDemo(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('demo/demo/export', {
+    ...queryParams.value
+  }, `demo_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
-- 
Gitee


From a1d4e25d36dc59f63c11d5a44f33cee48539b85a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A3=AE=E7=88=B7?= <17701509727@163.com>
Date: Wed, 27 Sep 2023 09:50:05 +0000
Subject: [PATCH 10/10] =?UTF-8?q?Revert=20"=E5=88=A0=E9=99=A4=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20src/api/demo/demo/types.ts"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ea8b54764fb0230be0cfc2128a47903956f7883c.
---
 src/api/demo/demo/types.ts | 127 +++++++++++++++++++++++++++++++++++++
 1 file changed, 127 insertions(+)
 create mode 100644 src/api/demo/demo/types.ts

diff --git a/src/api/demo/demo/types.ts b/src/api/demo/demo/types.ts
new file mode 100644
index 00000000..c7a8d771
--- /dev/null
+++ b/src/api/demo/demo/types.ts
@@ -0,0 +1,127 @@
+export interface DemoVO {
+  /**
+   * 主键
+   */
+  id: string | number;
+
+  /**
+   * 部门id
+   */
+  deptId: string | number;
+
+  /**
+   * 用户id
+   */
+  userId: string | number;
+
+  /**
+   * 排序号
+   */
+  orderNum: number;
+
+  /**
+   * key键
+   */
+  testKey: string;
+
+  /**
+   * 值
+   */
+  value: string;
+}
+
+export interface DemoForm extends BaseEntity {
+  /**
+   * 主键
+   */
+  id?: string | number;
+
+  /**
+   * 部门id
+   */
+  deptId?: string | number;
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  /**
+   * 排序号
+   */
+  orderNum?: number;
+
+  /**
+   * key键
+   */
+  testKey?: string;
+
+  /**
+   * 值
+   */
+  value?: string;
+}
+
+export interface DemoPageQuery extends PageQuery {
+  /**
+   * 部门id
+   */
+  deptId?: string | number;
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  /**
+   * 排序号
+   */
+  orderNum?: number;
+
+  /**
+   * key键
+   */
+  testKey?: string;
+
+  /**
+   * 值
+   */
+  value?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
+
+export interface DemoCountQuery {
+  /**
+   * 部门id
+   */
+  deptId?: string | number;
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  /**
+   * 排序号
+   */
+  orderNum?: number;
+
+  /**
+   * key键
+   */
+  testKey?: string;
+
+  /**
+   * 值
+   */
+  value?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
-- 
Gitee