From 7a267fc8e5bc6bbe1d770c1aebb50bbed5461e22 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 07 二月 2025 17:45:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/Process/panel/PropertiesPanel.vue | 69 ++++++++++++++++++++++++++++++++--
1 files changed, 65 insertions(+), 4 deletions(-)
diff --git a/src/components/Process/panel/PropertiesPanel.vue b/src/components/Process/panel/PropertiesPanel.vue
index 6042067..e1a171f 100644
--- a/src/components/Process/panel/PropertiesPanel.vue
+++ b/src/components/Process/panel/PropertiesPanel.vue
@@ -14,8 +14,8 @@
<el-button size="mini" type="primary" icon="el-icon-setting" @click="openAttributesForm(null, -1)">灞炴�ц缃�</el-button>
</div>
- <el-dialog :visible.sync="propertyFormModelVisible" title="灞炴�ч厤缃�" width="600px" append-to-body destroy-on-close>
- <div v-for="item in canConfigPropertyList">
+ <el-dialog :visible.sync="propertyFormModelVisible" title="灞炴�ч厤缃�" width="600px" @close="closeProperty" append-to-body :destroy-on-close="true" :close-on-click-modal="false">
+ <div v-for="item in canConfigPropertyList" style="margin-bottom: 20px">
<div v-if="item.vueType === 'switch'">
<el-switch
v-model="item.value"
@@ -35,7 +35,7 @@
<!-- </el-form-item>-->
<!-- </el-form>-->
<template slot="footer">
- <el-button size="mini" @click="propertyFormModelVisible = false">鍏� 闂�</el-button>
+ <el-button size="mini" @click="closeProperty">鍏� 闂�</el-button>
</template>
</el-dialog>
</div>
@@ -56,13 +56,36 @@
return {
canConfigPropertyList: [
{
- name: '璇ヨ妭鐐规槸瀹℃壒鑺傜偣',
+ name: '鏄惁瀹℃壒鑺傜偣',
value: false,
vueType: 'switch',
method: (name, value) => {
this.propertyForm.name = name
this.propertyForm.value = value
this.saveAttribute()
+ this.resetList()
+ }
+ },
+ {
+ name: '鏄惁鍏佽璺宠繃',
+ value: false,
+ vueType: 'switch',
+ method: (name, value) => {
+ this.propertyForm.name = name
+ this.propertyForm.value = value
+ this.saveAttribute()
+ this.resetList()
+ }
+ },
+ {
+ name: '鏄惁鍏佽瀹圭己',
+ value: false,
+ vueType: 'switch',
+ method: (name, value) => {
+ this.propertyForm.name = name
+ this.propertyForm.value = value
+ this.saveAttribute()
+ this.resetList()
}
}
], // 鍙互閰嶇疆鐨勫睘鎬у垪琛�
@@ -84,6 +107,44 @@
}
},
methods: {
+ closeProperty() {
+ this.propertyFormModelVisible = false
+ this.resetList()
+ },
+ resetList() {
+ this.canConfigPropertyList = [
+ {
+ name: '鏄惁瀹℃壒鑺傜偣',
+ value: false,
+ vueType: 'switch',
+ method: (name, value) => {
+ this.propertyForm.name = name
+ this.propertyForm.value = value
+ this.saveAttribute()
+ }
+ },
+ {
+ name: '鏄惁鍏佽璺宠繃',
+ value: false,
+ vueType: 'switch',
+ method: (name, value) => {
+ this.propertyForm.name = name
+ this.propertyForm.value = value
+ this.saveAttribute()
+ }
+ },
+ {
+ name: '鏄惁鍏佽瀹圭己',
+ value: false,
+ vueType: 'switch',
+ method: (name, value) => {
+ this.propertyForm.name = name
+ this.propertyForm.value = value
+ this.saveAttribute()
+ }
+ }
+ ]
+ },
resetAttributesList() {
this.bpmnElement = this.modelerStore.element;
this.otherExtensionList = []; // 鍏朵粬鎵╁睍閰嶇疆
--
Gitblit v1.8.0