From 6ae0fcef149ddbe614746023a58a3885b3ac4bde Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 25 三月 2025 11:31:04 +0800
Subject: [PATCH] Merge branch 'dev'
---
src/components/Process/panel/PropertiesPanel.vue | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/components/Process/panel/PropertiesPanel.vue b/src/components/Process/panel/PropertiesPanel.vue
index 1b1af02..e7bc2dc 100644
--- a/src/components/Process/panel/PropertiesPanel.vue
+++ b/src/components/Process/panel/PropertiesPanel.vue
@@ -108,7 +108,17 @@
}
},
{
- name: '娴佺▼闃舵',
+ name: '鏄惁鍏佽鎸傝捣',
+ value: false,
+ vueType: 'switch',
+ method: (name, value) => {
+ this.propertyForm.name = name
+ this.propertyForm.value = value
+ this.saveAttribute()
+ }
+ },
+ {
+ name: '椤圭洰闃舵',
value: null,
vueType: 'select',
options: [
@@ -191,14 +201,20 @@
return ex.$type === `flowable:Properties`;
}) ?? [];
// 淇濆瓨鎵�鏈夌殑 鎵╁睍灞炴�у瓧娈�
- this.bpmnElementPropertyList = this.bpmnElementProperties.reduce((pre, current) => pre.concat(current.values), []);
- console.log("bpmnElementPropertyList",this.bpmnElementPropertyList)
+ this.bpmnElementPropertyList = this.bpmnElementProperties.reduce((pre, current) => {
+ // 妫�鏌� current.values 鏄惁鏄暟缁勶紝濡傛灉涓嶆槸鍒欎娇鐢ㄧ┖鏁扮粍
+ const values = current.values ? current.values : [];
+ return pre.concat(values);
+ }, []);
+ console.log("bpmnElementProperties",this.bpmnElementProperties)
// 鍥炴樉
this.canConfigPropertyList.forEach(item => {
const find = this.bpmnElementPropertyList.find(el => el.name === item.name);
if (find) {
if (item.vueType === 'switch') {
item.value = find.value === '鏄�' ? true : false
+ }else if (item.vueType === 'select') {
+ item.value = find.value
}
} else {
item.value = null
--
Gitblit v1.8.0