From 16ac482d9e681faf3e632c1bb43aba2149b66b11 Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Mon, 2 Aug 2021 11:51:32 +0800
Subject: [PATCH] [1.3.7-prepare][Fix-5699][UI] Fix update user error in user
 information (#5902)

---
 .../security/pages/users/_source/createUser.vue   |  7 ++++---
 .../pages/user/pages/account/_source/info.vue     | 15 +++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

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 a6502e508b..7839622423 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
@@ -124,7 +124,8 @@
       }
     },
     props: {
-      item: Object
+      item: Object,
+      fromUserInfo: Boolean
     },
     methods: {
       _ok () {
@@ -277,7 +278,7 @@
             this.userPassword = ''
             this.email = this.item.email
             this.phone = this.item.phone
-            if (this.item.tenantId) {
+            if (this.fromUserInfo || this.item.tenantId) {
               this.tenantId = this.item.tenantId
             }
             this.$nextTick(() => {
@@ -294,7 +295,7 @@
           this.userPassword = ''
           this.email = this.item.email
           this.phone = this.item.phone
-          if (this.item.tenantId) {
+          if (this.fromUserInfo || this.item.tenantId) {
             this.tenantId = this.item.tenantId
           }
           if (this.queueList.length > 0) {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue
index f199527176..8a1e8d217f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue
@@ -73,7 +73,7 @@
   </div>
 </template>
 <script>
-  import { mapState, mapMutations } from 'vuex'
+  import { mapActions, mapState, mapMutations } from 'vuex'
   import mListBoxF from '@/module/components/listBoxF/listBoxF'
   import mCreateUser from '@/conf/home/pages/security/pages/users/_source/createUser'
 
@@ -85,6 +85,7 @@
     props: {},
     methods: {
       ...mapMutations('user', ['setUserInfo']),
+      ...mapActions('user', ['getUserInfo']),
       /**
        * edit
        */
@@ -101,19 +102,17 @@
             return h(mCreateUser, {
               on: {
                 onUpdate (param) {
-                  self.setUserInfo({
-                    userName: param.userName,
-                    userPassword: param.userPassword,
-                    email: param.email,
-                    phone: param.phone
+                  self.setUserInfo(param)
+                  self.getUserInfo().finally(() => {
+                    modal.remove()
                   })
-                  modal.remove()
                 },
                 close () {
                 }
               },
               props: {
-                item: item
+                item: item,
+                fromUserInfo: true
               }
             })
           }