mirror of
https://github.com/pure-admin/vue-pure-admin.git
synced 2025-06-07 08:57:19 +08:00
feat: 兼容fontawesome4和5版本
This commit is contained in:
parent
10e8b296e3
commit
3c4619d071
@ -30,6 +30,9 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@amap/amap-jsapi-loader": "^1.0.1",
|
"@amap/amap-jsapi-loader": "^1.0.1",
|
||||||
"@element-plus/icons": "^0.0.11",
|
"@element-plus/icons": "^0.0.11",
|
||||||
|
"@fortawesome/fontawesome-svg-core": "^1.2.36",
|
||||||
|
"@fortawesome/free-solid-svg-icons": "^5.15.4",
|
||||||
|
"@fortawesome/vue-fontawesome": "^3.0.0-5",
|
||||||
"@logicflow/core": "0.7.1",
|
"@logicflow/core": "0.7.1",
|
||||||
"@logicflow/extension": "0.7.1",
|
"@logicflow/extension": "0.7.1",
|
||||||
"@vueuse/core": "^6.7.1",
|
"@vueuse/core": "^6.7.1",
|
||||||
|
50
pnpm-lock.yaml
generated
50
pnpm-lock.yaml
generated
@ -5,6 +5,9 @@ specifiers:
|
|||||||
"@commitlint/cli": 13.1.0
|
"@commitlint/cli": 13.1.0
|
||||||
"@commitlint/config-conventional": 13.1.0
|
"@commitlint/config-conventional": 13.1.0
|
||||||
"@element-plus/icons": ^0.0.11
|
"@element-plus/icons": ^0.0.11
|
||||||
|
"@fortawesome/fontawesome-svg-core": ^1.2.36
|
||||||
|
"@fortawesome/free-solid-svg-icons": ^5.15.4
|
||||||
|
"@fortawesome/vue-fontawesome": ^3.0.0-5
|
||||||
"@logicflow/core": 0.7.1
|
"@logicflow/core": 0.7.1
|
||||||
"@logicflow/extension": 0.7.1
|
"@logicflow/extension": 0.7.1
|
||||||
"@types/element-resize-detector": 1.1.3
|
"@types/element-resize-detector": 1.1.3
|
||||||
@ -85,6 +88,9 @@ specifiers:
|
|||||||
dependencies:
|
dependencies:
|
||||||
"@amap/amap-jsapi-loader": 1.0.1
|
"@amap/amap-jsapi-loader": 1.0.1
|
||||||
"@element-plus/icons": 0.0.11
|
"@element-plus/icons": 0.0.11
|
||||||
|
"@fortawesome/fontawesome-svg-core": 1.2.36
|
||||||
|
"@fortawesome/free-solid-svg-icons": 5.15.4
|
||||||
|
"@fortawesome/vue-fontawesome": 3.0.0-5_a4ef6aa86ab1c63b266771040e7bf2c7
|
||||||
"@logicflow/core": 0.7.1
|
"@logicflow/core": 0.7.1
|
||||||
"@logicflow/extension": 0.7.1
|
"@logicflow/extension": 0.7.1
|
||||||
"@vueuse/core": 6.7.5_vue@3.2.21
|
"@vueuse/core": 6.7.5_vue@3.2.21
|
||||||
@ -812,6 +818,50 @@ packages:
|
|||||||
- supports-color
|
- supports-color
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
|
/@fortawesome/fontawesome-common-types/0.2.36:
|
||||||
|
resolution:
|
||||||
|
{
|
||||||
|
integrity: sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==
|
||||||
|
}
|
||||||
|
engines: { node: ">=6" }
|
||||||
|
requiresBuild: true
|
||||||
|
dev: false
|
||||||
|
|
||||||
|
/@fortawesome/fontawesome-svg-core/1.2.36:
|
||||||
|
resolution:
|
||||||
|
{
|
||||||
|
integrity: sha512-YUcsLQKYb6DmaJjIHdDWpBIGCcyE/W+p/LMGvjQem55Mm2XWVAP5kWTMKWLv9lwpCVjpLxPyOMOyUocP1GxrtA==
|
||||||
|
}
|
||||||
|
engines: { node: ">=6" }
|
||||||
|
requiresBuild: true
|
||||||
|
dependencies:
|
||||||
|
"@fortawesome/fontawesome-common-types": 0.2.36
|
||||||
|
dev: false
|
||||||
|
|
||||||
|
/@fortawesome/free-solid-svg-icons/5.15.4:
|
||||||
|
resolution:
|
||||||
|
{
|
||||||
|
integrity: sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==
|
||||||
|
}
|
||||||
|
engines: { node: ">=6" }
|
||||||
|
requiresBuild: true
|
||||||
|
dependencies:
|
||||||
|
"@fortawesome/fontawesome-common-types": 0.2.36
|
||||||
|
dev: false
|
||||||
|
|
||||||
|
/@fortawesome/vue-fontawesome/3.0.0-5_a4ef6aa86ab1c63b266771040e7bf2c7:
|
||||||
|
resolution:
|
||||||
|
{
|
||||||
|
integrity: sha512-aNmBT4bOecrFsZTog1l6AJDQHPP3ocXV+WQ3Ogy8WZCqstB/ahfhH4CPu5i4N9Hw0MBKXqE+LX+NbUxcj8cVTw==
|
||||||
|
}
|
||||||
|
peerDependencies:
|
||||||
|
"@fortawesome/fontawesome-svg-core": ~1 || >=1.3.0-beta1
|
||||||
|
vue: ">= 3.0.0 < 4"
|
||||||
|
dependencies:
|
||||||
|
"@fortawesome/fontawesome-svg-core": 1.2.36
|
||||||
|
vue: 3.2.21
|
||||||
|
dev: false
|
||||||
|
|
||||||
/@humanwhocodes/config-array/0.5.0:
|
/@humanwhocodes/config-array/0.5.0:
|
||||||
resolution:
|
resolution:
|
||||||
{
|
{
|
||||||
|
@ -6,6 +6,7 @@ import { createApp, Directive } from "vue";
|
|||||||
import { usI18n } from "../src/plugins/i18n";
|
import { usI18n } from "../src/plugins/i18n";
|
||||||
import { MotionPlugin } from "@vueuse/motion";
|
import { MotionPlugin } from "@vueuse/motion";
|
||||||
import { useTable } from "../src/plugins/vxe-table";
|
import { useTable } from "../src/plugins/vxe-table";
|
||||||
|
import { useFontawesome } from "../src/plugins/fontawesome";
|
||||||
import { useElementPlus } from "../src/plugins/element-plus";
|
import { useElementPlus } from "../src/plugins/element-plus";
|
||||||
import { injectResponsiveStorage } from "/@/utils/storage/responsive";
|
import { injectResponsiveStorage } from "/@/utils/storage/responsive";
|
||||||
|
|
||||||
@ -33,7 +34,8 @@ getServerConfig(app).then(async config => {
|
|||||||
.use(MotionPlugin)
|
.use(MotionPlugin)
|
||||||
.use(useElementPlus)
|
.use(useElementPlus)
|
||||||
.use(useTable)
|
.use(useTable)
|
||||||
.use(usI18n);
|
.use(usI18n)
|
||||||
|
.use(useFontawesome);
|
||||||
await router.isReady();
|
await router.isReady();
|
||||||
app.mount("#app");
|
app.mount("#app");
|
||||||
});
|
});
|
||||||
|
15
src/plugins/fontawesome/index.ts
Normal file
15
src/plugins/fontawesome/index.ts
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
/** 兼容fontawesome4和5版本
|
||||||
|
* 4版本: www.fontawesome.com.cn/faicons/
|
||||||
|
* 5版本:https://fontawesome.com/v5.15/icons?d=gallery&p=2&m=free
|
||||||
|
* https://github.com/FortAwesome/vue-fontawesome
|
||||||
|
*/
|
||||||
|
import { App } from "vue";
|
||||||
|
import "font-awesome/css/font-awesome.css";
|
||||||
|
import { library } from "@fortawesome/fontawesome-svg-core";
|
||||||
|
import { faUserSecret } from "@fortawesome/free-solid-svg-icons";
|
||||||
|
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
|
||||||
|
|
||||||
|
export function useFontawesome(app: App) {
|
||||||
|
library.add(faUserSecret);
|
||||||
|
app.component("font-awesome-icon", FontAwesomeIcon);
|
||||||
|
}
|
@ -1,7 +1,6 @@
|
|||||||
import "xe-utils";
|
import "xe-utils";
|
||||||
import { App } from "vue";
|
import { App } from "vue";
|
||||||
import { i18n } from "../i18n/index";
|
import { i18n } from "../i18n/index";
|
||||||
import "font-awesome/css/font-awesome.css";
|
|
||||||
import {
|
import {
|
||||||
// 核心
|
// 核心
|
||||||
VXETable,
|
VXETable,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user