From 8dd8a5ed011834e851703df8beac4003d357471a Mon Sep 17 00:00:00 2001
From: mfish <qiufeng9862@qq.com>
Date: Wed, 18 Jan 2023 11:17:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=AE=BE=E7=BD=AE=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E4=BF=AE=E6=94=B9=E6=97=B6=E5=BC=B9=E5=87=BA=E7=AA=97?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8E=9F=E5=9B=BE=E7=89=87=EF=BC=8C=E7=94=B1?=
 =?UTF-8?q?=E4=BA=8E=E8=B7=A8=E5=9F=9F=E8=8E=B7=E5=8F=96=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E9=97=AE=E9=A2=98=E6=9A=82=E6=97=B6=E5=B0=86?=
 =?UTF-8?q?user.ts=E4=B8=AD=E7=9A=84=E8=B7=A8=E5=9F=9F=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=8E=BB=E6=8E=89=EF=BC=8C=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E9=87=87=E7=94=A8=E6=9C=AC=E5=9C=B0=E5=9B=BE=E7=89=87=20(#2487?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(axiosSuccess): 操作成功后根据传入提示模式进行相应

* fix(axiosRetry): 解决get重试请求返回的headers造成无法成功请求的问题

* fix(axiosRetry): 参数首字母小写

* fix(useDataSource): 解决deleteTableRecord删除树形表格的行记录时，无法删除，无法找到子节点的问题

* feat(useDataSource): 删除之前提交代码遗留的console

* fix(permissionGuard): 当获取用户信息失败时，不允许正常登陆返回登陆界面

* fix(permissionGuard): 代码还原

* fix(menu): 解决隐藏菜单目录只能隐藏第一层目录的问题，递归隐藏所有子菜单

* feat(baseSetting): 个人设置图标修改时弹出窗显示原图片，由于跨域获取图片存在问题暂时将user.ts中的跨域图片链接去掉，直接采用本地图片
---
 mock/sys/user.ts                                    | 4 ++--
 src/components/Cropper/src/CopperModal.vue          | 3 ++-
 src/views/demo/page/account/setting/BaseSetting.vue | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mock/sys/user.ts b/mock/sys/user.ts
index 5b569d4d..79e46b99 100644
--- a/mock/sys/user.ts
+++ b/mock/sys/user.ts
@@ -7,7 +7,7 @@ export function createFakeUserList() {
       userId: '1',
       username: 'vben',
       realName: 'Vben Admin',
-      avatar: 'https://q1.qlogo.cn/g?b=qq&nk=190848757&s=640',
+      avatar: '',
       desc: 'manager',
       password: '123456',
       token: 'fakeToken1',
@@ -24,7 +24,7 @@ export function createFakeUserList() {
       username: 'test',
       password: '123456',
       realName: 'test user',
-      avatar: 'https://q1.qlogo.cn/g?b=qq&nk=339449197&s=640',
+      avatar: '',
       desc: 'tester',
       token: 'fakeToken2',
       homePath: '/dashboard/workbench',
diff --git a/src/components/Cropper/src/CopperModal.vue b/src/components/Cropper/src/CopperModal.vue
index 00482831..8670939e 100644
--- a/src/components/Cropper/src/CopperModal.vue
+++ b/src/components/Cropper/src/CopperModal.vue
@@ -129,6 +129,7 @@
     uploadApi: {
       type: Function as PropType<(params: apiFunParams) => Promise<any>>,
     },
+    src: { type: String },
   };
 
   export default defineComponent({
@@ -138,7 +139,7 @@
     emits: ['uploadSuccess', 'register'],
     setup(props, { emit }) {
       let filename = '';
-      const src = ref('');
+      const src = ref(props.src || '');
       const previewSource = ref('');
       const cropper = ref<Cropper>();
       let scaleX = 1;
diff --git a/src/views/demo/page/account/setting/BaseSetting.vue b/src/views/demo/page/account/setting/BaseSetting.vue
index 36467ac5..a17e0d31 100644
--- a/src/views/demo/page/account/setting/BaseSetting.vue
+++ b/src/views/demo/page/account/setting/BaseSetting.vue
@@ -62,6 +62,7 @@
 
       const avatar = computed(() => {
         const { avatar } = userStore.getUserInfo;
+        console.log(avatar);
         return avatar || headerImg;
       });