[incubator-dolphinscheduler] branch 1.3.6-prepare updated: [1.3.6-prepare][Improvement-4740][UI] Set the default Tenant as default or the first exist tenant in save process #4742 (#4975)

[leonbao]

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

leonbao pushed a commit to branch 1.3.6-prepare
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/1.3.6-prepare by this push:
     new 66f6bd5  [1.3.6-prepare][Improvement-4740][UI] Set the default Tenant 
as default or the first exist tenant in save process #4742 (#4975)
66f6bd5 is described below

commit 66f6bd513fb203af3977587fb1572f6885ff2796
Author: Shiwen Cheng <chengshiwen0...@gmail.com>
AuthorDate: Tue Mar 9 17:45:05 2021 +0800

    [1.3.6-prepare][Improvement-4740][UI] Set the default Tenant as default or 
the first exist tenant in save process #4742 (#4975)
---
 dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue | 7 +++----
 .../js/conf/home/pages/security/pages/users/_source/createUser.vue | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

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 8bb0b66..4b62aef 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
@@ -204,13 +204,12 @@
       this.timeout = dag.timeout || 0
       this.checkedTimeout = this.timeout !== 0
       this.$nextTick(() => {
-        if (dag.tenantId === -1) {
-          this.tenantId = this.store.state.user.userInfo.tenantId
-        } else {
+        if (dag.tenantId > -1) {
           this.tenantId = dag.tenantId
+        } else if (this.store.state.user.userInfo.tenantId) {
+          this.tenantId = this.store.state.user.userInfo.tenantId
         }
       })
-
     },
     mounted () {},
     components: {FormTenant, mLocalParams }
diff --git 
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
 
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
index 68e3bcd..a6502e5 100644
--- 
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
+++ 
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
@@ -277,7 +277,7 @@
             this.userPassword = ''
             this.email = this.item.email
             this.phone = this.item.phone
-            if (this.item.tenantName) {
+            if (this.item.tenantId) {
               this.tenantId = this.item.tenantId
             }
             this.$nextTick(() => {
@@ -294,10 +294,10 @@
           this.userPassword = ''
           this.email = this.item.email
           this.phone = this.item.phone
-          if (this.item.tenantName) {
+          if (this.item.tenantId) {
             this.tenantId = this.item.tenantId
           }
-          if(this.queueList.length>0) {
+          if (this.queueList.length > 0) {
             let queue = _.find(this.queueList, ['code', this.item.queue])
             if (queue) {
               this.queueName = queue.id || ''