fix: [bpm] web-ele 修复审批等按钮不能操作等问题
parent
a357dbf940
commit
1b5a06f3a2
|
|
@ -42,7 +42,7 @@ import { registerComponent } from '#/utils';
|
||||||
|
|
||||||
import ProcessInstanceBpmnViewer from './modules/bpm-viewer.vue';
|
import ProcessInstanceBpmnViewer from './modules/bpm-viewer.vue';
|
||||||
import ProcessInstanceOperationButton from './modules/operation-button.vue';
|
import ProcessInstanceOperationButton from './modules/operation-button.vue';
|
||||||
import ProcessssPrint from './modules/process-print.vue';
|
import ProcessPrint from './modules/process-print.vue';
|
||||||
import ProcessInstanceSimpleViewer from './modules/simple-bpm-viewer.vue';
|
import ProcessInstanceSimpleViewer from './modules/simple-bpm-viewer.vue';
|
||||||
import BpmProcessInstanceTaskList from './modules/task-list.vue';
|
import BpmProcessInstanceTaskList from './modules/task-list.vue';
|
||||||
import ProcessInstanceTimeline from './modules/time-line.vue';
|
import ProcessInstanceTimeline from './modules/time-line.vue';
|
||||||
|
|
@ -200,7 +200,7 @@ const refresh = () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const [PrintModal, printModalApi] = useVbenModal({
|
const [PrintModal, printModalApi] = useVbenModal({
|
||||||
connectedComponent: ProcessssPrint,
|
connectedComponent: ProcessPrint,
|
||||||
destroyOnClose: true,
|
destroyOnClose: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -343,7 +343,12 @@ onMounted(async () => {
|
||||||
</ElCol>
|
</ElCol>
|
||||||
</ElRow>
|
</ElRow>
|
||||||
</ElTabPane>
|
</ElTabPane>
|
||||||
<ElTabPane label="流程图" name="diagram" class="pb-20 pr-3">
|
<ElTabPane
|
||||||
|
label="流程图"
|
||||||
|
name="diagram"
|
||||||
|
:lazy="false"
|
||||||
|
class="pb-20 pr-3"
|
||||||
|
>
|
||||||
<ProcessInstanceSimpleViewer
|
<ProcessInstanceSimpleViewer
|
||||||
v-show="
|
v-show="
|
||||||
processDefinition.modelType &&
|
processDefinition.modelType &&
|
||||||
|
|
@ -420,7 +425,21 @@ onMounted(async () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
:deep(.el-tabs__content) {
|
:deep(.el-tabs__content) {
|
||||||
|
display: flex;
|
||||||
|
flex: 1;
|
||||||
|
flex-direction: column;
|
||||||
|
overflow-y: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.el-tab-pane) {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 流程图 tab 特殊处理:需要内部 flex 布局 */
|
||||||
|
:deep(#pane-diagram) {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
overflow-y: auto;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ watch(
|
||||||
view.value = newModelView;
|
view.value = newModelView;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{ immediate: true },
|
||||||
);
|
);
|
||||||
|
|
||||||
/** 监听 bpmnXml */
|
/** 监听 bpmnXml */
|
||||||
|
|
|
||||||
|
|
@ -280,6 +280,7 @@ async function openPopover(type: string) {
|
||||||
Object.keys(popOverVisible.value).forEach((item) => {
|
Object.keys(popOverVisible.value).forEach((item) => {
|
||||||
if (popOverVisible.value[item]) popOverVisible.value[item] = item === type;
|
if (popOverVisible.value[item]) popOverVisible.value[item] = item === type;
|
||||||
});
|
});
|
||||||
|
popOverVisible.value[type] = true;
|
||||||
if (type === 'approve') {
|
if (type === 'approve') {
|
||||||
// 当前任务有节点表单时,等 form-create 的 fApi 就绪后再计算下一个节点;
|
// 当前任务有节点表单时,等 form-create 的 fApi 就绪后再计算下一个节点;
|
||||||
// 没有节点表单时,approveFormFApi 永远不会被赋值,跳过等待
|
// 没有节点表单时,approveFormFApi 永远不会被赋值,跳过等待
|
||||||
|
|
|
||||||
|
|
@ -56,6 +56,7 @@ watch(
|
||||||
simpleModel.value = newModelView.simpleModel || {};
|
simpleModel.value = newModelView.simpleModel || {};
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{ immediate: true },
|
||||||
);
|
);
|
||||||
|
|
||||||
/** 监控模型结构数据 */
|
/** 监控模型结构数据 */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue