From 094e300939e42582cf08e6bef1628307eb22fed9 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 28 二月 2025 19:45:29 +0800
Subject: [PATCH] 代码生成列表支持按时间排序
---
src/views/tool/gen/index.vue | 112 ++++++++++++++++++++++++++++----------------------------
1 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 262edee..3318784 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -1,11 +1,12 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
<el-form-item label="琛ㄥ悕绉�" prop="tableName">
<el-input
v-model="queryParams.tableName"
placeholder="璇疯緭鍏ヨ〃鍚嶇О"
clearable
+ style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
@@ -14,6 +15,7 @@
v-model="queryParams.tableComment"
placeholder="璇疯緭鍏ヨ〃鎻忚堪"
clearable
+ style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
@@ -39,9 +41,19 @@
type="primary"
plain
icon="Download"
+ :disabled="multiple"
@click="handleGenTable"
v-hasPermi="['tool:gen:code']"
>鐢熸垚</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="Plus"
+ @click="openCreateTable"
+ v-hasRole="['admin']"
+ >鍒涘缓</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@@ -75,74 +87,34 @@
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
+ <el-table ref="genRef" 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 #default="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"
- />
- <el-table-column
- label="琛ㄦ弿杩�"
- align="center"
- prop="tableComment"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="瀹炰綋"
- align="center"
- prop="className"
- :show-overflow-tooltip="true"
- />
- <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" />
+ <el-table-column label="琛ㄦ弿杩�" align="center" prop="tableComment" :show-overflow-tooltip="true" />
+ <el-table-column label="瀹炰綋" align="center" prop="className" :show-overflow-tooltip="true" />
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="160" sortable="custom" :sort-orders="['descending', 'ascending']" />
+ <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="160" sortable="custom" :sort-orders="['descending', 'ascending']" />
<el-table-column label="鎿嶄綔" align="center" width="330" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="棰勮" placement="top">
- <el-button
- type="text"
- icon="View"
- @click="handlePreview(scope.row)"
- v-hasPermi="['tool:gen:preview']"
- ></el-button>
+ <el-button link type="primary" icon="View" @click="handlePreview(scope.row)" v-hasPermi="['tool:gen:preview']"></el-button>
</el-tooltip>
<el-tooltip content="缂栬緫" placement="top">
- <el-button
- type="text"
- icon="Edit"
- @click="handleEditTable(scope.row)"
- v-hasPermi="['tool:gen:edit']"
- ></el-button>
+ <el-button link type="primary" icon="Edit" @click="handleEditTable(scope.row)" v-hasPermi="['tool:gen:edit']"></el-button>
</el-tooltip>
<el-tooltip content="鍒犻櫎" placement="top">
- <el-button
- type="text"
- icon="Delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['tool:gen:remove']"
- ></el-button>
+ <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['tool:gen:remove']"></el-button>
</el-tooltip>
<el-tooltip content="鍚屾" placement="top">
- <el-button
- type="text"
- icon="Refresh"
- @click="handleSynchDb(scope.row)"
- v-hasPermi="['tool:gen:edit']"
- ></el-button>
+ <el-button link type="primary" icon="Refresh" @click="handleSynchDb(scope.row)" v-hasPermi="['tool:gen:edit']"></el-button>
</el-tooltip>
<el-tooltip content="鐢熸垚浠ｇ爜" placement="top">
- <el-button
- type="text"
- icon="Download"
- @click="handleGenTable(scope.row)"
- v-hasPermi="['tool:gen:code']"
- ></el-button>
+ <el-button link type="primary" icon="Download" @click="handleGenTable(scope.row)" v-hasPermi="['tool:gen:code']"></el-button>
</el-tooltip>
</template>
</el-table-column>
@@ -155,7 +127,7 @@
@pagination="getList"
/>
<!-- 棰勮鐣岄潰 -->
- <el-dialog :title="preview.title" v-model="preview.open" width="80%" top="5vh" append-to-body custom-class="scrollbar">
+ <el-dialog :title="preview.title" v-model="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,6 +141,7 @@
</el-tabs>
</el-dialog>
<import-table ref="importRef" @ok="handleQuery" />
+ <create-table ref="createRef" @ok="handleQuery" />
</div>
</template>
@@ -176,6 +149,7 @@
import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/gen";
import router from "@/router";
import importTable from "./importTable";
+import createTable from "./createTable";
const route = useRoute();
const { proxy } = getCurrentInstance();
@@ -190,13 +164,16 @@
const tableNames = ref([]);
const dateRange = ref([]);
const uniqueId = ref("");
+const defaultSort = ref({ prop: "createTime", order: "descending" });
const data = reactive({
queryParams: {
pageNum: 1,
pageSize: 10,
tableName: undefined,
- tableComment: undefined
+ tableComment: undefined,
+ orderByColumn: defaultSort.value.prop,
+ isAsc: defaultSort.value.order
},
preview: {
open: false,
@@ -228,11 +205,13 @@
loading.value = false;
});
}
+
/** 鎼滅储鎸夐挳鎿嶄綔 */
function handleQuery() {
queryParams.value.pageNum = 1;
getList();
}
+
/** 鐢熸垚浠ｇ爜鎿嶄綔 */
function handleGenTable(row) {
const tbNames = row.tableName || tableNames.value;
@@ -245,9 +224,10 @@
proxy.$modal.msgSuccess("鎴愬姛鐢熸垚鍒拌嚜瀹氫箟璺緞锛�" + row.genPath);
});
} else {
- proxy.$download.zip("/tool/gen/batchGenCode?tables=" + tbNames, "ruoyi");
+ proxy.$download.zip("/tool/gen/batchGenCode?tables=" + tbNames, "ruoyi.zip");
}
}
+
/** 鍚屾鏁版嵁搴撴搷浣� */
function handleSynchDb(row) {
const tableName = row.tableName;
@@ -257,16 +237,25 @@
proxy.$modal.msgSuccess("鍚屾鎴愬姛");
}).catch(() => {});
}
+
/** 鎵撳紑瀵煎叆琛ㄥ脊绐� */
function openImportTable() {
proxy.$refs["importRef"].show();
}
+
+/** 鎵撳紑鍒涘缓琛ㄥ脊绐� */
+function openCreateTable() {
+ proxy.$refs["createRef"].show();
+}
+
/** 閲嶇疆鎸夐挳鎿嶄綔 */
function resetQuery() {
dateRange.value = [];
proxy.resetForm("queryRef");
- handleQuery();
+ queryParams.value.pageNum = 1;
+ proxy.$refs["genRef"].sort(defaultSort.value.prop, defaultSort.value.order);
}
+
/** 棰勮鎸夐挳 */
function handlePreview(row) {
previewTable(row.tableId).then(response => {
@@ -275,10 +264,12 @@
preview.value.activeName = "domain.java";
});
}
+
/** 澶嶅埗浠ｇ爜鎴愬姛 */
function copyTextSuccess() {
proxy.$modal.msgSuccess("澶嶅埗鎴愬姛");
}
+
// 澶氶�夋閫変腑鏁版嵁
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.tableId);
@@ -286,11 +277,20 @@
single.value = selection.length != 1;
multiple.value = !selection.length;
}
+
+/** 鎺掑簭瑙﹀彂浜嬩欢 */
+function handleSortChange(column, prop, order) {
+ queryParams.value.orderByColumn = column.prop;
+ queryParams.value.isAsc = column.order;
+ getList();
+}
+
/** 淇敼鎸夐挳鎿嶄綔 */
function handleEditTable(row) {
const tableId = row.tableId || ids.value[0];
router.push({ path: "/tool/gen-edit/index/" + tableId, query: { pageNum: queryParams.value.pageNum } });
}
+
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
function handleDelete(row) {
const tableIds = row.tableId || ids.value;
--
Gitblit v1.9.3