From b60f7fa728ec9e833c03cf8a41c51a9469d1fc2a Mon Sep 17 00:00:00 2001
From: h_mo <596417202@qq.com>
Date: Wed, 28 Sep 2022 20:45:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E6=95=B4=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pnpm-lock.yaml                                | 26 -------------------
 src/components/FontAwesomeIcon/index.vue      |  5 +++-
 .../FontAwesomeIcon/scss/_core.scss           | 12 +++++++--
 .../FontAwesomeIcon/scss/_icons.scss          |  6 +++++
 .../FontAwesomeIcon/scss/_variables.scss      |  2 +-
 .../FontAwesomeIcon/scss/duotone.scss         | 20 ++++++++++++++
 .../FontAwesomeIcon/scss/light.scss           |  2 +-
 .../FontAwesomeIcon/scss/regular.scss         |  2 +-
 .../FontAwesomeIcon/scss/sharp-solid.scss     |  2 +-
 .../FontAwesomeIcon/scss/solid.scss           |  2 +-
 src/components/FontAwesomeIcon/scss/thin.scss |  2 +-
 11 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 31a49b4..2632ff3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -19,7 +19,6 @@ specifiers:
   '@dcloudio/uni-quickapp-webview': ^3.0.0-alpha-3060420220922004
   '@dcloudio/vite-plugin-uni': ^3.0.0-alpha-3060420220922004
   '@fortawesome/fontawesome-free': ^6.2.0
-  '@fortawesome/vue-fontawesome': ^2.0.8
   '@types/crypto-js': ^4.1.1
   '@types/lodash-es': ^4.17.6
   '@types/node': ^17.0.45
@@ -66,7 +65,6 @@ dependencies:
   '@dcloudio/uni-mp-weixin': 3.0.0-alpha-3060420220922004_postcss@8.4.16+vue@3.2.39
   '@dcloudio/uni-quickapp-webview': 3.0.0-alpha-3060420220922004_postcss@8.4.16+vue@3.2.39
   '@fortawesome/fontawesome-free': 6.2.0
-  '@fortawesome/vue-fontawesome': 2.0.8_4h6vf4pkzarhnju6fzmo7mfhke
   crypto-js: 4.1.1
   echarts: 5.4.0
   lodash-es: 4.17.21
@@ -953,36 +951,12 @@ packages:
       - supports-color
     dev: true
 
-  /@fortawesome/fontawesome-common-types/6.2.0:
-    resolution: {integrity: sha512-rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg==}
-    engines: {node: '>=6'}
-    requiresBuild: true
-    dev: false
-
   /@fortawesome/fontawesome-free/6.2.0:
     resolution: {integrity: sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ==}
     engines: {node: '>=6'}
     requiresBuild: true
     dev: false
 
-  /@fortawesome/fontawesome-svg-core/6.2.0:
-    resolution: {integrity: sha512-Cf2mAAeMWFMzpLC7Y9H1I4o3wEU+XovVJhTiNG8ZNgSQj53yl7OCJaS80K4YjrABWZzbAHVaoHE1dVJ27AAYXw==}
-    engines: {node: '>=6'}
-    requiresBuild: true
-    dependencies:
-      '@fortawesome/fontawesome-common-types': 6.2.0
-    dev: false
-
-  /@fortawesome/vue-fontawesome/2.0.8_4h6vf4pkzarhnju6fzmo7mfhke:
-    resolution: {integrity: sha512-SRmP0q9Ox4zq8ydDR/hrH+23TVU1bdwYVnugLVaAIwklOHbf56gx6JUGlwES7zjuNYqzKgl8e39iYf6ph8qSQw==}
-    peerDependencies:
-      '@fortawesome/fontawesome-svg-core': ~1 || ~6
-      vue: ~2
-    dependencies:
-      '@fortawesome/fontawesome-svg-core': 6.2.0
-      vue: 3.2.39
-    dev: false
-
   /@humanwhocodes/config-array/0.10.5:
     resolution: {integrity: sha512-XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug==}
     engines: {node: '>=10.10.0'}
