From b45e176e9d9e3c44aaee005f603ce8faa90545f7 Mon Sep 17 00:00:00 2001 From: Stan-BK <2568143457@qq.com> Date: Wed, 19 Mar 2025 16:01:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(isImg):=20=E4=BF=AE=E5=A4=8D=E6=9C=AA?= =?UTF-8?q?=E5=8C=85=E5=90=AB=E6=A3=80=E6=B5=8B=E5=9B=BE=E7=89=87=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=98=AF=E5=90=A6=E4=B8=BAbase64=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/pro-layout/src/utils/isImg/index.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/pro-layout/src/utils/isImg/index.ts b/packages/pro-layout/src/utils/isImg/index.ts index 38ad45b9..b12469e0 100644 --- a/packages/pro-layout/src/utils/isImg/index.ts +++ b/packages/pro-layout/src/utils/isImg/index.ts @@ -1,8 +1,12 @@ // source by https://github.com/ant-design/pro-components/blob/master/packages/utils/src/isImg/index.ts +const imagePattern = 'png|jpg|jpeg|svg|webp|gif|bmp'; +const suffixPattern = new RegExp(`\\w.(${imagePattern})$`, 'i'); +const base64Pattern = new RegExp(`^data:image\\/(${imagePattern})`, 'i'); + /** 判断是否是图片链接 */ function isImg(path: string): boolean { - return /\w.(png|jpg|jpeg|svg|webp|gif|bmp)$/i.test(path); + return suffixPattern.test(path) || base64Pattern.test(path); } export default isImg; From e55fc237b4811722f07b2a75d07e20ba21e4b123 Mon Sep 17 00:00:00 2001 From: Stan-BK <2568143457@qq.com> Date: Wed, 19 Mar 2025 16:13:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=20#b45e176e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/utils/src/isImg/index.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/utils/src/isImg/index.ts b/packages/utils/src/isImg/index.ts index 38ad45b9..b12469e0 100644 --- a/packages/utils/src/isImg/index.ts +++ b/packages/utils/src/isImg/index.ts @@ -1,8 +1,12 @@ // source by https://github.com/ant-design/pro-components/blob/master/packages/utils/src/isImg/index.ts +const imagePattern = 'png|jpg|jpeg|svg|webp|gif|bmp'; +const suffixPattern = new RegExp(`\\w.(${imagePattern})$`, 'i'); +const base64Pattern = new RegExp(`^data:image\\/(${imagePattern})`, 'i'); + /** 判断是否是图片链接 */ function isImg(path: string): boolean { - return /\w.(png|jpg|jpeg|svg|webp|gif|bmp)$/i.test(path); + return suffixPattern.test(path) || base64Pattern.test(path); } export default isImg;