Browse Source

fix: 去除<el-dialog/>中:modal="false"属性

master
tony 3 years ago
parent
commit
bdf4ebf03e
  1. 1
      ruoyi-ui/src/components/Process/components/nodePanel/property/executionListener.vue
  2. 1
      ruoyi-ui/src/components/Process/components/nodePanel/property/listenerParam.vue
  3. 1
      ruoyi-ui/src/components/Process/components/nodePanel/property/multiInstance.vue
  4. 1
      ruoyi-ui/src/components/Process/components/nodePanel/property/signal.vue
  5. 1
      ruoyi-ui/src/components/Process/components/nodePanel/property/taskListener.vue
  6. 3
      ruoyi-ui/src/components/Process/components/nodePanel/task.vue
  7. 26
      ruoyi-ui/src/views/flowable/definition/index.vue
  8. 22
      ruoyi-ui/src/views/flowable/definition/model.vue

1
ruoyi-ui/src/components/Process/components/nodePanel/property/executionListener.vue

@ -2,7 +2,6 @@
<div>
<el-dialog
title="执行监听器"
:modal="false"
:visible.sync="dialogVisible"
width="900px"
:close-on-click-modal="false"

1
ruoyi-ui/src/components/Process/components/nodePanel/property/listenerParam.vue

@ -2,7 +2,6 @@
<div>
<el-dialog
title="监听器参数"
:modal="false"
:visible.sync="dialogVisible"
width="700px"
:close-on-click-modal="false"

1
ruoyi-ui/src/components/Process/components/nodePanel/property/multiInstance.vue

@ -2,7 +2,6 @@
<div>
<el-dialog
title="多实例配置"
:modal="false"
:visible.sync="dialogVisible"
width="600px"
:close-on-click-modal="false"

1
ruoyi-ui/src/components/Process/components/nodePanel/property/signal.vue

@ -2,7 +2,6 @@
<div>
<el-dialog
title="信号定义"
:modal="false"
:visible.sync="dialogVisible"
width="700px"
:close-on-click-modal="false"

1
ruoyi-ui/src/components/Process/components/nodePanel/property/taskListener.vue

@ -2,7 +2,6 @@
<div>
<el-dialog
title="任务监听器"
:modal="false"
:visible.sync="dialogVisible"
width="900px"
:close-on-click-modal="false"

3
ruoyi-ui/src/components/Process/components/nodePanel/task.vue

@ -71,7 +71,6 @@
<!--选择人员-->
<el-dialog
title="选择人员"
:modal="false"
:visible.sync="userVisible"
width="60%"
:close-on-press-escape="false"
@ -86,7 +85,6 @@
<!--选择表达式-->
<el-dialog
title="选择表达式"
:modal="false"
:visible.sync="expVisible"
width="60%"
:close-on-press-escape="false"
@ -101,7 +99,6 @@
<!--选择角色-->
<el-dialog
title="选择候选角色"
:modal="false"
:visible.sync="roleVisible"
width="60%"
:close-on-press-escape="false"

26
ruoyi-ui/src/views/flowable/definition/index.vue

@ -224,16 +224,16 @@
</el-row>
</el-dialog>
<!--流程设计器-->
<el-dialog
title="流程配置"
:visible.sync="dialogVisible"
:close-on-press-escape="false"
:fullscreen=true
:before-close="handleClose"
append-to-body>
<Model :deployId="deployId"/>
</el-dialog>
<!-- &lt;!&ndash;流程设计器&ndash;&gt;-->
<!-- <el-dialog-->
<!-- title="流程配置"-->
<!-- :visible.sync="dialogVisible"-->
<!-- :close-on-press-escape="false"-->
<!-- :fullscreen=true-->
<!-- :before-close="handleClose"-->
<!-- append-to-body>-->
<!-- <Model :deployId="deployId"/>-->
<!-- </el-dialog>-->
</div>
</template>
@ -410,9 +410,9 @@ export default {
},
/** 跳转到流程设计页面 */
handleLoadXml(row){
this.dialogVisible = true;
this.deployId = row.deploymentId;
// this.$router.push({ path: '/flowable/definition/model',query: { deployId: row.deploymentId }})
// this.dialogVisible = true;
// this.deployId = row.deploymentId;
this.$router.push({ path: '/flowable/definition/model',query: { deployId: row.deploymentId }})
},
/** 流程图查看 */
handleReadImage(deployId){

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

@ -33,12 +33,6 @@ export default {
bpmnModeler,
vkBeautify
},
props: {
deployId: {
type: String,
default: ''
},
},
//
directives: {
deep: true,
@ -84,18 +78,12 @@ export default {
};
},
watch: {
deployId: {
handler(newVal) {
if (newVal) {
this.getXmlData(newVal);
}
},
immediate: true, //
deep: true //
},
},
created () {
const deployId = this.$route.query && this.$route.query.deployId;
// xml
if (deployId) {
this.getXmlData(deployId);
}
this.getDicts("sys_process_category").then(res => {
this.categorys = res.data;
});

Loading…
Cancel
Save