From 31d4755d2949e4ababeacfd58126c5e320958929 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Mon, 19 Feb 2024 12:12:30 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/genDatabaseType.ts      |  20 +++
 .../system/controller/genTableFieldType.ts    |  20 +++
 .../platform/system/entity/genDatabaseType.ts |  13 ++
 .../system/entity/genTableFieldType.ts        |  16 ++
 ...ientModal.vue => GenDataBaseTypeModal.vue} |   5 +-
 .../devtools/genDataBaseType/client.data.ts   | 154 ------------------
 .../genDataBaseType/genDataBaseType.data.ts   |  89 ++++++++++
 .../system/devtools/genDataBaseType/index.vue |  73 ++++++---
 8 files changed, 209 insertions(+), 181 deletions(-)
 create mode 100644 src/api/platform/system/controller/genDatabaseType.ts
 create mode 100644 src/api/platform/system/controller/genTableFieldType.ts
 create mode 100644 src/api/platform/system/entity/genDatabaseType.ts
 create mode 100644 src/api/platform/system/entity/genTableFieldType.ts
 rename src/views/system/devtools/genDataBaseType/{ClientModal.vue => GenDataBaseTypeModal.vue} (95%)
 delete mode 100644 src/views/system/devtools/genDataBaseType/client.data.ts
 create mode 100644 src/views/system/devtools/genDataBaseType/genDataBaseType.data.ts

