From 56050aa6501f3d9d2f79a2c40a28815878ac56ee Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 24 十一月 2022 15:14:47 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复Log注解GET请求记录不到参数问题 * fix 修复某些特性的环境生成代码变乱码TXT文件问题 * update 消除Vue3控制台出现的警告信息 * fix 开启TopNav没有子菜单隐藏侧边栏 * fix 修复回显数据字典数组异常问题(I60UYQ) * update 忽略不必要的属性数据返回
---
ruoyi-ui/src/views/tool/gen/importTable.vue | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ruoyi-ui/src/views/tool/gen/importTable.vue b/ruoyi-ui/src/views/tool/gen/importTable.vue
index fd98460..3ea9532 100644
--- a/ruoyi-ui/src/views/tool/gen/importTable.vue
+++ b/ruoyi-ui/src/views/tool/gen/importTable.vue
@@ -1,13 +1,12 @@
<template>
<!-- 瀵煎叆琛� -->
- <el-dialog title="瀵煎叆琛�" :visible.sync="visible" width="800px" top="5vh">
- <el-form :model="queryParams" ref="queryForm" :inline="true">
+ <el-dialog title="瀵煎叆琛�" :visible.sync="visible" width="800px" top="5vh" append-to-body>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
<el-form-item label="琛ㄥ悕绉�" prop="tableName">
<el-input
v-model="queryParams.tableName"
placeholder="璇疯緭鍏ヨ〃鍚嶇О"
clearable
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -16,7 +15,6 @@
v-model="queryParams.tableComment"
placeholder="璇疯緭鍏ヨ〃鎻忚堪"
clearable
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -28,8 +26,8 @@
<el-row>
<el-table @row-click="clickRow" ref="table" :data="dbTableList" @selection-change="handleSelectionChange" height="260px">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="tableName" label="琛ㄥ悕绉�"></el-table-column>
- <el-table-column prop="tableComment" label="琛ㄦ弿杩�"></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>
@@ -104,8 +102,13 @@
},
/** 瀵煎叆鎸夐挳鎿嶄綔 */
handleImportTable() {
- importTable({ tables: this.tables.join(",") }).then(res => {
- this.msgSuccess(res.msg);
+ const tableNames = this.tables.join(",");
+ if (tableNames == "") {
+ this.$modal.msgError("璇烽�夋嫨瑕佸鍏ョ殑琛�");
+ return;
+ }
+ importTable({ tables: tableNames }).then(res => {
+ this.$modal.msgSuccess(res.msg);
if (res.code === 200) {
this.visible = false;
this.$emit("ok");
--
Gitblit v1.9.3