[incubator-dolphinscheduler] branch dev-1.3.0 updated: Fixed selection of tenant value and defalut changed to lower case

[ch...@apache.org]

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 e8d9f5c  Fixed selection of tenant value and defalut changed to lower case
     new dd7513d  Merge pull request #2902 from break60/dev-1.3.0
e8d9f5c is described below

commit e8d9f5c2ddd01ed715c8985b0aa6b5d6e958e622
Author: break60 <79...@qq.com>
AuthorDate: Fri Jun 5 11:52:33 2020 +0800

    Fixed selection of tenant value and defalut changed to lower case
---
 .../src/js/conf/home/pages/dag/_source/udp/udp.vue               | 9 +++++----
 dolphinscheduler-ui/src/js/conf/home/store/security/actions.js   | 2 +-
 2 files changed, 6 insertions(+), 5 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 cfbf5de..b9610cb 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,12 +205,13 @@
       this.syncDefine = dag.syncDefine
       this.timeout = dag.timeout || 0
       this.checkedTimeout = this.timeout !== 0
-
-      if (dag.tenantId === -1) {
+      this.$nextTick(() => {
+        if (dag.tenantId === -1) {
           this.tenantId = this.store.state.user.userInfo.tenantId
-      } else {
+        } else {
           this.tenantId = dag.tenantId
-      }
+        }
+      })
 
     },
     mounted () {},
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
index 94e8a69..d1d2389 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
@@ -282,7 +282,7 @@ export default {
         const list = res.data
         list.unshift({
           id: -1,
-          tenantName: 'Default'
+          tenantName: 'default'
         })
         state.tenantAllList = list
         resolve(list)