From 77d2b09121bd7742a37ea4a8d2dc5150c8c17175 Mon Sep 17 00:00:00 2001
From: harrywan <harrywan@webank.com>
Date: Wed, 4 Sep 2024 09:54:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96svg=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89fill=E7=AD=89=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/fes-plugin-icon/package.json         | 72 +++++++++----------
 packages/fes-plugin-icon/src/optimizeSvg.js   |  6 +-
 .../fes-plugin-icon/src/runtime/Icon/Icon.jsx | 10 +--
 .../src/runtime/Icon/icon.less                |  3 +-
 4 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/packages/fes-plugin-icon/package.json b/packages/fes-plugin-icon/package.json
index c6217c02..94128c36 100644
--- a/packages/fes-plugin-icon/package.json
+++ b/packages/fes-plugin-icon/package.json
@@ -1,38 +1,38 @@
 {
-  "name": "@fesjs/plugin-icon",
-  "version": "3.0.0",
-  "description": "@fesjs/plugin-icon",
-  "main": "lib/index.js",
-  "files": [
-    "lib",
-    "types.d.ts"
-  ],
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/WeBankFinTech/fes.js.git",
-    "directory": "packages/fes-plugin-icon"
-  },
-  "keywords": [
-    "fes"
-  ],
-  "author": "qlin",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/WeBankFinTech/fes.js/issues"
-  },
-  "homepage": "https://github.com/WeBankFinTech/fes.js#readme",
-  "publishConfig": {
-    "access": "public"
-  },
-  "peerDependencies": {
-    "@fesjs/fes": "^3.0.0",
-    "vue": "^3.2.47"
-  },
-  "dependencies": {
-    "svgo": "^3.0.2"
-  },
-  "typings": "./types.d.ts"
+    "name": "@fesjs/plugin-icon",
+    "version": "3.0.0",
+    "description": "@fesjs/plugin-icon",
+    "author": "qlin",
+    "license": "MIT",
+    "homepage": "https://github.com/WeBankFinTech/fes.js#readme",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/WeBankFinTech/fes.js.git",
+        "directory": "packages/fes-plugin-icon"
+    },
+    "bugs": {
+        "url": "https://github.com/WeBankFinTech/fes.js/issues"
+    },
+    "keywords": [
+        "fes"
+    ],
+    "main": "lib/index.js",
+    "files": [
+        "lib",
+        "types.d.ts"
+    ],
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "publishConfig": {
+        "access": "public"
+    },
+    "peerDependencies": {
+        "@fesjs/fes": "^3.0.0",
+        "vue": "^3.2.47"
+    },
+    "dependencies": {
+        "svgo": "^3.0.2"
+    },
+    "typings": "./types.d.ts"
 }
diff --git a/packages/fes-plugin-icon/src/optimizeSvg.js b/packages/fes-plugin-icon/src/optimizeSvg.js
index 8673f230..335aa1e3 100644
--- a/packages/fes-plugin-icon/src/optimizeSvg.js
+++ b/packages/fes-plugin-icon/src/optimizeSvg.js
@@ -1,5 +1,5 @@
-import { extname, basename } from 'path';
-import { statSync, readFileSync } from 'fs';
+import { basename, extname } from 'node:path';
+import { readFileSync, statSync } from 'node:fs';
 import { optimize } from 'svgo';
 
 const presetDefault = [
@@ -15,7 +15,7 @@ const presetDefault = [
     {
         name: 'removeAttrs',
         params: {
-            attrs: '(fill|stroke|class)',
+            attrs: '(class)',
         },
     },
 ];
diff --git a/packages/fes-plugin-icon/src/runtime/Icon/Icon.jsx b/packages/fes-plugin-icon/src/runtime/Icon/Icon.jsx
index ee625a0b..af88422a 100644
--- a/packages/fes-plugin-icon/src/runtime/Icon/Icon.jsx
+++ b/packages/fes-plugin-icon/src/runtime/Icon/Icon.jsx
@@ -1,8 +1,8 @@
 import { computed } from 'vue';
-// eslint-disable-next-line
+
 import icons from '../icons';
 
-const noop = () => {};
+function noop() {}
 
 export default {
     name: 'FesIcon',
@@ -19,9 +19,9 @@ export default {
         const svgStyle = computed(() =>
             props.rotate
                 ? {
-                      msTransform: `rotate(${props.rotate}deg)`,
-                      transform: `rotate(${props.rotate}deg)`,
-                  }
+                        msTransform: `rotate(${props.rotate}deg)`,
+                        transform: `rotate(${props.rotate}deg)`,
+                    }
                 : null,
         );
         const svgCls = computed(() => ({
diff --git a/packages/fes-plugin-icon/src/runtime/Icon/icon.less b/packages/fes-plugin-icon/src/runtime/Icon/icon.less
index e2efbaaa..f437f4cf 100644
--- a/packages/fes-plugin-icon/src/runtime/Icon/icon.less
+++ b/packages/fes-plugin-icon/src/runtime/Icon/icon.less
@@ -29,6 +29,7 @@
     &[tabindex] {
         cursor: pointer;
     }
+
     &--spin {
         display: inline-block;
         animation: loadingCircle 1s infinite linear;
@@ -46,5 +47,5 @@
             transform: rotate(360deg);
         }
     }
-    
+
 }