From f9ed391c8194ab26618ae822bd0ba2f70d3d30a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Tue, 1 Nov 2022 21:17:24 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E7=9A=84=E6=8E=A5=E5=8F=A3=E5=92=8C=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E7=9A=84=E5=B1=95=E7=A4=BA=E5=9C=B0=E5=9D=80=E6=8B=BC?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/path/project.api.ts | 4 ++-- src/hooks/useSystemInit.hook.ts | 4 ++-- .../components/CanvasPage/index.vue | 10 +++------- src/views/chart/hooks/useSync.hook.ts | 10 +++------- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/api/path/project.api.ts b/src/api/path/project.api.ts index 5123ff2f..42aeaf22 100644 --- a/src/api/path/project.api.ts +++ b/src/api/path/project.api.ts @@ -74,9 +74,9 @@ export const changeProjectReleaseApi = async (data: object) => { } // * 上传文件 -export const uploadFile = async (url:string, data: object) => { +export const uploadFile = async (data: object) => { try { - const res = await http(RequestHttpEnum.POST)(url, data, ContentTypeEnum.FORM_DATA); + const res = await http(RequestHttpEnum.POST)(`${ModuleTypeEnum.PROJECT}/upload`, data, ContentTypeEnum.FORM_DATA); return res; } catch { httpErrorHandle(); diff --git a/src/hooks/useSystemInit.hook.ts b/src/hooks/useSystemInit.hook.ts index 72f2d0fa..54b61e6b 100644 --- a/src/hooks/useSystemInit.hook.ts +++ b/src/hooks/useSystemInit.hook.ts @@ -1,14 +1,14 @@ import { useSystemStore } from '@/store/modules/systemStore/systemStore' import { SystemStoreEnum } from '@/store/modules/systemStore/systemStore.d' import { ResultEnum } from '@/enums/httpEnum' -import { ossUrlApi } from '@/api/path/' +import { ossUrlApi } from '@/api/path' // * 初始化 export const useSystemInit = async () => { const systemStore = useSystemStore() - // 获取 OSS 信息 + // 获取 OSS 信息的 url 地址，用来拼接展示图片的地址 const getOssUrl = async () => { const res = await ossUrlApi({}) as unknown as MyResponseType if (res.code === ResultEnum.SUCCESS) { diff --git a/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue b/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue index def4781a..470ce0b6 100644 --- a/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue +++ b/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue @@ -134,7 +134,7 @@ import { EditCanvasConfigEnum } from '@/store/modules/chartEditStore/chartEditSt import { useSystemStore } from '@/store/modules/systemStore/systemStore' import { StylesSetting } from '@/components/Pages/ChartItemSetting' import { UploadCustomRequestOptions } from 'naive-ui' -import { fileToUrl, loadAsyncComponent, fetchRouteParamsLocation } from '@/utils' +import { loadAsyncComponent, fetchRouteParamsLocation } from '@/utils' import { PreviewScaleEnum } from '@/enums/styleEnum' import { ResultEnum } from '@/enums/httpEnum' import { icon } from '@/plugins' @@ -273,10 +273,6 @@ const clearColor = () => { const customRequest = (options: UploadCustomRequestOptions) => { const { file } = options nextTick(async () => { - if(!systemStore.getFetchInfo.OSSUrl) { - window['$message'].error('添加图片失败，请刷新页面重试！') - return - } if (file.file) { // 修改名称 const newNameFile = new File( @@ -286,12 +282,12 @@ const customRequest = (options: UploadCustomRequestOptions) => { ) let uploadParams = new FormData() uploadParams.append('object', newNameFile) - const uploadRes = await uploadFile(systemStore.getFetchInfo.OSSUrl ,uploadParams) as unknown as MyResponseType + const uploadRes = await uploadFile(uploadParams) as unknown as MyResponseType if(uploadRes.code === ResultEnum.SUCCESS) { chartEditStore.setEditCanvasConfig( EditCanvasConfigEnum.BACKGROUND_IMAGE, - `${uploadRes.data.objectContent.httpRequest.uri}?time=${new Date().getTime()}` + `${systemStore.getFetchInfo.OSSUrl}${uploadRes.data.fileName}?time=${new Date().getTime()}` ) chartEditStore.setEditCanvasConfig( EditCanvasConfigEnum.SELECT_COLOR, diff --git a/src/views/chart/hooks/useSync.hook.ts b/src/views/chart/hooks/useSync.hook.ts index c4f378a7..0da6f2a3 100644 --- a/src/views/chart/hooks/useSync.hook.ts +++ b/src/views/chart/hooks/useSync.hook.ts @@ -4,6 +4,7 @@ import { getUUID, httpErrorHandle, fetchRouteParamsLocation, base64toFile } from import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore' import { EditCanvasTypeEnum, ChartEditStoreEnum, ProjectInfoEnum, ChartEditStorage } from '@/store/modules/chartEditStore/chartEditStore.d' import { useChartHistoryStore } from '@/store/modules/chartHistoryStore/chartHistoryStore' +import { StylesSetting } from '@/components/Pages/ChartItemSetting' import { useSystemStore } from '@/store/modules/systemStore/systemStore' import { fetchChartComponent, fetchConfigComponent, createComponent } from '@/packages/index' import { saveInterval } from '@/settings/designSetting' @@ -197,11 +198,6 @@ export const useSync = () => { const dataSyncUpdate = throttle(async () => { if(!fetchRouteParamsLocation()) return - if(!systemStore.getFetchInfo.OSSUrl) { - window['$message'].error('数据保存失败，请刷新页面重试！') - return - } - let projectId = chartEditStore.getProjectInfo[ProjectInfoEnum.PROJECT_ID]; if(projectId === null || projectId === ''){ window['$message'].error('数据初未始化成功,请刷新页面！') @@ -222,12 +218,12 @@ export const useSync = () => { // 上传预览图 let uploadParams = new FormData() uploadParams.append('object', base64toFile(canvasImage.toDataURL(), `${fetchRouteParamsLocation()}_index_preview.png`)) - const uploadRes = await uploadFile(systemStore.getFetchInfo.OSSUrl, uploadParams) as unknown as MyResponseType + const uploadRes = await uploadFile(uploadParams) as unknown as MyResponseType // 保存预览图 if(uploadRes.code === ResultEnum.SUCCESS) { await updateProjectApi({ id: fetchRouteParamsLocation(), - indexImage: uploadRes.data.objectContent.httpRequest.uri + indexImage: `${systemStore.getFetchInfo.OSSUrl}${uploadRes.data.fileName}` }) }