From 2d5005edbc09c975b8f154bdf0a5ddac83b6e0eb Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Thu, 5 Dec 2024 16:59:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=BB=9A=E5=8A=A8=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/elevator/demos/taro/demo2.tsx | 2 +- src/packages/elevator/demos/taro/demo3.tsx | 1 + src/packages/elevator/demos/taro/demo4.tsx | 1 + src/packages/elevator/demos/taro/demo5.tsx | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/packages/elevator/demos/taro/demo2.tsx b/src/packages/elevator/demos/taro/demo2.tsx index bd25162c9e..aa297b9228 100644 --- a/src/packages/elevator/demos/taro/demo2.tsx +++ b/src/packages/elevator/demos/taro/demo2.tsx @@ -113,7 +113,7 @@ const Demo2 = () => { } return ( { } return ( { } return ( { } return ( onItemClick(key, item)} From 570700f9d1ada6e556105687013b3d6e5361123e Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Wed, 18 Dec 2024 10:45:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(countup):=20=E5=88=86=E9=9A=94=E7=AC=A6?= =?UTF-8?q?=E6=96=87=E5=AD=97=E9=A2=9C=E8=89=B2=E6=94=AF=E6=8C=81css?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/animatingnumbers/countup.scss | 2 +- src/packages/animatingnumbers/demos/h5/demo2.tsx | 1 + src/packages/animatingnumbers/demos/taro/demo2.tsx | 1 + src/packages/animatingnumbers/doc.en-US.md | 1 + src/packages/animatingnumbers/doc.md | 1 + src/packages/animatingnumbers/doc.taro.md | 1 + src/packages/animatingnumbers/doc.zh-TW.md | 1 + src/styles/variables.scss | 4 ++++ 8 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/packages/animatingnumbers/countup.scss b/src/packages/animatingnumbers/countup.scss index 12779786c9..a2d53654cc 100644 --- a/src/packages/animatingnumbers/countup.scss +++ b/src/packages/animatingnumbers/countup.scss @@ -24,7 +24,7 @@ display: flex; height: 80%; align-items: flex-end; - color: $countup-bg-color; + color: $countup-separator-color; font-size: $countup-base-size; font-weight: $font-weight-bold; } diff --git a/src/packages/animatingnumbers/demos/h5/demo2.tsx b/src/packages/animatingnumbers/demos/h5/demo2.tsx index 324a8812e7..fe7dcf1399 100644 --- a/src/packages/animatingnumbers/demos/h5/demo2.tsx +++ b/src/packages/animatingnumbers/demos/h5/demo2.tsx @@ -7,6 +7,7 @@ const Demo2 = () => { nutuiCountupBgColor: `var(--nutui-color-primary)`, nutuiCountupColor: `#fff`, nutuiCountupLrMargin: `1px`, + nutuiCountupSeparatorColor: `var(--nutui-color-primary)`, } const [value, setEndNumer] = useState('1570.99') useEffect(() => { diff --git a/src/packages/animatingnumbers/demos/taro/demo2.tsx b/src/packages/animatingnumbers/demos/taro/demo2.tsx index a16bb9d4a5..caa6b8ac4a 100644 --- a/src/packages/animatingnumbers/demos/taro/demo2.tsx +++ b/src/packages/animatingnumbers/demos/taro/demo2.tsx @@ -7,6 +7,7 @@ const Demo2 = () => { nutuiCountupBgColor: `var(--nutui-color-primary)`, nutuiCountupColor: `#fff`, nutuiCountupLrMargin: `1px`, + nutuiCountupSeparatorColor: `var(--nutui-color-primary)`, } const [value, setEndNumer] = useState('1570.99') useEffect(() => { diff --git a/src/packages/animatingnumbers/doc.en-US.md b/src/packages/animatingnumbers/doc.en-US.md index da9320582e..f9fea38408 100644 --- a/src/packages/animatingnumbers/doc.en-US.md +++ b/src/packages/animatingnumbers/doc.en-US.md @@ -53,3 +53,4 @@ The component provides the following CSS variables, which can be used to customi | \--nutui-countup-lr-margin | margin of item | `0` | | \--nutui-countup-bg-color | background color of item | `inherit` | | \--nutui-countup-color | color of item | `$color-title` | +| \--nutui-countup-separator-color | The font color of the separator | `$color-title` | diff --git a/src/packages/animatingnumbers/doc.md b/src/packages/animatingnumbers/doc.md index f65ebf7ddc..78c824a6dc 100644 --- a/src/packages/animatingnumbers/doc.md +++ b/src/packages/animatingnumbers/doc.md @@ -53,3 +53,4 @@ import { AnimatingNumbers } from '@nutui/nutui-react' | \--nutui-countup-lr-margin | 每个数字的margin | `0` | | \--nutui-countup-bg-color | 每个数字块的背景色 | `inherit` | | \--nutui-countup-color | 每个数字块的字色 | `$color-title` | +| \--nutui-countup-separator-color | 分隔符的字体颜色 | `$color-title` | diff --git a/src/packages/animatingnumbers/doc.taro.md b/src/packages/animatingnumbers/doc.taro.md index cb821e0abd..13582470ea 100644 --- a/src/packages/animatingnumbers/doc.taro.md +++ b/src/packages/animatingnumbers/doc.taro.md @@ -53,3 +53,4 @@ import { AnimatingNumbers } from '@nutui/nutui-react-taro' | \--nutui-countup-lr-margin | 每个数字的margin | `0` | | \--nutui-countup-bg-color | 每个数字块的背景色 | `inherit` | | \--nutui-countup-color | 每个数字块的字色 | `$color-title` | +| \--nutui-countup-separator-color | 分隔符的字体颜色 | `$color-title` | diff --git a/src/packages/animatingnumbers/doc.zh-TW.md b/src/packages/animatingnumbers/doc.zh-TW.md index 8c50042e5f..7c7a85f486 100644 --- a/src/packages/animatingnumbers/doc.zh-TW.md +++ b/src/packages/animatingnumbers/doc.zh-TW.md @@ -53,3 +53,4 @@ import { AnimatingNumbers } from '@nutui/nutui-react' | \--nutui-countup-lr-margin | 每個數字的margin | `0` | | \--nutui-countup-bg-color | 每個數字塊的背景色 | `inherit` | | \--nutui-countup-color | 每個數字塊的字色 | `$color-title` | +| \--nutui-countup-separator-color | 分隔符的字體顏色 | `$color-title` | diff --git a/src/styles/variables.scss b/src/styles/variables.scss index ee8dc9720c..e995510c55 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -2423,6 +2423,10 @@ $countup-border-radius: var(--nutui-countup-border-radius, 4px) !default; $countup-lr-margin: var(--nutui-countup-lr-margin, 0) !default; $countup-bg-color: var(--nutui-countup-bg-color, inherit) !default; $countup-color: var(--nutui-countup-color, $color-title) !default; +$countup-separator-color: var( + --nutui-countup-separator-color, + $color-title +) !default; // layout（✅） $row-content-color: var(--nutui-row-content-color, #fff) !default;