From 7a6054ffb5de998aee5338dd1ad41dfe0eedc2fd Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Mon, 20 Feb 2023 15:08:48 +0800
Subject: [PATCH] =?UTF-8?q?:rocket:=20=E9=80=82=E9=85=8D=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../header/components/user-dropdown/index.vue | 22 ++++++++++------
 src/store/modules/user.ts                     |  5 ----
 src/views/system/user/userInfo/index.vue      | 25 +++++++++++--------
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/layouts/default/header/components/user-dropdown/index.vue b/src/layouts/default/header/components/user-dropdown/index.vue
index 9a38ded..8ba2cff 100644
--- a/src/layouts/default/header/components/user-dropdown/index.vue
+++ b/src/layouts/default/header/components/user-dropdown/index.vue
@@ -1,9 +1,9 @@
 <template>
   <Dropdown placement="bottomLeft" :trigger="['click', 'hover']" :overlayClassName="`${prefixCls}-dropdown-overlay`">
     <span :class="[prefixCls, `${prefixCls}--${theme}`]" class="flex">
-      <img :class="`${prefixCls}__header`" :src="getUserInfo.avatar">
+      <img :class="`${prefixCls}__header`" :src="getAvatarUrl">
       <span :class="`${prefixCls}__info hidden md:block`">
-        <span :class="`${prefixCls}__name  `" class="truncate">
+        <span :class="`${prefixCls}__name`" class="truncate">
           {{ getUserInfo.nickName }}
         </span>
       </span>
@@ -34,7 +34,7 @@
 </template>
 <script lang="ts">
   import { Dropdown, Menu } from 'ant-design-vue';
-  import { defineComponent, computed } from 'vue';
+  import { defineComponent, computed, unref, ref } from 'vue';
   import { useUserStore } from '/@/store/modules/user';
   import { useHeaderSetting } from '/@/hooks/setting/useHeaderSetting';
   import { useI18n } from '/@/hooks/web/useI18n';
@@ -43,7 +43,11 @@
   import { propTypes } from '/@/utils/propTypes';
   import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
   import { useRouter } from 'vue-router';
+  import { isUrl } from '/@/utils/is';
+  import { useGlobSetting } from '/@/hooks/setting';
   type MenuEvent = 'logout' | 'doc' | 'lock' | 'userInfo';
+  import defaultAvatar from '/@/assets/images/defaultAvatar.svg';
+  import type { User } from '/@/api/platform/core/entity/user';
 
   export default defineComponent({
     name: 'UserDropdown',
@@ -61,11 +65,9 @@
       const { t } = useI18n();
       const { getUseLockPage } = useHeaderSetting();
       const userStore = useUserStore();
+      const { apiUrl } = useGlobSetting();
 
-      const getUserInfo = computed(() => {
-        const { nickName = '', avatar, remarks } = userStore.getUserInfo || {};
-        return { nickName, avatar: avatar, remarks };
-      });
+      const getUserInfo = computed((): User =>  userStore.getUserInfo || {});
       const { push } = useRouter();
       const [register, { openModal }] = useModal();
 
@@ -78,6 +80,11 @@
         userStore.confirmLoginOut();
       }
 
+      const getAvatarUrl = computed((): string => {
+        if (!unref(getUserInfo).avatar) return defaultAvatar;
+        return isUrl(unref(getUserInfo).avatar) ? unref(getUserInfo).avatar : apiUrl + unref(getUserInfo).avatar;
+      });
+
       function handleMenuClick(e: { key: MenuEvent }) {
         switch (e.key) {
           case 'userInfo':
@@ -99,6 +106,7 @@
         handleMenuClick,
         register,
         getUseLockPage,
+        getAvatarUrl,
       };
     },
   });
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index a38a809..61b4b3b 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -17,10 +17,6 @@ import { useMessage } from '/@/hooks/web/useMessage';
 import { router } from '/@/router';
 import { usePermissionStore } from '/@/store/modules/permission';
 import { RouteRecordRaw } from 'vue-router';