diff --git a/src/components/FontAwesomeIcon/index.vue b/src/components/FontAwesomeIcon/index.vue
index d1c3214..2f96b48 100644
--- a/src/components/FontAwesomeIcon/index.vue
+++ b/src/components/FontAwesomeIcon/index.vue
@@ -16,8 +16,11 @@
   <view> <view class="fa-regular fa-house" />regular</view>
   <view> <view class="fa-light fa-house" />light</view>
   <view> <view class="fa-thin fa-house" />thin</view>
-  <view> <view class="fa-duotone fa-house" />duotone</view>
+  <view>
+    <view class="fa-duotone fa-house" /> <i class="fa-duotone fa-magnifying-glass"></i>duotone</view
+  >
   <view> <view class="fa-brands fa-bilibili" />brands </view>
+  <view> <view class="fass fa-user" />sharp </view>
 </template>
 <style lang="scss" scoped>
   .font-awesome-icon {
diff --git a/src/components/FontAwesomeIcon/scss/_core.scss b/src/components/FontAwesomeIcon/scss/_core.scss
index 8c60e6b..1c20a5b 100644
--- a/src/components/FontAwesomeIcon/scss/_core.scss
+++ b/src/components/FontAwesomeIcon/scss/_core.scss
@@ -20,7 +20,10 @@
 .fat,
 .#{$fa-css-prefix}-thin,
 .fad,
-.#{$fa-css-prefix}-duotone
+.#{$fa-css-prefix}-duotone,
+.fass,
+.#{$fa-css-prefix}-sharp,
+.#{$fa-css-prefix}-sharp-solid
 {
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
@@ -43,7 +46,7 @@
 .fat,
 .#{$fa-css-prefix}-thin
 {
-  font-family: 'Font Awesome 6 Free';
+  font-family: 'Font Awesome 6';
 }
 
 .fab,
@@ -56,6 +59,11 @@
   font-family: 'Font Awesome 6 Duotone';
 }
 
+.fass,
+.#{$fa-css-prefix}-harp-solid.#{$fa-css-prefix}-solid {
+  font-family: 'Font Awesome 6 Sharp';
+}
+
 
 %fa-icon {
   @include fa-icon;
diff --git a/src/components/FontAwesomeIcon/scss/_icons.scss b/src/components/FontAwesomeIcon/scss/_icons.scss
index 9e57e39..ea3198e 100644
--- a/src/components/FontAwesomeIcon/scss/_icons.scss
+++ b/src/components/FontAwesomeIcon/scss/_icons.scss
@@ -7,3 +7,9 @@ readers do not read off random characters that represent icons */
 @each $name, $icon in $fa-icons {
   .#{$fa-css-prefix}-#{$name}::before { content: unquote("\"#{ $icon }\""); }
 }
+@each $name, $icon in $fa-icons {
+  .#{$fa-css-prefix}-duotone.#{$fa-css-prefix}-#{$name}::after { content: unquote("\"#{ $icon }#{ $icon }\""); }
+}
+
+
+
diff --git a/src/components/FontAwesomeIcon/scss/_variables.scss b/src/components/FontAwesomeIcon/scss/_variables.scss
index a58400d..23cce38 100644
--- a/src/components/FontAwesomeIcon/scss/_variables.scss
+++ b/src/components/FontAwesomeIcon/scss/_variables.scss
@@ -3,7 +3,7 @@
 
 $fa-css-prefix          : fa !default;
 $fa-style               : 900 !default;
-$fa-style-family        : "Font Awesome 6 Free" !default;
+$fa-style-family        : "Font Awesome 6" !default;
 
 $fa-display             : inline-block !default;
 
diff --git a/src/components/FontAwesomeIcon/scss/duotone.scss b/src/components/FontAwesomeIcon/scss/duotone.scss
index bf6d654..1b17358 100644
--- a/src/components/FontAwesomeIcon/scss/duotone.scss
+++ b/src/components/FontAwesomeIcon/scss/duotone.scss
@@ -23,4 +23,24 @@
 .far,
 .#{$fa-css-prefix}-duotone {
   font-weight: 900;
+}
+
+.fad:before,
+.#{$fa-css-prefix}-duotone:before{
+  position: absolute;
+  color: var(--fa-primary-color,inherit);
+  opacity: var(--fa-primary-opacity,1);
+}
+
+.#{$fa-css-prefix}-duotone.#{$fa-css-prefix}-swap-opacity:before, 
+.#{$fa-css-prefix}-duotone:after, .#{$fa-css-prefix}-swap-opacity 
+.#{$fa-css-prefix}-duotone:before, .#{$fa-css-prefix}-swap-opacity 
+.fad:before, 
+.fad.#{$fa-css-prefix}-swap-opacity:before, 
+.fad:after {
+  opacity: var(--fa-secondary-opacity,.4);
+}
+
+.#{$fa-css-prefix}-duotone:after, .fad:after {
+  color: var(--fa-secondary-color,inherit);
 }
