From 5560b3b9037259e177acdf73a27fd5ff1b967504 Mon Sep 17 00:00:00 2001 From: xuan Date: Tue, 27 Dec 2022 15:15:32 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20build(svg):=20=E5=8D=87=E7=BA=A7?= =?UTF-8?q?taro-iconfont-svg=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iconfont.json | 2 +- package.json | 2 +- src/components/iconfont/iconfont.tsx | 109 ++++++++++++++------------- yarn.lock | 68 +++++++++++++---- 4 files changed, 112 insertions(+), 69 deletions(-) diff --git a/iconfont.json b/iconfont.json index a0499e0..180f0e0 100644 --- a/iconfont.json +++ b/iconfont.json @@ -1,5 +1,5 @@ { - "symbol_url": "//at.alicdn.com/t/c/font_3786318_8mk04nkdxlg.js", + "symbol_url": "//at.alicdn.com/t/c/font_3786318_dbfm4mvm98c.js", "save_dir": "./src/components/iconfont", "use_typescript": false, "use_rpx": true, diff --git a/package.json b/package.json index 8c66942..bda52e5 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "prettier": "^2.8.0", "react-refresh": "0.14.0", "stylelint": "14.16.0", - "taro-iconfont-svg": "^1.0.19", + "taro-iconfont-svg": "^1.1.1", "typescript": "^4.9.3", "webpack": "^5.75.0" } diff --git a/src/components/iconfont/iconfont.tsx b/src/components/iconfont/iconfont.tsx index dda8d1b..3207b8b 100644 --- a/src/components/iconfont/iconfont.tsx +++ b/src/components/iconfont/iconfont.tsx @@ -24,7 +24,7 @@ function hex2rgb(hex) { return "rgb(" + rgb.join(",") + ")"; } -export type IconNames = 'icon-dianhua' | 'icon-rukou' | 'icon-renzhengchenggong' | 'icon-paixu' | 'icon-shaixuan' | 'icon-bodakehujingli' | 'icon-guanfangweixinkefu' | 'icon-tuijianbiaoqian' | 'icon-rukou' | 'icon-renzhengchenggong' | 'icon-wodekefu' | 'icon-yanseduibi' | 'icon-dizhiguanli' | 'icon-weixin' | 'icon-riqi' | 'icon-shuru' | 'icon-a-0tianzhangqi' | 'icon-huodaofukuan' | 'icon-huozhuziti' | 'icon-saomazhifu' | 'icon-xianxiahuikuan' | 'icon-yufukuan' | 'icon-xinzengshoucangjia' | 'icon-qingchusousuo' | 'icon-xuanzechenggong' | 'icon-gongnengtubiao-saomiao' | 'icon-bianjizidingyimadan' | 'icon-zidingyimadanyulan' | 'icon-yuanshimadanyulan' | 'icon-xiala' | 'icon-shangla' | 'icon-qingchuxinxi' | 'icon-sousuo' | 'icon-guanli' | 'icon-bianji' | 'icon-shoucangjia' | 'icon-shezhi' | 'icon-tishi' | 'icon-erweima' | 'icon-dianjishoucang' | 'icon-gouwuche' | 'icon-shoucangchenggong' | 'icon-fenxiangshangpin' | 'icon-kefu' | 'icon-xinzenganniu' | 'icon-jianshaoanniu' | 'icon-daifahuo2' | 'icon-daishouhuo2' | 'icon-tuikuan-shouhou' | 'icon-daipeibu2' | 'icon-daifukuan2'; +export type IconNames = 'icon-tips' | 'icon-dianhua' | 'icon-paixu' | 'icon-shaixuan' | 'icon-bodakehujingli' | 'icon-guanfangweixinkefu' | 'icon-tuijianbiaoqian' | 'icon-rukou' | 'icon-renzhengchenggong' | 'icon-wodekefu' | 'icon-yanseduibi' | 'icon-dizhiguanli' | 'icon-weixin' | 'icon-riqi' | 'icon-shuru' | 'icon-a-0tianzhangqi' | 'icon-huodaofukuan' | 'icon-huozhuziti' | 'icon-saomazhifu' | 'icon-xianxiahuikuan' | 'icon-yufukuan' | 'icon-xinzengshoucangjia' | 'icon-qingchusousuo' | 'icon-xuanzechenggong' | 'icon-gongnengtubiao-saomiao' | 'icon-bianjizidingyimadan' | 'icon-zidingyimadanyulan' | 'icon-yuanshimadanyulan' | 'icon-xiala' | 'icon-shangla' | 'icon-qingchuxinxi' | 'icon-sousuo' | 'icon-guanli' | 'icon-bianji' | 'icon-shoucangjia' | 'icon-shezhi' | 'icon-tishi' | 'icon-erweima' | 'icon-dianjishoucang' | 'icon-gouwuche' | 'icon-shoucangchenggong' | 'icon-fenxiangshangpin' | 'icon-kefu' | 'icon-xinzenganniu' | 'icon-jianshaoanniu' | 'icon-daifahuo2' | 'icon-daishouhuo2' | 'icon-tuikuan-shouhou' | 'icon-daipeibu2' | 'icon-daifukuan2'; type PropsType = { name: IconNames; @@ -36,7 +36,7 @@ type PropsType = { const IconFont:FC = ({ name, - size = 18, + size = 36, color, customStyle = {}, customClassName = "" @@ -66,6 +66,8 @@ const IconFont:FC = ({ // 也可以使用 if (name === 'xxx') { return } 来渲染,但是测试发现在ios下会有问题,报错 Maximum call stack啥的。下面这个写法没问题 return ( + {/* icon-colorCard 本地svg */ } + {/* { name === 'icon-colorCard' && () } */} {/* icon-alipay */} {/* {name === "icon-alipay" && ( = ({ className={classnames(icon, customClassName)} /> )} */} - {/* icon-dianhua */} + {/* icon-tips */} - { name === 'icon-dianhua' && () } + { name === 'icon-tips' && () } +{/* icon-dianhua */} + + { name === 'icon-dianhua' && () } {/* icon-paixu */} - { name === 'icon-paixu' && () } + { name === 'icon-paixu' && () } {/* icon-shaixuan */} - { name === 'icon-shaixuan' && () } + { name === 'icon-shaixuan' && () } {/* icon-bodakehujingli */} - { name === 'icon-bodakehujingli' && () } + { name === 'icon-bodakehujingli' && () } {/* icon-guanfangweixinkefu */} - { name === 'icon-guanfangweixinkefu' && () } + { name === 'icon-guanfangweixinkefu' && () } {/* icon-tuijianbiaoqian */} - { name === 'icon-tuijianbiaoqian' && () } + { name === 'icon-tuijianbiaoqian' && () } {/* icon-rukou */} - { name === 'icon-rukou' && () } + { name === 'icon-rukou' && () } {/* icon-renzhengchenggong */} - { name === 'icon-renzhengchenggong' && () } + { name === 'icon-renzhengchenggong' && () } {/* icon-wodekefu */} - { name === 'icon-wodekefu' && () } + { name === 'icon-wodekefu' && () } {/* icon-yanseduibi */} - { name === 'icon-yanseduibi' && () } + { name === 'icon-yanseduibi' && () } {/* icon-dizhiguanli */} - { name === 'icon-dizhiguanli' && () } + { name === 'icon-dizhiguanli' && () } {/* icon-weixin */} - { name === 'icon-weixin' && () } + { name === 'icon-weixin' && () } {/* icon-riqi */} - { name === 'icon-riqi' && () } + { name === 'icon-riqi' && () } {/* icon-shuru */} - { name === 'icon-shuru' && () } + { name === 'icon-shuru' && () } {/* icon-a-0tianzhangqi */} - { name === 'icon-a-0tianzhangqi' && () } + { name === 'icon-a-0tianzhangqi' && () } {/* icon-huodaofukuan */} - { name === 'icon-huodaofukuan' && () } + { name === 'icon-huodaofukuan' && () } {/* icon-huozhuziti */} - { name === 'icon-huozhuziti' && () } + { name === 'icon-huozhuziti' && () } {/* icon-saomazhifu */} - { name === 'icon-saomazhifu' && () } + { name === 'icon-saomazhifu' && () } {/* icon-xianxiahuikuan */} - { name === 'icon-xianxiahuikuan' && () } + { name === 'icon-xianxiahuikuan' && () } {/* icon-yufukuan */} - { name === 'icon-yufukuan' && () } + { name === 'icon-yufukuan' && () } {/* icon-xinzengshoucangjia */} - { name === 'icon-xinzengshoucangjia' && () } + { name === 'icon-xinzengshoucangjia' && () } {/* icon-qingchusousuo */} - { name === 'icon-qingchusousuo' && () } + { name === 'icon-qingchusousuo' && () } {/* icon-xuanzechenggong */} - { name === 'icon-xuanzechenggong' && () } + { name === 'icon-xuanzechenggong' && () } {/* icon-gongnengtubiao-saomiao */} - { name === 'icon-gongnengtubiao-saomiao' && () } + { name === 'icon-gongnengtubiao-saomiao' && () } {/* icon-bianjizidingyimadan */} - { name === 'icon-bianjizidingyimadan' && () } + { name === 'icon-bianjizidingyimadan' && () } {/* icon-zidingyimadanyulan */} - { name === 'icon-zidingyimadanyulan' && () } + { name === 'icon-zidingyimadanyulan' && () } {/* icon-yuanshimadanyulan */} - { name === 'icon-yuanshimadanyulan' && () } + { name === 'icon-yuanshimadanyulan' && () } {/* icon-xiala */} - { name === 'icon-xiala' && () } + { name === 'icon-xiala' && () } {/* icon-shangla */} - { name === 'icon-shangla' && () } + { name === 'icon-shangla' && () } {/* icon-qingchuxinxi */} - { name === 'icon-qingchuxinxi' && () } + { name === 'icon-qingchuxinxi' && () } {/* icon-sousuo */} - { name === 'icon-sousuo' && () } + { name === 'icon-sousuo' && () } {/* icon-guanli */} - { name === 'icon-guanli' && () } + { name === 'icon-guanli' && () } {/* icon-bianji */} - { name === 'icon-bianji' && () } + { name === 'icon-bianji' && () } {/* icon-shoucangjia */} - { name === 'icon-shoucangjia' && () } + { name === 'icon-shoucangjia' && () } {/* icon-shezhi */} - { name === 'icon-shezhi' && () } + { name === 'icon-shezhi' && () } {/* icon-tishi */} - { name === 'icon-tishi' && () } + { name === 'icon-tishi' && () } {/* icon-erweima */} - { name === 'icon-erweima' && () } + { name === 'icon-erweima' && () } {/* icon-dianjishoucang */} - { name === 'icon-dianjishoucang' && () } + { name === 'icon-dianjishoucang' && () } {/* icon-gouwuche */} - { name === 'icon-gouwuche' && () } + { name === 'icon-gouwuche' && () } {/* icon-shoucangchenggong */} - { name === 'icon-shoucangchenggong' && () } + { name === 'icon-shoucangchenggong' && () } {/* icon-fenxiangshangpin */} - { name === 'icon-fenxiangshangpin' && () } + { name === 'icon-fenxiangshangpin' && () } {/* icon-kefu */} - { name === 'icon-kefu' && () } + { name === 'icon-kefu' && () } {/* icon-xinzenganniu */} - { name === 'icon-xinzenganniu' && () } + { name === 'icon-xinzenganniu' && () } {/* icon-jianshaoanniu */} - { name === 'icon-jianshaoanniu' && () } + { name === 'icon-jianshaoanniu' && () } {/* icon-daifahuo2 */} - { name === 'icon-daifahuo2' && () } + { name === 'icon-daifahuo2' && () } {/* icon-daishouhuo2 */} - { name === 'icon-daishouhuo2' && () } + { name === 'icon-daishouhuo2' && () } {/* icon-tuikuan-shouhou */} - { name === 'icon-tuikuan-shouhou' && () } + { name === 'icon-tuikuan-shouhou' && () } {/* icon-daipeibu2 */} - { name === 'icon-daipeibu2' && () } + { name === 'icon-daipeibu2' && () } {/* icon-daifukuan2 */} - { name === 'icon-daifukuan2' && () } + { name === 'icon-daifukuan2' && () } ) diff --git a/yarn.lock b/yarn.lock index 4e0060e..92660c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2424,9 +2424,9 @@ "@tarojs/api" "3.5.8" "@tarojs/runtime" "3.5.8" -"@tarojs/taro@^3.5.7": +"@tarojs/taro@^3.5.10": version "3.5.10" - resolved "https://registry.npmmirror.com/@tarojs/taro/-/taro-3.5.10.tgz#004b161099b89e0ca29311394694784445934a40" + resolved "https://registry.npmjs.org/@tarojs/taro/-/taro-3.5.10.tgz#004b161099b89e0ca29311394694784445934a40" integrity sha512-WU+y8AAdbSZS9Oexz34irKkVxRkGkTpu70mDxYenfrrkgY6tOuQ/EmHavuxmQ7aEoFIjgm6s6pW91jd2AyOh+w== dependencies: "@tarojs/api" "3.5.10" @@ -5752,6 +5752,17 @@ css-select@^4.1.3: domutils "^2.8.0" nth-check "^2.0.1" +css-select@^5.1.0: + version "5.1.0" + resolved "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6" + integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg== + dependencies: + boolbase "^1.0.0" + css-what "^6.1.0" + domhandler "^5.0.2" + domutils "^3.0.1" + nth-check "^2.0.1" + css-tree@1.0.0-alpha.29: version "1.0.0-alpha.29" resolved "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz" @@ -5768,6 +5779,14 @@ css-tree@^1.1.2, css-tree@^1.1.3: mdn-data "2.0.14" source-map "^0.6.1" +css-tree@^2.2.1: + version "2.3.1" + resolved "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20" + integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw== + dependencies: + mdn-data "2.0.30" + source-map-js "^1.0.1" + css-tree@~2.2.0: version "2.2.1" resolved "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz" @@ -5776,7 +5795,7 @@ css-tree@~2.2.0: mdn-data "2.0.28" source-map-js "^1.0.1" -css-what@^6.0.1: +css-what@^6.0.1, css-what@^6.1.0: version "6.1.0" resolved "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz" integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== @@ -5867,7 +5886,7 @@ csso@^4.0.2, csso@^4.2.0: dependencies: css-tree "^1.1.2" -csso@^5.0.2: +csso@^5.0.2, csso@^5.0.5: version "5.0.5" resolved "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz" integrity sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ== @@ -7468,10 +7487,10 @@ fs-extra@8.1.0, fs-extra@^8.0.1, fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^10.1.0: - version "10.1.0" - resolved "https://registry.npmmirror.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" - integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== +fs-extra@^11.1.0: + version "11.1.0" + resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz#5784b102104433bb0e090f48bfc4a30742c357ed" + integrity sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw== dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" @@ -9531,6 +9550,11 @@ mdn-data@2.0.28: resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz" integrity sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g== +mdn-data@2.0.30: + version "2.0.30" + resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc" + integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA== + mdn-data@~1.1.0: version "1.1.4" resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz" @@ -13047,6 +13071,18 @@ svgo@^2.7.0: picocolors "^1.0.0" stable "^0.1.8" +svgo@^3.0.2: + version "3.0.2" + resolved "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz#5e99eeea42c68ee0dc46aa16da093838c262fe0a" + integrity sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ== + dependencies: + "@trysound/sax" "0.2.0" + commander "^7.2.0" + css-select "^5.1.0" + css-tree "^2.2.1" + csso "^5.0.5" + picocolors "^1.0.0" + swiper@6.8.0: version "6.8.0" resolved "https://registry.npmjs.org/swiper/-/swiper-6.8.0.tgz" @@ -13104,20 +13140,22 @@ taro-css-to-react-native@3.5.8: css-mediaquery "^0.1.2" postcss-value-parser "^3.3.0" -taro-iconfont-svg@^1.0.19: - version "1.0.19" - resolved "https://registry.npmmirror.com/taro-iconfont-svg/-/taro-iconfont-svg-1.0.19.tgz#92c5f264af37dc5a9e5ba59cdc1b5594ff60431b" - integrity sha512-A5B5pe6gYjYcvuMAOgz5mJ3pA+syDP8lx2F2o12r1ddcccQljsU9k4KYp73wfouCCLSNi5CCy+UCcC6Ts51f4A== +taro-iconfont-svg@^1.1.1: + version "1.1.1" + resolved "https://registry.npmjs.org/taro-iconfont-svg/-/taro-iconfont-svg-1.1.1.tgz#9bf97717bb312e9ab766fb0f4dca30dcf244ff50" + integrity sha512-rOfrubDg3hGky6b7sb+rygleq97LW1dnd23MVIJ+0h9xsMxFwEv1t4+R/ZMpWhxrWV4CQPgIJJ0YKb1BIqLs5A== dependencies: - "@tarojs/taro" "^3.5.7" + "@tarojs/taro" "^3.5.10" classnames "^2.3.2" colors "^1.4.0" - fs-extra "^10.1.0" + fs-extra "^11.1.0" glob "^8.0.3" iconfont-parser "^1.0.0" minimist "^1.2.7" mkdirp "^1.0.4" + svgo "^3.0.2" ts-node "^10.9.1" + xml2js "^0.4.23" tarojs@^2.1.1: version "2.1.1" @@ -14248,7 +14286,7 @@ xml-parse-from-string@^1.0.0: resolved "https://registry.npmjs.org/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz" integrity sha512-ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g== -xml2js@^0.4.19, xml2js@^0.4.22, xml2js@^0.4.5: +xml2js@^0.4.19, xml2js@^0.4.22, xml2js@^0.4.23, xml2js@^0.4.5: version "0.4.23" resolved "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz" integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==