[incubator-dolphinscheduler] branch 1.3.3-release updated: The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.

[ch...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

chenxingchun pushed a commit to branch 1.3.3-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/1.3.3-release by this push:
     new 05594d4  The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
     new 4464565  Merge pull request #3781 from break60/1.3.3-release
05594d4 is described below

commit 05594d4a9c7514d0d2544c6f2f9b1922ac161f3e
Author: zhuangchong <zh...@163.com>
AuthorDate: Wed Sep 9 20:09:37 2020 +0800

    The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.
---
 .../pages/projects/pages/definition/pages/list/_source/list.vue   | 8 ++++++++
 .../pages/projects/pages/instance/pages/list/_source/list.vue     | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
index 577bb4f..7bc400a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
@@ -263,6 +263,12 @@
        * Close the delete layer
        */
       _closeDelete (i) {
+        // close batch
+        if (i < 0) {
+          this.$refs['poptipDeleteAll'].doClose()
+          return
+        }
+        // close one
         this.$refs[`poptip-delete-${i}`][0].doClose()
       },
       /**
@@ -396,8 +402,10 @@
         }).then(res => {
           this._onUpdate()
           this.checkAll = false
+          this.strSelectIds = ''
           this.$message.success(res.msg)
         }).catch(e => {
+          this.strSelectIds = ''
           this.checkAll = false
           this.$message.error(e.msg || '')
         })
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
index 3757588..8f5972a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
@@ -344,6 +344,12 @@
        * Close the delete layer
        */
       _closeDelete (i) {
+        // close batch
+        if (i < 0) {
+          this.$refs['poptipDeleteAll'].doClose()
+          return
+        }
+        // close one
         this.$refs[`poptip-delete-${i}`][0].doClose()
       },
       /**
@@ -539,9 +545,11 @@
         }).then(res => {
           this._onUpdate()
           this.checkAll = false
+          this.strDelete = ''
           this.$message.success(res.msg)
         }).catch(e => {
           this.checkAll = false
+          this.strDelete = ''
           this.$message.error(e.msg || '')
         })
       }