From 3bf8a6db79316f1b252afccf9cecae9ea353fe44 Mon Sep 17 00:00:00 2001
From: "fangfang.dong" <fangfang.dong@fit2cloud.com>
Date: Mon, 19 Jun 2023 16:46:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=97=B6=20=E5=85=88=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=86=8D=E9=80=89=E6=8B=A9=E6=9D=A5=E6=BA=90?=
 =?UTF-8?q?=E4=B8=BALDAP=20=E5=AF=86=E7=A0=81=E9=A1=B9=E4=BB=8D=E5=8F=AF?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=9C=AA=E9=9A=90=E8=97=8F=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/User/UserCreateUpdate.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/users/User/UserCreateUpdate.vue b/src/views/users/User/UserCreateUpdate.vue
index d0ff13ade..588d37d47 100644
--- a/src/views/users/User/UserCreateUpdate.vue
+++ b/src/views/users/User/UserCreateUpdate.vue
@@ -55,10 +55,13 @@ export default {
         password: {
           component: UserPassword,
           hidden: (formValue) => {
-            if (formValue.password_strategy === 'custom') {
+            if (formValue.source !== 'local') {
+              return true
+            }
+            if (formValue.password_strategy === 'custom' || formValue.update_password) {
               return false
             }
-            return !formValue.update_password || formValue.source !== 'local'
+            return true
           },
           el: {
             required: false,
@@ -79,10 +82,13 @@ export default {
             }
           ],
           hidden: (formValue) => {
-            if (formValue.password_strategy === 'custom') {
+            if (formValue.source !== 'local') {
+              return true
+            }
+            if (formValue.password_strategy === 'custom' || formValue.update_password || this.user.can_public_key_auth) {
               return false
             }
-            return !formValue.update_password || !this.user.can_public_key_auth
+            return true
           }
         },
         set_public_key: {