huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-26 01:01:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

bpmnProcessDesigner 修改 xml、json 预览，使用老版本的 highlight

Browse Source
This commit is contained in:
YunaiV 2022-01-03 01:36:39 +08:00
parent 490f907ada
commit 38221a3e2e
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
yudao-admin-ui/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
View File

@ -80,8 +80,8 @@
<div class="my-process-designer__container"> <div class="my-process-designer__container">
<div class="my-process-designer__canvas" ref="bpmn-canvas"></div> <div class="my-process-designer__canvas" ref="bpmn-canvas"></div>
</div> </div>
<el-dialog title="预览" width="60%" :visible.sync="previewModelVisible" append-to-body destroy-on-close> <el-dialog title="预览" width="80%" :visible.sync="previewModelVisible" append-to-body destroy-on-close>
<highlightjs :language="previewType" :code="previewResult" /> <pre><code class="hljs" v-html="highlightedCode(previewType, previewResult)"></code></pre>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -107,6 +107,12 @@ import flowableModdleExtension from "./plugins/extension-moddle/flowable";
// 引入json转换与高亮 // 引入json转换与高亮
import convert from "xml-js"; import convert from "xml-js";
// 代码高亮插件
import hljs from "highlight.js/lib/highlight";
import "highlight.js/styles/github-gist.css";
hljs.registerLanguage("xml", require("highlight.js/lib/languages/xml"));
hljs.registerLanguage("json", require("highlight.js/lib/languages/json"));
export default { export default {
name: "MyProcessDesigner", name: "MyProcessDesigner",
componentName: "MyProcessDesigner", componentName: "MyProcessDesigner",
@ -463,7 +469,12 @@ export default {
} }
// 触发 save 事件 // 触发 save 事件
this.$emit('save', xml) this.$emit('save', xml)
} },
/** 高亮显示 */
highlightedCode(previewType, previewResult) {
const result = hljs.highlight(previewType, previewResult || "", true);
return result.value || '&nbsp;';
},
} }
}; };
</script> </script>

2
yudao-admin-ui/src/views/tool/codegen/index.vue
View File

@ -125,8 +125,6 @@ import importTable from "./importTable";
// 代码高亮插件 // 代码高亮插件
import hljs from "highlight.js/lib/highlight"; import hljs from "highlight.js/lib/highlight";
import "highlight.js/styles/github-gist.css"; import "highlight.js/styles/github-gist.css";
import {SysCommonStatusEnum} from "@/utils/constants";
import {createTestDemo, updateTestDemo} from "@/api/tool/testDemo";
hljs.registerLanguage("java", require("highlight.js/lib/languages/java")); hljs.registerLanguage("java", require("highlight.js/lib/languages/java"));
hljs.registerLanguage("xml", require("highlight.js/lib/languages/xml")); hljs.registerLanguage("xml", require("highlight.js/lib/languages/xml"));
hljs.registerLanguage("html", require("highlight.js/lib/languages/xml")); hljs.registerLanguage("html", require("highlight.js/lib/languages/xml"));