From 291bf570b2106cb99b0e689af7d6ccaacc9e5c1c Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期三, 25 十二月 2024 18:10:42 +0800 Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat-ui-vue3 --- src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue b/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue index 86a1cf7..96e8b08 100644 --- a/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue +++ b/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue @@ -1,5 +1,5 @@ <template> - <div class="process-panel__container" :style="{ width: `${width}px` }"> + <div class="process-panel__container" :style="{ width: `${width}px`,maxHeight: '700px' }"> <el-collapse v-model="activeTab"> <el-collapse-item name="base"> <!-- class="panel-tab__title" --> @@ -54,6 +54,10 @@ <template #title><Icon icon="ep:promotion" />其他</template> <element-other-config :id="elementId" /> </el-collapse-item> + <el-collapse-item name="customConfig" v-if="elementType.indexOf('Task') !== -1" key="customConfig"> + <template #title><Icon icon="ep:circle-plus-filled" />自定义配置</template> + <element-custom-config :id="elementId" :type="elementType" /> + </el-collapse-item> </el-collapse> </div> </template> -- Gitblit v1.9.3