diff --git a/src/api/axios.ts b/src/api/axios.ts index c55d929..1ab9941 100644 --- a/src/api/axios.ts +++ b/src/api/axios.ts @@ -40,7 +40,6 @@ axiosInstance.interceptors.request.use( const userInfo = info[SystemStoreEnum.USER_INFO] if (userInfo && userInfo[SystemStoreUserInfoEnum.USER_TOKEN]) { config.headers['authorization'] = userInfo[SystemStoreUserInfoEnum.USER_TOKEN] - console.log('[GoView] 请求拦截器:添加 authorization 头:', userInfo[SystemStoreUserInfoEnum.USER_TOKEN]) } else { console.warn('[GoView] 请求拦截器:未找到 token') } diff --git a/src/views/chart/hooks/useSync.hook.ts b/src/views/chart/hooks/useSync.hook.ts index 33b25df..cfe788c 100644 --- a/src/views/chart/hooks/useSync.hook.ts +++ b/src/views/chart/hooks/useSync.hook.ts @@ -290,21 +290,41 @@ export const useSync = () => { if (updateImg) { // 获取缩略图片 const range = document.querySelector('.go-edit-range') as HTMLElement + + // 只有配置了背景图片时才需要临时修改样式 + const hasBackgroundImage = !!chartEditStore.getEditCanvasConfig.backgroundImage + let originalBgColor = '' + let originalBgImage = '' + + if (hasBackgroundImage) { + // 保存原始背景色 + originalBgColor = range.style.backgroundColor + originalBgImage = range.style.backgroundImage + + // 临时设置为透明背景 + range.style.backgroundColor = 'transparent' + range.style.backgroundImage = 'none' + } + // 生成图片(透明底) const canvasImage: HTMLCanvasElement = await html2canvas(range, { - backgroundColor: 'transparent', + backgroundColor: null, allowTaint: true, useCORS: true, scale: 2, logging: false }) - - // 上传预览图 + + if (hasBackgroundImage) { + // 恢复原始背景色 + range.style.backgroundColor = originalBgColor + range.style.backgroundImage = originalBgImage + } // 上传预览图(使用 FtsUpload) let uploadParams = new FormData() - uploadParams.append('file', base64toFile(canvasImage.toDataURL('image/png'), `${fetchRouteParamsLocation()}_index_preview.png`)) - console.log(base64toFile(canvasImage.toDataURL('image/png'), `${fetchRouteParamsLocation()}_index_preview.png`)) + uploadParams.append('file', base64toFile(canvasImage.toDataURL('image/png'), `${fetchRouteParamsLocation()}.png`)) + // console.log(base64toFile(canvasImage.toDataURL('image/png'), `${fetchRouteParamsLocation()}_index_preview.png`)) const uploadRes: any = await FtsUpload(uploadParams) // 保存预览图 diff --git a/src/views/project/items/components/ProjectItemsCard/index.vue b/src/views/project/items/components/ProjectItemsCard/index.vue index ed61455..099a0a3 100644 --- a/src/views/project/items/components/ProjectItemsCard/index.vue +++ b/src/views/project/items/components/ProjectItemsCard/index.vue @@ -12,10 +12,11 @@ > -
+
diff --git a/src/views/project/items/components/ProjectItemsList/hooks/useData.hook.ts b/src/views/project/items/components/ProjectItemsList/hooks/useData.hook.ts index 8520613..0dde139 100644 --- a/src/views/project/items/components/ProjectItemsList/hooks/useData.hook.ts +++ b/src/views/project/items/components/ProjectItemsList/hooks/useData.hook.ts @@ -13,7 +13,7 @@ export const useDataListInit = () => { // 当前页数 page: 1, // 每页值 - limit: 12, + limit: 10, // 总数 count: 10 }) @@ -23,23 +23,22 @@ export const useDataListInit = () => { // 数据请求 const fetchList = async () => { loading.value = true - const res = await projectListApi({ + const { code, data }: any = await projectListApi({ page: paginat.page, - limit: paginat.limit + size: paginat.limit }) - console.log('fetchList', res) - if (res && res.data) { - const { count } = res as any // 这里的count与data平级,不在Response结构中 - paginat.count = count - list.value = res.data.map(e => { - const { identity, projectName, state, createTime, indexImage, createUserId } = e + if (code === 0) { + paginat.count = data.total + list.value = (data.list).map(e => { + const { identity, projectName, state, createTime, indexImage, createUserId, backgroundImage } = e return { identity: identity, title: projectName, createId: createUserId, time: createTime, image: indexImage, - release: state === 1 + release: state === 1, + backgroundImage } }) setTimeout(() => { diff --git a/src/views/project/items/components/ProjectItemsModalCard/index.vue b/src/views/project/items/components/ProjectItemsModalCard/index.vue index d76e484..e4d09b5 100644 --- a/src/views/project/items/components/ProjectItemsModalCard/index.vue +++ b/src/views/project/items/components/ProjectItemsModalCard/index.vue @@ -24,10 +24,13 @@ > -
+
@@ -74,7 +77,7 @@