diff --git a/package.json b/package.json index 05a417a4fa..20e8ea8076 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "dependencies": { "@babel/runtime": "^7.23.9", "@nutui/icons-react": "^1.0.5", - "@nutui/icons-react-taro": "^1.0.5", + "@nutui/icons-react-taro": "2.0.0-beta.0", "@nutui/jdesign-icons-react-taro": "1.0.6-beta.2", "@nutui/touch-emulator": "^1.0.0", "@react-spring/web": "~9.6.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c6aea0aed2..7b08e62173 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,8 +19,8 @@ importers: specifier: ^1.0.5 version: 1.0.5 '@nutui/icons-react-taro': - specifier: ^1.0.5 - version: 1.0.5 + specifier: 2.0.0-beta.0 + version: 2.0.0-beta.0 '@nutui/jdesign-icons-react-taro': specifier: 1.0.6-beta.2 version: 1.0.6-beta.2 @@ -1615,8 +1615,8 @@ packages: resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==, tarball: https://r2.cnpmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz} engines: {node: '>= 8'} - '@nutui/icons-react-taro@1.0.5': - resolution: {integrity: sha512-p7dCW29wASH/qQ1OaUGGKA6PRV33wDPb80+qrHnWtT40syIb0W+e92mpplbULWM01s+GYVGyUU3i8b7Iy7qfvw==} + '@nutui/icons-react-taro@2.0.0-beta.0': + resolution: {integrity: sha512-Wca6RWjy76fT9Co4T8PTjZCB/nzUxxyBR6efYl5tSKUJEvc6FPGHuA2FL6F0Gs9BBHo6ppTs02DRcSohX6UFWQ==} '@nutui/icons-react@1.0.5': resolution: {integrity: sha512-0TYl3Fk+sVz95DKqn/7isYAvaK5YGnaBwMMib4rqYLoqi9GGFwgU9rp2hYXu/X5IYdWgshj0xiuGMK75/vUYbQ==} @@ -1708,35 +1708,30 @@ packages: engines: {node: '>= 10.0.0'} cpu: [arm] os: [linux] - libc: [glibc] '@parcel/watcher-linux-arm64-glibc@2.4.1': resolution: {integrity: sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==} engines: {node: '>= 10.0.0'} cpu: [arm64] os: [linux] - libc: [glibc] '@parcel/watcher-linux-arm64-musl@2.4.1': resolution: {integrity: sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==} engines: {node: '>= 10.0.0'} cpu: [arm64] os: [linux] - libc: [musl] '@parcel/watcher-linux-x64-glibc@2.4.1': resolution: {integrity: sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==} engines: {node: '>= 10.0.0'} cpu: [x64] os: [linux] - libc: [glibc] '@parcel/watcher-linux-x64-musl@2.4.1': resolution: {integrity: sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==} engines: {node: '>= 10.0.0'} cpu: [x64] os: [linux] - libc: [musl] '@parcel/watcher-win32-arm64@2.4.1': resolution: {integrity: sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==} @@ -1987,55 +1982,46 @@ packages: resolution: {integrity: sha512-KRSFHyE/RdxQ1CSeOIBVIAxStFC/hnBgVcaiCkQaVC+EYDtTe4X7z5tBkFyRoBgUGtB6Xg6t9t2kulnX6wJc6A==} cpu: [arm] os: [linux] - libc: [glibc] '@rollup/rollup-linux-arm-musleabihf@4.24.3': resolution: {integrity: sha512-h6Q8MT+e05zP5BxEKz0vi0DhthLdrNEnspdLzkoFqGwnmOzakEHSlXfVyA4HJ322QtFy7biUAVFPvIDEDQa6rw==} cpu: [arm] os: [linux] - libc: [musl] '@rollup/rollup-linux-arm64-gnu@4.24.3': resolution: {integrity: sha512-fKElSyXhXIJ9pqiYRqisfirIo2Z5pTTve5K438URf08fsypXrEkVmShkSfM8GJ1aUyvjakT+fn2W7Czlpd/0FQ==} cpu: [arm64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-arm64-musl@4.24.3': resolution: {integrity: sha512-YlddZSUk8G0px9/+V9PVilVDC6ydMz7WquxozToozSnfFK6wa6ne1ATUjUvjin09jp34p84milxlY5ikueoenw==} cpu: [arm64] os: [linux] - libc: [musl] '@rollup/rollup-linux-powerpc64le-gnu@4.24.3': resolution: {integrity: sha512-yNaWw+GAO8JjVx3s3cMeG5Esz1cKVzz8PkTJSfYzE5u7A+NvGmbVFEHP+BikTIyYWuz0+DX9kaA3pH9Sqxp69g==} cpu: [ppc64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-riscv64-gnu@4.24.3': resolution: {integrity: sha512-lWKNQfsbpv14ZCtM/HkjCTm4oWTKTfxPmr7iPfp3AHSqyoTz5AgLemYkWLwOBWc+XxBbrU9SCokZP0WlBZM9lA==} cpu: [riscv64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-s390x-gnu@4.24.3': resolution: {integrity: sha512-HoojGXTC2CgCcq0Woc/dn12wQUlkNyfH0I1ABK4Ni9YXyFQa86Fkt2Q0nqgLfbhkyfQ6003i3qQk9pLh/SpAYw==} cpu: [s390x] os: [linux] - libc: [glibc] '@rollup/rollup-linux-x64-gnu@4.24.3': resolution: {integrity: sha512-mnEOh4iE4USSccBOtcrjF5nj+5/zm6NcNhbSEfR3Ot0pxBwvEn5QVUXcuOwwPkapDtGZ6pT02xLoPaNv06w7KQ==} cpu: [x64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-x64-musl@4.24.3': resolution: {integrity: sha512-rMTzawBPimBQkG9NKpNHvquIUTQPzrnPxPbCY1Xt+mFkW7pshvyIS5kYgcf74goxXOQk0CP3EoOC1zcEezKXhw==} cpu: [x64] os: [linux] - libc: [musl] '@rollup/rollup-win32-arm64-msvc@4.24.3': resolution: {integrity: sha512-2lg1CE305xNvnH3SyiKwPVsTVLCg4TmNCF1z7PSHX2uZY2VbUpdkgAllVoISD7JO7zu+YynpWNSKAtOrX3AiuA==} @@ -2145,56 +2131,48 @@ packages: engines: {node: '>=10'} cpu: [arm64] os: [linux] - libc: [glibc] '@swc/core-linux-arm64-gnu@1.7.40': resolution: {integrity: sha512-v2fBlHJ/6Ovz0L2xFAI9TRiKyl9DTdx139PuAHD9gyzp16Utl/W0MPd4t2cYdkI6hPXE9PsJCSzMOrduh+YoDg==} engines: {node: '>=10'} cpu: [arm64] os: [linux] - libc: [glibc] '@swc/core-linux-arm64-musl@1.3.96': resolution: {integrity: sha512-i5/UTUwmJLri7zhtF6SAo/4QDQJDH2fhYJaBIUhrICmIkRO/ltURmpejqxsM/ye9Jqv5zG7VszMC0v/GYn/7BQ==} engines: {node: '>=10'} cpu: [arm64] os: [linux] - libc: [musl] '@swc/core-linux-arm64-musl@1.7.40': resolution: {integrity: sha512-uMkduQuU4LFVkW6txv8AVArT8GjJVJ5IHoWloXaUBMT447iE8NALmpePdZWhMyj6KV7j0y23CM5rzV/I2eNGLg==} engines: {node: '>=10'} cpu: [arm64] os: [linux] - libc: [musl] '@swc/core-linux-x64-gnu@1.3.96': resolution: {integrity: sha512-USdaZu8lTIkm4Yf9cogct/j5eqtdZqTgcTib4I+NloUW0E/hySou3eSyp3V2UAA1qyuC72ld1otXuyKBna0YKQ==} engines: {node: '>=10'} cpu: [x64] os: [linux] - libc: [glibc] '@swc/core-linux-x64-gnu@1.7.40': resolution: {integrity: sha512-4LZdY1MBSnXyTpW5fpBU/+JGAhkuHT+VnFTDNegRboN5nSPh7y0Yvn4LmIioESV+sWzjKkEXujJPGjrp+oSp5w==} engines: {node: '>=10'} cpu: [x64] os: [linux] - libc: [glibc] '@swc/core-linux-x64-musl@1.3.96': resolution: {integrity: sha512-QYErutd+G2SNaCinUVobfL7jWWjGTI0QEoQ6hqTp7PxCJS/dmKmj3C5ZkvxRYcq7XcZt7ovrYCTwPTHzt6lZBg==} engines: {node: '>=10'} cpu: [x64] os: [linux] - libc: [musl] '@swc/core-linux-x64-musl@1.7.40': resolution: {integrity: sha512-FPjOwT3SgI6PAwH1O8bhOGBPzuvzOlzKeCtxLaCjruHJu9V8KKBrMTWOZT/FJyYC9mX5Ip1+l9j30UqUZdQxtA==} engines: {node: '>=10'} cpu: [x64] os: [linux] - libc: [musl] '@swc/core-win32-arm64-msvc@1.3.96': resolution: {integrity: sha512-hjGvvAduA3Un2cZ9iNP4xvTXOO4jL3G9iakhFsgVhpkU73SGmK7+LN8ZVBEu4oq2SUcHO6caWvnZ881cxGuSpg==} @@ -2403,7 +2381,7 @@ packages: resolution: {integrity: sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ==, tarball: https://r2.cnpmjs.org/@types/acorn/-/acorn-4.0.6.tgz} '@types/archy@0.0.31': - resolution: {integrity: sha512-v+dxizsFVyXgD3EpFuqT9YjdEjbJmPxNf1QIX9ohZOhxh1ZF2yhqv3vYaeum9lg3VghhxS5S0a6yldN9J9lPEQ==, tarball: https://r2.cnpmjs.org/@types/archy/-/archy-0.0.31.tgz} + resolution: {integrity: sha512-v+dxizsFVyXgD3EpFuqT9YjdEjbJmPxNf1QIX9ohZOhxh1ZF2yhqv3vYaeum9lg3VghhxS5S0a6yldN9J9lPEQ==} '@types/argparse@1.0.38': resolution: {integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==, tarball: https://r2.cnpmjs.org/@types/argparse/-/argparse-1.0.38.tgz} @@ -2445,7 +2423,7 @@ packages: resolution: {integrity: sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==} '@types/glob@7.2.0': - resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==, tarball: https://r2.cnpmjs.org/@types/glob/-/glob-7.2.0.tgz} + resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} '@types/graceful-fs@4.1.9': resolution: {integrity: sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==} @@ -2777,10 +2755,10 @@ packages: resolution: {integrity: sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==} '@xtuc/ieee754@1.2.0': - resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==, tarball: https://r2.cnpmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz} + resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==} '@xtuc/long@4.2.2': - resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==, tarball: https://r2.cnpmjs.org/@xtuc/long/-/long-4.2.2.tgz} + resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==} JSONStream@1.3.5: resolution: {integrity: sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==, tarball: https://r2.cnpmjs.org/JSONStream/-/JSONStream-1.3.5.tgz} @@ -2927,7 +2905,7 @@ packages: resolution: {integrity: sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==, tarball: https://r2.cnpmjs.org/arch/-/arch-2.2.0.tgz} archy@1.0.0: - resolution: {integrity: sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==, tarball: https://r2.cnpmjs.org/archy/-/archy-1.0.0.tgz} + resolution: {integrity: sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==} argparse@1.0.10: resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==, tarball: https://r2.cnpmjs.org/argparse/-/argparse-1.0.10.tgz} @@ -3523,7 +3501,7 @@ packages: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==, tarball: https://r2.cnpmjs.org/commander/-/commander-2.20.3.tgz} commander@4.1.1: - resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==, tarball: https://r2.cnpmjs.org/commander/-/commander-4.1.1.tgz} + resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} engines: {node: '>= 6'} commander@6.2.1: @@ -4136,7 +4114,7 @@ packages: optional: true eslint-scope@5.1.1: - resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==, tarball: https://r2.cnpmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz} + resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==} engines: {node: '>=8.0.0'} eslint-scope@7.2.2: @@ -4171,7 +4149,7 @@ packages: engines: {node: '>=4.0'} estraverse@4.3.0: - resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==, tarball: https://r2.cnpmjs.org/estraverse/-/estraverse-4.3.0.tgz} + resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==} engines: {node: '>=4.0'} estraverse@5.3.0: @@ -4384,7 +4362,7 @@ packages: engines: {node: '>=18'} find-yarn-workspace-root@2.0.0: - resolution: {integrity: sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==, tarball: https://r2.cnpmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz} + resolution: {integrity: sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==} findup-sync@5.0.0: resolution: {integrity: sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==, tarball: https://r2.cnpmjs.org/findup-sync/-/findup-sync-5.0.0.tgz} @@ -4403,7 +4381,7 @@ packages: engines: {node: ^10.12.0 || >=12.0.0} flat@5.0.2: - resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==, tarball: https://r2.cnpmjs.org/flat/-/flat-5.0.2.tgz} + resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==} hasBin: true flatted@3.3.1: @@ -4573,7 +4551,7 @@ packages: engines: {node: '>=10.13.0'} glob-to-regexp@0.4.1: - resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==, tarball: https://r2.cnpmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz} + resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} glob-watcher@6.0.0: resolution: {integrity: sha512-wGM28Ehmcnk2NqRORXFOTOR064L4imSw3EeOqU5bIwUf62eXGwg89WivH6VMahL8zlQHeodzvHpXplrqzrz3Nw==} @@ -4633,7 +4611,7 @@ packages: engines: {node: '>=18'} globs@0.1.4: - resolution: {integrity: sha512-D23dWbOq48vlOraoSigbcQV4tWrnhwk+E/Um2cMuDS3/5dwGmdFeA7L/vAvDhLFlQOTDqHcXh35m/71g2A2WzQ==, tarball: https://r2.cnpmjs.org/globs/-/globs-0.1.4.tgz} + resolution: {integrity: sha512-D23dWbOq48vlOraoSigbcQV4tWrnhwk+E/Um2cMuDS3/5dwGmdFeA7L/vAvDhLFlQOTDqHcXh35m/71g2A2WzQ==} glogg@2.2.0: resolution: {integrity: sha512-eWv1ds/zAlz+M1ioHsyKJomfY7jbDDPpwSkv14KQj89bycx1nvK5/2Cj/T9g7kzJcX5Bc7Yv22FjfBZS/jl94A==} @@ -5753,7 +5731,7 @@ packages: hasBin: true loglevel-plugin-prefix@0.8.4: - resolution: {integrity: sha512-WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g==, tarball: https://r2.cnpmjs.org/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.8.4.tgz} + resolution: {integrity: sha512-WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g==} loglevel@1.9.2: resolution: {integrity: sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==} @@ -6828,7 +6806,7 @@ packages: resolution: {integrity: sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==, tarball: https://r2.cnpmjs.org/queue/-/queue-6.0.2.tgz} randombytes@2.1.0: - resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==, tarball: https://r2.cnpmjs.org/randombytes/-/randombytes-2.1.0.tgz} + resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==} range-parser@1.2.1: resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==, tarball: https://r2.cnpmjs.org/range-parser/-/range-parser-1.2.1.tgz} @@ -7220,7 +7198,7 @@ packages: engines: {node: '>= 10.13.0'} scss-bundle@3.1.2: - resolution: {integrity: sha512-lvxTwCKDLgzmRWhGwJ834ggtnEhs0G9FxSJRWte+NwlshVvBcQ/kOHHkpAGDpCxIMNGz/Utl0yd/MWyQAOBhqg==, tarball: https://r2.cnpmjs.org/scss-bundle/-/scss-bundle-3.1.2.tgz} + resolution: {integrity: sha512-lvxTwCKDLgzmRWhGwJ834ggtnEhs0G9FxSJRWte+NwlshVvBcQ/kOHHkpAGDpCxIMNGz/Utl0yd/MWyQAOBhqg==} hasBin: true semver-greatest-satisfied-range@2.0.0: @@ -7598,7 +7576,7 @@ packages: engines: {node: ^14.18.0 || >=16.0.0} tapable@2.2.1: - resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==, tarball: https://r2.cnpmjs.org/tapable/-/tapable-2.2.1.tgz} + resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} teex@1.0.1: @@ -9936,7 +9914,7 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.17.1 - '@nutui/icons-react-taro@1.0.5': {} + '@nutui/icons-react-taro@2.0.0-beta.0': {} '@nutui/icons-react@1.0.5': {} diff --git a/src/config.json b/src/config.json index 98b7a88ecf..5ce4a330ad 100644 --- a/src/config.json +++ b/src/config.json @@ -873,7 +873,7 @@ "author": "Ymm0008" }, { - "version": "2.0.0", + "version": "3.0.0", "name": "Toast", "type": "component", "tarodoc": true, diff --git a/src/packages/overlay/overlay.harmony.css b/src/packages/overlay/overlay.harmony.css index 1ee36be032..7dc90947a0 100644 --- a/src/packages/overlay/overlay.harmony.css +++ b/src/packages/overlay/overlay.harmony.css @@ -1,5 +1,10 @@ .nut-overlay { + /* #ifdef rn */ position: absolute; + /* #endif */ + /* #ifndef rn */ + position: fixed; + /* #endif */ top: 0; left: 0; bottom: 0; @@ -19,9 +24,6 @@ .nut-overflow-hidden { overflow: hidden !important; } -.nut-overflow-hidden .taro_page { - overflow: hidden !important; -} @keyframes nut-fade-in { 0% { diff --git a/src/packages/toast/Notification.tsx b/src/packages/toast/Notification.tsx index 8803f15aed..4a7dddba22 100644 --- a/src/packages/toast/Notification.tsx +++ b/src/packages/toast/Notification.tsx @@ -1,6 +1,6 @@ import * as React from 'react' import classNames from 'classnames' -import { Check, Loading, Failure, Tips } from '@nutui/icons-react' +import { Success, Loading, Failure, Tips } from '@nutui/icons-react' import { render, unmount } from '@/utils/render' import Overlay from '@/packages/overlay/index' import { BasicComponent } from '@/utils/typings' @@ -83,23 +83,12 @@ export default class Notification extends React.PureComponent< renderIcon() { const { icon } = this.props if (typeof icon === 'string') { - let iconNode = null - switch (icon) { - case 'success': - iconNode = - break - case 'loading': - iconNode = - break - case 'fail': - iconNode = - break - case 'warn': - iconNode = - break - default: - break - } + const iconNode = { + success: , + fail: , + warn: , + loading: , + }[icon] return

{iconNode}

} return icon @@ -134,7 +123,6 @@ export default class Notification extends React.PureComponent< const classes = classNames({ 'nut-toast-has-icon': icon, - [`nut-toast-${size}`]: true, }) return ( <> @@ -150,14 +138,20 @@ export default class Notification extends React.PureComponent< >
{this.renderIcon()} {title ? (
{title}
) : null} - {content} + + {content} +
diff --git a/src/packages/toast/__test__/toast.spec.tsx b/src/packages/toast/__test__/toast.spec.tsx index 426a945918..185f278bae 100644 --- a/src/packages/toast/__test__/toast.spec.tsx +++ b/src/packages/toast/__test__/toast.spec.tsx @@ -62,7 +62,9 @@ test('test toast props', async () => { fireEvent.click(getByTestId('emit-click')) expect(onClickToast).toBeCalled() expect(document.querySelector('.nut-toast-text')?.innerHTML).toBe('文案') - expect(document.querySelector('.nut-toast')).toHaveClass('nut-toast-small') + expect(document.querySelector('.nut-toast-inner')).toHaveClass( + 'nut-toast-inner-small' + ) expect(document.querySelector('.nut-toast')).toHaveClass( 'nut-toast-has-icon' ) @@ -83,7 +85,9 @@ test('event show-success-toast', async () => { await waitFor(() => { fireEvent.click(getByTestId('emit-click')) expect(onClickToast).toBeCalled() - expect(document.querySelector('.nut-icon')).toHaveClass('nut-icon-Check') + expect(document.querySelector('.nut-icon')).toHaveClass( + 'nut-icon nut-icon-Success' + ) expect(document.querySelector('.nut-toast-text')?.innerHTML).toBe('success') }) }) diff --git a/src/packages/toast/demo.taro.tsx b/src/packages/toast/demo.taro.tsx index d037fe8650..e2f5421152 100644 --- a/src/packages/toast/demo.taro.tsx +++ b/src/packages/toast/demo.taro.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { Toast } from '@nutui/nutui-react-taro' import { ScrollView, View } from '@tarojs/components' +import { Toast } from '@nutui/nutui-react-taro' import Header from '@/sites/components/header' import { useTranslate } from '@/sites/assets/locale/taro' import Demo1 from './demos/taro/demo1' @@ -32,20 +32,10 @@ const ToastDemo = () => { }, }) - function demoClass() { - if (web()) { - return 'web' - } - if (!harmonyAndRn()) { - return 'full' - } - return '' - } - return ( <>
- + {translated.basic} {translated.toastFunction} @@ -55,8 +45,13 @@ const ToastDemo = () => { {translated.toastCustomIcon} - {translated.toastWordBreak} - + {/* rn和 鸿蒙不支持 break-all */} + {harmonyAndRn() ? null : ( + <> + {translated.toastWordBreak} + + + )} ) diff --git a/src/packages/toast/demos/h5/demo1.tsx b/src/packages/toast/demos/h5/demo1.tsx index b94099ed09..37016161ea 100644 --- a/src/packages/toast/demos/h5/demo1.tsx +++ b/src/packages/toast/demos/h5/demo1.tsx @@ -13,7 +13,8 @@ const Demo1 = () => { title="成功提示" onClick={() => Toast.show({ - content: '成功提示', + title: '成功提示', + content: '成功提示成功提示成功提示', icon: 'success', }) } diff --git a/src/packages/toast/demos/h5/demo5.tsx b/src/packages/toast/demos/h5/demo5.tsx index b7ecd444ba..e2a3e99cdd 100644 --- a/src/packages/toast/demos/h5/demo5.tsx +++ b/src/packages/toast/demos/h5/demo5.tsx @@ -6,6 +6,7 @@ const Demo5 = () => { Toast.show({ content: `Let's try ABCDEFGHIJKLMN here.`, wordBreak: mode, + contentStyle: { width: '200px' }, }) } return ( diff --git a/src/packages/toast/demos/taro/demo1.tsx b/src/packages/toast/demos/taro/demo1.tsx index e1dfca5484..c26eb81bcc 100644 --- a/src/packages/toast/demos/taro/demo1.tsx +++ b/src/packages/toast/demos/taro/demo1.tsx @@ -41,14 +41,14 @@ const Demo1 = () => { }} /> { openToast('text', '网络失败，请稍后再试~') setShowToast(true) }} /> { openToast( 'text', @@ -61,30 +61,30 @@ const Demo1 = () => { }} /> { - openToast('success', '成功提示') + openToast('success', '成功提示成功提示成功提示') setShowToast(true) }} /> { openToast('fail', '失败提示') setShowToast(true) }} /> { openToast('warn', '警告提示') setShowToast(true) }} /> { - openToast('loading', '加载中') + openToast('loading', '加载提示') setShowToast(true) }} /> diff --git a/src/packages/toast/demos/taro/demo2.tsx b/src/packages/toast/demos/taro/demo2.tsx index dfb98d7658..580a801087 100644 --- a/src/packages/toast/demos/taro/demo2.tsx +++ b/src/packages/toast/demos/taro/demo2.tsx @@ -9,8 +9,8 @@ const Demo5 = () => { title="函数调用" onClick={() => { Toast.show('test', { - title: '函数调用', - content: '函数调用', + title: '函数调用函数调用', + content: '函数调用函数调用函数调用函数调用函数', type: 'fail', duration: 2, position: 'center', diff --git a/src/packages/toast/demos/taro/demo5.tsx b/src/packages/toast/demos/taro/demo5.tsx index af1f601b21..1725efe181 100644 --- a/src/packages/toast/demos/taro/demo5.tsx +++ b/src/packages/toast/demos/taro/demo5.tsx @@ -1,9 +1,10 @@ import React, { useState } from 'react' import { Cell, Toast, ToastWordBreak } from '@nutui/nutui-react-taro' +import pxTransform from '@/utils/px-transform' const Demo5 = () => { const [state, setState] = useState<{ - content: string + content?: string wordBreak: ToastWordBreak }>({ content: `Let's try ABCDEFGHIJKLMN here.`, @@ -19,10 +20,20 @@ const Demo5 = () => { onClose={() => { setShow(false) }} + contentStyle={{ width: pxTransform(200) }} wordBreak={state.wordBreak} /> - setShow(true)} /> + { + setState({ + content: `Let's try ABCDEFGHIJKLMN here.`, + wordBreak: 'break-all', + }) + setShow(true) + }} + /> { diff --git a/src/packages/toast/toast.harmony.css b/src/packages/toast/toast.harmony.css index 6e8b76caea..3358c5816d 100644 --- a/src/packages/toast/toast.harmony.css +++ b/src/packages/toast/toast.harmony.css @@ -6,42 +6,40 @@ -webkit-transform: rotate(360deg); } } - -.nut-toast-overlay-default { - background: rgba(0, 0, 0, 0); - z-index: 1300; -} - .nut-toast { - display: flex; - flex-direction: column; + /* #ifdef rn */ + position: absolute; + /* #endif */ + /* #ifndef rn */ position: fixed; - top: 0; + /* #endif */ left: 0; - height: 100%; - width: 100%; - align-items: center; + top: 0; + display: flex; + flex-direction: row; justify-content: center; + align-items: center; + width: 100%; + height: 100%; + pointer-events: none; z-index: 1300; } - - -.nut-toast-small .nut-toast-inner { - font-size: 12px; -} - -.nut-toast-large .nut-toast-inner { - font-size: 16px; +.nut-toast-overlay-default-taro { + /* #ifdef harmony */ + background-color: rgba(0, 0, 0, 0); + z-index: 1300; + /* #endif */ + /* #ifndef harmony */ + /* #endif */ } - .nut-toast-inner { + position: absolute; + top: 50%; + transform: translate(0, -50%); display: flex; flex-direction: column; justify-content: center; align-items: center; - position: absolute; - left: 50%; - top: 50%; min-width: 30%; max-width: 95.7%; font-size: 14px; @@ -51,79 +49,72 @@ background: rgba(0, 0, 0, 0.7); border-radius: 16px; color: #ffffff; - transform: translate(-50%, -50%); } - -.nut-toast-inner.normal { +.nut-toast-inner-normal { word-break: normal; word-wrap: normal; } - -.nut-toast-inner.break-word { +.nut-toast-inner-break-word { word-break: normal; word-wrap: break-word; } - +.nut-toast-inner-small { + font-size: 12px; +} +.nut-toast-inner-large { + font-size: 16px; +} .nut-toast-center { - top: 50%; + /* #ifdef rn */ + top: 38%; + /* #endif */ + /* #ifndef rn */ + top: 48%; + /* #endif */ } - .nut-toast-bottom { top: 80%; } - .nut-toast-top { top: 20%; } - .nut-toast-text { - display: flex; color: #ffffff; text-align: center; } - -.nut-toast-text:empty { +.nut-toast-text-empty { margin-bottom: -8px; } - .nut-toast-title { - display: flex; color: #ffffff; font-size: 16px; font-weight: 500; + text-align: center; } - -.nut-toast-title:empty { - margin-bottom: -8px; +.nut-toast-icon { + width: 24px; + height: 24px; + color: #ffffff; } - -.nut-toast-has-icon .nut-toast-icon-wrapper { +.nut-toast-icon-wrapper { width: 100%; display: flex; align-items: center; justify-content: center; margin-bottom: 8px; + color: #ffffff; } - -.nut-toast-has-icon .nut-toast-icon-wrapper .nut-icon { +.nut-toast-icon-wrapper-icon { width: 24px; height: 24px; } - -.nut-toast-loading .nut-toast-inner { - display: inline-flex; - flex-direction: column; - justify-content: center; - align-items: center; -} - -.nut-toast-loading .nut-toast-icon-wrapper { - animation: rotation 2s linear infinite; +.nut-toast-rtl { + left: auto; + right: 0; } - -.nut-toast-loading .nut-toast-icon-wrapper .nut-icon { - width: 24px; - height: 24px; +.nut-toast-rtl-inner { + left: auto; + right: 50%; } [dir=rtl] .nut-toast, @@ -131,12 +122,10 @@ left: auto; right: 0; } - [dir=rtl] .nut-toast-inner, .nut-rtl .nut-toast-inner { left: auto; right: 50%; - transform: translate(50%, -50%); } .toast-fade-enter-active { diff --git a/src/packages/toast/toast.scss b/src/packages/toast/toast.scss index a556f6da8e..78af89391c 100644 --- a/src/packages/toast/toast.scss +++ b/src/packages/toast/toast.scss @@ -9,12 +9,20 @@ } .nut-toast { + /* #ifdef rn */ + position: absolute; + /* #endif */ + /* #ifndef rn */ position: fixed; + /* #endif */ left: 0; top: 0; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; width: 100%; height: 100%; - text-align: center; pointer-events: none; z-index: 1300; @@ -23,24 +31,25 @@ --nutui-overlay-zIndex: 1300; } - &-small { - .nut-toast-inner { - font-size: $font-size-s; - } - } - - &-large { - .nut-toast-inner { - font-size: $font-size-l; - } + &-overlay-default-taro { + /* #ifdef harmony */ + background-color: rgba(0, 0, 0, 0); + z-index: 1300; + /* #endif */ + /* #ifndef harmony */ + --nutui-overlay-bg-color: rgba(0, 0, 0, 0); + --nutui-overlay-zIndex: 1300; + /* #endif */ } &-inner { - display: flex; - flex-direction: column; position: absolute; - left: 50%; top: $toast-inner-top; + transform: translate(-0, -50%); + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; min-width: 30%; max-width: 95.7%; font-size: $toast-text-font-size; @@ -50,21 +59,33 @@ background: $toast-inner-bg-color; border-radius: $toast-inner-border-radius; color: $toast-font-color; - transform: translate(-50%, -50%); - &.normal { + &-normal { word-break: normal; word-wrap: normal; } - &.break-word { + &-break-word { word-break: normal; word-wrap: break-word; } + + &-small { + font-size: $font-size-s; + } + + &-large { + font-size: $font-size-l; + } } &-center { - top: var(--nutui-toast-inner-top, 50%); + /* #ifdef rn */ + top: var(--nutui-toast-inner-top, 38%); + /* #endif */ + /* #ifndef rn */ + top: var(--nutui-toast-inner-top, 48%); + /* #endif */ } &-bottom { @@ -76,7 +97,9 @@ } &-text { - &:empty { + color: #ffffff; + text-align: $toast-inner-text-align; + &-empty { margin-bottom: -8px; } } @@ -85,42 +108,36 @@ color: #ffffff; font-size: $toast-title-font-size; font-weight: 500; - - &:empty { - margin-bottom: -8px; - } + text-align: $toast-inner-text-align; } - &-has-icon { - .nut-toast-icon-wrapper { - width: 100%; - display: flex; - align-items: center; - justify-content: center; - margin-bottom: 8px; - - .nut-icon { - width: 24px; - height: 24px; - } - } + &-icon { + width: 24px; + height: 24px; + color: #ffffff; } - &-loading { - .nut-toast-inner { - display: inline-flex; - flex-direction: column; - justify-content: center; - align-items: center; + &-icon-wrapper { + width: 100%; + display: flex; + align-items: center; + justify-content: center; + margin-bottom: 8px; + color: #ffffff; + + &-icon { + width: 24px; + height: 24px; } + } - .nut-toast-icon-wrapper { - animation: rotation 2s linear infinite; + &-rtl { + left: auto; + right: 0; - .nut-icon { - width: 24px; - height: 24px; - } + &-inner { + left: auto; + right: 50%; } } } @@ -133,7 +150,6 @@ &-inner { left: auto; right: 50%; - transform: translate(50%, -50%); } } diff --git a/src/packages/toast/toast.taro.tsx b/src/packages/toast/toast.taro.tsx index ec2bf3255d..2e3d059480 100644 --- a/src/packages/toast/toast.taro.tsx +++ b/src/packages/toast/toast.taro.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent, useEffect, useRef } from 'react' import classNames from 'classnames' -import { View } from '@tarojs/components' +import { Text, View } from '@tarojs/components' import { Failure, Loading, Success, Tips } from '@nutui/icons-react-taro' import Overlay from '@/packages/overlay/index.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' @@ -11,6 +11,8 @@ import { useParams, } from '@/utils/use-custom-event' import { usePropsValue } from '@/utils/use-props-value' +import { useRtl } from '@/packages/configprovider/index.taro' +import { harmony } from '@/utils/platform-taro' import { mergeProps } from '@/utils/merge-props' export type ToastPosition = 'top' | 'bottom' | 'center' @@ -19,19 +21,19 @@ export type ToastWordBreak = 'normal' | 'break-all' | 'break-word' export interface ToastProps extends BasicComponent { id?: string - maskClassName?: string - contentClassName?: string - contentStyle?: React.CSSProperties - icon: React.ReactNode - iconSize: string - content: React.ReactNode duration: number position?: ToastPosition - type: string title: string closeOnOverlayClick: boolean lockScroll: boolean size: ToastSize + icon: React.ReactNode + iconSize: string + maskClassName?: string + content: React.ReactNode + contentClassName?: string + contentStyle?: React.CSSProperties + type: string visible: boolean wordBreak?: ToastWordBreak onClose: () => void @@ -44,18 +46,18 @@ export interface ToastProps extends BasicComponent { const defaultProps = { ...ComponentDefaults, id: '', + duration: 2, // 时长,duration为0则一直展示 + position: 'center', + title: '', + size: 'base', // 设置字体大小，默认base,可选large\small\base icon: null, iconSize: '20', content: '', msg: '', - duration: 2, // 时长,duration为0则一直展示 - position: 'center', type: 'text', - title: '', closeOnOverlayClick: false, lockScroll: false, contentClassName: '', // 内容自定义样式名 - size: 'base', // 设置字体大小，默认base,可选large\small\base visible: false, wordBreak: 'break-all', onClose: () => {}, // 未实现 @@ -95,6 +97,7 @@ export const Toast: FunctionComponent< setParams, } = useParams(mergeProps(defaultProps, props)) const timer = useRef(-1) + const rtl = useRtl() const [innerVisible, setInnerVisible] = usePropsValue({ value: visible, @@ -104,7 +107,6 @@ export const Toast: FunctionComponent< !v && onClose?.() }, }) - useEffect(() => { if (innerVisible) { autoClose() @@ -124,7 +126,6 @@ export const Toast: FunctionComponent< } } ) - const clearTimer = () => { if (timer.current) { clearTimeout(timer.current) @@ -155,18 +156,18 @@ export const Toast: FunctionComponent< } const hasIcon = () => { - if (type !== 'text') { - return true - } - return !!icon + return type !== 'text' || !!icon } const iconName = () => { if (icon) { return icon } + return { - success: , + success: ( + + ), fail: , warn: , loading: , @@ -175,15 +176,20 @@ export const Toast: FunctionComponent< const classes = classNames({ 'nut-toast-has-icon': icon, - [`nut-toast-${size}`]: true, + 'nut-toast-rtl': rtl, }) + + const styles = harmony() + ? { left: '50%', transform: 'translate(-50%, -50%)' } + : null + return ( <> {innerVisible ? ( { @@ -192,16 +198,22 @@ export const Toast: FunctionComponent< > {hasIcon() ? ( -

{iconName()}

+ + {iconName()} + ) : null} {title ? ( - {title} + {title} ) : null} - {content || msg} + + {content || msg} + diff --git a/src/packages/toast/toast.tsx b/src/packages/toast/toast.tsx index 5e22741746..016a30ad42 100644 --- a/src/packages/toast/toast.tsx +++ b/src/packages/toast/toast.tsx @@ -37,11 +37,11 @@ let options: ToastProps = { title: '', size: 'base', // 设置字体大小，默认base,可选large\small\base icon: null, - onClose: () => {}, closeOnOverlayClick: false, // 是否点击遮罩可关闭 lockScroll: false, contentClassName: '', wordBreak: 'break-all', + onClose: () => {}, } function getInstance( diff --git a/src/styles/variables-jrkf.scss b/src/styles/variables-jrkf.scss index ff65090025..7730842f40 100644 --- a/src/styles/variables-jrkf.scss +++ b/src/styles/variables-jrkf.scss @@ -192,9 +192,9 @@ $font-family: // Font $font-size-xxs: $font-text-mini !default; $font-size-xs: $font-text-xs !default; -$font-size-small: $font-text-small !default; +$font-size-s: $font-text-small !default; $font-size-base: $font-text !default; -$font-size-large: $font-text-large !default; +$font-size-l: $font-text-large !default; $font-size-xl: $font-h2 !default; $font-size-xxl: var(--nutui-font-size-8) !default; $font-size-xxxl: var(--nutui-font-size-10) !default; @@ -280,7 +280,7 @@ $button-large-padding: var( ) !default; $button-large-font-size: var( --nutui-button-large-font-size, - $font-size-large + $font-size-l ) !default; $button-large-font-weight: var( --nutui-button-large-font-weight, @@ -312,7 +312,7 @@ $button-mini-padding: var( $button-mini-height: var(--nutui-button-mini-height, 24px) !default; $button-mini-font-size: var( --nutui-button-mini-font-size, - $font-size-small + $font-size-s ) !default; $button-mini-border-radius: var( --nutui-button-mini-border-radius, @@ -408,7 +408,7 @@ $cell-title-font-size: var( ) !default; $cell-description-font-size: var( --nutui-cell-description-font-size, - $font-size-small + $font-size-s ) !default; $cell-description-color: var( --nutui-cell-description-color, @@ -461,7 +461,7 @@ $cell-group-description-color: var( ) !default; $cell-group-description-font-size: var( --nutui-cell-group-description-font-size, - $font-size-small + $font-size-s ) !default; $cell-group-description-line-height: var( --nutui-cell-group-description-line-height, @@ -478,7 +478,7 @@ $cell-group-wrap-margin: var(--nutui-cell-group-wrap-margin, 10px 0) !default; $divider-margin: var(--nutui-divider-margin, 16px 0) !default; $divider-text-font-size: var( --nutui-divider-text-font-size, - $font-size-small + $font-size-s ) !default; $divider-border-color: var( --nutui-divider-border-color, @@ -802,7 +802,7 @@ $numberkeyboard-key-color: var( ) !default; $numberkeyboard-key-confirm-font-size: var( --nutui-numberkeyboard-key-confirm-font-size, - $font-size-large + $font-size-l ) !default; $numberkeyboard-key-confirm-color: var( --nutui-numberkeyboard-key-confirm-color, @@ -1011,7 +1011,7 @@ $calendar-disable-color: var( ) !default; $calendar-base-font-size: var( --nutui-calendar-base-font-size, - $font-size-large + $font-size-l ) !default; $calendar-title-font-size: var( --nutui-calendar-title-font-size, @@ -1233,7 +1233,7 @@ $steps-base-icon-margin-bottom: var( ) !default; $steps-base-icon-font-size: var( --nutui-steps-base-icon-font-size, - $font-size-small + $font-size-s ) !default; $steps-base-line-width: var(--nutui-steps-base-line-width, 70%) !default; $steps-base-line-height: var(--nutui-steps-base-line-height, 1px) !default; @@ -1255,7 +1255,7 @@ $steps-base-title-margin-bottom: var( ) !default; $steps-base-description-font-size: var( --nutui-steps-base-description-font-size, - $font-size-small + $font-size-s ) !default; $steps-base-description-color: var( --nutui-steps-base-description-color, @@ -1392,7 +1392,7 @@ $dialog-footer-ok-max-width: var( ) !default; $dialog-header-font-size: var( --nutui-dialog-header-font-size, - $font-size-large + $font-size-l ) !default; $dialog-header-font-weight: var( --nutui-dialog-header-font-weight, @@ -1424,7 +1424,7 @@ $checkbox-label-font-size: var( ) !default; $checkbox-icon-font-size: var( --nutui-checkbox-icon-font-size, - $font-size-large + $font-size-l ) !default; $checkbox-button-font-size: var( --nutui-checkbox-button-font-size, @@ -1463,10 +1463,7 @@ $checkbox-list-item-padding: var( ) !default; //radio（✅） -$radio-icon-font-size: var( - --nutui-radio-icon-font-size, - $font-size-large -) !default; +$radio-icon-font-size: var(--nutui-radio-icon-font-size, $font-size-l) !default; $radio-label-color: var(--nutui-radio-label-color, $color-text) !default; $radio-label-disable-color: var( --nutui-radio-label-disable-color, @@ -1551,10 +1548,7 @@ $noticebar-background: var( rgba(251, 248, 220, 1) ) !default; $noticebar-color: var(--nutui-noticebar-color, #d9500b) !default; -$noticebar-font-size: var( - --nutui-noticebar-font-size, - $font-size-small -) !default; +$noticebar-font-size: var(--nutui-noticebar-font-size, $font-size-s) !default; $noticebar-line-height: var(--nutui-noticebar-line-height, 24px) !default; $noticebar-box-padding: var( --nutui-noticebar-box-padding, @@ -1790,7 +1784,7 @@ $tabs-titles-item-active-font-weight: var( ) !default; $tabs-titles-item-active-font-size: var( --nutui-tabs-titles-item-active-font-size, - $font-size-large + $font-size-l ) !default; $tabs-titles-item-active-background-color: var( --nutui-tabs-titles-item-active-background-color, @@ -2151,7 +2145,7 @@ $grid-item-text-color: var( ) !default; $grid-item-text-font-size: var( --nutui-grid-item-text-font-size, - $font-size-small + $font-size-s ) !default; // table（✅） @@ -2242,7 +2236,7 @@ $sidenavbar-sub-list-color: var( $elevator-list-bg-color: var(--nutui-elevator-list-bg-color, $white) !default; $elevator-list-font-size: var( --nutui-elevator-list-font-size, - $font-size-small + $font-size-s ) !default; $elevator-list-color: var( --nutui-elevator-list-color, @@ -2409,7 +2403,7 @@ $circleprogress-text-color: var( ) !default; $circleprogress-text-size: var( --nutui-circleprogress-text-size, - $font-size-large + $font-size-l ) !default; // Ellipsis @@ -2464,9 +2458,9 @@ $space-gap: var(--nutui-space-gap, 8px) !default; // loading $loading-icon-color: var(--nutui-loading-icon-color, $color-text-help) !default; -$loading-icon-size: var(--nutui-loading-icon-size, $font-size-small) !default; +$loading-icon-size: var(--nutui-loading-icon-size, $font-size-s) !default; $loading-color: var(--nutui-loading-color, $color-text-help) !default; -$loading-font-size: var(--nutui-loading-font-size, $font-size-small) !default; +$loading-font-size: var(--nutui-loading-font-size, $font-size-s) !default; // ResultPage $resultpage-width: var(--nutui-resultpage-width, 247px) !default; $resultpage-icon-size: var(--nutui-resultpage-icon-size, 48px) !default;