From 486717570e2fc4b81b6e9db511cd445447fca333 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 18 八月 2023 22:58:08 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/components/mkIcon/index.jsx | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/components/mkIcon/index.jsx b/src/components/mkIcon/index.jsx
index 529f3a4..fd157d7 100644
--- a/src/components/mkIcon/index.jsx
+++ b/src/components/mkIcon/index.jsx
@@ -47,8 +47,8 @@
componentDidMount() {
if (!window.GLOB.designView) {
- if (sessionStorage.getItem('systemIcons')) {
- this.setState({cusicons: JSON.parse(sessionStorage.getItem('systemIcons'))})
+ if (window.GLOB.systemIcons) {
+ this.setState({cusicons: window.GLOB.systemIcons})
} else {
this.getIcons()
}
@@ -72,18 +72,16 @@
message: res.message,
duration: 5
})
- sessionStorage.setItem('systemIcons', JSON.stringify([]))
- return
- } else if (!res.data) {
+ window.GLOB.systemIcons = []
return
}
- let icons = res.data.map(item => {
+ let icons = (res.data || []).map(item => {
item.icon_svg = window.decodeURIComponent(window.atob(item.icon_svg))
return item
})
- sessionStorage.setItem('systemIcons', JSON.stringify(icons))
+ window.GLOB.systemIcons = icons
this.setState({cusicons: icons})
})
--
Gitblit v1.8.0