diff --git a/src/api/platform/system/controller/genDatabaseType.ts b/src/api/platform/system/controller/genDatabaseType.ts
new file mode 100644
index 0000000..78fd5fe
--- /dev/null
+++ b/src/api/platform/system/controller/genDatabaseType.ts
@@ -0,0 +1,20 @@
+import type { GenDatabaseTypeParams, GenDatabaseType, GenDatabaseTypeResult } from '/@/api/platform/system/entity/genDatabaseType';
+import { defHttp } from '/@/utils/http/axios';
+
+enum Api {
+  list = '/system_proxy/system/devtools/genDatabaseType/list',
+  add = '/system_proxy/system/devtools/genDatabaseType/save',
+  get = '/system_proxy/system/devtools/genDatabaseType',
+  edit = '/system_proxy/system/devtools/genDatabaseType/update',
+  del = '/system_proxy/system/devtools/genDatabaseType/remove',
+}
+
+export const listGenDatabaseType = (params?: Partial<GenDatabaseTypeParams>) => defHttp.get<GenDatabaseTypeResult>({ url: Api.list, params }, { isReturnResultResponse: true });
+
+export const addGenDatabaseType = (params: Partial<GenDatabaseType>) => defHttp.post({ url: Api.add, data: params });
+
+export const editGenDatabaseType = (params: Partial<GenDatabaseType>) => defHttp.put({ url: Api.edit, data: params });
+
+export const getGenDatabaseType = (id: string) => defHttp.get<GenDatabaseType>({ url: `${Api.get}/${id}` });
+
+export const delGenDatabaseType = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` });
diff --git a/src/api/platform/system/controller/genTableFieldType.ts b/src/api/platform/system/controller/genTableFieldType.ts
new file mode 100644
index 0000000..1bde6bb
--- /dev/null
+++ b/src/api/platform/system/controller/genTableFieldType.ts
@@ -0,0 +1,20 @@
+import type { GenTableFieldTypeParams, GenTableFieldType, GenTableFieldTypeResult } from '/@/api/platform/system/entity/genTableFieldType';
+import { defHttp } from '/@/utils/http/axios';
+
+enum Api {
+  list = '/system_proxy/system/devtools/genTableFieldType/list',
+  add = '/system_proxy/system/devtools/genTableFieldType/save',
+  get = '/system_proxy/system/devtools/genTableFieldType',
+  edit = '/system_proxy/system/devtools/genTableFieldType/update',
+  del = '/system_proxy/system/devtools/genTableFieldType/remove',
+}
+
+export const listGenTableFieldType = (params?: Partial<GenTableFieldTypeParams>) => defHttp.get<GenTableFieldTypeResult>({ url: Api.list, params }, { isReturnResultResponse: true });
+
+export const addGenTableFieldType = (params: Partial<GenTableFieldType>) => defHttp.post({ url: Api.add, data: params });
+
+export const editGenTableFieldType = (params: Partial<GenTableFieldType>) => defHttp.put({ url: Api.edit, data: params });
+
+export const getGenTableFieldType = (id: string) => defHttp.get<GenTableFieldType>({ url: `${Api.get}/${id}` });
+
+export const delGenTableFieldType = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` });
diff --git a/src/api/platform/system/entity/genDatabaseType.ts b/src/api/platform/system/entity/genDatabaseType.ts
new file mode 100644
index 0000000..aa66a86
--- /dev/null
+++ b/src/api/platform/system/entity/genDatabaseType.ts
@@ -0,0 +1,13 @@
+import type { R } from '/#/axios';
+import type { Page } from '/@/api/common/data/entity';
+import type { BaseEntity } from '/@/api/common/base/entity';
+
+export type GenDatabaseTypeParams = Page & GenDatabaseType;
+
+export interface GenDatabaseType extends BaseEntity {
+  id: string;
+  type: string;
+  [key: string]: any;
+}
+
+export type GenDatabaseTypeResult = R<GenDatabaseType[]>;
diff --git a/src/api/platform/system/entity/genTableFieldType.ts b/src/api/platform/system/entity/genTableFieldType.ts
new file mode 100644
index 0000000..8c95a42
--- /dev/null
+++ b/src/api/platform/system/entity/genTableFieldType.ts
@@ -0,0 +1,16 @@
+import type { R } from '/#/axios';
+import type { Page } from '/@/api/common/data/entity';
+import type { BaseEntity } from '/@/api/common/base/entity';
+
+export type GenTableFieldTypeParams = Page & GenTableFieldType;
+
+export interface GenTableFieldType extends BaseEntity {
+  id: string;
+  typeId: string;
+  label: string;
+  value: string;
+  sort: number;
+  [key: string]: any;
+}
+
+export type GenTableFieldTypeResult = R<GenTableFieldType[]>;
diff --git a/src/views/system/devtools/genDataBaseType/ClientModal.vue b/src/views/system/devtools/genDataBaseType/GenDataBaseTypeModal.vue
similarity index 95%
rename from src/views/system/devtools/genDataBaseType/ClientModal.vue
rename to src/views/system/devtools/genDataBaseType/GenDataBaseTypeModal.vue
index ebacf06..e31ba40 100644
--- a/src/views/system/devtools/genDataBaseType/ClientModal.vue
+++ b/src/views/system/devtools/genDataBaseType/GenDataBaseTypeModal.vue
@@ -11,7 +11,7 @@
 <script lang="ts" setup>
   import { ref, unref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { formSchema } from './client.data';
+  import { formSchema } from './genDataBaseType.data';
   import { addClient, editClient, getClient, listClient } from '/@/api/platform/system/controller/client';
   import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
   import { isEmpty } from '/@/utils/is';
@@ -62,6 +62,9 @@
       case 'add':
         props.title = '新增客户端';
         break;
+      case 'view':
+        props.title = '查看客户端';
+        break;
       case 'edit':
         props.title = '编辑客户端';
         await setFieldsValue(await getClient(clientId));
diff --git a/src/views/system/devtools/genDataBaseType/client.data.ts b/src/views/system/devtools/genDataBaseType/client.data.ts
deleted file mode 100644
index 39b54c6..0000000
--- a/src/views/system/devtools/genDataBaseType/client.data.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-import { BasicColumn } from '/@/components/Table';
-import { FormSchema } from '/@/components/Table';
-
-export const columns: BasicColumn[] = [
-  {
-    title: '客户端Id',
-    dataIndex: 'clientId',
-    width: 100
-  },
-  {
-    title: '客户端密钥',
-    dataIndex: 'clientSecret',
-    width: 100
-  },
-  {
-    title: '授权类型',
-    dataIndex: 'authorizedGrantTypes',
-    width: 130
-  },
-  {
-    title: '授权范围',
-    dataIndex: 'scope',
-    width: 90
-  },
-  {
-    title: '令牌过期秒数',
-    dataIndex: 'accessTokenValidity',
-    width: 130
-  },
-  {
-    title: '令牌过期秒数',
-    dataIndex: 'refreshTokenValidity',
-    width: 130
-  },
-  {
-    title: '创建时间',
-    dataIndex: 'createTime',
-    width: 100
-  }
-];
-
-export const searchFormSchema: FormSchema[] = [
-  {
-    field: 'clientId',
-    label: '客户端编码',
-    component: 'Input',
-    componentProps: {
-      placeholder: '请输入客户端编码',
-    },
-    colProps: { span: 8 },
-  },
-  {
-    field: 'dateRange',
-    label: '创建时间',
-    component: 'RangePicker',
-    componentProps: {
-      style: { width:'100%' },
-      valueFormat: 'YYYY-MM-DD',
-      placeholder: ['开始日期','结束日期']
-    },
-    colProps: { span: 8 }
-  }
-];
-
-export const formSchema: FormSchema[] = [
-  {
-    field: 'id',
-    label: 'ID',
-    component: 'Input',
-    show: false
-  },
-  {
-    field: 'clientId',
-    label: '客户端Id',
-    component: 'Input',
-    required: true,
-    colProps: {
-      span: 12
-    }
-  },
-  {
-    field: 'clientSecret',
-    label: '客户端密钥',
-    component: 'Input',
-    required: true,
-    colProps: {
-      span: 12
-    }
-  },
-  {
-    field: 'authorizedGrantTypes',
-    label: '授权类型',
-    component: 'InputTextArea',
-    required:true,
-    componentProps: {
-      rows: 3
-    },
-    colProps: {
-      span: 24
-    }
-  },
-  {
-    field: 'scope',
-    label: '授权范围',
-    component: 'Input',
-    required:true,
-    colProps: {
-      span: 12
-    }
-  },
-  {
-    field: 'accessTokenValidity',
-    label: '过期秒数',
-    component: 'InputNumber',
-    componentProps: {
-      style: { width:'100%' },
-      min: 0
-    },
-    colProps: {
-      span: 12
-    }
-  },
-  {
-    field: 'refreshTokenValidity',
-    label: '刷新秒数',
-    component: 'InputNumber',
-    componentProps: {
-      style: { width:'100%' },
-      min: 0
-    },
-    colProps: {
-      span: 12
-    }
-  },
-  {
-    field: 'webServerRedirectUri',
-    label: '回调地址',
-    component: 'Input',
-    colProps: {
-      span: 12
-    }
-  },
-  {
-    field: 'additionalInformation',
-    label: '附加说明',
-    component: 'InputTextArea',
-    componentProps: {
-      rows: 6
-    },
-    colProps: {
-      span: 24
-    }
-  }
-];
diff --git a/src/views/system/devtools/genDataBaseType/genDataBaseType.data.ts b/src/views/system/devtools/genDataBaseType/genDataBaseType.data.ts
new file mode 100644
index 0000000..ce40483
--- /dev/null
+++ b/src/views/system/devtools/genDataBaseType/genDataBaseType.data.ts
@@ -0,0 +1,89 @@
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { listGenDatabaseType } from '/@/api/platform/system/controller/genDatabaseType';
+
+export const columns: BasicColumn[] = [
+  {
+    title: '数据库类型',
+    dataIndex: 'type'
+  }
+];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'type',
+    label: '数据库类型',
+    component: 'ApiSelect',
+    colProps: { span: 6 },
+    componentProps: {
+      api: listGenDatabaseType,
+      params: {
+        size: 99
+      },
+      labelField: 'type',
+      valueField: 'id',
+      resultField: 'data'
+    }
+  }
+];
+
+export const formSchema: FormSchema[] = [
+  {
+    field: 'id',
+    label: 'ID',
+    component: 'Input',
+    show: false
+  },
+  {
+    field: 'nickName',
+    label: '昵称',
+    component: 'Input',
+  },
+  {
+    field: 'deptName',
+    label: '所属部门',
+    component: 'Input',
+    colProps: {
+      span: 12
+    },
+  },
+  {
+    field: 'sex',
+    label: '性别',
+    component: 'Select',
+    colProps: {
+      span: 12
+    },
+    componentProps: {
+      options: [
+        { label: '男', value: '0' },
+        { label: '女', value: '1' }
+      ]
+    },
+  },
+  {
+    field: 'phone',
+    label: '手机号',
+    component: 'Input',
+  },
+  {
+    field: 'email',
+    label: '邮箱',
+    component: 'Input',
+  },
+];
+
+export const genTableFieldTypeReloadColumns: BasicColumn[] = [
+  {
+    title: '标签',
+    dataIndex: 'label'
+  },
+  {
+    title: '值',
+    dataIndex: 'value'
+  },
+  {
+    title: '排序',
+    dataIndex: 'sort'
+  }
+];
diff --git a/src/views/system/devtools/genDataBaseType/index.vue b/src/views/system/devtools/genDataBaseType/index.vue
index 41981c5..4aeee19 100644
--- a/src/views/system/devtools/genDataBaseType/index.vue
+++ b/src/views/system/devtools/genDataBaseType/index.vue
@@ -4,66 +4,70 @@
       @register="registerTable"
       @selection-change="handleSelectionChange"
     >
