From bcd25fde56d979bdfa9c5c356355689fdc0e7767 Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Fri, 8 Dec 2023 18:19:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../top-bar/avatar/ResetPasssword.vue         | 28 +++++++----------
 .../components/top-bar/avatar/index.vue       | 30 ++++++++++++++-----
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/ui/src/layout/components/top-bar/avatar/ResetPasssword.vue b/ui/src/layout/components/top-bar/avatar/ResetPasssword.vue
index 9cd99decb..da40f1b86 100644
--- a/ui/src/layout/components/top-bar/avatar/ResetPasssword.vue
+++ b/ui/src/layout/components/top-bar/avatar/ResetPasssword.vue
@@ -6,6 +6,7 @@
       :model="resetPasswordForm"
       :rules="rules"
     >
+      <p class="mb-8">新密码</p>
       <el-form-item prop="password">
         <el-input
           type="password"
@@ -13,10 +14,8 @@
           class="input-item"
           v-model="resetPasswordForm.password"
           placeholder="请输入密码"
+          show-password
         >
-          <template #prepend>
-            <el-button icon="Lock" />
-          </template>
         </el-input>
       </el-form-item>
       <el-form-item prop="re_password">
@@ -26,12 +25,11 @@
           class="input-item"
           v-model="resetPasswordForm.re_password"
           placeholder="请输入确认密码"
+          show-password
         >
-          <template #prepend>
-            <el-button icon="Lock" />
-          </template>
         </el-input>
       </el-form-item>
+      <p class="mb-8">使用邮箱</p>
       <el-form-item>
         <el-input
           size="large"
@@ -40,9 +38,6 @@
           v-bind:modelValue="user.userInfo?.email"
           placeholder="请输入邮箱"
         >
-          <template #prepend>
-            <el-button icon="UserFilled" />
-          </template>
         </el-input>
       </el-form-item>
       <el-form-item prop="code">
@@ -53,9 +48,6 @@
             v-model="resetPasswordForm.code"
             placeholder="请输入验证码"
           >
-            <template #prepend>
-              <el-button icon="Key" />
-            </template>
           </el-input>
           <el-button
             size="large"
@@ -69,7 +61,8 @@
     </el-form>
     <template #footer>
       <span class="dialog-footer">
-        <el-button type="primary" @click="resetPassword"> 修改密码 </el-button>
+        <el-button @click="resetPasswordDialog = false"> 取消 </el-button>
+        <el-button type="primary" @click="resetPassword"> 保存 </el-button>
       </span>
     </template>
   </el-dialog>
@@ -107,8 +100,8 @@ const rules = ref<FormRules<ResetCurrentUserPasswordRequest>>({
     },
     {
       min: 6,
-      max: 30,
-      message: '长度在 6 到 30 个字符',
+      max: 20,
+      message: '长度在 6 到 20 个字符',
       trigger: 'blur'
     }
   ],
@@ -120,8 +113,8 @@ const rules = ref<FormRules<ResetCurrentUserPasswordRequest>>({
     },
     {
       min: 6,
-      max: 30,
-      message: '长度在 6 到 30 个字符',
+      max: 20,
+      message: '长度在 6 到 20 个字符',
       trigger: 'blur'
     },
     {
@@ -152,6 +145,7 @@ const open = () => {
     re_password: ''
   }
   resetPasswordDialog.value = true
+  resetPasswordFormRef.value?.resetFields()
 }
 const resetPassword = () => {
   resetPasswordFormRef.value
diff --git a/ui/src/layout/components/top-bar/avatar/index.vue b/ui/src/layout/components/top-bar/avatar/index.vue
index bccf2e2be..7dda01804 100644
--- a/ui/src/layout/components/top-bar/avatar/index.vue
+++ b/ui/src/layout/components/top-bar/avatar/index.vue
@@ -11,13 +11,20 @@
     </div>
 
     <template #dropdown>
-      <el-dropdown-menu>
-        <el-dropdown-item @click="openResetPassword">
-          <AppIcon iconName="Lock"></AppIcon><span style="margin-left: 5px">修改密码</span>
-        </el-dropdown-item>
-        <el-dropdown-item @click="logout">
-          <AppIcon iconName="app-exit"></AppIcon><span style="margin-left: 5px">退出</span>
+      <el-dropdown-menu class="avatar-dropdown">
+        <div class="userInfo">
+          <p class="bold mb-4" style="font-size: 14px;">{{ user.userInfo?.username }}</p>
+          <p>
+            <el-text type="info">
+              {{ user.userInfo?.email }}
+            </el-text>
+          </p>
+        </div>
+        <el-dropdown-item class="border-t p-8" @click="openResetPassword">
+          修改密码
         </el-dropdown-item>
+        <el-dropdown-item class="border-t"> 关于 </el-dropdown-item>
+        <el-dropdown-item class="border-t" @click="logout"> 退出 </el-dropdown-item>
       </el-dropdown-menu>
     </template>
   </el-dropdown>
@@ -43,4 +50,13 @@ const logout = () => {
   })
 }
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.avatar-dropdown {
+  .userInfo {
+    padding: 12px 11px;
+  }
+  :deep(.el-dropdown-menu__item) {
+    padding: 12px 11px;
+  }
+}
+</style>