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 |  144 +++++++++++++++++++++++++++---------------------
 1 files changed, 81 insertions(+), 63 deletions(-)

diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue
index 63c6d4a..eada1dc 100644
--- a/src/views/tool/gen/importTable.vue
+++ b/src/views/tool/gen/importTable.vue
@@ -1,5 +1,44 @@
+<template>
+  <!-- 瀵煎叆琛� -->
+  <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="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">
+        <el-input v-model="queryParams.tableComment" placeholder="璇疯緭鍏ヨ〃鎻忚堪" clearable @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-row>
+      <el-table @row-click="clickRow" ref="tableRef" :data="dbTableList" @selection-change="handleSelectionChange" height="260px">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column prop="tableName" label="琛ㄥ悕绉�" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column prop="tableComment" label="琛ㄦ弿杩�" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column prop="createTime" label="鍒涘缓鏃堕棿"></el-table-column>
+        <el-table-column prop="updateTime" label="鏇存柊鏃堕棿"></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-row>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="handleImportTable">纭� 瀹�</el-button>
+        <el-button @click="visible = false">鍙� 娑�</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</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';
@@ -14,93 +53,72 @@
 const queryFormRef = ref(ElForm);
 
 const queryParams = reactive<DbTableQuery>({
-  pageNum: 1,
-  pageSize: 10,
-  tableName: '',
-  tableComment: ''
+    pageNum: 1,
+    pageSize: 10,
+    dataName: '',
+    tableName: '',
+    tableComment: ''
 });
+const dataNameList = ref<Array<string>>([]);
 
 const emit = defineEmits(["ok"]);
 
 /** 鏌ヨ鍙傛暟鍒楄〃 */
-const show = () => {
-  getList();
-  visible.value = true;
+const show = (dataName: string) => {
+    getDataNameList();
+    if(dataName){
+      queryParams.dataName = dataName;
+    } else {
+      queryParams.dataName = 'master';
+    }
+    getList();
+    visible.value = true;
 }
 /** 鍗曞嚮閫夋嫨琛� */
 const clickRow = (row: DbTableVO) => {
-  tableRef.value.toggleRowSelection(row);
+    tableRef.value.toggleRowSelection(row);
 }
 /** 澶氶�夋閫変腑鏁版嵁 */
 const handleSelectionChange = (selection: DbTableVO[]) => {
-  tables.value = selection.map(item => item.tableName);
+    tables.value = selection.map(item => item.tableName);
 }
 /** 鏌ヨ琛ㄦ暟鎹� */
 const getList = async () => {
-	const res = await listDbTable(queryParams);
-	dbTableList.value = res.rows;
-	total.value = res.total;
+    const res = await listDbTable(queryParams);
+    dbTableList.value = res.rows;
+    total.value = res.total;
 }
 /** 鎼滅储鎸夐挳鎿嶄綔 */
 const handleQuery = () => {
-  queryParams.pageNum = 1;
-  getList();
+    queryParams.pageNum = 1;
+    getList();
 }
 /** 閲嶇疆鎸夐挳鎿嶄綔 */
 const resetQuery = () => {
-	queryFormRef.value.resetFields();
-  handleQuery();
+    queryFormRef.value.resetFields();
+    handleQuery();
 }
 /** 瀵煎叆鎸夐挳鎿嶄綔 */
 const handleImportTable = async () => {
-  const tableNames = tables.value.join(",");
-  if (tableNames == "") {
-    proxy?.$modal.msgError("璇烽�夋嫨瑕佸鍏ョ殑琛�");
-    return;
-  }
-	const res = await importTable({ tables: tableNames });
-	proxy?.$modal.msgSuccess(res.msg);
-	if (res.code === 200) {
-		visible.value = false;
-		emit("ok");
-	}
+    const tableNames = tables.value.join(",");
+    if (tableNames == "") {
+        proxy?.$modal.msgError("璇烽�夋嫨瑕佸鍏ョ殑琛�");
+        return;
+    }
+    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,
+    show,
 });
 </script>
-
-<template>
-	<!-- 瀵煎叆琛� -->
-	<el-dialog title="瀵煎叆琛�" v-model="visible" width="800px" top="5vh" append-to-body>
-		<el-form :model="queryParams" ref="queryFormRef" :inline="true">
-			<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">
-				<el-input v-model="queryParams.tableComment" placeholder="璇疯緭鍏ヨ〃鎻忚堪" clearable @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-row>
-			<el-table @row-click="clickRow" ref="tableRef" :data="dbTableList" @selection-change="handleSelectionChange" height="260px">
-				<el-table-column type="selection" width="55"></el-table-column>
-				<el-table-column prop="tableName" label="琛ㄥ悕绉�" :show-overflow-tooltip="true"></el-table-column>
-				<el-table-column prop="tableComment" label="琛ㄦ弿杩�" :show-overflow-tooltip="true"></el-table-column>
-				<el-table-column prop="createTime" label="鍒涘缓鏃堕棿"></el-table-column>
-				<el-table-column prop="updateTime" label="鏇存柊鏃堕棿"></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-row>
-		<template #footer>
-			<div class="dialog-footer">
-				<el-button type="primary" @click="handleImportTable">纭� 瀹�</el-button>
-				<el-button @click="visible = false">鍙� 娑�</el-button>
-			</div>
-		</template>
-	</el-dialog>
-</template>

--
Gitblit v1.9.3