From 54827a9876051cda6c71542ac083df38afc77b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Thu, 19 Mar 2026 17:30:21 +0800 Subject: [PATCH] =?UTF-8?q?fix(file):=20=E8=A7=A3=E5=86=B3OSS=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=A4=84=E7=90=86=E5=8F=82=E6=95=B0=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E8=AE=BF=E9=97=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在SelectFile组件中为文件链接添加stripOssImageProcess处理 - 从common工具库导入并使用stripOssImageProcess函数 - 在creditMpCustomer编辑页面对文件URL进行图片处理参数清理 - 在creditMpCustomer列表页面添加sanitizeFileUrl函数处理文件URL - 修改文件规范化逻辑以确保非图片文件移除OSS处理参数 --- src/components/SelectFile/index.vue | 4 +-- src/utils/common.ts | 18 +++++++++++ .../components/creditMpCustomerEdit.vue | 32 ++++++++++++------- src/views/credit/creditMpCustomer/index.vue | 23 ++++++++----- 4 files changed, 55 insertions(+), 22 deletions(-) diff --git a/src/components/SelectFile/index.vue b/src/components/SelectFile/index.vue index 13a6074..c38597f 100644 --- a/src/components/SelectFile/index.vue +++ b/src/components/SelectFile/index.vue @@ -18,7 +18,7 @@
{ }); }; +// 移除 OSS 图片处理参数（非图片文件拼接该参数会导致访问失败） +export const stripOssImageProcess = (url?: string) => { + if (!url) return url; + const hashIndex = url.indexOf('#'); + const withNoHash = hashIndex >= 0 ? url.slice(0, hashIndex) : url; + const hash = hashIndex >= 0 ? url.slice(hashIndex) : ''; + const queryIndex = withNoHash.indexOf('?'); + if (queryIndex < 0) return url; + const base = withNoHash.slice(0, queryIndex); + const query = withNoHash.slice(queryIndex + 1); + const kept = query + .split('&') + .filter(Boolean) + .filter((p) => p !== 'x-oss-process' && !p.startsWith('x-oss-process=')); + const rebuilt = kept.length ? `${base}?${kept.join('&')}` : base; + return `${rebuilt}${hash}`; +}; + export const getWeek = (text) => { const week = [ '星期日', diff --git a/src/views/credit/creditMpCustomer/components/creditMpCustomerEdit.vue b/src/views/credit/creditMpCustomer/components/creditMpCustomerEdit.vue index 0968bb0..995d1a1 100644 --- a/src/views/credit/creditMpCustomer/components/creditMpCustomerEdit.vue +++ b/src/views/credit/creditMpCustomer/components/creditMpCustomerEdit.vue @@ -149,7 +149,7 @@ import { FileRecord } from '@/api/system/file/model'; import RegionsSelect from '@/components/RegionsSelect/index.vue'; import SelectFile from '@/components/SelectFile/index.vue'; - import { isImage } from '@/utils/common'; + import { isImage, stripOssImageProcess } from '@/utils/common'; // 是否是修改 const isUpdate = ref(false); @@ -247,16 +247,23 @@ return raw .map((item: any) => { if (!item) return null; - if (typeof item === 'string') { - return { - url: item, - name: guessNameFromUrl(item), - thumbnail: item, - isImage: isImage(item) - }; - } - const url = item.url || item.path || item.href; - if (!url || typeof url !== 'string') return null; + if (typeof item === 'string') { + const url = isImage(item) ? item : stripOssImageProcess(item); + return { + url, + name: guessNameFromUrl(url), + thumbnail: url, + isImage: isImage(url) + }; + } + const rawUrl = item.url || item.path || item.href; + const url = + rawUrl && typeof rawUrl === 'string' + ? isImage(rawUrl) + ? rawUrl + : stripOssImageProcess(rawUrl) + : undefined; + if (!url) return null; return { url, name: typeof item.name === 'string' ? item.name : guessNameFromUrl(url), @@ -298,7 +305,8 @@ }; const onFileChoose = (data: FileRecord) => { - const url = data.url || data.downloadUrl || data.path; + const rawUrl = data.url || data.downloadUrl || data.path; + const url = rawUrl ? (isImage(rawUrl) ? rawUrl : stripOssImageProcess(rawUrl)) : undefined; if (!url) return; const exists = fileList.value.some((d: any) => d?.url === url); if (exists) return; diff --git a/src/views/credit/creditMpCustomer/index.vue b/src/views/credit/creditMpCustomer/index.vue index b0b0f6d..14f17f9 100644 --- a/src/views/credit/creditMpCustomer/index.vue +++ b/src/views/credit/creditMpCustomer/index.vue @@ -49,7 +49,7 @@ /> @@ -108,6 +108,7 @@ import { } from '@/api/credit/creditMpCustomer'; import type {CreditMpCustomer, CreditMpCustomerParam} from '@/api/credit/creditMpCustomer/model'; import {exportCreditData} from '../utils/export'; +import { stripOssImageProcess } from '@/utils/common'; type NormalizedFile = { name?: string; @@ -213,6 +214,10 @@ const tryParseJson = (value: string) => { } }; +const sanitizeFileUrl = (url: string, isImage: boolean) => { + return isImage ? url : (stripOssImageProcess(url) as string); +}; + const filesCache = new Map(); const normalizeFiles = (raw: unknown): NormalizedFile[] => { @@ -223,19 +228,21 @@ const normalizeFiles = (raw: unknown): NormalizedFile[] => { .map((item: any) => { if (!item) return null; if (typeof item === 'string') { + const url = sanitizeFileUrl(item, isImageUrl(item)); return { - url: item, - thumbnail: item, - name: guessNameFromUrl(item), - isImage: isImageUrl(item) + url, + thumbnail: url, + name: guessNameFromUrl(url), + isImage: isImageUrl(url) } satisfies NormalizedFile; } - const url = item.url || item.path || item.href; - if (!url || typeof url !== 'string') return null; + const rawUrl = item.url || item.path || item.href; + const url = typeof rawUrl === 'string' ? rawUrl : undefined; + if (!url) return null; const thumbnail = typeof item.thumbnail === 'string' ? item.thumbnail : undefined; const name = typeof item.name === 'string' ? item.name : guessNameFromUrl(url); const isImage = typeof item.isImage === 'boolean' ? item.isImage : isImageUrl(url); - return {url, thumbnail, name, isImage} satisfies NormalizedFile; + return {url: sanitizeFileUrl(url, isImage), thumbnail, name, isImage} satisfies NormalizedFile; }) .filter(Boolean) as NormalizedFile[]; }