From 985dc26ab03552ef372797baa1dbdc7cdf376645 Mon Sep 17 00:00:00 2001
From: Fnckerpoi <382716335@qq.com>
Date: Mon, 15 May 2023 14:03:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=8E=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=99=A8=EF=BC=9A=E5=AE=9E=E7=8E=B0=E5=A4=9A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E6=89=A9=E5=B1=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/develop/codegen/CodeGen.api.ts    |  9 +++-
 .../modules/develop/codegen/CodeGenForm.vue   |  6 ++-
 .../modules/develop/codegen/CodeGenList.vue   | 45 +++++++++++++------
 3 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/src/views/modules/develop/codegen/CodeGen.api.ts b/src/views/modules/develop/codegen/CodeGen.api.ts
index 6e0629f..90dd553 100644
--- a/src/views/modules/develop/codegen/CodeGen.api.ts
+++ b/src/views/modules/develop/codegen/CodeGen.api.ts
@@ -14,10 +14,10 @@ export const page = (params) => {
 /**
  * 获取表相关的代码生成参数信息
  */
-export function getTableGenParam(tableName) {
+export function getTableGenParam(dataSourceCode, tableName) {
   return defHttp.get<Result<TableGenParam>>({
     url: '/gen/table/getTableGenParam',
-    params: { tableName },
+    params: { dataSourceCode, tableName },
   })
 }
 
@@ -65,3 +65,8 @@ export interface TableGenParam {
   // 功能模块名称(全小写)
   module: string
 }
+
+export interface DataSource {
+  value: string
+  label: string
+}
diff --git a/src/views/modules/develop/codegen/CodeGenForm.vue b/src/views/modules/develop/codegen/CodeGenForm.vue
index 42b0ca7..67480a5 100644
--- a/src/views/modules/develop/codegen/CodeGenForm.vue
+++ b/src/views/modules/develop/codegen/CodeGenForm.vue
@@ -89,6 +89,7 @@
   const form = $ref({
     basePack: 'cn.bootx',
     module: '',
+    dataSourceCode: '',
     tableName: '',
     entityName: '',
     baseEntity: 'MpBaseEntity',
@@ -111,9 +112,10 @@
 
   const emits = defineEmits(['down', 'preview'])
 
-  function show(tableName, type: 'down' | 'preview') {
+  function show(dataSourceCode, tableName, type: 'down' | 'preview') {
     visible.value = true
     form.tableName = tableName
+    form.dataSourceCode = dataSourceCode
     genType = type
     genPackFlag = false
     getGenConfigParam()
@@ -129,7 +131,7 @@
    */
   async function getGenConfigParam() {
     // 获取功能模块名称
-    const { data } = await getTableGenParam(form.tableName)
+    const { data } = await getTableGenParam(form.dataSourceCode, form.tableName)
     form.entityName = data.entityName
     form.module = data.module
   }
diff --git a/src/views/modules/develop/codegen/CodeGenList.vue b/src/views/modules/develop/codegen/CodeGenList.vue
index f2269a9..50b2642 100644
--- a/src/views/modules/develop/codegen/CodeGenList.vue
+++ b/src/views/modules/develop/codegen/CodeGenList.vue
@@ -1,7 +1,13 @@
 <template>
   <div>
     <div class="m-3 p-3 pt-5 bg-white">
-      <b-query :query-params="model.queryParam" :fields="fields" @query="queryPage" @reset="resetQueryParams" />
+      <b-query
+        :query-params="model.queryParam"
+        :fields="fields"
+        :defaultItemCount="fields.length"
+        @query="queryPage"
+        @reset="resetQueryParams"
+      />
     </div>
     <div class="m-3 p-3 bg-white">
       <vxe-toolbar ref="xToolbar" custom zoom :refresh="{ query: queryPage }" />
@@ -15,7 +21,7 @@
           <template #default="{ row }">
             <!--          <a href="javascript:" @click="previewShow(row)">预览</a>-->
             <!--          <a-divider type="vertical" />-->
-            <a href="javascript:" @click="generateShow(row)">生成</a>
+            <a href="javascript:" @click="generateShow(model.queryParam['dataSourceCode'], row)">生成</a>
           </template>
         </vxe-column>
       </vxe-table>
@@ -33,39 +39,52 @@
 
 <script lang="ts" setup>
   import CodeGenForm from './CodeGenForm.vue'
-  import { QueryField, STRING } from '/@/components/Bootx/Query/Query'
+  import { LIST, QueryField, STRING } from '/@/components/Bootx/Query/Query'
   import useTablePage from '/@/hooks/bootx/useTablePage'
   import { $ref } from '@vue-macros/reactivity-transform/macros'
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
   import { onMounted } from 'vue'
-  import { codeGenPreview, genCodeZip, page } from './CodeGen.api'
+  import { codeGenPreview, DataSource, genCodeZip, page } from './CodeGen.api'
   import { downloadByData } from '/@/utils/file/download'
   import BQuery from '/@/components/Bootx/Query/BQuery.vue'
+  import { findAllDataSource } from '/@/views/modules/develop/dynamicsource/DynamicDataSource.api'
 
   const { handleTableChange, resetQueryParams, pageQueryResHandel, pagination, pages, model, loading } = useTablePage(queryPage)
-
   // 查询条件
-  const fields = [
-    { field: 'tableName', type: STRING, name: '名称', placeholder: '请输入表名称' },
-    { field: 'tableComment', type: STRING, name: '描述', placeholder: '请输入表描述' },
-  ] as QueryField[]
 
   const xTable = $ref<VxeTableInstance>()
   const xToolbar = $ref<VxeToolbarInstance>()
   let codeGenForm = $ref<any>()
+  let optionTest = $ref([] as DataSource[])
+
+  const fields = [
+    { field: 'tableName', type: STRING, name: '名称', placeholder: '请输入表名称' },
+    { field: 'tableComment', type: STRING, name: '描述', placeholder: '请输入表描述' },
+    { field: 'dataSourceCode', type: LIST, name: '数据库源', placeholder: '选择所需数据源', selectList: optionTest },
+  ] as QueryField[]
 
   onMounted(() => {
     vxeBind()
+    initDataSource()
     queryPage()
   })
   function vxeBind() {
     xTable?.connect(xToolbar as VxeToolbarInstance)
   }
 
+  // 数据源列表获取
+  function initDataSource() {
+    findAllDataSource().then(({ data }) => {
+      data.forEach((item) => {
+        optionTest.push({ label: item.key, value: item.key })
+      })
+    })
+  }
+
   // 分页查询
-  function queryPage() {
+  async function queryPage() {
     loading.value = true
-    page({
+    await page({
       ...model.queryParam,
       ...pages,
     }).then(({ data }) => {
@@ -80,8 +99,8 @@
     })
   }
   // 打开预览
-  function generateShow(record) {
-    codeGenForm.show(record.tableName, 'down')
+  function generateShow(dataSourceName, record) {
+    codeGenForm.show(dataSourceName, record.tableName, 'down')
   }
   // 生成代码
   function generate(from) {
-- 
Gitee