Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue

@@ -150,7 +150,7 @@
         :visible.sync="drawer"
         size="35%"
         :with-header="false">
-        <m-versions :versionData = versionData @mVersionSwitchProcessDefinitionVersion="mVersionSwitchProcessDefinitionVersion" @mVersionGetProcessDefinitionVersionsPage="mVersionGetProcessDefinitionVersionsPage" @mVersionDeleteProcessDefinitionVersion="mVersionDeleteProcessDefinitionVersion"></m-versions>
+        <m-versions :versionData = versionData @mVersionSwitchProcessDefinitionVersion="mVersionSwitchProcessDefinitionVersion" @mVersionGetProcessDefinitionVersionsPage="mVersionGetProcessDefinitionVersionsPage" @mVersionDeleteProcessDefinitionVersion="mVersionDeleteProcessDefinitionVersion" @closeVersion="closeVersion"></m-versions>
       </el-drawer>
       <el-drawer
         :visible.sync="nodeDrawer"
@@ -800,6 +800,10 @@
         }).catch(e => {
           this.$message.error(e.msg || '')
         })
+      },
+
+      closeVersion () {
+        this.drawer = false
       }
     },
     watch: {

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue

@@ -126,7 +126,7 @@
       :visible.sync="drawer"
       size="35%"
       :with-header="false">
-      <m-versions :versionData = versionData @mVersionSwitchProcessDefinitionVersion="mVersionSwitchProcessDefinitionVersion" @mVersionGetProcessDefinitionVersionsPage="mVersionGetProcessDefinitionVersionsPage" @mVersionDeleteProcessDefinitionVersion="mVersionDeleteProcessDefinitionVersion"></m-versions>
+      <m-versions :versionData = versionData @mVersionSwitchProcessDefinitionVersion="mVersionSwitchProcessDefinitionVersion" @mVersionGetProcessDefinitionVersionsPage="mVersionGetProcessDefinitionVersionsPage" @mVersionDeleteProcessDefinitionVersion="mVersionDeleteProcessDefinitionVersion" @closeVersion="closeVersion"></m-versions>
     </el-drawer>
     <el-dialog
       :title="$t('Please set the parameters before starting')"
@@ -434,6 +434,10 @@
         })
       },
 
+      closeVersion () {
+        this.drawer = false
+      },
+
       _batchExport () {
         this.exportDefinition({
           processDefinitionIds: this.strSelectIds,

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue

@@ -151,9 +151,7 @@
        */
       _close () {
         // flag Whether to delete a node this.$destroy()
-        this.$emit('close', {
+        this.$emit('closeVersion')
-          fromThis: this
-        })
       }
     },
     created () {

dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue

@@ -183,6 +183,8 @@
           this.transferData.targetListPrs = targetListPrs
           this.transferData.type.name = `${i18n.$t('Project')}`
           this.authProjectDialog = true
+        }).catch(e => {
+          this.$message.error(e.msg || '')
         })
       },
       onUpdateAuthProject (projectIds) {
@@ -260,6 +262,8 @@
           this.resourceData.udfTargetList = udfTargetList
           this.resourceData.type.name = `${i18n.$t('Resources')}`
           this.resourceDialog = true
+        }).catch(e => {
+          this.$message.error(e.msg || '')
         })
       },
 
@@ -298,6 +302,8 @@
           this.transferData.targetListPrs = targetListPrs
           this.transferData.type.name = `${i18n.$t('Datasource')}`
           this.authDataSourceDialog = true
+        }).catch(e => {
+          this.$message.error(e.msg || '')
         })
       },
       onUpdateAuthDataSource (datasourceIds) {
@@ -334,6 +340,8 @@
           this.transferData.targetListPrs = targetListPrs
           this.transferData.type.name = `${i18n.$t('UDF Function')}`
           this.authUdfFuncDialog = true
+        }).catch(e => {
+          this.$message.error(e.msg || '')
         })
       },
       onUpdateAuthUdfFunc (udfIds) {