From f3cb18c8363ec15d8482ccb70b8b021f67881f47 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期五, 08 一月 2021 10:46:36 +0800
Subject: [PATCH] !161 修复导入数据为负浮点数时,导入结果会丢失精度问题 Merge pull request !161 from 嘿白熊/master
---
ruoyi-ui/src/views/tool/gen/index.vue | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue
index 824148e..9557a92 100644
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -32,7 +32,7 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -41,6 +41,7 @@
<el-col :span="1.5">
<el-button
type="primary"
+ plain
icon="el-icon-download"
size="mini"
@click="handleGenTable"
@@ -50,6 +51,7 @@
<el-col :span="1.5">
<el-button
type="info"
+ plain
icon="el-icon-upload"
size="mini"
@click="openImportTable"
@@ -59,6 +61,7 @@
<el-col :span="1.5">
<el-button
type="success"
+ plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@@ -69,6 +72,7 @@
<el-col :span="1.5">
<el-button
type="danger"
+ plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@@ -91,21 +95,21 @@
align="center"
prop="tableName"
:show-overflow-tooltip="true"
- width="130"
+ width="120"
/>
<el-table-column
label="琛ㄦ弿杩�"
align="center"
prop="tableComment"
:show-overflow-tooltip="true"
- width="130"
+ width="120"
/>
<el-table-column
label="瀹炰綋"
align="center"
prop="className"
:show-overflow-tooltip="true"
- width="130"
+ width="120"
/>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="160" />
<el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="160" />
@@ -165,7 +169,7 @@
:name="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
:key="key"
>
- <pre>{{ value }}</pre>
+ <pre><code class="hljs" v-html="highlightedCode(value, key)"></code></pre>
</el-tab-pane>
</el-tabs>
</el-dialog>
@@ -177,6 +181,15 @@
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"));
+hljs.registerLanguage("xml", require("highlight.js/lib/languages/xml"));
+hljs.registerLanguage("html", require("highlight.js/lib/languages/xml"));
+hljs.registerLanguage("vue", require("highlight.js/lib/languages/xml"));
+hljs.registerLanguage("javascript", require("highlight.js/lib/languages/javascript"));
+hljs.registerLanguage("sql", require("highlight.js/lib/languages/sql"));
+
export default {
name: "Gen",
components: { importTable },
@@ -289,6 +302,13 @@
this.preview.open = true;
});
},
+ /** 楂樹寒鏄剧ず */
+ highlightedCode(code, key) {
+ const vmName = key.substring(key.lastIndexOf("/") + 1, key.indexOf(".vm"));
+ var language = vmName.substring(vmName.indexOf(".") + 1, vmName.length);
+ const result = hljs.highlight(language, code || "", true);
+ return result.value || ' ';
+ },
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.tableId);
--
Gitblit v1.9.3