From 911867d5a589d010c698261a6b04b0f59cb6150b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 17 一月 2022 17:09:27 +0800
Subject: [PATCH] update 数据库更改 对接多用户体系
---
ruoyi-ui/src/views/tool/gen/index.vue | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue
index cfc4f37..3b7c902 100644
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -169,7 +169,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 +181,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"));
@@ -262,28 +262,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");
}
},
/** 鍚屾鏁版嵁搴撴搷浣� */
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(() => {});
},
/** 鎵撳紑瀵煎叆琛ㄥ脊绐� */
@@ -301,6 +297,7 @@
previewTable(row.tableId).then(response => {
this.preview.data = response.data;
this.preview.open = true;
+ this.preview.activeName = "domain.java";
});
},
/** 楂樹寒鏄剧ず */
@@ -309,6 +306,10 @@
var language = vmName.substring(vmName.indexOf(".") + 1, vmName.length);
const result = hljs.highlight(language, code || "", true);
return result.value || ' ';
+ },
+ /** 澶嶅埗浠g爜鎴愬姛 */
+ clipboardSuccess(){
+ this.$modal.msgSuccess("澶嶅埗鎴愬姛");
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -325,15 +326,11 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
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