From a6d8cfa29017d53871a4f101795b8b9b041566f2 Mon Sep 17 00:00:00 2001 From: douxc Date: Tue, 21 Jul 2020 17:17:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?icon=E6=94=AF=E6=8C=81=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/SiderMenu/BaseMenu.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SiderMenu/BaseMenu.tsx b/src/SiderMenu/BaseMenu.tsx index 43ac39fc..6c47bb4b 100644 --- a/src/SiderMenu/BaseMenu.tsx +++ b/src/SiderMenu/BaseMenu.tsx @@ -73,7 +73,7 @@ let IconFont = createFromIconfontCN({ // icon: , const getIcon = (icon?: string | React.ReactNode): React.ReactNode => { if (typeof icon === 'string' && icon !== '') { - if (isUrl(icon)) { + if (isUrl(icon)||/\w.(png|jpg|jpeg|svg|webp|gif|bmp)$/i.test(icon)) { return ( ( From 112d33fe31545028570065f1fde5041452b0532f Mon Sep 17 00:00:00 2001 From: douxc Date: Tue, 21 Jul 2020 20:15:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=BD=E7=A6=BB=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=98=AF=E5=9B=BE=E7=89=87=E9=93=BE=E6=8E=A5=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/SiderMenu/BaseMenu.tsx | 4 ++-- src/utils/utils.ts | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/SiderMenu/BaseMenu.tsx b/src/SiderMenu/BaseMenu.tsx index 6c47bb4b..faae6c8f 100644 --- a/src/SiderMenu/BaseMenu.tsx +++ b/src/SiderMenu/BaseMenu.tsx @@ -9,7 +9,7 @@ import { MenuMode, MenuProps } from 'antd/es/menu'; import { MenuTheme } from 'antd/es/menu/MenuContext'; import defaultSettings, { PureSettings } from '../defaultSettings'; import { getSelectedMenuKeys } from './SiderMenuUtils'; -import { isUrl, getOpenKeysFromMenuData } from '../utils/utils'; +import { isUrl, getOpenKeysFromMenuData, isImg } from '../utils/utils'; import { MenuDataItem, @@ -73,7 +73,7 @@ let IconFont = createFromIconfontCN({ // icon: , const getIcon = (icon?: string | React.ReactNode): React.ReactNode => { if (typeof icon === 'string' && icon !== '') { - if (isUrl(icon)||/\w.(png|jpg|jpeg|svg|webp|gif|bmp)$/i.test(icon)) { + if (isUrl(icon) || isImg(icon)) { return ( ( diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 964185a7..442e293f 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -18,6 +18,11 @@ export const isBrowser = () => typeof window.document !== 'undefined' && !isNode; +/** 判断是否是图片链接 */ +export function isImg(path: string): boolean { + return /\w.(png|jpg|jpeg|svg|webp|gif|bmp)$/i.test(path); +} + export function guid() { return 'xxxxxxxx'.replace(/[xy]/g, (c) => { // eslint-disable-next-line no-bitwise