From 012a45ea449d06ed31b6ca99afd80646580ff3fa Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Sun, 6 Aug 2023 05:58:20 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E5=A4=8D=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E8=A3=81=E5=87=8F=E5=93=8D=E5=BA=94=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Cropper/src/CopperModal.vue | 5 ++++-
 src/utils/index.ts                         | 5 ++++-
 src/views/system/user/sso/SsoModal.vue     | 3 ++-
 src/views/system/user/sso/index.vue        | 9 ++++-----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/components/Cropper/src/CopperModal.vue b/src/components/Cropper/src/CopperModal.vue
index 03b6902..54af891 100644
--- a/src/components/Cropper/src/CopperModal.vue
+++ b/src/components/Cropper/src/CopperModal.vue
@@ -113,7 +113,7 @@
 <script lang="ts">
   import type { CropendResult, Cropper } from './typing';
 
-  import { defineComponent, ref } from 'vue';
+  import {defineComponent, ref, watchEffect} from 'vue';
   import CropperImage from './Cropper.vue';
   import { Space, Upload, Avatar, Tooltip } from 'ant-design-vue';
   import { useDesign } from '/@/hooks/web/useDesign';
@@ -148,6 +148,9 @@
       const { prefixCls } = useDesign('cropper-am');
       const [register, { closeModal, setModalProps }] = useModalInner();
       const { t } = useI18n();
+      watchEffect(() => {
+        src.value = props.src as string;
+      });
 
       // Block upload
       function handleBeforeUpload(file: File) {
diff --git a/src/utils/index.ts b/src/utils/index.ts
index a75d5ad..096a02d 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -9,7 +9,7 @@
 import type { RouteLocationNormalized, RouteRecordNormalized } from 'vue-router';
 import type { App, Component } from 'vue';
 import { unref } from 'vue';
-import { isObject } from '/@/utils/is';
+import {isObject, isUrl} from '/@/utils/is';
 import { isEmpty, cloneDeep } from 'lodash-es';
 import { isDevMode } from '/@/utils/env';
 import { useGlobSetting } from '/@/hooks/setting';
@@ -145,3 +145,6 @@ export function getCloudProxyUrl(): string {
   }
   return baseUrl;
 }
+
+/** 获取OSS代理地址 */
+export const getOSSProxyUrl = (url: string) => isUrl(url) ? url :  `${apiUrl}${url}`;
diff --git a/src/views/system/user/sso/SsoModal.vue b/src/views/system/user/sso/SsoModal.vue
index 7fda49f..767ead3 100644
--- a/src/views/system/user/sso/SsoModal.vue
+++ b/src/views/system/user/sso/SsoModal.vue
@@ -42,6 +42,7 @@
   import { Col, Row } from 'ant-design-vue';
   import { CropperAvatar } from '/@/components/Cropper';
   import { commonUpload } from '/@/api/platform/core/controller/upload';
+  import { getOSSProxyUrl } from '/@/utils';
 
   /** 类型规范统一声明定义区域 */
   interface WindowState {
@@ -116,7 +117,7 @@
             props.title = '编辑用户';
             const ssoUser = await getSsoUser(id);
             await setFieldsValue(ssoUser);
-            ssoUser.avatar && (state.avatar = ssoUser.avatar);
+            ssoUser.avatar && (state.avatar = getOSSProxyUrl(ssoUser.avatar));
             break;
         }
         // 尾部:设置处理后的最终配置数据
diff --git a/src/views/system/user/sso/index.vue b/src/views/system/user/sso/index.vue
index 6eb7454..babee95 100644
--- a/src/views/system/user/sso/index.vue
+++ b/src/views/system/user/sso/index.vue
@@ -44,7 +44,7 @@
           />
         </template>
         <template v-else-if="column.key === 'avatar'">
-          <TableImg :size="60" :simpleShow="true" :imgList="getOssImgUrl(text)"/>
+          <TableImg :size="60" :simpleShow="true" :imgList="[getOSSProxyUrl(text)]"/>
         </template>
       </template>
     </BasicTable>
@@ -69,7 +69,7 @@
   import SsoModal from './SsoModal.vue';
   import { columns, searchFormSchema } from './sso.data';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { isUrl } from '/@/utils/is';
+  import { getOSSProxyUrl } from '/@/utils';
   import { useGlobSetting } from '/@/hooks/setting';
 
   interface TableState {
@@ -120,14 +120,13 @@
         clickToRowSelect: false,
         showIndexColumn: false,
         actionColumn: {
-          width: 220,
+          width: 240,
           title: '操作',
           dataIndex: 'action',
           fixed: false
         },
         handleSearchInfoFn: () => clearSelectedRowKeys()
       });
-      const getOssImgUrl = (url: string) => isUrl(url) ? [url] : [apiUrl + url];
 
       /** 处理多选框选中数据 */
       function handleSelectionChange(selection?: Recordable) {
@@ -185,7 +184,7 @@
         handleSelectionChange,
         handleRefreshTable,
         handleResetPassword,
-        getOssImgUrl
+        getOSSProxyUrl
       };
     }
   });