From c13c622eac5551c6f099f148feb5256711ca34de Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期二, 11 七月 2023 21:03:01 +0800 Subject: [PATCH] !25 部分优化以及新增功能 Merge pull request !25 from ahaos/tspr --- src/views/tool/gen/importTable.vue | 87 +++++++++++++++++++++---------------------- 1 files changed, 43 insertions(+), 44 deletions(-) diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue index eada1dc..91e88fc 100644 --- a/src/views/tool/gen/importTable.vue +++ b/src/views/tool/gen/importTable.vue @@ -3,11 +3,11 @@ <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-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"> @@ -26,7 +26,7 @@ <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" /> + <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"> @@ -40,8 +40,6 @@ <script setup lang="ts"> 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'; const total = ref(0); const visible = ref(false); @@ -49,15 +47,15 @@ const dbTableList = ref<Array<DbTableVO>>([]); const { proxy } = getCurrentInstance() as ComponentInternalInstance; -const tableRef = ref(ElTable); -const queryFormRef = ref(ElForm); +const tableRef = ref<ElTableInstance>(); +const queryFormRef = ref<ElFormInstance>(); const queryParams = reactive<DbTableQuery>({ - pageNum: 1, - pageSize: 10, - dataName: '', - tableName: '', - tableComment: '' + pageNum: 1, + pageSize: 10, + dataName: '', + tableName: '', + tableComment: '' }); const dataNameList = ref<Array<string>>([]); @@ -65,52 +63,53 @@ /** 鏌ヨ鍙傛暟鍒楄〃 */ const show = (dataName: string) => { - getDataNameList(); - if(dataName){ - queryParams.dataName = dataName; - } else { - queryParams.dataName = 'master'; - } - getList(); - visible.value = true; + getDataNameList(); + if (dataName) { + queryParams.dataName = dataName; + } else { + queryParams.dataName = 'master'; + } + getList(); + visible.value = true; } /** 鍗曞嚮閫夋嫨琛� */ const clickRow = (row: DbTableVO) => { - tableRef.value.toggleRowSelection(row); + // ele bug + 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, dataName: queryParams.dataName }); - 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 () => { @@ -119,6 +118,6 @@ } defineExpose({ - show, + show, }); </script> -- Gitblit v1.9.3