From a7119c1cbe8e22cf0ccf84956d88cec967f0d3f8 Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Mon, 25 Apr 2022 19:37:23 +0800 Subject: [PATCH] perf: icon --- package.json | 2 -- pnpm-lock.yaml | 22 ------------ src/components/ReIcon/src/iconifyIconOffline.ts | 48 +++---------------------- src/layout/components/setting/index.vue | 2 +- src/views/login.vue | 4 +-- 5 files changed, 7 insertions(+), 71 deletions(-) diff --git a/package.json b/package.json index 9aa5937..56ea3b6 100644 --- a/package.json +++ b/package.json @@ -59,8 +59,6 @@ "@commitlint/cli": "13.1.0", "@commitlint/config-conventional": "13.1.0", "@iconify-icons/ep": "^1.2.4", - "@iconify-icons/fa": "^1.2.2", - "@iconify-icons/fa-solid": "^1.2.2", "@iconify-icons/ri": "^1.2.1", "@iconify/vue": "^3.2.0", "@intlify/vite-plugin-vue-i18n": "^3.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 53f9056..657aaf5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,8 +5,6 @@ specifiers: "@commitlint/config-conventional": 13.1.0 "@ctrl/tinycolor": ^3.4.0 "@iconify-icons/ep": ^1.2.4 - "@iconify-icons/fa": ^1.2.2 - "@iconify-icons/fa-solid": ^1.2.2 "@iconify-icons/ri": ^1.2.1 "@iconify/vue": ^3.2.0 "@intlify/vite-plugin-vue-i18n": ^3.4.0 @@ -120,8 +118,6 @@ devDependencies: "@commitlint/cli": 13.1.0 "@commitlint/config-conventional": 13.1.0 "@iconify-icons/ep": 1.2.4 - "@iconify-icons/fa": 1.2.2 - "@iconify-icons/fa-solid": 1.2.2 "@iconify-icons/ri": 1.2.1 "@iconify/vue": 3.2.0_vue@3.2.33 "@intlify/vite-plugin-vue-i18n": 3.4.0_3d08e1d9025840888da5ae870455a383 @@ -924,24 +920,6 @@ packages: "@iconify/types": 1.1.0 dev: true - /@iconify-icons/fa-solid/1.2.2: - resolution: - { - integrity: sha512-XNU+pk89pMbozQk9YMpxA+K+rPsq07MXJa9TwZS1oyBlbaIdeH6r/KOOeNYzmDVk6yaaZyTh9wfSJhuc8zIVYw== - } - dependencies: - "@iconify/types": 1.1.0 - dev: true - - /@iconify-icons/fa/1.2.2: - resolution: - { - integrity: sha512-8lecoWNI7X/GRw7B9NPVyGlPrqUxi1w1aZyzAm1s+eiPixmmivxdHtg53tGeSJpYgm/grfSti8EbYoiFTIckrw== - } - dependencies: - "@iconify/types": 1.1.0 - dev: true - /@iconify-icons/ri/1.2.1: resolution: { diff --git a/src/components/ReIcon/src/iconifyIconOffline.ts b/src/components/ReIcon/src/iconifyIconOffline.ts index 299b41d..d7711bf 100644 --- a/src/components/ReIcon/src/iconifyIconOffline.ts +++ b/src/components/ReIcon/src/iconifyIconOffline.ts @@ -5,89 +5,49 @@ import { Icon as IconifyIcon, addIcon } from "@iconify/vue/dist/offline"; import Check from "@iconify-icons/ep/check"; import Menu from "@iconify-icons/ep/menu"; import HomeFilled from "@iconify-icons/ep/home-filled"; -import SetUp from "@iconify-icons/ep/set-up"; -import Edit from "@iconify-icons/ep/edit"; import Setting from "@iconify-icons/ep/setting"; import Lollipop from "@iconify-icons/ep/lollipop"; import Link from "@iconify-icons/ep/link"; -import Position from "@iconify-icons/ep/position"; -import Histogram from "@iconify-icons/ep/histogram"; import RefreshRight from "@iconify-icons/ep/refresh-right"; import ArrowDown from "@iconify-icons/ep/arrow-down"; import Close from "@iconify-icons/ep/close"; import CloseBold from "@iconify-icons/ep/close-bold"; import Bell from "@iconify-icons/ep/bell"; -import Guide from "@iconify-icons/ep/guide"; -import User from "@iconify-icons/ep/user"; import Iphone from "@iconify-icons/ep/iphone"; -import Location from "@iconify-icons/ep/location"; -import Tickets from "@iconify-icons/ep/tickets"; -import OfficeBuilding from "@iconify-icons/ep/office-building"; -import Notebook from "@iconify-icons/ep/notebook"; -import Rank from "@iconify-icons/ep/rank"; -import videoPlay from "@iconify-icons/ep/video-play"; -import Monitor from "@iconify-icons/ep/monitor"; import Search from "@iconify-icons/ep/search"; addIcon("check", Check); addIcon("menu", Menu); addIcon("home-filled", HomeFilled); -addIcon("set-up", SetUp); -addIcon("edit", Edit); addIcon("setting", Setting); addIcon("lollipop", Lollipop); addIcon("link", Link); -addIcon("position", Position); -addIcon("histogram", Histogram); addIcon("refresh-right", RefreshRight); addIcon("arrow-down", ArrowDown); addIcon("close", Close); addIcon("close-bold", CloseBold); addIcon("bell", Bell); -addIcon("guide", Guide); -addIcon("user", User); addIcon("iphone", Iphone); -addIcon("location", Location); -addIcon("tickets", Tickets); -addIcon("office-building", OfficeBuilding); -addIcon("notebook", Notebook); -addIcon("video-play", videoPlay); -addIcon("rank", Rank); -addIcon("monitor", Monitor); addIcon("search", Search); // remixicon import arrowRightSLine from "@iconify-icons/ri/arrow-right-s-line"; import arrowLeftSLine from "@iconify-icons/ri/arrow-left-s-line"; import logoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line"; -import nodeTree from "@iconify-icons/ri/node-tree"; -import ubuntuFill from "@iconify-icons/ri/ubuntu-fill"; -import questionLine from "@iconify-icons/ri/question-line"; -import checkboxCircleLine from "@iconify-icons/ri/checkbox-circle-line"; import informationLine from "@iconify-icons/ri/information-line"; -import closeCircleLine from "@iconify-icons/ri/close-circle-line"; import arrowUpLine from "@iconify-icons/ri/arrow-up-line"; import arrowDownLine from "@iconify-icons/ri/arrow-down-line"; import bookmark2Line from "@iconify-icons/ri/bookmark-2-line"; +import User from "@iconify-icons/ri/user-3-fill"; +import Lock from "@iconify-icons/ri/lock-fill"; addIcon("arrow-right-s-line", arrowRightSLine); addIcon("arrow-left-s-line", arrowLeftSLine); addIcon("logout-circle-r-line", logoutCircleRLine); -addIcon("node-tree", nodeTree); -addIcon("ubuntu-fill", ubuntuFill); -addIcon("question-line", questionLine); -addIcon("checkbox-circle-line", checkboxCircleLine); addIcon("information-line", informationLine); -addIcon("close-circle-line", closeCircleLine); addIcon("arrow-up-line", arrowUpLine); addIcon("arrow-down-line", arrowDownLine); addIcon("bookmark-2-line", bookmark2Line); - -// Font Awesome 4 -import faUser from "@iconify-icons/fa/user"; -import faLock from "@iconify-icons/fa/lock"; -import faSignOut from "@iconify-icons/fa/sign-out"; -addIcon("fa-user", faUser); -addIcon("fa-lock", faLock); -addIcon("fa-sign-out", faSignOut); +addIcon("user", User); +addIcon("lock", Lock); // Iconify Icon在Vue里离线使用（用于内网环境）https://docs.iconify.design/icon-components/vue/offline.html export default defineComponent({ diff --git a/src/layout/components/setting/index.vue b/src/layout/components/setting/index.vue index b512853..e00bca4 100644 --- a/src/layout/components/setting/index.vue +++ b/src/layout/components/setting/index.vue @@ -447,7 +447,7 @@ nextTick(() => { @click="onReset" >
- +
用户名
@@ -111,7 +111,7 @@ function onPwdBlur() { }" >
- +
密码