From 8d37e3639544fc5540388474e60e2108ef917213 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Fri, 30 Dec 2022 11:40:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/api/tools/code.ts             |  6 +++-
 admin/src/views/dev_tools/code/edit.vue | 46 +++++++++++++++++++------
 2 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/admin/src/api/tools/code.ts b/admin/src/api/tools/code.ts
index 67235853..36cc1834 100644
--- a/admin/src/api/tools/code.ts
+++ b/admin/src/api/tools/code.ts
@@ -10,11 +10,15 @@ export function dataTable(params: any) {
     return request.get({ url: '/gen/db', params })
 }
 
-// 数据表列表接口
+// 数据表所有列表接口
 export function dataTableAll() {
     return request.get({ url: '/gen/dbAll' })
 }
 
+//表名查字段
+export function dataTableToColumn(params: any) {
+    return request.get({ url: '/gen/dbColumn', params })
+}
 //选择要生成代码的数据表
 export function selectTable(params: any) {
     return request.post(
diff --git a/admin/src/views/dev_tools/code/edit.vue b/admin/src/views/dev_tools/code/edit.vue
index 9c525f56..58551209 100644
--- a/admin/src/views/dev_tools/code/edit.vue
+++ b/admin/src/views/dev_tools/code/edit.vue
@@ -275,7 +275,12 @@
                     </el-tab-pane>
                     <el-tab-pane label="关联配置" name="relation">
                         <el-form-item label="关联子表的表名" prop="gen.subTableName">
-                            <el-select class="w-80" v-model="formData.gen.subTableName" clearable>
+                            <el-select
+                                class="w-80"
+                                v-model="formData.gen.subTableName"
+                                clearable
+                                @change="handleTableChange"
+                            >
                                 <el-option
                                     v-for="item in optionsData.dataTable"
                                     :key="item.tableName"
@@ -285,9 +290,14 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="子表关联的外键名 " prop="gen.subTableFk">
-                            <el-select class="w-80" v-model="formData.gen.subTableFk" clearable>
+                            <el-select
+                                class="w-80"
+                                v-model="formData.gen.subTableFk"
+                                clearable
+                                :loading="columnLoading"
+                            >
                                 <el-option
-                                    v-for="item in formData.column"
+                                    v-for="item in tableColumn"
                                     :key="item.id"
                                     :value="item.columnName"
                                     :label="`${item.columnName}：${item.columnComment}`"
@@ -295,13 +305,14 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="关联表主键 " prop="gen.subTableFr">
-                            <div class="w-80">
-                                <el-input
-                                    v-model="formData.gen.subTableFr"
-                                    placeholder="请输入关联表主键"
-                                    clearable
+                            <el-select class="w-80" v-model="formData.gen.subTableFr" clearable>
+                                <el-option
+                                    v-for="item in formData.column"
+                                    :key="item.id"
+                                    :value="item.columnName"
+                                    :label="`${item.columnName}：${item.columnComment}`"
                                 />
-                            </div>
+                            </el-select>
                         </el-form-item>
                     </el-tab-pane>
                 </el-tabs>
@@ -314,7 +325,7 @@
 </template>
 
 <script lang="ts" setup name="tableEdit">
-import { dataTableAll, generateEdit, tableDetail } from '@/api/tools/code'
+import { dataTableAll, generateEdit, tableDetail, dataTableToColumn } from '@/api/tools/code'
 import { dictTypeAll } from '@/api/setting/dict'
 import type { FormInstance } from 'element-plus'
 import feedback from '@/utils/feedback'
@@ -377,10 +388,12 @@ const getDetails = async () => {
     const data = await tableDetail({
         id: route.query.id
     })
+
     Object.keys(formData).forEach((key) => {
         //@ts-ignore
         formData[key] = data[key]
     })
+    getTableColumn()
 }
 
 const { optionsData } = useDictOptions<{
@@ -404,6 +417,19 @@ const { optionsData } = useDictOptions<{
     }
 })
 
+const columnLoading = ref(false)
+const tableColumn = ref<any[]>([])
+const getTableColumn = async () => {
+    columnLoading.value = true
+    const res = await dataTableToColumn({ tableName: formData.gen.subTableName })
+    columnLoading.value = false
+    tableColumn.value = res
+}
+
+const handleTableChange = () => {
+    formData.gen.subTableFk = ''
+    getTableColumn()
+}
 const handleSave = async () => {
     try {
         await formRef.value?.validate()