From e87846bfc7e467836d958632b15a22a901eb51d2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 09 一月 2025 15:33:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/Process/designer.vue | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/src/components/Process/designer.vue b/src/components/Process/designer.vue
index 5fb87e9..5687849 100644
--- a/src/components/Process/designer.vue
+++ b/src/components/Process/designer.vue
@@ -66,7 +66,7 @@
import TaskListener from './panel/taskListener'
import MultiInstance from './panel/multiInstance'
import CommonPanel from './panel/commonPanel'
-import UserTaskPanel from './panel/taskPanel'
+import UserTaskPanel from './panel/TaskConfPanel'
import ConditionPanel from './panel/conditionPanel'
import FormPanel from './panel/formPanel'
import OtherPanel from './panel/otherPanel'
@@ -139,11 +139,9 @@
});
// 鐩戝惉閫夋嫨浜嬩欢锛屼慨鏀瑰綋鍓嶆縺娲荤殑鍏冪礌浠ュ強琛ㄥ崟
this.modelerStore.modeler.on("selection.changed", ({newSelection}) => {
- console.log("鏁版嵁鏀瑰彉1", newSelection)
this.initFormOnChanged(newSelection[0] || null);
});
this.modelerStore.modeler.on("element.changed", ({element}) => {
- console.log("鏁版嵁鏀瑰彉2")
// 淇濊瘉 淇敼 "榛樿娴佽浆璺緞" 绫讳技闇�瑕佷慨鏀瑰涓厓绱犵殑浜嬩欢鍙戠敓鐨勬椂鍊欙紝鏇存柊琛ㄥ崟鐨勫厓绱犱笌鍘熼�変腑鍏冪礌涓嶄竴鑷淬��
if (element && element.id === this.elementId) {
this.initFormOnChanged(element);
@@ -153,24 +151,19 @@
// 鍒濆鍖栨暟鎹�
initFormOnChanged(element) {
- console.log(element, "鑺傜偣鏁版嵁")
let activatedElement = element;
if (!activatedElement) {
- console.log(1)
activatedElement =
this.modelerStore.elRegistry.find(el => el.type === "bpmn:Process") ??
this.modelerStore.elRegistry.find(el => el.type === "bpmn:Collaboration");
}
if (!activatedElement) return;
- console.log(2, activatedElement)
this.modelerStore.element = activatedElement;
this.elementId = activatedElement.id;
// 纭繚elementId鍊兼病鍙樹篃瑕佹洿鏂癴orm缁勪欢閫変腑鐨勫��
if (this.formVisible) {
- console.log(this.modelerStore.element.businessObject.formKey, "鏂扮殑鍊�")
this.$refs.formSelect.init()
}
- console.log(3, this.elementId)
this.elementType = activatedElement.type.split(":")[1] || "";
this.conditionVisible = !!(
this.elementType === "SequenceFlow" &&
--
Gitblit v1.8.0