From ab3a88b64b5ac7db905cffe76ff679756595f63b Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Tue, 29 Jun 2021 17:22:12 +0800
Subject: [PATCH] [Fix-5699][UI] Fix update user error in user information
 (#5700)

---
 .../pages/security/pages/users/_source/createUser.vue    | 7 ++++---
 .../js/conf/home/pages/security/pages/users/index.vue    | 6 ++++--
 .../conf/home/pages/user/pages/account/_source/info.vue  | 9 ++-------
 3 files changed, 10 insertions(+), 12 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 eed178787b..53db31cb86 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
@@ -138,7 +138,8 @@
       }
     },
     props: {
-      item: Object
+      item: Object,
+      fromUserInfo: Boolean
     },
     methods: {
       _ok () {
@@ -294,7 +295,7 @@
             this.phone = this.item.phone
             this.state = this.item.state
             this.userState = this.item.state + '' || '1'
-            if (this.item.tenantId === 0 || this.item.tenantId) {
+            if (this.fromUserInfo || this.item.tenantId) {
               this.tenantId = this.item.tenantId
             }
             this.$nextTick(() => {
@@ -313,7 +314,7 @@
           this.phone = this.item.phone
           this.state = this.item.state
           this.userState = this.state + '' || '1'
-          if (this.item.tenantId === 0 || 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/security/pages/users/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
index 220346b9c0..f0789019e3 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
@@ -60,7 +60,7 @@
 </template>
 <script>
   import _ from 'lodash'
-  import { mapActions } from 'vuex'
+  import { mapActions, mapMutations } from 'vuex'
   import mList from './_source/list'
   import mCreateUser from './_source/createUser'
   import mSpin from '@/module/components/spin/spin'
@@ -89,6 +89,7 @@
     mixins: [listUrlParamHandle],
     props: {},
     methods: {
+      ...mapMutations('user', ['setUserInfo']),
       ...mapActions('security', ['getUsersListP']),
       /**
        * Query
@@ -113,8 +114,9 @@
         this.item = item
         this.createUserDialog = true
       },
-      onUpdate () {
+      onUpdate (param) {
         this._debounceGET('false')
+        this.setUserInfo(param)
         this.createUserDialog = false
       },
       close () {
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 5f30ed8fb3..3a48b53a65 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 @@
           v-if="createUserDialog"
           :visible.sync="createUserDialog"
           width="auto">
-          <m-create-user :item="item" @onUpdate="onUpdate" @close="close"></m-create-user>
+          <m-create-user :item="item" :from-user-info="true" @onUpdate="onUpdate" @close="close"></m-create-user>
         </el-dialog>
       </template>
     </m-list-box-f>
@@ -104,12 +104,7 @@
         this.createUserDialog = true
       },
       onUpdate (param) {
-        this.setUserInfo({
-          userName: param.userName,
-          userPassword: param.userPassword,
-          email: param.email,
-          phone: param.phone
-        })
+        this.setUserInfo(param)
         this.getUserInfo().finally(() => {
           this.createUserDialog = false
         })