From e130475259afe4121d65c026e5e8c489ab2bae29 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 28 十一月 2022 14:02:06 +0800
Subject: [PATCH] ⛄发布 4.4.0 正式版
---
ruoyi-ui/src/views/tool/gen/index.vue | 61 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue
index b69ce44..66bd13f 100644
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -1,12 +1,19 @@
<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="dataName">
+ <el-input
+ v-model="queryParams.dataName"
+ placeholder="璇疯緭鍏ユ暟鎹簮鍚嶇О"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
<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 +22,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"
@@ -169,7 +174,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 +186,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"));
@@ -220,7 +225,8 @@
pageNum: 1,
pageSize: 10,
tableName: undefined,
- tableComment: undefined
+ tableComment: undefined,
+ dataName: "master"
},
// 棰勮鍙傛暟
preview: {
@@ -232,6 +238,7 @@
};
},
created() {
+ localStorage.setItem("dataName", this.queryParams.dataName);
this.getList();
},
activated() {
@@ -239,8 +246,6 @@
if (time != null && time != this.uniqueId) {
this.uniqueId = time;
this.queryParams.pageNum = Number(this.$route.query.pageNum);
- this.dateRange = [];
- this.resetForm("queryForm");
this.getList();
}
},
@@ -257,6 +262,7 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
+ localStorage.setItem("dataName", this.queryParams.dataName);
this.queryParams.pageNum = 1;
this.getList();
},
@@ -264,28 +270,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("/tool/gen/batchGenCode?tables=" + tableNames, "ruoyi");
+ this.$download.zip("/tool/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(() => {});
},
/** 鎵撳紑瀵煎叆琛ㄥ脊绐� */
@@ -303,6 +305,7 @@
previewTable(row.tableId).then(response => {
this.preview.data = response.data;
this.preview.open = true;
+ this.preview.activeName = "domain.java";
});
},
/** 楂樹寒鏄剧ず */
@@ -311,6 +314,10 @@
var language = vmName.substring(vmName.indexOf(".") + 1, vmName.length);
const result = hljs.highlight(language, code || "", true);
return result.value || ' ';
+ },
+ /** 澶嶅埗浠ｇ爜鎴愬姛 */
+ clipboardSuccess() {
+ this.$modal.msgSuccess("澶嶅埗鎴愬姛");
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -322,20 +329,18 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleEditTable(row) {
const tableId = row.tableId || this.ids[0];
- this.$router.push({ path: '/tool/gen-edit/index', query: { tableId: tableId, pageNum: this.queryParams.pageNum } });
+ 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