[incubator-dolphinscheduler] branch dev-1.3.0 updated: when init workflow, the tenantId linked by the tenantId of user

[chenxingchun]

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

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


The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
     new 2c6aa57  when init workflow, the tenantId linked by the tenantId of 
user
     new fa9706f  Merge pull request #2825 from Eights-Li/dev-1.3.0
2c6aa57 is described below

commit 2c6aa57ce9a44a99d0995f047cd02f38aa558da4
Author: yelli...@foxmail.com <amarant...@my.com>
AuthorDate: Wed May 27 09:51:25 2020 +0800

    when init workflow, the tenantId linked by the tenantId of user
---
 .../src/js/conf/home/pages/dag/_source/udp/udp.vue                | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
index 1bd48d8..cfbf5de 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
@@ -205,7 +205,13 @@
       this.syncDefine = dag.syncDefine
       this.timeout = dag.timeout || 0
       this.checkedTimeout = this.timeout !== 0
-      this.tenantId = dag.tenantId || -1
+
+      if (dag.tenantId === -1) {
+          this.tenantId = this.store.state.user.userInfo.tenantId
+      } else {
+          this.tenantId = dag.tenantId
+      }
+
     },
     mounted () {},
     components: {FormTenant, mLocalParams }