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; 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;