Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pre Merge pull request !398 from xivLi/master

Browse Source
This commit is contained in:
xivLi 2021-12-29 11:55:16 +00:00 committed by Gitee
commit 103215d2cd
2 changed files with 92 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/package.json
View File

@ -44,7 +44,7 @@
"element-ui": "2.15.6",
"file-saver": "2.0.5",
"fuse.js": "6.4.3",
"highlight.js": "9.18.5",
"highlight.js": "10.7.3",
"js-beautify": "1.13.0",
"js-cookie": "3.0.1",
"jsencrypt": "3.2.1",

4
ruoyi-ui/src/views/tool/gen/index.vue
View File

@ -181,7 +181,7 @@
<script>
import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/gen";
import importTable from "./importTable";
import hljs from "highlight.js/lib/highlight";
import hljs from "highlight.js";
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"));
@ -304,7 +304,7 @@ export default {
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);
const result = hljs.highlight(code || "", { language: language, ignoreIllegals: true});
return result.value || '&nbsp;';
},
/** 复制代码成功 */