From 06bc04c04c120b2e89a661c36b6316b99c1ad6ea Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: 星期二, 06 六月 2023 16:27:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/tool/gen/importTable.vue | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue
index 5ff0145..eada1dc 100644
--- a/src/views/tool/gen/importTable.vue
+++ b/src/views/tool/gen/importTable.vue
@@ -1,8 +1,13 @@
<template>
<!-- 瀵煎叆琛� -->
- <el-dialog title="瀵煎叆琛�" v-model="visible" width="800px" top="5vh" append-to-body>
+ <el-dialog title="瀵煎叆琛�" v-model="visible" width="1100px" top="5vh" append-to-body>
<el-form :model="queryParams" ref="queryFormRef" :inline="true">
- <el-form-item label="琛ㄥ悕绉�" prop="tableName">
+ <el-form-item label="鏁版嵁婧�" prop="dataName">
+ <el-select v-model="queryParams.dataName" filterable placeholder="璇烽�夋嫨/杈撳叆鏁版嵁婧愬悕绉�" style="width: 200px">
+ <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 @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="琛ㄦ弿杩�" prop="tableComment">
@@ -33,7 +38,7 @@
</template>
<script setup lang="ts">
-import { listDbTable, importTable } from '@/api/tool/gen';
+import { listDbTable, importTable, getDataNames } from '@/api/tool/gen';
import { DbTableQuery, DbTableVO } from '@/api/tool/gen/types';
import { ComponentInternalInstance } from 'vue';
import { ElTable, ElForm } from 'element-plus';
@@ -50,14 +55,22 @@
const queryParams = reactive<DbTableQuery>({
pageNum: 1,
pageSize: 10,
+ dataName: '',
tableName: '',
tableComment: ''
});
+const dataNameList = ref<Array<string>>([]);
const emit = defineEmits(["ok"]);
/** 鏌ヨ鍙傛暟鍒楄〃 */
-const show = () => {
+const show = (dataName: string) => {
+ getDataNameList();
+ if(dataName){
+ queryParams.dataName = dataName;
+ } else {
+ queryParams.dataName = 'master';
+ }
getList();
visible.value = true;
}
@@ -92,13 +105,18 @@
proxy?.$modal.msgError("璇烽�夋嫨瑕佸鍏ョ殑琛�");
return;
}
- const res = await importTable({ tables: tableNames });
+ const res = await importTable({ tables: tableNames, dataName: queryParams.dataName });
proxy?.$modal.msgSuccess(res.msg);
if (res.code === 200) {
visible.value = false;
emit("ok");
}
}
+/** 鏌ヨ澶氭暟鎹簮鍚嶇О */
+const getDataNameList = async () => {
+ const res = await getDataNames()
+ dataNameList.value = res.data;
+}
defineExpose({
show,
--
Gitblit v1.9.3