diff --git a/src/api/path/project.api.ts b/src/api/path/project.api.ts index 164df1d3..36b1cb6c 100644 --- a/src/api/path/project.api.ts +++ b/src/api/path/project.api.ts @@ -89,7 +89,8 @@ export const uploadFile = async (data: object) => { /** * 文件地址 */ - fileName: string + fileName: string, + httpurl: string, }>(`${ModuleTypeEnum.PROJECT}/upload`, data, ContentTypeEnum.FORM_DATA) return res } catch { diff --git a/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue b/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue index 79a6c916..3142541b 100644 --- a/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue +++ b/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue @@ -139,7 +139,7 @@ import { loadAsyncComponent, fetchRouteParamsLocation } from '@/utils' import { PreviewScaleEnum } from '@/enums/styleEnum' import { ResultEnum } from '@/enums/httpEnum' import { icon } from '@/plugins' -import { uploadFile} from '@/api/path' +import { uploadFile } from '@/api/path' const { ColorPaletteIcon } = icon.ionicons5 const { ScaleIcon, FitToScreenIcon, FitToHeightIcon, FitToWidthIcon } = icon.carbon @@ -273,24 +273,26 @@ const customRequest = (options: UploadCustomRequestOptions) => { nextTick(async () => { if (file.file) { // 修改名称 - const newNameFile = new File( - [file.file], - `${fetchRouteParamsLocation()}_index_background.png`, - { type: file.file.type } - ) + const newNameFile = new File([file.file], `${fetchRouteParamsLocation()}_index_background.png`, { + type: file.file.type + }) let uploadParams = new FormData() uploadParams.append('object', newNameFile) const uploadRes = await uploadFile(uploadParams) - if(uploadRes && uploadRes.code === ResultEnum.SUCCESS) { - chartEditStore.setEditCanvasConfig( - EditCanvasConfigEnum.BACKGROUND_IMAGE, - `${systemStore.getFetchInfo.OSSUrl}${uploadRes.data.fileName}?time=${new Date().getTime()}` - ) - chartEditStore.setEditCanvasConfig( - EditCanvasConfigEnum.SELECT_COLOR, - false - ) + if (uploadRes && uploadRes.code === ResultEnum.SUCCESS) { + if (uploadRes.data.httpurl) { + chartEditStore.setEditCanvasConfig( + EditCanvasConfigEnum.BACKGROUND_IMAGE, + `${uploadRes.data.httpurl}?time=${new Date().getTime()}` + ) + } else { + chartEditStore.setEditCanvasConfig( + EditCanvasConfigEnum.BACKGROUND_IMAGE, + `${systemStore.getFetchInfo.OSSUrl || ''}${uploadRes.data.fileName}?time=${new Date().getTime()}` + ) + } + chartEditStore.setEditCanvasConfig(EditCanvasConfigEnum.SELECT_COLOR, false) return } window['$message'].error('添加图片失败,请稍后重试!') diff --git a/src/views/chart/hooks/useSync.hook.ts b/src/views/chart/hooks/useSync.hook.ts index 1bf5c82e..8aa67c7f 100644 --- a/src/views/chart/hooks/useSync.hook.ts +++ b/src/views/chart/hooks/useSync.hook.ts @@ -294,10 +294,17 @@ export const useSync = () => { const uploadRes = await uploadFile(uploadParams) // 保存预览图 if(uploadRes && uploadRes.code === ResultEnum.SUCCESS) { - await updateProjectApi({ - id: fetchRouteParamsLocation(), - indexImage: `${systemStore.getFetchInfo.OSSUrl}${uploadRes.data.fileName}` - }) + if (uploadRes.data.httpurl) { + await updateProjectApi({ + id: fetchRouteParamsLocation(), + indexImage: `${uploadRes.data.httpurl}` + }) + } else { + await updateProjectApi({ + id: fetchRouteParamsLocation(), + indexImage: `${systemStore.getFetchInfo.OSSUrl}${uploadRes.data.fileName}` + }) + } } } } catch (e) {