From 84c88825a9431b5b631403463247a419be4b36f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=81=AA=E6=99=A8?= <bo.wang1016@outlook.com>
Date: Sat, 22 Oct 2022 20:08:14 +0800
Subject: [PATCH] fix: post list showing the number of post in the tags (#650)

---
 package.json                    |  2 +-
 src/components/Post/PostTag.vue |  5 ++++-
 src/views/user/Profile.vue      | 40 +++++++++++++++++++++++----------
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 96305cda..da1c0351 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "halo-admin",
-  "version": "1.6.0-SNAPSHOT",
+  "version": "1.6.0",
   "author": "halo-dev",
   "description": "Halo admin client.",
   "repository": {
diff --git a/src/components/Post/PostTag.vue b/src/components/Post/PostTag.vue
index 82d32e54..078a8ff0 100644
--- a/src/components/Post/PostTag.vue
+++ b/src/components/Post/PostTag.vue
@@ -1,5 +1,8 @@
 <template>
-  <a-tag :color="tag.color" :style="{ color: labelColor }"> {{ tag.name }}({{ tag.postCount }})</a-tag>
+  <a-tag :color="tag.color" :style="{ color: labelColor }">
+    {{ tag.name }}
+    <span v-if="tag.postCount !== undefined">({{ tag.postCount }})</span>
+  </a-tag>
 </template>
 <script>
 import { isHex, isLight } from '@/utils/colorUtil'
diff --git a/src/views/user/Profile.vue b/src/views/user/Profile.vue
index 2a53de94..354f5955 100644
--- a/src/views/user/Profile.vue
+++ b/src/views/user/Profile.vue
@@ -255,7 +255,16 @@
       </a-form>
 
       <template #footer>
-        <a-button type="primary" @click="handleUpdateAvatar">确定</a-button>
+        <ReactiveButton
+          :errored="updateAvatarForm.errored"
+          :loading="updateAvatarForm.saving"
+          erroredText="保存失败"
+          loadedText="保存成功"
+          text="保存"
+          type="primary"
+          @callback="handleUpdateAvatarCallback"
+          @click="handleUpdateAvatar"
+        ></ReactiveButton>
         <a-button @click="updateAvatarForm.visible = false">关闭</a-button>
       </template>
     </a-modal>
@@ -521,20 +530,27 @@ export default {
       })
     },
     async handleUpdateAvatar() {
-      const { updateAvatarData } = await apiClient.user.getProfile()
-      updateAvatarData.avatar = this.updateAvatarForm.avatar
+      const { data: userToUpdate } = await apiClient.user.getProfile()
+      userToUpdate.avatar = this.updateAvatarForm.avatar
+      this.updateAvatarForm.saving = true
       apiClient.user
-        .updateProfile(updateAvatarData)
-        .then(response => {
-          this.$message.success('更新头像成功!')
-          this.updateAvatarForm.visible = false
-          this.userForm.model.avatar = response.data.avatar
-          this.setUser(Object.assign({}, this.userForm.model))
-        })
+        .updateProfile(userToUpdate)
         .catch(() => {
-          this.$message.error('更新头像失败!')
-          this.updateAvatarForm.visible = true
+          this.updateAvatarForm.saveErrored = true
         })
+        .finally(() => {
+          setTimeout(() => {
+            this.updateAvatarForm.saving = false
+          }, 400)
+          this.handleLoadStatistics()
+        })
+    },
+    handleUpdateAvatarCallback() {
+      if (this.updateAvatarForm.saveErrored) {
+        this.updateAvatarForm.saveErrored = false
+        return
+      }
+      this.updateAvatarForm.visible = false
     }
   }
 }