From bdfb55ae7865f10eabbe2222f085f973740a5985 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: Thu, 1 Feb 2024 15:19:39 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=AE=8C=E5=96=84=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BpmnDesign/panel/SequenceFlowPanel.vue    | 65 +++++++++++++------
 1 file changed, 46 insertions(+), 19 deletions(-)

diff --git a/src/components/BpmnDesign/panel/SequenceFlowPanel.vue b/src/components/BpmnDesign/panel/SequenceFlowPanel.vue
index f827682..7a8c0cc 100644
--- a/src/components/BpmnDesign/panel/SequenceFlowPanel.vue
+++ b/src/components/BpmnDesign/panel/SequenceFlowPanel.vue
@@ -1,21 +1,47 @@
 <template>
   <div>
-    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px">
-      <el-form-item prop="id" label="节点 ID">
-        <el-input v-model="formData.id" @change="idChange"> </el-input>
-      </el-form-item>
-      <el-form-item prop="name" label="节点名称">
-        <el-input v-model="formData.name" @change="nameChange"> </el-input>
-      </el-form-item>
-      <el-form-item prop="conditionExpression" label="跳过条件">
-        <el-input v-model="formData.conditionExpression" @change="conditionExpressionChange"> </el-input>
-      </el-form-item>
-      <el-form-item prop="skipExpression" label="跳过表达式">
-        <el-input v-model="formData.skipExpression" @change="skipExpressionChange"> </el-input>
-      </el-form-item>
-      <el-form-item label="执行监听器" style="margin-bottom: 0"> </el-form-item>
-      <ExecutionListener :modeler="modeler" :element="element"></ExecutionListener>
-    </el-form>
+    <el-collapse v-model="currentCollapseItem">
+      <el-collapse-item name="1">
+        <template #title>
+          <div class="collapse__title">
+            <el-icon>
+              <InfoFilled />
+            </el-icon>
+            常规
+          </div>
+        </template>
+        <div>
+          <el-form ref="formRef" :model="formData" :rules="formRules" label-width="90px">
+            <el-form-item prop="id" label="节点 ID">
+              <el-input v-model="formData.id" @change="idChange"> </el-input>
+            </el-form-item>
+            <el-form-item prop="name" label="节点名称">
+              <el-input v-model="formData.name" @change="nameChange"> </el-input>
+            </el-form-item>
+            <el-form-item prop="conditionExpression" label="跳过条件">
+              <el-input v-model="formData.conditionExpression" @change="conditionExpressionChange"> </el-input>
+            </el-form-item>
+            <el-form-item prop="skipExpression" label="跳过表达式">
+              <el-input v-model="formData.skipExpression" @change="skipExpressionChange"> </el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-collapse-item>
+
+      <el-collapse-item name="2">
+        <template #title>
+          <div class="collapse__title">
+            <el-icon>
+              <BellFilled />
+            </el-icon>
+            执行监听器
+          </div>
+        </template>
+        <div>
+          <ExecutionListener :element="element"></ExecutionListener>
+        </div>
+      </el-collapse-item>
+    </el-collapse>
   </div>
 </template>
 <script setup lang="ts">
@@ -23,9 +49,9 @@ import useParseElement from '@/components/BpmnDesign/hooks/useParseElement';
 import usePanel from '@/components/BpmnDesign/hooks/usePanel';
 import { Modeler, Element } from 'bpmn';
 import { SequenceFlowPanel } from 'bpmnDesign';
+import useModelerStore from '@/store/modules/modeler';
 
 interface PropType {
-  modeler: Modeler;
   element: Element;
 }
 const props = withDefaults(defineProps<PropType>(), {});
@@ -35,7 +61,8 @@ const { nameChange, idChange, updateProperties } = usePanel({
 const { parseData } = useParseElement({
   element: toRaw(props.element)
 });
-
+const moddle = useModelerStore().getModdle();
+const currentCollapseItem = ref(['1', '2']);
 const formData = ref(parseData<SequenceFlowPanel>());
 
 const formRules = ref<ElFormRules>({
@@ -46,7 +73,7 @@ const formRules = ref<ElFormRules>({
 
 const conditionExpressionChange = (val: string) => {
   if (val) {
-    const newCondition = props.modeler.get('moddle').create('bpmn:FormalExpression', { body: val });
+    const newCondition = moddle.create('bpmn:FormalExpression', { body: val });
     updateProperties({ conditionExpression: newCondition });
   } else {
     updateProperties({ conditionExpression: null });