fix: 优化svg不能去掉fill等属性

WeBankFinTech · Sep 4, 2024 · dd1897a · dd1897a
1 parent 191ea81
commit dd1897a
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 45 deletions.
diff --git 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
@@ -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
@@ -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
@@ -29,6 +29,7 @@
     &[tabindex] {
         cursor: pointer;
     }
+
     &--spin {
         display: inline-block;
         animation: loadingCircle 1s infinite linear;
@@ -46,5 +47,5 @@
             transform: rotate(360deg);
         }
     }
-    
+
 }