\ No newline at end of file
diff --git a/src/components/FontAwesomeIcon/scss/light.scss b/src/components/FontAwesomeIcon/scss/light.scss
index f269160..5d6bca7 100644
--- a/src/components/FontAwesomeIcon/scss/light.scss
+++ b/src/components/FontAwesomeIcon/scss/light.scss
@@ -12,7 +12,7 @@
 }
 
 @font-face {
-  font-family: 'Font Awesome 6 Free';
+  font-family: 'Font Awesome 6';
   font-style: normal;
   font-weight: 300;
   font-display: $fa-font-display;
diff --git a/src/components/FontAwesomeIcon/scss/regular.scss b/src/components/FontAwesomeIcon/scss/regular.scss
index b3910d1..af7b48d 100644
--- a/src/components/FontAwesomeIcon/scss/regular.scss
+++ b/src/components/FontAwesomeIcon/scss/regular.scss
@@ -12,7 +12,7 @@
 }
 
 @font-face {
-  font-family: 'Font Awesome 6 Free';
+  font-family: 'Font Awesome 6';
   font-style: normal;
   font-weight: 400;
   font-display: $fa-font-display;
diff --git a/src/components/FontAwesomeIcon/scss/sharp-solid.scss b/src/components/FontAwesomeIcon/scss/sharp-solid.scss
index 04512d2..00e03f7 100644
--- a/src/components/FontAwesomeIcon/scss/sharp-solid.scss
+++ b/src/components/FontAwesomeIcon/scss/sharp-solid.scss
@@ -12,7 +12,7 @@
 }
 
 @font-face {
-  font-family: 'Font Awesome 6 Free';
+  font-family: 'Font Awesome 6 Sharp';
   font-style: normal;
   font-weight: 900;
   font-display: $fa-font-display;
diff --git a/src/components/FontAwesomeIcon/scss/solid.scss b/src/components/FontAwesomeIcon/scss/solid.scss
index cea4ff1..096ad7f 100644
--- a/src/components/FontAwesomeIcon/scss/solid.scss
+++ b/src/components/FontAwesomeIcon/scss/solid.scss
@@ -12,7 +12,7 @@
 }
 
 @font-face {
-  font-family: 'Font Awesome 6 Free';
+  font-family: 'Font Awesome 6';
   font-style: normal;
   font-weight: 900;
   font-display: $fa-font-display;
diff --git a/src/components/FontAwesomeIcon/scss/thin.scss b/src/components/FontAwesomeIcon/scss/thin.scss
index 5024bb6..20d39ba 100644
--- a/src/components/FontAwesomeIcon/scss/thin.scss
+++ b/src/components/FontAwesomeIcon/scss/thin.scss
@@ -12,7 +12,7 @@
 }
 
 @font-face {
-  font-family: 'Font Awesome 6 Free';
+  font-family: 'Font Awesome 6';
   font-style: normal;
   font-weight: 100;
   font-display: $fa-font-display;