+      <template #expandedRowRender="{ record }">
+        <BasicTable :style="{ margin: '0px' }"
+                    :searchInfo="{ typeId: record.id }"
+                    @register="genTableFieldTypeRegisterTable"
+        />
+      </template>
       <template #toolbar>
         <a-button
-          v-auth="['client_add']"
           type="primary"
           @click="handleAdd()"
-        >新增客户端</a-button>
+        >新增</a-button>
         <a-button
-          v-auth="['client_edit']"
           type="primary"
           :disabled="state.single"
           @click="handleEdit()"
-        >修改客户端</a-button>
+        >修改</a-button>
         <a-button
-          v-auth="['client_del']"
           type="primary"
           :disabled="state.multiple"
           @click="handleDel()"
-        >删除客户端</a-button>
+        >删除</a-button>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
           <TableAction
             :actions="[
+              {
+                label: '查看',
+                icon: 'fa-regular:eye',
+                onClick: handleViewEdit.bind(null, record)
+              },
               {
                 label: '编辑',
                 icon: 'fa6-regular:pen-to-square',
-                auth: ['client_edit'],
                 onClick: handleEdit.bind(null, record)
               },
               {
                 label: '删除',
                 icon: 'ant-design:delete-outlined',
                 color: 'error',
-                auth: ['client_del'],
                 onClick: handleDel.bind(null, record)
               }]"
           />
         </template>
       </template>
     </BasicTable>
