From cb80de3742d66cfee20bc3136c735e5ca5a7d45c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 29 十一月 2023 12:44:42 +0800
Subject: [PATCH] 优化字典标签支持自定义分隔符
---
src/views/tool/gen/index.vue | 65 +++++++++++++++-----------------
1 files changed, 30 insertions(+), 35 deletions(-)
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index a500b9b..8c9ce6a 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>
@@ -105,44 +107,19 @@
<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,14 +132,15 @@
@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"
:label="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
:name="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
- :key="key"
+ :key="value"
>
+ <el-link :underline="false" icon="DocumentCopy" v-copyText="value" v-copyText:callback="copyTextSuccess" style="float:right"> 澶嶅埗</el-link>
<pre>{{ value }}</pre>
</el-tab-pane>
</el-tabs>
@@ -176,6 +154,7 @@
import router from "@/router";
import importTable from "./importTable";
+const route = useRoute();
const { proxy } = getCurrentInstance();
const tableList = ref([]);
@@ -187,6 +166,7 @@
const total = ref(0);
const tableNames = ref([]);
const dateRange = ref([]);
+const uniqueId = ref("");
const data = reactive({
queryParams: {
@@ -204,6 +184,17 @@
});
const { queryParams, preview } = toRefs(data);
+
+onActivated(() => {
+ const time = route.query.t;
+ if (time != null && time != uniqueId.value) {
+ uniqueId.value = time;
+ queryParams.value.pageNum = Number(route.query.pageNum);
+ dateRange.value = [];
+ proxy.resetForm("queryForm");
+ getList();
+ }
+})
/** 鏌ヨ琛ㄩ泦鍚� */
function getList() {
@@ -231,7 +222,7 @@
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");
}
}
/** 鍚屾鏁版嵁搴撴搷浣� */
@@ -261,6 +252,10 @@
preview.value.activeName = "domain.java";
});
}
+/** 澶嶅埗浠ｇ爜鎴愬姛 */
+function copyTextSuccess() {
+ proxy.$modal.msgSuccess("澶嶅埗鎴愬姛");
+}
// 澶氶�夋閫変腑鏁版嵁
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.tableId);
@@ -271,7 +266,7 @@
/** 淇敼鎸夐挳鎿嶄綔 */
function handleEditTable(row) {
const tableId = row.tableId || ids.value[0];
- router.push({ path: "/tool/gen-edit/index", query: { tableId: tableId, pageNum: queryParams.value.pageNum } });
+ router.push({ path: "/tool/gen-edit/index/" + tableId, query: { pageNum: queryParams.value.pageNum } });
}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
function handleDelete(row) {
--
Gitblit v1.9.3