From f4a2f909a779d0d2ffa8d5256b3d48648f65e761 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 26 Sep 2021 09:03:28 +0800
Subject: [PATCH] Excel注解支持导入导出标题信息
---
ruoyi-ui/src/views/tool/gen/index.vue | 34 ++++++++++++++--------------------
1 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue
index a11d739..fcc9f62 100644
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -161,7 +161,7 @@
@pagination="getList"
/>
<!-- 预览界面 -->
- <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body>
+ <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body class="scrollbar">
<el-tabs v-model="preview.activeName">
<el-tab-pane
v-for="(value, key) in preview.data"
@@ -238,7 +238,8 @@
const time = this.$route.query.t;
if (time != null && time != this.uniqueId) {
this.uniqueId = time;
- this.resetQuery();
+ this.queryParams.pageNum = Number(this.$route.query.pageNum);
+ this.getList();
}
},
methods: {
@@ -261,12 +262,12 @@
handleGenTable(row) {
const tableNames = row.tableName || this.tableNames;
if (tableNames == "") {
- this.msgError("请选择要生成的数据");
+ this.$modal.msgError("请选择要生成的数据");
return;
}
if(row.genType === "1") {
genCode(row.tableName).then(response => {
- this.msgSuccess("成功生成到自定义路径：" + row.genPath);
+ this.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath);
});
} else {
downLoadZip("/code/gen/batchGenCode?tables=" + tableNames, "ruoyi");
@@ -275,14 +276,10 @@
/** 同步数据库操作 */
handleSynchDb(row) {
const tableName = row.tableName;
- this.$confirm('确认要强制同步"' + tableName + '"表结构吗？', "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(function() {
- return synchDb(tableName);
+ this.$modal.confirm('确认要强制同步"' + tableName + '"表结构吗？').then(function() {
+ return synchDb(tableName);
}).then(() => {
- this.msgSuccess("同步成功");
+ this.$modal.msgSuccess("同步成功");
}).catch(() => {});
},
/** 打开导入表弹窗 */
@@ -300,6 +297,7 @@
previewTable(row.tableId).then(response => {
this.preview.data = response.data;
this.preview.open = true;
+ this.preview.activeName = "domain.java";
});
},
/** 高亮显示 */
@@ -319,20 +317,16 @@
/** 修改按钮操作 */
handleEditTable(row) {
const tableId = row.tableId || this.ids[0];
- this.$router.push("/tool/gen-edit/index/" + tableId);
+ this.$router.push({ path: '/tool/gen-edit/index', query: { tableId: tableId, pageNum: this.queryParams.pageNum } });
},
/** 删除按钮操作 */
handleDelete(row) {
const tableIds = row.tableId || this.ids;
- this.$confirm('是否确认删除表编号为"' + tableIds + '"的数据项?', "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(function() {
- return delTable(tableIds);
+ this.$modal.confirm('是否确认删除表编号为"' + tableIds + '"的数据项？').then(function() {
+ return delTable(tableIds);
}).then(() => {
- this.getList();
- this.msgSuccess("删除成功");
+ this.getList();
+ this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}
}
--
Gitblit v1.9.3