From edf0f909bffed2f03fce8ee01fd87a7295563a17 Mon Sep 17 00:00:00 2001
From: 13728789855 <winny_rain@126.com>
Date: Wed, 10 Aug 2022 11:11:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fixed=203ca94a5=20from=20https://gitee.com/?=
 =?UTF-8?q?zhengguojing/magic-net/pulls/41=20=E4=BF=AE=E5=A4=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=B5=81=E7=A8=8B=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?=
 =?UTF-8?q?code=E5=92=8CcustomName=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/flowCenter/workflow/editForm.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/views/flowCenter/workflow/editForm.vue b/frontend/src/views/flowCenter/workflow/editForm.vue
index 5ea1f74..7130aea 100644
--- a/frontend/src/views/flowCenter/workflow/editForm.vue
+++ b/frontend/src/views/flowCenter/workflow/editForm.vue
@@ -101,6 +101,7 @@
         nextMakerName:'',
         webId:null,
         nextNodeDesignateType:null,
+        code:null,
         customName:null,
         schemeContent:null,
         schemeId:null,
@@ -112,6 +113,7 @@
     methods: {
       // 初始化方法 
       edit (record) {
+        this.code = record.code
         this.customName = record.customName
         this.frmType = record.frmType
         this.schemeContent=record.schemeContent
@@ -236,6 +238,8 @@
           input.id = that.id
           input.nextNodeDesignateType= that.nextNodeDesignateType
           input.nextNodeDesignates = that.nextNodeDesignates
+          input.code = that.code
+          input.customName = that.customName
           flowinstanceEdit(input).then((res) => {
             if (res.success) {
               this.$message.success('新增成功')
-- 
Gitee


From 56cf72f43639b15320974691429eafcace959513 Mon Sep 17 00:00:00 2001
From: 13728789855 <winny_rain@126.com>
Date: Tue, 9 Aug 2022 13:40:36 +0800
Subject: [PATCH 2/2] fixed 7f552f5 from
 https://gitee.com/zhengguojing/magic-net/pulls/41 Fix handleCancel without
 this

---
 frontend/src/views/flowCenter/workflow/previewForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/flowCenter/workflow/previewForm.vue b/frontend/src/views/flowCenter/workflow/previewForm.vue
index 7475793..a41a1a4 100644
--- a/frontend/src/views/flowCenter/workflow/previewForm.vue
+++ b/frontend/src/views/flowCenter/workflow/previewForm.vue
@@ -234,7 +234,7 @@
         }, 100)
       },
       handleSubmit () {
-        handleCancel ()
+        this.handleCancel ()
       },
       handleCancel () {
         this.form.resetFields()
-- 
Gitee