Browse Source

fix: 修复流程xml更新后在线查看数据未更新问题

master
tony 3 years ago
parent
commit
9436bb4154
  1. 3
      ruoyi-ui/src/components/Process/index.vue
  2. 50
      ruoyi-ui/src/views/flowable/definition/model.vue

3
ruoyi-ui/src/components/Process/index.vue

@ -321,8 +321,7 @@ export default {
}, },
async showXML() { async showXML() {
try { try {
const { xml } = await this.modeler.saveXML({ format: true }) const xml = await this.saveXML()
debugger
this.$emit('showXML',xml) this.$emit('showXML',xml)
} catch (err) { } catch (err) {
console.log(err) console.log(err)

50
ruoyi-ui/src/views/flowable/definition/model.vue

@ -15,11 +15,7 @@
<el-dialog :title="xmlTitle" :visible.sync="xmlOpen" width="70%" class="showAll_dialog"> <el-dialog :title="xmlTitle" :visible.sync="xmlOpen" width="70%" class="showAll_dialog">
<!-- 设置对话框内容高度 --> <!-- 设置对话框内容高度 -->
<el-scrollbar> <el-scrollbar>
<pre v-highlight> <pre v-highlight="xmlData"><code class="xml"></code></pre>
<code class="xml">
{{xmlData}}
</code>
</pre>
</el-scrollbar> </el-scrollbar>
</el-dialog> </el-dialog>
</div> </div>
@ -28,7 +24,7 @@
import {readXml, roleList, saveXml, userList,expList} from "@/api/flowable/definition"; import {readXml, roleList, saveXml, userList,expList} from "@/api/flowable/definition";
import bpmnModeler from '@/components/Process/index' import bpmnModeler from '@/components/Process/index'
import vkBeautify from 'vkbeautify' import vkBeautify from 'vkbeautify'
import highlight from 'highlight.js' import hljs from 'highlight.js'
import 'highlight.js/styles/atelier-savanna-dark.css' import 'highlight.js/styles/atelier-savanna-dark.css'
export default { export default {
@ -39,11 +35,33 @@ export default {
}, },
// //
directives: { directives: {
highlight:(el) => { deep: true,
let blocks = el.querySelectorAll('pre code'); highlight:{
blocks.forEach((block) => { deep: true,
highlight.highlightBlock(block) bind: function bind(el, binding) {
}) const targets = el.querySelectorAll('code');
let target;
let i;
for (i = 0; i < targets.length; i += 1) {
target = targets[i];
if (typeof binding.value === 'string') {
target.textContent = binding.value;
}
hljs.highlightBlock(target);
}
},
componentUpdated: function componentUpdated(el, binding) {
const targets = el.querySelectorAll('code');
let target;
let i;
for (i = 0; i < targets.length; i += 1) {
target = targets[i];
if (typeof binding.value === 'string') {
target.textContent = binding.value;
hljs.highlightBlock(target);
}
}
},
} }
}, },
data() { data() {
@ -88,7 +106,7 @@ export default {
xml: data.xml xml: data.xml
} }
saveXml(params).then(res => { saveXml(params).then(res => {
this.$message(res.msg) this.$modal.msgSuccess(res.msg)
// //
this.$store.dispatch("tagsView/delView", this.$route); this.$store.dispatch("tagsView/delView", this.$route);
this.$router.go(-1) this.$router.go(-1)
@ -105,8 +123,8 @@ export default {
val.userId = val.userId.toString(); val.userId = val.userId.toString();
}) })
this.users = res.data; this.users = res.data;
let arr = {nickName: "流程发起人", userId: "${INITIATOR}"} // let arr = {nickName: "", userId: "${INITIATOR}"}
this.users.push(arr) // this.users.push(arr)
}); });
roleList().then(res =>{ roleList().then(res =>{
res.data.forEach(val =>{ res.data.forEach(val =>{
@ -119,10 +137,10 @@ export default {
}); });
}, },
/** 展示xml */ /** 展示xml */
showXML(data){ showXML(xmlData){
this.xmlTitle = 'xml查看'; this.xmlTitle = 'xml查看';
this.xmlOpen = true; this.xmlOpen = true;
this.xmlData = vkBeautify.xml(data); this.xmlData = vkBeautify.xml(xmlData);
}, },
// /** */ // /** */
// dataType(data){ // dataType(data){

Loading…
Cancel
Save