From 16d8b71e21dc7298b30f46bf264cd9b3589a6978 Mon Sep 17 00:00:00 2001
From: who's hu <hup_dev@outlook.com>
Date: Tue, 22 Aug 2023 17:25:19 +0800
Subject: [PATCH] update ruoyi-ui/src/permission.js. 由于重定向url存在 http://xxx.xx.xxx/{id}?param={a}&name={b} 的场景, 当未登录访问时, 通过改js封装登录后重定向参数, 会丢失?后的query params 如: 访问 http://localhost:1024/core/doc/doc?id=1683734914907807745&version=31 期望 http://localhost:1024/login?redirect=%2Fcore%2Fdoc%2Fdoc%3Fid%3D1683734914907807745%26version%3D31 实际通过 to.fullPath 封装后 获得 http://localhost:1024/login?redirect=%2Fcore%2Fdoc%2Fdoc%3Fid%3D1683734914907807745&version=31
---
ruoyi-ui/src/views/tool/gen/importTable.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/views/tool/gen/importTable.vue b/ruoyi-ui/src/views/tool/gen/importTable.vue
index e48a5f3..9d738be 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" append-to-body>
- <el-form :model="queryParams" ref="queryForm" :inline="true">
+ <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>
@@ -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.2