From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/components/mk-icon/index.jsx | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/src/components/mk-icon/index.jsx b/src/components/mk-icon/index.jsx
index 8c8f824..42e8885 100644
--- a/src/components/mk-icon/index.jsx
+++ b/src/components/mk-icon/index.jsx
@@ -12,8 +12,6 @@
DownloadOutlined,
StepBackwardOutlined,
StepForwardOutlined,
- FastBackwardOutlined,
- FastForwardOutlined,
DoubleRightOutlined,
DoubleLeftOutlined,
ForwardOutlined,
@@ -225,7 +223,8 @@
UserDeleteOutlined,
UserSwitchOutlined,
VideoCameraOutlined,
- WifiOutlined
+ WifiOutlined,
+ TableOutlined
} from '@ant-design/icons'
const MkIcons = {
@@ -241,8 +240,6 @@
'download': (props) => <DownloadOutlined {...props} />,
'step-backward': (props) => <StepBackwardOutlined {...props} />,
'step-forward': (props) => <StepForwardOutlined {...props} />,
- 'fast-backward': (props) => <FastBackwardOutlined {...props} />,
- 'fast-forward': (props) => <FastForwardOutlined {...props} />,
'double-right': (props) => <DoubleRightOutlined {...props} />,
'double-left': (props) => <DoubleLeftOutlined {...props} />,
'forward': (props) => <ForwardOutlined {...props} />,
@@ -460,17 +457,35 @@
'user-switch': (props) => <UserSwitchOutlined {...props} />,
'video-camera': (props) => <VideoCameraOutlined {...props} />,
'wifi': (props) => <WifiOutlined {...props} />,
+ 'table': (props) => <TableOutlined {...props} />,
}
class MkIcon extends Component {
render() {
const { type, ...resProps } = this.props
- if (!type || !MkIcons[type]) return null
+ if (!type) {
+ return null
+ } else if (MkIcons[type]) {
+ return (
+ MkIcons[type](resProps)
+ )
+ } else {
+ let svg = type
- return (
- MkIcons[type](resProps)
- )
+ if (!/<svg/.test(svg)) {
+ try {
+ svg = window.decodeURIComponent(window.atob(svg))
+ if (!/<svg/.test(svg)) {
+ svg = ''
+ }
+ } catch (e) {
+ svg = ''
+ }
+ }
+
+ return <span className={'anticon anticon-mk ' + (resProps.className || '')} style={resProps.style || null} dangerouslySetInnerHTML={{ __html: svg }}></span>
+ }
}
}
export default MkIcon
\ No newline at end of file
--
Gitblit v1.8.0