diff --git a/build/plugins/unplugin.ts b/build/plugins/unplugin.ts index 942e91d17..a054f579d 100644 --- a/build/plugins/unplugin.ts +++ b/build/plugins/unplugin.ts @@ -24,8 +24,7 @@ export default function unplugin(viteEnv: ImportMetaEnv) { [collectionName]: FileSystemIconLoader(localIconPath) }, scale: 1, - defaultClass: 'inline-block', - autoInstall: true + defaultClass: 'inline-block' }), Components({ dts: 'src/typings/components.d.ts', diff --git a/mock/model/route.ts b/mock/model/route.ts index 2a678361d..d87de6533 100644 --- a/mock/model/route.ts +++ b/mock/model/route.ts @@ -28,7 +28,7 @@ export const routeModel: Record = { ], meta: { title: '仪表盘', - icon: 'carbon:dashboard', + icon: 'mdi:monitor-dashboard', order: 1 } }, @@ -90,7 +90,7 @@ export const routeModel: Record = { ], meta: { title: '文档', - icon: 'carbon:document', + icon: 'mdi:file-document-multiple-outline', order: 2 } }, @@ -106,7 +106,7 @@ export const routeModel: Record = { meta: { title: '按钮', requiresAuth: true, - icon: 'ic:baseline-radio-button-checked' + icon: 'mdi:button-cursor' } }, { @@ -132,7 +132,7 @@ export const routeModel: Record = { ], meta: { title: '组件示例', - icon: 'fluent:app-store-24-regular', + icon: 'cib:app-store', order: 3 } }, @@ -163,13 +163,13 @@ export const routeModel: Record = { meta: { title: 'AntV', requiresAuth: true, - icon: 'ant-design:bar-chart-outlined' + icon: 'simple-icons:antdesign' } } ], meta: { title: '图表', - icon: 'material-symbols:bar-chart-rounded' + icon: 'mdi:chart-areaspline' } }, { @@ -260,7 +260,7 @@ export const routeModel: Record = { meta: { title: '打印', requiresAuth: true, - icon: 'ic:baseline-local-printshop' + icon: 'mdi:printer' } } ], @@ -345,7 +345,7 @@ export const routeModel: Record = { ], meta: { title: '功能', - icon: 'ri:function-line', + icon: 'icon-park-outline:all-application', order: 6 } }, @@ -408,7 +408,7 @@ export const routeModel: Record = { meta: { title: '二级菜单', requiresAuth: true, - icon: 'ic:outline-menu' + icon: 'mdi:menu' } }, { @@ -423,19 +423,19 @@ export const routeModel: Record = { meta: { title: '三级菜单', requiresAuth: true, - icon: 'ic:outline-menu' + icon: 'mdi:menu' } } ], meta: { title: '二级菜单(有子菜单)', - icon: 'ic:outline-menu' + icon: 'mdi:menu' } } ], meta: { title: '一级菜单', - icon: 'ic:outline-menu' + icon: 'mdi:menu' } } ], @@ -539,7 +539,7 @@ export const routeModel: Record = { ], meta: { title: '仪表盘', - icon: 'carbon:dashboard', + icon: 'mdi:monitor-dashboard', order: 1 } }, @@ -601,7 +601,7 @@ export const routeModel: Record = { ], meta: { title: '文档', - icon: 'carbon:document', + icon: 'mdi:file-document-multiple-outline', order: 2 } }, @@ -617,7 +617,7 @@ export const routeModel: Record = { meta: { title: '按钮', requiresAuth: true, - icon: 'ic:baseline-radio-button-checked' + icon: 'mdi:button-cursor' } }, { @@ -643,7 +643,7 @@ export const routeModel: Record = { ], meta: { title: '组件示例', - icon: 'fluent:app-store-24-regular', + icon: 'cib:app-store', order: 3 } }, @@ -674,13 +674,13 @@ export const routeModel: Record = { meta: { title: 'AntV', requiresAuth: true, - icon: 'ant-design:bar-chart-outlined' + icon: 'simple-icons:antdesign' } } ], meta: { title: '图表', - icon: 'material-symbols:bar-chart-rounded' + icon: 'mdi:chart-areaspline' } }, { @@ -771,7 +771,7 @@ export const routeModel: Record = { meta: { title: '打印', requiresAuth: true, - icon: 'ic:baseline-local-printshop' + icon: 'mdi:printer' } } ], @@ -846,7 +846,7 @@ export const routeModel: Record = { ], meta: { title: '功能', - icon: 'ri:function-line', + icon: 'icon-park-outline:all-application', order: 6 } }, @@ -909,7 +909,7 @@ export const routeModel: Record = { meta: { title: '二级菜单', requiresAuth: true, - icon: 'ic:outline-menu' + icon: 'mdi:menu' } }, { @@ -924,19 +924,19 @@ export const routeModel: Record = { meta: { title: '三级菜单', requiresAuth: true, - icon: 'ic:outline-menu' + icon: 'mdi:menu' } } ], meta: { title: '二级菜单(有子菜单)', - icon: 'ic:outline-menu' + icon: 'mdi:menu' } } ], meta: { title: '一级菜单', - icon: 'ic:outline-menu' + icon: 'mdi:menu' } } ], @@ -1030,7 +1030,7 @@ export const routeModel: Record = { ], meta: { title: '仪表盘', - icon: 'carbon:dashboard', + icon: 'mdi:monitor-dashboard', order: 1 } }, @@ -1073,7 +1073,7 @@ export const routeModel: Record = { meta: { title: '二级菜单', requiresAuth: true, - icon: 'ic:outline-menu' + icon: 'mdi:menu' } }, { @@ -1088,19 +1088,19 @@ export const routeModel: Record = { meta: { title: '三级菜单', requiresAuth: true, - icon: 'ic:outline-menu' + icon: 'mdi:menu' } } ], meta: { title: '二级菜单(有子菜单)', - icon: 'ic:outline-menu' + icon: 'mdi:menu' } } ], meta: { title: '一级菜单', - icon: 'ic:outline-menu' + icon: 'mdi:menu' } } ], diff --git a/package.json b/package.json index c86a78ee7..4a8c802eb 100644 --- a/package.json +++ b/package.json @@ -82,12 +82,7 @@ "@amap/amap-jsapi-types": "^0.0.8", "@commitlint/cli": "^17.1.2", "@commitlint/config-conventional": "^17.1.0", - "@iconify-json/ant-design": "^1.1.3", - "@iconify-json/clarity": "^1.1.4", - "@iconify-json/ic": "^1.1.9", - "@iconify-json/mdi": "^1.1.33", - "@iconify-json/ph": "^1.1.2", - "@iconify-json/uil": "^1.1.2", + "@iconify/json": "^2.1.112", "@iconify/vue": "^4.0.0", "@milahu/patch-package": "^6.4.14", "@types/bmapgl": "^0.0.5", diff --git a/src/router/modules/component.ts b/src/router/modules/component.ts index 5f09c850e..6cffaf897 100644 --- a/src/router/modules/component.ts +++ b/src/router/modules/component.ts @@ -10,7 +10,7 @@ const component: AuthRoute.Route = { meta: { title: '按钮', requiresAuth: true, - icon: 'ic:baseline-radio-button-checked' + icon: 'mdi:button-cursor' } }, { @@ -36,7 +36,7 @@ const component: AuthRoute.Route = { ], meta: { title: '组件示例', - icon: 'fluent:app-store-24-regular', + icon: 'cib:app-store', order: 3 } }; diff --git a/src/router/modules/dashboard.ts b/src/router/modules/dashboard.ts index ce5aad889..3243b7438 100644 --- a/src/router/modules/dashboard.ts +++ b/src/router/modules/dashboard.ts @@ -20,14 +20,13 @@ const dashboard: AuthRoute.Route = { meta: { title: '工作台', requiresAuth: true, - permissions: ['super', 'admin'], icon: 'icon-park-outline:workbench' } } ], meta: { title: '仪表盘', - icon: 'carbon:dashboard', + icon: 'mdi:monitor-dashboard', order: 1 } }; diff --git a/src/router/modules/document.ts b/src/router/modules/document.ts index c850e78dc..f1590c496 100644 --- a/src/router/modules/document.ts +++ b/src/router/modules/document.ts @@ -56,7 +56,7 @@ const document: AuthRoute.Route = { ], meta: { title: '文档', - icon: 'carbon:document', + icon: 'mdi:file-document-multiple-outline', order: 2 } }; diff --git a/src/router/modules/function.ts b/src/router/modules/function.ts index a5bc2c13e..a9fcdf56b 100644 --- a/src/router/modules/function.ts +++ b/src/router/modules/function.ts @@ -41,7 +41,7 @@ const functionRoute: AuthRoute.Route = { ], meta: { title: '功能', - icon: 'ri:function-line', + icon: 'icon-park-outline:all-application', order: 6 } }; diff --git a/src/router/modules/multi-menu.ts b/src/router/modules/multi-menu.ts index d06fec139..07edbab3e 100644 --- a/src/router/modules/multi-menu.ts +++ b/src/router/modules/multi-menu.ts @@ -15,7 +15,7 @@ const multiMenu: AuthRoute.Route = { meta: { title: '二级菜单', requiresAuth: true, - icon: 'ic:outline-menu' + icon: 'mdi:menu' } }, { @@ -30,19 +30,19 @@ const multiMenu: AuthRoute.Route = { meta: { title: '三级菜单', requiresAuth: true, - icon: 'ic:outline-menu' + icon: 'mdi:menu' } } ], meta: { title: '二级菜单(有子菜单)', - icon: 'ic:outline-menu' + icon: 'mdi:menu' } } ], meta: { title: '一级菜单', - icon: 'ic:outline-menu' + icon: 'mdi:menu' } } ], diff --git a/src/router/modules/plugin.ts b/src/router/modules/plugin.ts index 7d52a4c43..a7d13fc05 100644 --- a/src/router/modules/plugin.ts +++ b/src/router/modules/plugin.ts @@ -25,13 +25,13 @@ const plugin: AuthRoute.Route = { meta: { title: 'AntV', requiresAuth: true, - icon: 'ant-design:bar-chart-outlined' + icon: 'simple-icons:antdesign' } } ], meta: { title: '图表', - icon: 'material-symbols:bar-chart-rounded' + icon: 'mdi:chart-areaspline' } }, { @@ -112,7 +112,7 @@ const plugin: AuthRoute.Route = { meta: { title: '图标', requiresAuth: true, - icon: 'ic:baseline-insert-emoticon' + localIcon: 'custom-icon' } }, { @@ -122,7 +122,7 @@ const plugin: AuthRoute.Route = { meta: { title: '打印', requiresAuth: true, - icon: 'ic:baseline-local-printshop' + icon: 'mdi:printer' } } ],