-import defaultAvatar from '/@/assets/images/defaultAvatar.svg';
-import { isUrl } from '/@/utils/is';
-import { useGlobSetting } from '/@/hooks/setting';
-const { apiUrl } = useGlobSetting();
 
 interface UserState {
   userInfo: Nullable<User>;
@@ -137,7 +133,6 @@ export const useUserStore = defineStore({
     /** 获取用户信息 */
     async getUserInfoAction(): Promise<User> {
       const userInfo = await getUserInfo().catch(()=> this.resetState());
-      userInfo.avatar ? (userInfo.avatar = isUrl(userInfo.avatar) ? userInfo.avatar : apiUrl + userInfo.avatar) : (userInfo.avatar = defaultAvatar);
       userInfo.tenantIds = String(userInfo.tenantId).split(',');
       // 存储用户扩展信息,便于鉴权
       this.setUserInfo(userInfo);
diff --git a/src/views/system/user/userInfo/index.vue b/src/views/system/user/userInfo/index.vue
index 69b2024..30ccf8d 100644
--- a/src/views/system/user/userInfo/index.vue
+++ b/src/views/system/user/userInfo/index.vue
@@ -12,7 +12,7 @@
         <div class="user-info-top">
           <AAvatar draggable
                    width="32px"
-                   :src="getUserInfo.avatar"
+                   :src="getAvatarUrl"
                    :size="80"
           />
           <h2>{{ getUserInfo.nickName }}</h2>
@@ -62,6 +62,7 @@
               <template #label>
                 <Icon icon="fa6-solid:robot"/>
               </template>
+              <a href="#">申请</a>
               已认证
             </ADescriptionsItem>
           </ADescriptions>
@@ -92,7 +93,7 @@
                        :customRequest="handleUploadAvatar"
                        :before-upload="handleBeforeUpload"
               >
-                <img v-if="state.imageUrl" :src="state.imageUrl">
+                <img v-if="getImageUrl" :src="getImageUrl">
                 <div v-else>
                   <LoadingOutlined v-if="state.uploadAvatarLoading"/>
                   <PlusOutlined v-else/>
@@ -119,7 +120,7 @@
   import {PageWrapper} from '/@/components/Page';
   import {CreditCardOutlined, LoadingOutlined, PlusOutlined, UserOutlined} from '@ant-design/icons-vue';
   import type {CSSProperties} from 'vue';
-  import {computed, reactive} from 'vue';
+  import {computed, reactive, unref} from 'vue';
   import {Icon} from '/@/components/Icon';
   import {BasicForm, useForm} from '/@/components/Form/index';
   import {userFormSchema} from './userInfo.data';
@@ -137,7 +138,7 @@
     uploadAvatarBtnLoading: boolean;
     uploadAvatarLoading: boolean;
     userInfo: User | any;
-    imageUrl?: string;
+    imageUrl: string;
     tabList: Recordable[];
   }
 
@@ -159,7 +160,7 @@
     uploadAvatarLoading: false,
     uploadAvatarBtnLoading: false,
     userInfo: undefined,
-    imageUrl: undefined,
+    imageUrl: '',
     tabList: [
       {
         key: 'baseInfo',
@@ -222,14 +223,16 @@
   }
 
   const getUserInfo = computed((): User & any => {
-    let userInfo = state.userInfo ? state.userInfo : {};
-    if (userInfo.avatar) {
-      userInfo.avatar ? (userInfo.avatar = isUrl(userInfo.avatar) ? userInfo.avatar : apiUrl + userInfo.avatar) : (userInfo.avatar = defaultAvatarUrl);
-      state!.imageUrl = userInfo.avatar;
-    }
+    let userInfo = state.userInfo || {};
+    userInfo.avatar || (userInfo.avatar = defaultAvatarUrl);
+    state!.imageUrl = userInfo.avatar;
     return userInfo;
   });
 
+  const getAvatarUrl = computed((): string => isUrl(unref(getUserInfo).avatar) ? unref(getUserInfo).avatar : apiUrl + unref(getUserInfo).avatar);
+
+  const getImageUrl = computed((): string => isUrl(state.imageUrl) ? state.imageUrl : apiUrl + state.imageUrl);
+
   const getLabelStyle = computed((): CSSProperties => ({
     fontSize: '14px',
     display: 'inline',
@@ -264,7 +267,7 @@
         const complete = ((progressEvent.loaded / progressEvent.total) * 100) | 0;
         if (complete >= 100) state.uploadAvatarLoading = false;
       });
-      state.imageUrl = apiUrl + data.url;
+      state.imageUrl = data.url;
     } finally {
       state.uploadAvatarLoading = false;
     }