diff --git a/mock/asyncRoutes.ts b/mock/asyncRoutes.ts
index e1f4624..da6a559 100644
--- a/mock/asyncRoutes.ts
+++ b/mock/asyncRoutes.ts
@@ -1,8 +1,6 @@
// 模拟后端动态生成路由
import { MockMethod } from "vite-plugin-mock";
-import Lollipop from "@iconify-icons/ep/lollipop";
-
/**
* roles:页面级别权限,这里模拟二种 "admin"、"common"
* admin:管理员角色
@@ -13,7 +11,7 @@ const permissionRouter = {
path: "/permission",
meta: {
title: "权限管理",
- icon: Lollipop,
+ icon: "lollipop",
rank: 10
},
children: [
diff --git a/package.json b/package.json
index 664d4fe..657c119 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "pure-admin-thin",
- "version": "3.9.2",
+ "version": "3.9.3",
"private": true,
"scripts": {
"dev": "NODE_OPTIONS=--max-old-space-size=4096 vite",
@@ -31,8 +31,8 @@
"dependencies": {
"@ctrl/tinycolor": "^3.4.1",
"@pureadmin/descriptions": "^1.1.0",
- "@pureadmin/table": "^1.8.2",
- "@pureadmin/utils": "^1.7.2",
+ "@pureadmin/table": "^1.8.3",
+ "@pureadmin/utils": "^1.7.4",
"@vueuse/core": "^9.6.0",
"@vueuse/motion": "2.0.0-beta.12",
"animate.css": "^4.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6ae699d..bf85017 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -8,9 +8,9 @@ specifiers:
'@iconify-icons/ri': ^1.2.3
'@iconify/vue': ^4.0.0
'@pureadmin/descriptions': ^1.1.0
- '@pureadmin/table': ^1.8.2
+ '@pureadmin/table': ^1.8.3
'@pureadmin/theme': ^2.4.0
- '@pureadmin/utils': ^1.7.2
+ '@pureadmin/utils': ^1.7.4
'@types/element-resize-detector': 1.1.3
'@types/js-cookie': ^3.0.1
'@types/lodash': ^4.14.180
@@ -93,8 +93,8 @@ specifiers:
dependencies:
'@ctrl/tinycolor': 3.4.1
'@pureadmin/descriptions': 1.1.1_element-plus@2.2.26
- '@pureadmin/table': 1.8.2_element-plus@2.2.26
- '@pureadmin/utils': 1.7.2_aotapuqn7htzdjltsyimavekky
+ '@pureadmin/table': 1.8.3_element-plus@2.2.26
+ '@pureadmin/utils': 1.7.4_aotapuqn7htzdjltsyimavekky
'@vueuse/core': 9.6.0_vue@3.2.45
'@vueuse/motion': 2.0.0-beta.12_vue@3.2.45
animate.css: 4.1.1
@@ -823,8 +823,8 @@ packages:
vue: 3.2.45
dev: false
- /@pureadmin/table/1.8.2_element-plus@2.2.26:
- resolution: {integrity: sha512-FGh1aOfgQtX16pCnP+bxg49TetcZDhdykIue0m5d8NIj6zkvJP53JU+DkUpvqvKmUiMsvIwme6e17BLZMmMiOw==}
+ /@pureadmin/table/1.8.3_element-plus@2.2.26:
+ resolution: {integrity: sha512-M+I+CDu74s/ffNybbDg0rHhiMHTdkgVIaksfmmrEwjuLB2nEaz7R0tob2qC5rKE96U2Z246meDHBidyQNx2z9w==}
peerDependencies:
element-plus: ^2.0.0
dependencies:
@@ -840,8 +840,8 @@ packages:
string-hash: 1.1.3
dev: true
- /@pureadmin/utils/1.7.2_aotapuqn7htzdjltsyimavekky:
- resolution: {integrity: sha512-L8tmogs9HCX6nuga1g79DcZr3KXNoWnIFcyP2z4zpmUmdBBAmMpXXz3Z+emI6HELmZu8DFx+v1MfKxccgsODRQ==}
+ /@pureadmin/utils/1.7.4_aotapuqn7htzdjltsyimavekky:
+ resolution: {integrity: sha512-uJNHcb2sO7R2avALf+v4TGyuZtJix0Wpw/kMb6eO4C003ZQImuGGi9WlxHaOlESrMyFHZ1AjWm5AqLwJLnpVlw==}
peerDependencies:
dayjs: '*'
echarts: '*'
diff --git a/public/serverConfig.json b/public/serverConfig.json
index 705accd..2c7f49b 100644
--- a/public/serverConfig.json
+++ b/public/serverConfig.json
@@ -1,5 +1,5 @@
{
- "Version": "3.9.2",
+ "Version": "3.9.3",
"Title": "PureAdmin",
"FixedHeader": true,
"HiddenSideBar": false,
diff --git a/src/components/ReIcon/src/offlineIcon.ts b/src/components/ReIcon/src/offlineIcon.ts
new file mode 100644
index 0000000..bb0e020
--- /dev/null
+++ b/src/components/ReIcon/src/offlineIcon.ts
@@ -0,0 +1,14 @@
+import { addIcon } from "@iconify/vue/dist/offline";
+
+/**
+ * 这里存放本地图标,在 src/layout/index.vue 文件中加载,避免在首启动加载
+ */
+
+// 本地菜单图标,后端在路由的icon中返回对应的图标字符串并且前端在此处使用addIcon添加即可渲染菜单图标
+import HomeFilled from "@iconify-icons/ep/home-filled";
+import InformationLine from "@iconify-icons/ri/information-line";
+import Lollipop from "@iconify-icons/ep/lollipop";
+
+addIcon("homeFilled", HomeFilled);
+addIcon("informationLine", InformationLine);
+addIcon("lollipop", Lollipop);
diff --git a/src/layout/components/setting/index.vue b/src/layout/components/setting/index.vue
index ba2d84d..69af67a 100644
--- a/src/layout/components/setting/index.vue
+++ b/src/layout/components/setting/index.vue
@@ -1,4 +1,13 @@
diff --git a/src/layout/components/sidebar/horizontal.vue b/src/layout/components/sidebar/horizontal.vue
index dc5f0ec..1817396 100644
--- a/src/layout/components/sidebar/horizontal.vue
+++ b/src/layout/components/sidebar/horizontal.vue
@@ -35,7 +35,10 @@ watch(
-