From 2129f76923dadbb35c6a63e409f3b0694a1e9360 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: Wed, 21 Feb 2024 10:31:28 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E5=A4=8D=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=9B=9E=E6=98=BEObject=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BpmnDesign/panel/SequenceFlowPanel.vue | 10 ++++++++--
 src/types/bpmn/panel.d.ts                             |  5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/components/BpmnDesign/panel/SequenceFlowPanel.vue b/src/components/BpmnDesign/panel/SequenceFlowPanel.vue
index d2ebab1..88ce350 100644
--- a/src/components/BpmnDesign/panel/SequenceFlowPanel.vue
+++ b/src/components/BpmnDesign/panel/SequenceFlowPanel.vue
@@ -18,8 +18,8 @@
             <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 prop="conditionExpression" label="跳转条件">
+              <el-input v-model="formData.conditionExpressionValue" @change="conditionExpressionChange"> </el-input>
             </el-form-item>
             <el-form-item prop="skipExpression" label="跳过表达式">
               <el-input v-model="formData.skipExpression" @change="skipExpressionChange"> </el-input>
@@ -83,6 +83,12 @@ const conditionExpressionChange = (val: string) => {
 const skipExpressionChange = (val: string) => {
   updateProperties({ 'flowable:skipExpression': val });
 };
+
+onBeforeMount(() => {
+  if (formData.value.conditionExpression) {
+    formData.value.conditionExpressionValue = formData.value.conditionExpression.body;
+  }
+});
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/types/bpmn/panel.d.ts b/src/types/bpmn/panel.d.ts
index df5bac5..baadd6a 100644
--- a/src/types/bpmn/panel.d.ts
+++ b/src/types/bpmn/panel.d.ts
@@ -65,7 +65,10 @@ declare module 'bpmnDesign' {
   export interface StartEndPanel extends BasePanel {}
   export interface GatewayPanel extends BasePanel {}
   export interface SequenceFlowPanel extends BasePanel {
-    conditionExpression: string;
+    conditionExpression: {
+      body: string;
+    };
+    conditionExpressionValue: string;
     skipExpression: string;
   }
 }