From f859d48ee2335a49fb289390ad8d3581a1358ef8 Mon Sep 17 00:00:00 2001 From: Mrtangl <1807746833@qq.com> Date: Fri, 22 Apr 2022 15:55:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/package-lock.json | 15 +- admin/src/assets/font/demo.css | 9 +- admin/src/assets/font/demo_index.html | 1785 ++++++++++++++++- admin/src/assets/font/iconfont.css | 357 +++- admin/src/assets/font/iconfont.json | 627 +++++- admin/src/assets/font/iconfont.ttf | Bin 2344 -> 24648 bytes admin/src/assets/font/iconfont.woff | Bin 1588 -> 14872 bytes admin/src/assets/font/iconfont.woff2 | Bin 1160 -> 12280 bytes admin/src/views/permission/menu/edit.vue | 86 +- .../permission/menu/select-icon/index.vue | 9 + admin/src/views/setting/system/cache.vue | 119 +- .../src/views/setting/system/environment.vue | 138 +- 12 files changed, 2867 insertions(+), 278 deletions(-) create mode 100644 admin/src/views/permission/menu/select-icon/index.vue diff --git a/admin/package-lock.json b/admin/package-lock.json index dd4e281b..55b173da 100644 --- a/admin/package-lock.json +++ b/admin/package-lock.json @@ -2526,11 +2526,18 @@ } }, "vue-router": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.12.tgz", - "integrity": "sha512-CPXvfqe+mZLB1kBWssssTiWg4EQERyqJZes7USiqfW9B5N2x+nHlnsM1D3b5CaJ6qgCvMmYJnz+G0iWjNCvXrg==", + "version": "4.0.14", + "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.0.14.tgz", + "integrity": "sha512-wAO6zF9zxA3u+7AkMPqw9LjoUCjSxfFvINQj3E/DceTt6uEz1XZLraDhdg2EYmvVwTBSGlLYsUw8bDmx0754Mw==", "requires": { - "@vue/devtools-api": "^6.0.0-beta.18" + "@vue/devtools-api": "^6.0.0" + }, + "dependencies": { + "@vue/devtools-api": { + "version": "6.1.4", + "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.1.4.tgz", + "integrity": "sha512-IiA0SvDrJEgXvVxjNkHPFfDx6SXw0b/TUkqMcDZWNg9fnCAHbTpoo59YfJ9QLFkwa3raau5vSlRVzMSLDnfdtQ==" + } } }, "vue-tsc": { diff --git a/admin/src/assets/font/demo.css b/admin/src/assets/font/demo.css index aefd9b84..65d45596 100644 --- a/admin/src/assets/font/demo.css +++ b/admin/src/assets/font/demo.css @@ -2,13 +2,10 @@ @font-face { font-family: 'iconfont logo'; src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834'); - src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') - format('embedded-opentype'), + src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'), url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'), - url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') - format('truetype'), - url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') - format('svg'); + url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'), + url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg'); } .logo { diff --git a/admin/src/assets/font/demo_index.html b/admin/src/assets/font/demo_index.html index 9fecb732..0db2c323 100644 --- a/admin/src/assets/font/demo_index.html +++ b/admin/src/assets/font/demo_index.html @@ -60,7 +60,7 @@ 查看项目
@@ -107,9 +617,9 @@ 
@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1640939015921') format('woff2'),
-       url('iconfont.woff?t=1640939015921') format('woff'),
-       url('iconfont.ttf?t=1640939015921') format('truetype');
+  src: url('iconfont.woff2?t=1638503419755') format('woff2'),
+       url('iconfont.woff?t=1638503419755') format('woff'),
+       url('iconfont.ttf?t=1638503419755') format('truetype');
 }

第二步：定义使用 iconfont 的样式

@@ -128,31 +638,538 @@ ><span class="iconfont">&#x33;</span>
-

- "iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 - "iconfont"。 -

+

"iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。

@@ -160,18 +1177,13 @@

- font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode - 书写不直观，语意不明确的问题。 + font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。

与 Unicode 使用方式相比，具有如下特点：

使用步骤如下：

@@ -179,13 +1191,10 @@ 
<link rel="stylesheet" href="./iconfont.css">

第二步：挑选相应图标并获取类名，应用于页面：

- 
<span class="iconfont icon-xxx"></span>
+                        
<span class="iconfont xxx"></span>
 

                         

-                            

-                                " iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是
-                                "iconfont"。
-                            

+                            
" iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。
@@ -193,26 +1202,706 @@
@@ -229,8 +1918,8 @@