From 03caa78fce9287075955a99e0d10bd1cd3d585be Mon Sep 17 00:00:00 2001
From: ssc <qwertyuiop>
Date: Wed, 26 May 2021 10:16:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A8=A1=E5=9E=8B/=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=88=A0=E9=99=A4=E5=8C=BA=E5=88=86=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E5=92=8C=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plugin/workflow/design/form.vue  | 19 +++++++++++--------
 src/views/plugin/workflow/design/model.vue | 19 +++++++++++--------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/views/plugin/workflow/design/form.vue b/src/views/plugin/workflow/design/form.vue
index b70d693..2c1613f 100644
--- a/src/views/plugin/workflow/design/form.vue
+++ b/src/views/plugin/workflow/design/form.vue
@@ -330,6 +330,7 @@ export default {
     },
     rowDel(row) {
       this.$confirm("删除全部版本或者回退到最后版本?", {
+        distinguishCancelAndClose: true,
         confirmButtonText: "回退",
         cancelButtonText: "全部删除",
         type: "warning"
@@ -342,15 +343,17 @@ export default {
           this.onLoad(this.page);
           this.$message.success("操作成功")
         })
-      }).catch(() => {
-        const param = {
-          id: row.id,
-          rollback: false
+      }).catch(action => {
+        if (action == 'cancel') {
+          const param = {
+            id: row.id,
+            rollback: false
+          }
+          remove(param).then(() => {
+            this.onLoad(this.page);
+            this.$message.success("操作成功")
+          })
         }
-        remove(param).then(() => {
-          this.onLoad(this.page);
-          this.$message.success("操作成功")
-        })
       })
     },
     handleDelete() {
diff --git a/src/views/plugin/workflow/design/model.vue b/src/views/plugin/workflow/design/model.vue
index a0586ed..2459eee 100644
--- a/src/views/plugin/workflow/design/model.vue
+++ b/src/views/plugin/workflow/design/model.vue
@@ -151,6 +151,7 @@ export default {
     },
     rowDel(row) {
       this.$confirm("删除全部版本或者回退到最后版本?", {
+        distinguishCancelAndClose: true,
         confirmButtonText: "回退",
         cancelButtonText: "全部删除",
         type: "warning"
@@ -163,15 +164,17 @@ export default {
           this.onLoad(this.page);
           this.$message.success("操作成功")
         })
-      }).catch(() => {
-        const param = {
-          id: row.id,
-          rollback: false
+      }).catch(action => {
+        if (action == 'cancel') {
+          const param = {
+            id: row.id,
+            rollback: false
+          }
+          remove(param).then(() => {
+            this.onLoad(this.page);
+            this.$message.success("操作成功")
+          })
         }
-        remove(param).then(() => {
-          this.onLoad(this.page);
-          this.$message.success("操作成功")
-        })
       })
     },
     handleDelete() {