-    <!--弹出窗体区域-->
-    <ClientModal @register="registerModal" @success="handleRefreshTable"/>
+    <GenDataBaseTypeModal @register="registerModal" @success="handleRefreshTable"/>
   </div>
 </template>
 
 <script lang="ts" setup>
   import { reactive, toRaw } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { listClient, delClient } from '/@/api/platform/system/controller/client';
   import { useModal } from '/@/components/Modal';
-  import ClientModal from './ClientModal.vue';
-  import { columns, searchFormSchema } from './client.data';
+  import GenDataBaseTypeModal from './GenDataBaseTypeModal.vue';
+  import {columns, genTableFieldTypeReloadColumns, searchFormSchema} from './genDataBaseType.data';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { listGenDatabaseType, delGenDatabaseType } from '/@/api/platform/system/controller/genDatabaseType';
+  import { listGenTableFieldType } from '/@/api/platform/system/controller/genTableFieldType';
 
   interface TableState {
     single: boolean;
     multiple: boolean;
   }
-
-  /** 通用变量统一声明区域 */
   const state = reactive<TableState>({
     // 非单个禁用
     single: true,
@@ -73,18 +77,17 @@
   const { createConfirm, createMessage } = useMessage();
   const [registerModal, { openModal }] = useModal();
   const [registerTable, { reload, clearSelectedRowKeys, getSelectRowKeys }] = useTable({
-    title: '客户端列表',
-    api: listClient,
-    rowKey: 'clientId',
+    title: '数据库类型列表',
+    api: listGenDatabaseType,
+    rowKey: 'id',
     columns,
     formConfig: {
       compact: true,
-      labelWidth: 100,
+      labelWidth: 80,
       schemas: searchFormSchema,
       autoSubmitOnEnter: true,
       showAdvancedButton: true,
       autoAdvancedLine: 3,
-      fieldMapToTime: [['dateRange', ['beginTime', 'endTime'], 'YYYY-MM-DD']]
     },
     rowSelection: { type: 'checkbox' },
     useSearchForm: true,
@@ -96,11 +99,22 @@
       width: 220,
       title: '操作',
       dataIndex: 'action',
-      //slots: { customRender: 'action' },
       fixed: false
     },
     handleSearchInfoFn: () => clearSelectedRowKeys()
   });
+  const [genTableFieldTypeRegisterTable] = useTable({
+    api: listGenTableFieldType,
+    rowKey: 'id',
+    columns: genTableFieldTypeReloadColumns,
+    useSearchForm: false,
+    showTableSetting: false,
+    searchInfo: { size: 999 },
+    bordered: true,
+    pagination: false,
+    clickToRowSelect: false,
+    showIndexColumn: false,
+  });
 
   /** 处理多选框选中数据 */
   function handleSelectionChange(selection?: Recordable) {
@@ -116,20 +130,26 @@
 
   /** 编辑按钮操作,行内编辑 */
   function handleEdit(record?: Recordable) {
-    record = record || { clientId: getSelectRowKeys() };
+    record = record || { id: getSelectRowKeys() };
     openModal(true, { _tag: 'edit', record });
   }
 
+  /** 查看按钮操作,行内查看 */
+  function handleViewEdit(record?: Recordable) {
+    record = record || { id: getSelectRowKeys() };
+    openModal(true, { _tag: 'view', record });
+  }
+
   /** 删除按钮操作,行内删除 */
   async function handleDel(record?: Recordable) {
-    const clientIds = record?.clientId || getSelectRowKeys();
+    const ids = record?.id || getSelectRowKeys();
     createConfirm({
       iconType: 'warning',
       title: '警告',
-      content: `是否确认删除客户端编号为${clientIds}客户端吗?`,
+      content: `是否确认取消编号为${ids}的数据?`,
       onOk: async () => {
-        await delClient(clientIds);
-        createMessage.success('删除成功!');
+        await delGenDatabaseType(ids);
+        createMessage.success('取消成功!');
         handleRefreshTable();
       }
     });
@@ -140,4 +160,5 @@
     clearSelectedRowKeys();
     reload();
   }
+
 </script>