From 60e2d55a2304ed7b973ed7a9bd40f3a6fb242585 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 21 Apr 2025 13:28:32 +0800
Subject: [PATCH] 优化菜单搜索查询页
---
ruoyi-ui/src/views/tool/gen/index.vue | 94 +++++++++++++++++++++--------------------------
1 files changed, 42 insertions(+), 52 deletions(-)
diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue
index a11d739..d510a8f 100644
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -1,12 +1,11 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="表名称" prop="tableName">
<el-input
v-model="queryParams.tableName"
placeholder="请输入表名称"
clearable
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -15,14 +14,12 @@
v-model="queryParams.tableComment"
placeholder="请输入表描述"
clearable
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="dateRange"
- size="small"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
@@ -83,36 +80,18 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
+ <el-table ref="tables" v-loading="loading" :data="tableList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column type="selection" align="center" width="55"></el-table-column>
<el-table-column label="序号" type="index" width="50" align="center">
<template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column
- label="表名称"
- align="center"
- prop="tableName"
- :show-overflow-tooltip="true"
- width="120"
- />
- <el-table-column
- label="表描述"
- align="center"
- prop="tableComment"
- :show-overflow-tooltip="true"
- width="120"
- />
- <el-table-column
- label="实体"
- align="center"
- prop="className"
- :show-overflow-tooltip="true"
- width="120"
- />
- <el-table-column label="创建时间" align="center" prop="createTime" width="160" />
- <el-table-column label="更新时间" align="center" prop="updateTime" width="160" />
+ <el-table-column label="表名称" align="center" prop="tableName" :show-overflow-tooltip="true" width="120" />
+ <el-table-column label="表描述" align="center" prop="tableComment" :show-overflow-tooltip="true" width="120" />
+ <el-table-column label="实体" align="center" prop="className" :show-overflow-tooltip="true" width="120" />
+ <el-table-column label="创建时间" align="center" prop="createTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="160" />
+ <el-table-column label="更新时间" align="center" prop="updateTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="160" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -161,7 +140,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"
@@ -169,7 +148,8 @@
:name="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
:key="key"
>
- <pre><code class="hljs" v-html="highlightedCode(value, key)"></code></pre>
+ <el-link :underline="false" icon="el-icon-document-copy" v-clipboard:copy="value" v-clipboard:success="clipboardSuccess" style="float:right">复制</el-link>
+ <pre><code class="hljs" v-html="highlightedCode(value, key)"></code></pre>
</el-tab-pane>
</el-tabs>
</el-dialog>
@@ -180,7 +160,6 @@
<script>
import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/gen";
import importTable from "./importTable";
-import { downLoadZip } from "@/utils/zipdownload";
import hljs from "highlight.js/lib/highlight";
import "highlight.js/styles/github-gist.css";
hljs.registerLanguage("java", require("highlight.js/lib/languages/java"));
@@ -215,6 +194,8 @@
tableList: [],
// 日期范围
dateRange: "",
+ // 默认排序
+ defaultSort: { prop: "createTime", order: "descending" },
// 查询参数
queryParams: {
pageNum: 1,
@@ -232,13 +213,16 @@
};
},
created() {
+ this.queryParams.orderByColumn = this.defaultSort.prop;
+ this.queryParams.isAsc = this.defaultSort.order;
this.getList();
},
activated() {
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,28 +245,24 @@
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");
+ this.$download.zip("/code/gen/batchGenCode?tables=" + tableNames, "ruoyi.zip");
}
},
/** 同步数据库操作 */
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(() => {});
},
/** 打开导入表弹窗 */
@@ -293,13 +273,15 @@
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
- this.handleQuery();
+ this.queryParams.pageNum = 1;
+ this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
},
/** 预览按钮 */
handlePreview(row) {
previewTable(row.tableId).then(response => {
this.preview.data = response.data;
this.preview.open = true;
+ this.preview.activeName = "domain.java";
});
},
/** 高亮显示 */
@@ -309,6 +291,10 @@
const result = hljs.highlight(language, code || "", true);
return result.value || ' ';
},
+ /** 复制代码成功 */
+ clipboardSuccess() {
+ this.$modal.msgSuccess("复制成功");
+ },
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.tableId);
@@ -316,23 +302,27 @@
this.single = selection.length != 1;
this.multiple = !selection.length;
},
+ /** 排序触发事件 */
+ handleSortChange(column, prop, order) {
+ this.queryParams.orderByColumn = column.prop;
+ this.queryParams.isAsc = column.order;
+ this.getList();
+ },
/** 修改按钮操作 */
handleEditTable(row) {
const tableId = row.tableId || this.ids[0];
- this.$router.push("/tool/gen-edit/index/" + tableId);
+ const tableName = row.tableName || this.tableNames[0];
+ const params = { pageNum: this.queryParams.pageNum };
+ this.$tab.openPage("修改[" + tableName + "]生成配置", '/tool/gen-edit/index/' + tableId, params);
},
/** 删除按钮操作 */
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