From d05e6a9e002004cd51d275e008da97d268c092aa Mon Sep 17 00:00:00 2001
From: jxnkwlp <jxnkwlp@hotmail.com>
Date: Sun, 24 Sep 2023 18:51:51 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20lost=20variables=20when=20?=
 =?UTF-8?q?update=20definition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WorkflowDefinitionCreateOrUpdateDto.cs                 | 4 +---
 .../WorkflowDefinitions/WorkflowDefinitionDto.cs           | 2 --
 .../WorkflowDefinitionVersionCreateOrUpdateDto.cs          | 7 ++++++-
 .../WorkflowDefinitions/WorkflowDefinitionAppService.cs    | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Passingwind.Abp.ElsaModule.Application.Contracts/WorkflowDefinitions/WorkflowDefinitionCreateOrUpdateDto.cs b/src/Passingwind.Abp.ElsaModule.Application.Contracts/WorkflowDefinitions/WorkflowDefinitionCreateOrUpdateDto.cs
index 6668333..066878c 100644
--- a/src/Passingwind.Abp.ElsaModule.Application.Contracts/WorkflowDefinitions/WorkflowDefinitionCreateOrUpdateDto.cs
+++ b/src/Passingwind.Abp.ElsaModule.Application.Contracts/WorkflowDefinitions/WorkflowDefinitionCreateOrUpdateDto.cs
@@ -29,7 +29,5 @@ public class WorkflowDefinitionCreateOrUpdateDto
 
     public WorkflowPersistenceBehavior PersistenceBehavior { get; set; } = WorkflowPersistenceBehavior.WorkflowBurst;
 
-    public WorkflowContextOptions ContextOptions { get; set; }
-
-    public Dictionary<string, object> Variables { get; set; }
+    public WorkflowContextOptions ContextOptions { get; set; } 
 }
diff --git a/src/Passingwind.Abp.ElsaModule.Application.Contracts/WorkflowDefinitions/WorkflowDefinitionDto.cs b/src/Passingwind.Abp.ElsaModule.Application.Contracts/WorkflowDefinitions/WorkflowDefinitionDto.cs
index ecdfd62..8b691f6 100644
--- a/src/Passingwind.Abp.ElsaModule.Application.Contracts/WorkflowDefinitions/WorkflowDefinitionDto.cs
+++ b/src/Passingwind.Abp.ElsaModule.Application.Contracts/WorkflowDefinitions/WorkflowDefinitionDto.cs
@@ -33,7 +33,5 @@ public class WorkflowDefinitionDto : AuditedEntityDto<Guid>
 
     public WorkflowContextOptions ContextOptions { get; set; }
 
-    public Dictionary<string, object> Variables { get; set; }
-
     public Dictionary<string, object> CustomAttributes { get; set; }
 }
diff --git a/src/Passingwind.Abp.ElsaModule.Application.Contracts/WorkflowDefinitions/WorkflowDefinitionVersionCreateOrUpdateDto.cs b/src/Passingwind.Abp.ElsaModule.Application.Contracts/WorkflowDefinitions/WorkflowDefinitionVersionCreateOrUpdateDto.cs
index ce0dfec..e1c481b 100644
--- a/src/Passingwind.Abp.ElsaModule.Application.Contracts/WorkflowDefinitions/WorkflowDefinitionVersionCreateOrUpdateDto.cs
+++ b/src/Passingwind.Abp.ElsaModule.Application.Contracts/WorkflowDefinitions/WorkflowDefinitionVersionCreateOrUpdateDto.cs
@@ -7,11 +7,16 @@ namespace Passingwind.Abp.ElsaModule.WorkflowDefinitions;
 public class WorkflowDefinitionVersionCreateOrUpdateDto
 {
     [Required]
-    public WorkflowDefinitionCreateOrUpdateDto Definition { get; set; }
+    public WorkflowDefinitionDto Definition { get; set; }
 
     public List<ActivityCreateOrUpdateDto> Activities { get; set; }
 
     public List<ActivityConnectionCreateDto> Connections { get; set; }
 
     public bool IsPublished { get; set; }
+
+    public class WorkflowDefinitionDto : WorkflowDefinitionCreateOrUpdateDto
+    {
+        public Dictionary<string, object> Variables { get; set; }
+    }
 }
diff --git a/src/Passingwind.Abp.ElsaModule.Application/WorkflowDefinitions/WorkflowDefinitionAppService.cs b/src/Passingwind.Abp.ElsaModule.Application/WorkflowDefinitions/WorkflowDefinitionAppService.cs
index 6a653d6..44c7730 100644
--- a/src/Passingwind.Abp.ElsaModule.Application/WorkflowDefinitions/WorkflowDefinitionAppService.cs
+++ b/src/Passingwind.Abp.ElsaModule.Application/WorkflowDefinitions/WorkflowDefinitionAppService.cs
@@ -369,7 +369,7 @@ public virtual async Task<WorkflowDefinitionDto> UpdateDefinitionAsync(Guid id,
                input.Tag,
                input.PersistenceBehavior,
                input.ContextOptions,
-               input.Variables,
+               entity.Variables,
                entity.CustomAttributes);
 
         // check name