From 3933a24ed50f5d1a192dd427e73cd5023122c8d2 Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Tue, 5 Nov 2024 19:05:07 +0800 Subject: [PATCH 01/12] =?UTF-8?q?fix(countdown):=20=E9=80=82=E9=85=8Dv14?= =?UTF-8?q?=20&&=20type=E5=A2=9E=E5=8A=A0text=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/countdown/countdown.harmony.css | 44 +++++++++++++------- src/packages/countdown/countdown.scss | 8 +++- src/packages/countdown/countdown.taro.tsx | 32 ++++---------- src/packages/countdown/countdown.tsx | 32 ++++---------- src/packages/countdown/demos/h5/demo1.tsx | 9 +++- src/packages/countdown/demos/h5/demo3.tsx | 22 +++++++--- src/packages/countdown/demos/h5/demo4.tsx | 2 +- src/packages/countdown/demos/taro/demo1.tsx | 9 +++- src/packages/countdown/demos/taro/demo3.tsx | 19 +++++++-- src/packages/countdown/demos/taro/demo4.tsx | 2 +- src/packages/countdown/doc.en-US.md | 11 ++--- src/packages/countdown/doc.md | 12 +++--- src/packages/countdown/doc.taro.md | 11 ++--- src/packages/countdown/doc.zh-TW.md | 27 ++++++------ src/packages/countdown/index.taro.ts | 2 +- src/packages/countdown/index.ts | 2 +- src/packages/countdown/types.ts | 21 ++++++++++ src/styles/variables.scss | 22 +++++----- 18 files changed, 169 insertions(+), 118 deletions(-) create mode 100644 src/packages/countdown/types.ts diff --git a/src/packages/countdown/countdown.harmony.css b/src/packages/countdown/countdown.harmony.css index 57b77bbe79..8236a6f81b 100644 --- a/src/packages/countdown/countdown.harmony.css +++ b/src/packages/countdown/countdown.harmony.css @@ -3,55 +3,69 @@ flex-direction: row; align-items: center; color: #ff0f23; - font-size: 10px; + font-size: 11px; } .nut-countdown-number-primary { display: flex; align-items: center; justify-content: center; - height: 14px; + height: 16px; font-weight: 400; - font-size: 10px; + font-size: 11px; } .nut-countdown-number { display: flex; align-items: center; justify-content: center; - height: 14px; + height: 16px; font-weight: 400; - font-size: 10px; + font-size: 11px; +} +.nut-countdown-number-text { + display: flex; + align-items: center; + justify-content: center; + height: 16px; + font-weight: 400; + font-size: 11px; } .nut-countdown-unit { display: flex; align-items: center; justify-content: center; - height: 14px; + height: 16px; font-weight: 400; - font-size: 10px; + font-size: 11px; } .nut-countdown-number { - min-width: 20px; - padding: 0 1px; + min-width: 16px; + padding: 0 0; border-radius: 2px; - margin: 0 2px; + margin: 0 1px; + text-align: center; } .nut-countdown-number-primary { - min-width: 20px; - padding: 0 1px; + min-width: 16px; + padding: 0 0; border-radius: 2px; - margin: 0 2px; + margin: 0 1px; + text-align: center; } .nut-countdown-number { border: 1px solid #ffebf1; - background-color: transparent; + background-color: #ffffff; color: #ff0f23; - text-align: center; } .nut-countdown-number-primary { border: 1px solid #ff0f23; background-color: #ff0f23; color: #ffffff; } +.nut-countdown-number-text { + border: 0; + background-color: transparent; + color: #ff0f23; +} .nut-countdown-unit { color: #ff0f23; } \ No newline at end of file diff --git a/src/packages/countdown/countdown.scss b/src/packages/countdown/countdown.scss index 8591c93949..21cb24977e 100644 --- a/src/packages/countdown/countdown.scss +++ b/src/packages/countdown/countdown.scss @@ -6,6 +6,7 @@ font-size: $countdown-font-size; &-number-primary, &-number, + &-number-text, &-unit { display: flex; align-items: center; @@ -20,18 +21,23 @@ padding: $countdown-number-padding; border-radius: $countdown-number-border-radius; margin: $countdown-number-margin; + text-align: center; } &-number { border: 1px solid $countdown-number-border-color; background-color: $countdown-number-background-color; color: $countdown-number-color; - text-align: center; } &-number-primary { border: 1px solid $countdown-number-primary-border-color; background-color: $countdown-number-primary-background-color; color: $countdown-number-primary-color; } + &-number-text { + border: 0; + background-color: transparent; + color: $countdown-number-color; + } &-unit { color: $color-primary; } diff --git a/src/packages/countdown/countdown.taro.tsx b/src/packages/countdown/countdown.taro.tsx index f1f178d6c5..5c443d987c 100644 --- a/src/packages/countdown/countdown.taro.tsx +++ b/src/packages/countdown/countdown.taro.tsx @@ -2,40 +2,22 @@ import React, { useState, useRef, useEffect, - ReactNode, ForwardRefRenderFunction, useImperativeHandle, } from 'react' +import classNames from 'classnames' import { View } from '@tarojs/components' -import { BasicComponent, ComponentDefaults } from '@/utils/typings' +import { ComponentDefaults } from '@/utils/typings' import { padZero } from '@/utils/pad-zero' import { web } from '@/utils/platform-taro' -export interface CountDownTimeProps { +interface CountDownTimeProps { d: number h: number m: number s: number ms: number } -export type CountDownType = 'default' | 'primary' -export interface CountDownProps extends BasicComponent { - type: CountDownType - paused: boolean - startTime: number - endTime: number - remainingTime: number - millisecond: boolean - format: string - autoStart: boolean - time: number - destroy: boolean - onEnd: () => void - onPaused: (restTime: number) => void - onRestart: (restTime: number) => void - onUpdate: (restTime: any) => void - children: ReactNode -} const defaultProps = { ...ComponentDefaults, @@ -198,7 +180,7 @@ const InternalCountDown: ForwardRefRenderFunction< } else if (formatCache.includes('SS')) { formatCache = formatCache.replace('SS', msC.slice(0, 2)) } else if (formatCache.includes('S')) { - formatCache = formatCache.replace('SS', msC.slice(0, 1)) + formatCache = formatCache.replace('S', msC.slice(0, 1)) } } @@ -301,7 +283,11 @@ const InternalCountDown: ForwardRefRenderFunction< {format.includes(formatUnit) ? ( <> {padZero(time)} diff --git a/src/packages/countdown/countdown.tsx b/src/packages/countdown/countdown.tsx index e9bb2da527..2efd624b61 100644 --- a/src/packages/countdown/countdown.tsx +++ b/src/packages/countdown/countdown.tsx @@ -2,32 +2,12 @@ import React, { useState, useRef, useEffect, - ReactNode, ForwardRefRenderFunction, useImperativeHandle, } from 'react' -import { BasicComponent, ComponentDefaults } from '@/utils/typings' +import { ComponentDefaults } from '@/utils/typings' import { padZero } from '@/utils/pad-zero' - -export type CountDownType = 'default' | 'primary' - -export interface CountDownProps extends BasicComponent { - type: CountDownType - paused: boolean - startTime: number - endTime: number - remainingTime: number - millisecond: boolean - format: string - autoStart: boolean - time: number - destroy: boolean - onEnd: () => void - onPaused: (restTime: number) => void - onRestart: (restTime: number) => void - onUpdate: (restTime: any) => void - children: ReactNode -} +import { CountDownProps } from './types' const defaultProps = { ...ComponentDefaults, @@ -194,14 +174,18 @@ const InternalCountDown: ForwardRefRenderFunction< } else if (formatCache.includes('SS')) { formatCache = formatCache.replace('SS', msC.slice(0, 2)) } else if (formatCache.includes('S')) { - formatCache = formatCache.replace('SS', msC.slice(0, 1)) + formatCache = formatCache.replace('S', msC.slice(0, 1)) } } + const isTextDom = + type === 'text' + ? `$1` + : `$1` formatCache = formatCache.replace( /(\d+)/g, type === 'primary' ? `$1` - : `$1` + : isTextDom ) return formatCache diff --git a/src/packages/countdown/demos/h5/demo1.tsx b/src/packages/countdown/demos/h5/demo1.tsx index 2b216cb815..7119a3f3cd 100644 --- a/src/packages/countdown/demos/h5/demo1.tsx +++ b/src/packages/countdown/demos/h5/demo1.tsx @@ -10,13 +10,20 @@ const Demo1 = () => { } return ( <> + + + diff --git a/src/packages/countdown/demos/h5/demo3.tsx b/src/packages/countdown/demos/h5/demo3.tsx index 4932c253f7..6fdedc8d60 100644 --- a/src/packages/countdown/demos/h5/demo3.tsx +++ b/src/packages/countdown/demos/h5/demo3.tsx @@ -4,14 +4,24 @@ import { Cell, CountDown } from '@nutui/nutui-react' const Demo3 = () => { const stateRef = useRef({ endTime: Date.now() + 60 * 1000, + endDay: Date.now() + 60 * 1000 * 60 * 25, }) return ( - - - + <> + + + + + + + + + + ) } export default Demo3 diff --git a/src/packages/countdown/demos/h5/demo4.tsx b/src/packages/countdown/demos/h5/demo4.tsx index a3f380de89..d83420ca0c 100644 --- a/src/packages/countdown/demos/h5/demo4.tsx +++ b/src/packages/countdown/demos/h5/demo4.tsx @@ -10,7 +10,7 @@ const Demo4 = () => { ) diff --git a/src/packages/countdown/demos/taro/demo1.tsx b/src/packages/countdown/demos/taro/demo1.tsx index 8d1e389c29..a5bf4b6083 100644 --- a/src/packages/countdown/demos/taro/demo1.tsx +++ b/src/packages/countdown/demos/taro/demo1.tsx @@ -10,13 +10,20 @@ const Demo1 = () => { } return ( <> + + + diff --git a/src/packages/countdown/demos/taro/demo3.tsx b/src/packages/countdown/demos/taro/demo3.tsx index 381268fbfd..dff590bb02 100644 --- a/src/packages/countdown/demos/taro/demo3.tsx +++ b/src/packages/countdown/demos/taro/demo3.tsx @@ -4,11 +4,24 @@ import { Cell, CountDown } from '@nutui/nutui-react-taro' const Demo3 = () => { const stateRef = useRef({ endTime: Date.now() + 60 * 1000, + endDay: Date.now() + 60 * 1000 * 60 * 25, }) return ( - - - + <> + + + + + + + + + + ) } export default Demo3 diff --git a/src/packages/countdown/demos/taro/demo4.tsx b/src/packages/countdown/demos/taro/demo4.tsx index a80f32f01a..239f29c4bb 100644 --- a/src/packages/countdown/demos/taro/demo4.tsx +++ b/src/packages/countdown/demos/taro/demo4.tsx @@ -10,7 +10,7 @@ const Demo4 = () => { ) diff --git a/src/packages/countdown/doc.en-US.md b/src/packages/countdown/doc.en-US.md index a3b8740a79..f91cb595f6 100644 --- a/src/packages/countdown/doc.en-US.md +++ b/src/packages/countdown/doc.en-US.md @@ -90,6 +90,7 @@ Paused and restarted the countdown with the paused attribute | Property | Description | Type | Default | | --- | --- | --- | --- | +| type | Display Type | `default`\|`primary`\|`text` | `default` | | startTime | Start Time | `number` | `Date.now()` | | endTime | End Time | `number` | `Date.now()` | | remainingTime | Remaining time, unit milliseconds | `number` | `0` | @@ -133,12 +134,12 @@ The component provides the following CSS variables, which can be used to customi | --- | --- | --- | | \--nutui-countdown-display | display mode of countdown | `flex` | | \--nutui-countdown-color | Countdown text color | `$color-primary` | -| \--nutui-countdown-font-size | The font size of the countdown | `10px` | +| \--nutui-countdown-font-size | The font size of the countdown | `11px` | | \--nutui-countdown-font-weight | Countdown font weight | `400` | -| \--nutui-countdown-width | Time area width of the countdown | `20px` | -| \--nutui-countdown-height | Time area height of the countdown | `14px` | -| \--nutui-countdown-number-padding | Countdown time area padding | `0 1px` | -| \--nutui-countdown-number-margin | Countdown time area margin | `0 2px` | +| \--nutui-countdown-width | Time area width of the countdown | `6px` | +| \--nutui-countdown-height | Time area height of the countdown | `16px` | +| \--nutui-countdown-number-padding | Countdown time area padding | `0 0` | +| \--nutui-countdown-number-margin | Countdown time area margin | `0 1px` | | \--countdown-number-border-radius | Countdown time area border radius | `2px` | | \--nutui-countdown-color | Countdown time area text color | `$color-primary-light-pressed` | | \--nutui-countdown-background-color | Countdown time area background color | `$color-primary` | diff --git a/src/packages/countdown/doc.md b/src/packages/countdown/doc.md index d9a1424e7c..bba4c206f6 100644 --- a/src/packages/countdown/doc.md +++ b/src/packages/countdown/doc.md @@ -90,7 +90,7 @@ import { CountDown } from '@nutui/nutui-react' | 属性 | 说明 | 类型 | 默认值 | | --- | --- | --- | --- | -| type | 展示类型 | `default`\|`primary` | `default` | +| type | 展示类型 | `default`\|`primary`\|`text` | `default` | | startTime | 开始时间 | `number` | `Date.now()` | | endTime | 结束时间 | `number` | `Date.now()` | | remainingTime | 剩余时间，单位是毫秒 | `number` | `0` | @@ -135,12 +135,12 @@ import { CountDown } from '@nutui/nutui-react' | --- | --- | --- | | \--nutui-countdown-display | 倒计时的布局方式 | `flex` | | \--nutui-countdown-color | 倒计时的文字颜色 | `$color-primary` | -| \--nutui-countdown-font-size | 倒计时的字体大小 | `10px` | +| \--nutui-countdown-font-size | 倒计时的字体大小 | `11px` | | \--nutui-countdown-font-weight | 倒计时的字体粗细 | `400` | -| \--nutui-countdown-width | 倒计时的时间区域宽度 | `20px` | -| \--nutui-countdown-height | 倒计时的时间区域高度 | `14px` | -| \--nutui-countdown-number-padding | 倒计时的时间区域padding | `0 1px` | -| \--nutui-countdown-number-margin | 倒计时的时间区域margin | `0 2px` | +| \--nutui-countdown-width | 倒计时的时间区域宽度 | `16px` | +| \--nutui-countdown-height | 倒计时的时间区域高度 | `16px` | +| \--nutui-countdown-number-padding | 倒计时的时间区域padding | `0 0` | +| \--nutui-countdown-number-margin | 倒计时的时间区域margin | `0 1px` | | \--countdown-number-border-radius | 倒计时的时间区域圆角大小 | `2px` | | \--nutui-countdown-color | 倒计时的时间区域的文字颜色 | `$color-primary-light-pressed` | | \--nutui-countdown-background-color | 倒计时的时间区域的背景颜色 | `$color-primary` | diff --git a/src/packages/countdown/doc.taro.md b/src/packages/countdown/doc.taro.md index 4941c4712a..92f15f54d2 100644 --- a/src/packages/countdown/doc.taro.md +++ b/src/packages/countdown/doc.taro.md @@ -90,6 +90,7 @@ import { CountDown } from '@nutui/nutui-react-taro' | 属性 | 说明 | 类型 | 默认值 | | --- | --- | --- | --- | +| type | 展示类型 | `default`\|`primary`\|`text` | `default` | | startTime | 开始时间 | `number` | `Date.now()` | | endTime | 结束时间 | `number` | `Date.now()` | | remainingTime | 剩余时间，单位是毫秒 | `number` | `0` | @@ -134,12 +135,12 @@ import { CountDown } from '@nutui/nutui-react-taro' | --- | --- | --- | | \--nutui-countdown-display | 倒计时的布局方式 | `flex` | | \--nutui-countdown-color | 倒计时的文字颜色 | `$color-primary` | -| \--nutui-countdown-font-size | 倒计时的字体大小 | `10px` | +| \--nutui-countdown-font-size | 倒计时的字体大小 | `11px` | | \--nutui-countdown-font-weight | 倒计时的字体粗细 | `400` | -| \--nutui-countdown-width | 倒计时的时间区域宽度 | `20px` | -| \--nutui-countdown-height | 倒计时的时间区域高度 | `14px` | -| \--nutui-countdown-number-padding | 倒计时的时间区域padding | `0 1px` | -| \--nutui-countdown-number-margin | 倒计时的时间区域margin | `0 2px` | +| \--nutui-countdown-width | 倒计时的时间区域宽度 | `16px` | +| \--nutui-countdown-height | 倒计时的时间区域高度 | `16px` | +| \--nutui-countdown-number-padding | 倒计时的时间区域padding | `0 0` | +| \--nutui-countdown-number-margin | 倒计时的时间区域margin | `0 1px` | | \--countdown-number-border-radius | 倒计时的时间区域圆角大小 | `2px` | | \--nutui-countdown-color | 倒计时的时间区域的文字颜色 | `$color-primary-light-pressed` | | \--nutui-countdown-background-color | 倒计时的时间区域的背景颜色 | `$color-primary` | diff --git a/src/packages/countdown/doc.zh-TW.md b/src/packages/countdown/doc.zh-TW.md index 4946d28a36..70ea9cd0fc 100644 --- a/src/packages/countdown/doc.zh-TW.md +++ b/src/packages/countdown/doc.zh-TW.md @@ -90,6 +90,7 @@ import { CountDown } from '@nutui/nutui-react' | 屬性 | 說明 | 類型 | 默認值 | | --- | --- | --- | --- | +| type | 展示類型 | `default`\|`primary`\|`text` | `default` | | startTime | 開始時間 | `number` | `Date.now()` | | endTime | 結束時間 | `number` | `Date.now()` | | remainingTime | 剩余時間，單位是毫秒 | `number` | `0` | @@ -132,18 +133,18 @@ import { CountDown } from '@nutui/nutui-react' | 名稱 | 說明 | 默認值 | | --- | --- | --- | -| \--nutui-countdown-display | 倒計時的布局方式 | `flex` | -| \--nutui-countdown-color | 倒計時的文字顔色 | `$color-primary` | -| \--nutui-countdown-font-size | 倒計時的字體大小 | `10px` | +| \--nutui-countdown-display | 倒計時的佈局方式 | `flex` | +| \--nutui-countdown-color | 倒計時的文字顏色 | `$color-primary` | +| \--nutui-countdown-font-size | 倒計時的字體大小 | `11px` | | \--nutui-countdown-font-weight | 倒計時的字體粗細 | `400` | -| \--nutui-countdown-width | 倒計時的時間區域寬度 | `20px` | -| \--nutui-countdown-height | 倒計時的時間區域高度 | `14px` | -| \--nutui-countdown-number-padding | 倒計時的時間區域padding | `0 1px` | -| \--nutui-countdown-number-margin | 倒計時的時間區域margin | `0 2px` | +| \--nutui-countdown-width | 倒計時的時間區域寬度 | `16px` | +| \--nutui-countdown-height | 倒計時的時間區域高度 | `16px` | +| \--nutui-countdown-number-padding | 倒計時的時間區域padding | `0 0` | +| \--nutui-countdown-number-margin | 倒計時的時間區域margin | `0 1px` | | \--countdown-number-border-radius | 倒計時的時間區域圓角大小 | `2px` | -| \--nutui-countdown-color | 倒計時的時間區域的文字顔色 | `$color-primary-light-pressed` | -| \--nutui-countdown-background-color | 倒計時的時間區域的背景顔色 | `$color-primary` | -| \--nutui-countdown-border-color | 倒計時的時間區域的邊框顔色顔色 | `$color-primary` | -| \--nutui-countdown-primary-color | type爲`primary`時，倒計時的時間區域的文字顔色 | `#FFFFFF` | -| \--nutui-countdown-primary-background-color | type爲`primary`時，倒計時的時間區域的背景顔色 | `$color-primary` | -| \--nutui-countdown-primary-border-color | type爲`primary`時，倒計時的時間區域的邊框顔色顔色 | `$color-primary` | +| \--nutui-countdown-color | 倒計時的時間區域的文字顏色 | `$color-primary-light-pressed` | +| \--nutui-countdown-background-color | 倒計時的時間區域的背景顏色 | `$color-primary` | +| \--nutui-countdown-border-color | 倒計時的時間區域的邊框顏色顏色 | `$color-primary` | +| \--nutui-countdown-primary-color | type爲`primary`時，倒計時的時間區域的文字顏色 | `#FFFFFF` | +| \--nutui-countdown-primary-background-color | type爲`primary`時，倒計時的時間區域的背景顏色 | `$color-primary` | +| \--nutui-countdown-primary-border-color | type爲`primary`時，倒計時的時間區域的邊框顏色顏色 | `$color-primary` | diff --git a/src/packages/countdown/index.taro.ts b/src/packages/countdown/index.taro.ts index 7613153601..0c0e63576f 100644 --- a/src/packages/countdown/index.taro.ts +++ b/src/packages/countdown/index.taro.ts @@ -1,4 +1,4 @@ import { CountDown } from './countdown.taro' -export type { CountDownProps } from './countdown.taro' +export type { CountDownProps, CountDownType } from './types' export default CountDown diff --git a/src/packages/countdown/index.ts b/src/packages/countdown/index.ts index 5879e8eea8..d9a4cc13bc 100644 --- a/src/packages/countdown/index.ts +++ b/src/packages/countdown/index.ts @@ -1,4 +1,4 @@ import { CountDown } from './countdown' -export type { CountDownProps } from './countdown' +export type { CountDownProps, CountDownType } from './types' export default CountDown diff --git a/src/packages/countdown/types.ts b/src/packages/countdown/types.ts new file mode 100644 index 0000000000..d033ca9c8b --- /dev/null +++ b/src/packages/countdown/types.ts @@ -0,0 +1,21 @@ +import { BasicComponent } from '@/utils/typings' + +export type CountDownType = 'default' | 'primary' | 'text' + +export interface CountDownProps extends BasicComponent { + type: CountDownType + paused: boolean + startTime: number + endTime: number + remainingTime: number + millisecond: boolean + format: string + autoStart: boolean + time: number + destroy: boolean + onEnd: () => void + onPaused: (restTime: number) => void + onRestart: (restTime: number) => void + onUpdate: (restTime: any) => void + children: React.ReactNode +} diff --git a/src/styles/variables.scss b/src/styles/variables.scss index cf74f9beac..1ad474e788 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -775,19 +775,19 @@ $numberkeyboard-key-confirm-background-color: var( // countdown（✅） $countdown-display: var(--nutui-countdown-display, flex) !default; $countdown-color: var(--nutui-countdown-color, $color-primary) !default; -$countdown-font-size: var(--nutui-countdown-font-size, 10px) !default; -$coutdown-font-weight: var(--nutui-countdown-font-weight, 400) !default; -$countdown-height: var(--nutui-countdown-height, 14px) !default; -$countdown-width: var(--nutui-countdown-width, 20px) !default; -$countdown-number-padding: var( - --nutui-countdown-number-padding, - 0 1px +$countdown-font-size: var(--nutui-countdown-font-size, $font-size-xs) !default; +$coutdown-font-weight: var( + --nutui-countdown-font-weight, + $font-weight ) !default; +$countdown-height: var(--nutui-countdown-height, 16px) !default; +$countdown-width: var(--nutui-countdown-width, 16px) !default; +$countdown-number-padding: var(--nutui-countdown-number-padding, 0 0) !default; $countdown-number-border-radius: var( --nutui-countdown-number-border-radius, - 2px + $radius-xxs ) !default; -$countdown-number-margin: var(--nutui-countdown-number-margin, 0 2px) !default; +$countdown-number-margin: var(--nutui-countdown-number-margin, 0 1px) !default; $countdown-number-border-color: var( --nutui-countdown-number-border-color, $color-primary-light-pressed @@ -798,7 +798,7 @@ $countdown-number-color: var( ) !default; $countdown-number-background-color: var( --nutui-countdown-number-background-color, - transparent + $color-background-overlay ) !default; $countdown-number-primary-border-color: var( --nutui-countdown-number-primary-border-color, @@ -806,7 +806,7 @@ $countdown-number-primary-border-color: var( ) !default; $countdown-number-primary-color: var( --nutui-countdown-number-primary-color, - #ffffff + $color-primary-text ) !default; $countdown-number-primary-background-color: var( --nutui-countdown-number-primary-background-color, From eaa1c1af1b6d964f6f7fa3e74426623b7ec0ea27 Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Tue, 5 Nov 2024 19:28:42 +0800 Subject: [PATCH 02/12] =?UTF-8?q?fix(countdown):=20=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=A1=A50?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/countdown/countdown.taro.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/packages/countdown/countdown.taro.tsx b/src/packages/countdown/countdown.taro.tsx index 5c443d987c..cd135bd8f9 100644 --- a/src/packages/countdown/countdown.taro.tsx +++ b/src/packages/countdown/countdown.taro.tsx @@ -10,6 +10,7 @@ import { View } from '@tarojs/components' import { ComponentDefaults } from '@/utils/typings' import { padZero } from '@/utils/pad-zero' import { web } from '@/utils/platform-taro' +import { CountDownProps } from './types' interface CountDownTimeProps { d: number @@ -289,7 +290,7 @@ const InternalCountDown: ForwardRefRenderFunction< [`${classPrefix}-number-text`]: type === 'text', })} > - {padZero(time)} + {unit ? padZero(time) : time} {unit ? ( {getUnit(unit)} @@ -321,7 +322,7 @@ const InternalCountDown: ForwardRefRenderFunction< 'S', padZero(ms, 3) .toString() - .slice(0, digit || 2) + .slice(0, digit || 1) )} ) From 2ad183a6990e63e2d28183f83c1b71cdbb79e5af Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Wed, 6 Nov 2024 14:22:44 +0800 Subject: [PATCH 03/12] fix(countdown): add test --- .../__snapshots__/countdown.spec.tsx.snap | 48 +++++++++++++++++++ .../countdown/__test__/countdown.spec.tsx | 11 +++++ 2 files changed, 59 insertions(+) create mode 100644 src/packages/countdown/__test__/__snapshots__/countdown.spec.tsx.snap diff --git a/src/packages/countdown/__test__/__snapshots__/countdown.spec.tsx.snap b/src/packages/countdown/__test__/__snapshots__/countdown.spec.tsx.snap new file mode 100644 index 0000000000..10397f7fd5 --- /dev/null +++ b/src/packages/countdown/__test__/__snapshots__/countdown.spec.tsx.snap @@ -0,0 +1,48 @@ +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html + +exports[`Countdown > type props text primary 1`] = ` +
+
+ + 00 + + : + + 00 + + : + + 00 + +
+
+ + 00 + + : + + 00 + + : + + 00 + +
+
+`; diff --git a/src/packages/countdown/__test__/countdown.spec.tsx b/src/packages/countdown/__test__/countdown.spec.tsx index fc08fa1c45..8d51851ced 100644 --- a/src/packages/countdown/__test__/countdown.spec.tsx +++ b/src/packages/countdown/__test__/countdown.spec.tsx @@ -43,6 +43,17 @@ describe('Countdown', () => { }) }) + test('type props text primary', async () => { + const { container } = render( + <> + + + + ) + + expect(container).toMatchSnapshot() + }) + test('paused props', async () => { const testClick = vi.fn() let paused = false From e880ace56c1c4d87bf6a3c804198deb11b67bde6 Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Wed, 6 Nov 2024 15:23:36 +0800 Subject: [PATCH 04/12] fix: cr update --- src/packages/countdown/countdown.scss | 2 +- src/packages/countdown/doc.en-US.md | 24 ++++++++++++------------ src/packages/countdown/doc.md | 10 +++++----- src/packages/countdown/doc.taro.md | 10 +++++----- src/packages/countdown/doc.zh-TW.md | 10 +++++----- src/packages/countdown/types.ts | 2 +- src/styles/variables.scss | 14 +++++++------- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/packages/countdown/countdown.scss b/src/packages/countdown/countdown.scss index 21cb24977e..1c2a5ec431 100644 --- a/src/packages/countdown/countdown.scss +++ b/src/packages/countdown/countdown.scss @@ -39,6 +39,6 @@ color: $countdown-number-color; } &-unit { - color: $color-primary; + color: $countdown-color; } } diff --git a/src/packages/countdown/doc.en-US.md b/src/packages/countdown/doc.en-US.md index f91cb595f6..433119dc17 100644 --- a/src/packages/countdown/doc.en-US.md +++ b/src/packages/countdown/doc.en-US.md @@ -132,18 +132,18 @@ The component provides the following CSS variables, which can be used to customi | Name | Description | Default | | --- | --- | --- | -| \--nutui-countdown-display | display mode of countdown | `flex` | +| \--nutui-countdown-display | Layout of countdown | `flex` | | \--nutui-countdown-color | Countdown text color | `$color-primary` | -| \--nutui-countdown-font-size | The font size of the countdown | `11px` | -| \--nutui-countdown-font-weight | Countdown font weight | `400` | -| \--nutui-countdown-width | Time area width of the countdown | `6px` | -| \--nutui-countdown-height | Time area height of the countdown | `16px` | +| \--nutui-countdown-font-size | Countdown font size | `11px` | +| \--nutui-countdown-font-weight | Countdown font thickness | `400` | +| \--nutui-countdown-width | Countdown time area width | `16px` | +| \--nutui-countdown-height | Countdown time area height | `16px` | | \--nutui-countdown-number-padding | Countdown time area padding | `0 0` | | \--nutui-countdown-number-margin | Countdown time area margin | `0 1px` | -| \--countdown-number-border-radius | Countdown time area border radius | `2px` | -| \--nutui-countdown-color | Countdown time area text color | `$color-primary-light-pressed` | -| \--nutui-countdown-background-color | Countdown time area background color | `$color-primary` | -| \--nutui-countdown-border-color | Countdown time area border color color | `$color-primary` | -| \--nutui-countdown-primary-color | When type is primary, the text color of the countdown time area | `#FFFFFF` | -| \--nutui-countdown-primary-background-color | When type is primary, the background color of the countdown time area | `$color-primary` | -| \--nutui-countdown-primary-border-color | When type is primary, the border color of the countdown time area is the color | `$color-primary` | +| \--nutui-countdown-number-border-radius | Countdown time area rounded angle size | `2px` | +| \--nutui-countdown-number-color | The text color of the countdown time area | `$color-primary` | +| \--nutui-countdown-background-color | Background color of the countdown time area | `$color-background-overlay` | +| \--nutui-countdown-border-color | Border color of the countdown time area | `$color-primary-light-pressed` | +| \--nutui-countdown-number-primary-color | When type is `primary`, the text color of the countdown time area | `$color-primary-text` | +| \--nutui-countdown-primary-background-color | When type is `primary`, the background color of the countdown time area | `$color-primary` | +| \--nutui-countdown-primary-border-color | When type is `primary`, the border color of the countdown time area | `$color-primary` | diff --git a/src/packages/countdown/doc.md b/src/packages/countdown/doc.md index bba4c206f6..d26bfec589 100644 --- a/src/packages/countdown/doc.md +++ b/src/packages/countdown/doc.md @@ -141,10 +141,10 @@ import { CountDown } from '@nutui/nutui-react' | \--nutui-countdown-height | 倒计时的时间区域高度 | `16px` | | \--nutui-countdown-number-padding | 倒计时的时间区域padding | `0 0` | | \--nutui-countdown-number-margin | 倒计时的时间区域margin | `0 1px` | -| \--countdown-number-border-radius | 倒计时的时间区域圆角大小 | `2px` | -| \--nutui-countdown-color | 倒计时的时间区域的文字颜色 | `$color-primary-light-pressed` | -| \--nutui-countdown-background-color | 倒计时的时间区域的背景颜色 | `$color-primary` | -| \--nutui-countdown-border-color | 倒计时的时间区域的边框颜色颜色 | `$color-primary` | -| \--nutui-countdown-primary-color | type为`primary`时，倒计时的时间区域的文字颜色 | `#FFFFFF` | +| \--nutui-countdown-number-border-radius | 倒计时的时间区域圆角大小 | `2px` | +| \--nutui-countdown-number-color | 倒计时的时间区域的文字颜色 | `$color-primary` | +| \--nutui-countdown-background-color | 倒计时的时间区域的背景颜色 | `$color-background-overlay` | +| \--nutui-countdown-border-color | 倒计时的时间区域的边框颜色颜色 | `$color-primary-light-pressed` | +| \--nutui-countdown-number-primary-color | type为`primary`时，倒计时的时间区域的文字颜色 | `$color-primary-text` | | \--nutui-countdown-primary-background-color | type为`primary`时，倒计时的时间区域的背景颜色 | `$color-primary` | | \--nutui-countdown-primary-border-color | type为`primary`时，倒计时的时间区域的边框颜色颜色 | `$color-primary` | diff --git a/src/packages/countdown/doc.taro.md b/src/packages/countdown/doc.taro.md index 92f15f54d2..3b492caf8c 100644 --- a/src/packages/countdown/doc.taro.md +++ b/src/packages/countdown/doc.taro.md @@ -141,10 +141,10 @@ import { CountDown } from '@nutui/nutui-react-taro' | \--nutui-countdown-height | 倒计时的时间区域高度 | `16px` | | \--nutui-countdown-number-padding | 倒计时的时间区域padding | `0 0` | | \--nutui-countdown-number-margin | 倒计时的时间区域margin | `0 1px` | -| \--countdown-number-border-radius | 倒计时的时间区域圆角大小 | `2px` | -| \--nutui-countdown-color | 倒计时的时间区域的文字颜色 | `$color-primary-light-pressed` | -| \--nutui-countdown-background-color | 倒计时的时间区域的背景颜色 | `$color-primary` | -| \--nutui-countdown-border-color | 倒计时的时间区域的边框颜色颜色 | `$color-primary` | -| \--nutui-countdown-primary-color | type为`primary`时，倒计时的时间区域的文字颜色 | `#FFFFFF` | +| \--nutui-countdown-number-border-radius | 倒计时的时间区域圆角大小 | `2px` | +| \--nutui-countdown-number-color | 倒计时的时间区域的文字颜色 | `$color-primary` | +| \--nutui-countdown-background-color | 倒计时的时间区域的背景颜色 | `$color-background-overlay` | +| \--nutui-countdown-border-color | 倒计时的时间区域的边框颜色颜色 | `$color-primary-light-pressed` | +| \--nutui-countdown-number-primary-color | type为`primary`时，倒计时的时间区域的文字颜色 | `$color-primary-text` | | \--nutui-countdown-primary-background-color | type为`primary`时，倒计时的时间区域的背景颜色 | `$color-primary` | | \--nutui-countdown-primary-border-color | type为`primary`时，倒计时的时间区域的边框颜色颜色 | `$color-primary` | diff --git a/src/packages/countdown/doc.zh-TW.md b/src/packages/countdown/doc.zh-TW.md index 70ea9cd0fc..458a9aef45 100644 --- a/src/packages/countdown/doc.zh-TW.md +++ b/src/packages/countdown/doc.zh-TW.md @@ -141,10 +141,10 @@ import { CountDown } from '@nutui/nutui-react' | \--nutui-countdown-height | 倒計時的時間區域高度 | `16px` | | \--nutui-countdown-number-padding | 倒計時的時間區域padding | `0 0` | | \--nutui-countdown-number-margin | 倒計時的時間區域margin | `0 1px` | -| \--countdown-number-border-radius | 倒計時的時間區域圓角大小 | `2px` | -| \--nutui-countdown-color | 倒計時的時間區域的文字顏色 | `$color-primary-light-pressed` | -| \--nutui-countdown-background-color | 倒計時的時間區域的背景顏色 | `$color-primary` | -| \--nutui-countdown-border-color | 倒計時的時間區域的邊框顏色顏色 | `$color-primary` | -| \--nutui-countdown-primary-color | type爲`primary`時，倒計時的時間區域的文字顏色 | `#FFFFFF` | +| \--nutui-countdown-number-border-radius | 倒計時的時間區域圓角大小 | `2px` | +| \--nutui-countdown-number-color | 倒計時的時間區域的文字顏色 | `$color-primary` | +| \--nutui-countdown-background-color | 倒計時的時間區域的背景顏色 | `$color-background-overlay` | +| \--nutui-countdown-border-color | 倒計時的時間區域的邊框顏色顏色 | `$color-primary-light-pressed` | +| \--nutui-countdown-number-primary-color | type爲`primary`時，倒計時的時間區域的文字顏色 | `$color-primary-text` | | \--nutui-countdown-primary-background-color | type爲`primary`時，倒計時的時間區域的背景顏色 | `$color-primary` | | \--nutui-countdown-primary-border-color | type爲`primary`時，倒計時的時間區域的邊框顏色顏色 | `$color-primary` | diff --git a/src/packages/countdown/types.ts b/src/packages/countdown/types.ts index d033ca9c8b..d4f86aed48 100644 --- a/src/packages/countdown/types.ts +++ b/src/packages/countdown/types.ts @@ -16,6 +16,6 @@ export interface CountDownProps extends BasicComponent { onEnd: () => void onPaused: (restTime: number) => void onRestart: (restTime: number) => void - onUpdate: (restTime: any) => void + onUpdate: (restTime: number) => void children: React.ReactNode } diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 1ad474e788..076192994d 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -788,10 +788,6 @@ $countdown-number-border-radius: var( $radius-xxs ) !default; $countdown-number-margin: var(--nutui-countdown-number-margin, 0 1px) !default; -$countdown-number-border-color: var( - --nutui-countdown-number-border-color, - $color-primary-light-pressed -) !default; $countdown-number-color: var( --nutui-countdown-number-color, $color-primary @@ -800,9 +796,9 @@ $countdown-number-background-color: var( --nutui-countdown-number-background-color, $color-background-overlay ) !default; -$countdown-number-primary-border-color: var( - --nutui-countdown-number-primary-border-color, - $color-primary +$countdown-number-border-color: var( + --nutui-countdown-number-border-color, + $color-primary-light-pressed ) !default; $countdown-number-primary-color: var( --nutui-countdown-number-primary-color, @@ -812,6 +808,10 @@ $countdown-number-primary-background-color: var( --nutui-countdown-number-primary-background-color, $color-primary ) !default; +$countdown-number-primary-border-color: var( + --nutui-countdown-number-primary-border-color, + $color-primary +) !default; //large price（✅） $price-symbol-padding-right: var( From 302f4d480a68e214629619f4d3fd52fabac54156 Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Wed, 6 Nov 2024 16:12:12 +0800 Subject: [PATCH 05/12] fix: test update --- .../__snapshots__/countdown.spec.tsx.snap | 52 +++++++++++++++++++ .../countdown/__test__/countdown.spec.tsx | 21 ++++++-- 2 files changed, 68 insertions(+), 5 deletions(-) diff --git a/src/packages/countdown/__test__/__snapshots__/countdown.spec.tsx.snap b/src/packages/countdown/__test__/__snapshots__/countdown.spec.tsx.snap index 10397f7fd5..e2ff6de2cd 100644 --- a/src/packages/countdown/__test__/__snapshots__/countdown.spec.tsx.snap +++ b/src/packages/countdown/__test__/__snapshots__/countdown.spec.tsx.snap @@ -1,5 +1,57 @@ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html +exports[`Countdown > type props primary 1`] = ` +
+
+ + 00 + + : + + 00 + + : + + 00 + +
+
+`; + +exports[`Countdown > type props text 1`] = ` +
+
+ + 00 + + : + + 00 + + : + + 00 + +
+
+`; + exports[`Countdown > type props text primary 1`] = `
{ }) }) - test('type props text primary', async () => { + test('type props text', async () => { const { container } = render( - <> - - - + ) + const countdownDom = container.querySelector('.nut-countdown') as Element + expect(container).toMatchSnapshot() + expect( + countdownDom?.querySelectorAll('.nut-countdown-number-text')?.length + ).toBe(3) + }) + test('type props primary', async () => { + const { container } = render( + + ) + const countdownDom = container.querySelector('.nut-countdown') as Element expect(container).toMatchSnapshot() + expect( + countdownDom?.querySelectorAll('.nut-countdown-number-primary')?.length + ).toBe(3) }) test('paused props', async () => { From f0271e0e52b475c6c910954f8fe26c4d430119c4 Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Wed, 6 Nov 2024 16:14:42 +0800 Subject: [PATCH 06/12] =?UTF-8?q?feat:=20add=20v14=E9=80=82=E9=85=8D?= =?UTF-8?q?=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config.json b/src/config.json index 98b7a88ecf..e4d4eb227d 100644 --- a/src/config.json +++ b/src/config.json @@ -987,7 +987,8 @@ "sort": 17, "show": true, "taro": true, - "author": "songsong" + "author": "songsong", + "v14": true }, { "version": "2.0.0", From d4adac84647503bf4d6dd30d49a7a3e8b5953bec Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Thu, 7 Nov 2024 17:04:45 +0800 Subject: [PATCH 07/12] fix: update icons-react-taro version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 05a417a4fa..e6c759c35d 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", From 847c2ed7696d87a82d2a9369cc00c7d17f24679c Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Thu, 7 Nov 2024 17:10:17 +0800 Subject: [PATCH 08/12] chore: update pnpm-lock.yaml --- pnpm-lock.yaml | 64 +++++++++++++++++--------------------------------- 1 file changed, 21 insertions(+), 43 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c6aea0aed2..51b07d3381 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.1 '@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.1': + resolution: {integrity: sha512-kmM4mDkYDHgQCuNmq9tMN5rXfGJLjPzlY6f4RfimFJJ9inb6lztKpQQuqsjqiJ1xhTRWf/uCBOB9waAFk+Ff6Q==} '@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.1': {} '@nutui/icons-react@1.0.5': {} From 7a2471d9d3dde388588b870a4340d8115e72ddbf Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Thu, 21 Nov 2024 15:43:48 +0800 Subject: [PATCH 09/12] fix: modify ts --- src/packages/animatingnumbers/countup.taro.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/packages/animatingnumbers/countup.taro.tsx b/src/packages/animatingnumbers/countup.taro.tsx index 639b9fc6c9..a375b1ca7d 100644 --- a/src/packages/animatingnumbers/countup.taro.tsx +++ b/src/packages/animatingnumbers/countup.taro.tsx @@ -91,6 +91,7 @@ export const CountUp: FunctionComponent> = (props) => { if (numberArr.length) { if (!isLoaded.current) { isLoaded.current = true + // @ts-ignore timerRef.current = setTimeout(() => { setNumberTransform() }, delay) From 6791a73fdcfbe2b086c1d4d432f8c94d236fd3cf Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Fri, 22 Nov 2024 15:20:09 +0800 Subject: [PATCH 10/12] fix: delete harmony css --- src/packages/countdown/countdown.harmony.css | 71 -------------------- 1 file changed, 71 deletions(-) delete mode 100644 src/packages/countdown/countdown.harmony.css diff --git a/src/packages/countdown/countdown.harmony.css b/src/packages/countdown/countdown.harmony.css deleted file mode 100644 index 8236a6f81b..0000000000 --- a/src/packages/countdown/countdown.harmony.css +++ /dev/null @@ -1,71 +0,0 @@ -.nut-countdown { - display: flex; - flex-direction: row; - align-items: center; - color: #ff0f23; - font-size: 11px; -} -.nut-countdown-number-primary { - display: flex; - align-items: center; - justify-content: center; - height: 16px; - font-weight: 400; - font-size: 11px; -} -.nut-countdown-number { - display: flex; - align-items: center; - justify-content: center; - height: 16px; - font-weight: 400; - font-size: 11px; -} -.nut-countdown-number-text { - display: flex; - align-items: center; - justify-content: center; - height: 16px; - font-weight: 400; - font-size: 11px; -} -.nut-countdown-unit { - display: flex; - align-items: center; - justify-content: center; - height: 16px; - font-weight: 400; - font-size: 11px; -} -.nut-countdown-number { - min-width: 16px; - padding: 0 0; - border-radius: 2px; - margin: 0 1px; - text-align: center; -} -.nut-countdown-number-primary { - min-width: 16px; - padding: 0 0; - border-radius: 2px; - margin: 0 1px; - text-align: center; -} -.nut-countdown-number { - border: 1px solid #ffebf1; - background-color: #ffffff; - color: #ff0f23; -} -.nut-countdown-number-primary { - border: 1px solid #ff0f23; - background-color: #ff0f23; - color: #ffffff; -} -.nut-countdown-number-text { - border: 0; - background-color: transparent; - color: #ff0f23; -} -.nut-countdown-unit { - color: #ff0f23; -} \ No newline at end of file From 82fb4a7b522513949bb136da66c53c7dc86630b9 Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Fri, 22 Nov 2024 15:41:55 +0800 Subject: [PATCH 11/12] fix: delete harmony css --- src/packages/countdown/countdown.taro.tsx | 13 ++----------- src/packages/countdown/countdown.tsx | 4 ++-- src/packages/countdown/types.ts | 10 +++++++++- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/packages/countdown/countdown.taro.tsx b/src/packages/countdown/countdown.taro.tsx index cd135bd8f9..8dadad0955 100644 --- a/src/packages/countdown/countdown.taro.tsx +++ b/src/packages/countdown/countdown.taro.tsx @@ -10,15 +10,7 @@ import { View } from '@tarojs/components' import { ComponentDefaults } from '@/utils/typings' import { padZero } from '@/utils/pad-zero' import { web } from '@/utils/platform-taro' -import { CountDownProps } from './types' - -interface CountDownTimeProps { - d: number - h: number - m: number - s: number - ms: number -} +import { CountDownProps, CountDownTimeProps } from './types' const defaultProps = { ...ComponentDefaults, @@ -220,8 +212,7 @@ const InternalCountDown: ForwardRefRenderFunction< // 监听值变更 useEffect(() => { const tranTime = formatRemainTime(stateRef.current.restTime, 'custom') - - onUpdate && onUpdate(tranTime) + onUpdate && onUpdate(tranTime as CountDownTimeProps) }, [restTimeStamp]) // 监听暂停 diff --git a/src/packages/countdown/countdown.tsx b/src/packages/countdown/countdown.tsx index 2efd624b61..75cebabf6b 100644 --- a/src/packages/countdown/countdown.tsx +++ b/src/packages/countdown/countdown.tsx @@ -7,7 +7,7 @@ import React, { } from 'react' import { ComponentDefaults } from '@/utils/typings' import { padZero } from '@/utils/pad-zero' -import { CountDownProps } from './types' +import { CountDownProps, CountDownTimeProps } from './types' const defaultProps = { ...ComponentDefaults, @@ -225,7 +225,7 @@ const InternalCountDown: ForwardRefRenderFunction< useEffect(() => { const tranTime = formatRemainTime(stateRef.current.restTime, 'custom') - onUpdate && onUpdate(tranTime) + onUpdate && onUpdate(tranTime as CountDownTimeProps) }, [restTimeStamp]) // 监听暂停 diff --git a/src/packages/countdown/types.ts b/src/packages/countdown/types.ts index d4f86aed48..1dce65f270 100644 --- a/src/packages/countdown/types.ts +++ b/src/packages/countdown/types.ts @@ -2,6 +2,14 @@ import { BasicComponent } from '@/utils/typings' export type CountDownType = 'default' | 'primary' | 'text' +export interface CountDownTimeProps { + d: number + h: number + m: number + s: number + ms: number +} + export interface CountDownProps extends BasicComponent { type: CountDownType paused: boolean @@ -16,6 +24,6 @@ export interface CountDownProps extends BasicComponent { onEnd: () => void onPaused: (restTime: number) => void onRestart: (restTime: number) => void - onUpdate: (restTime: number) => void + onUpdate: (restTime: string | CountDownTimeProps) => void children: React.ReactNode } From c12732906562b71dd0263972524baaf161b597dc Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Fri, 22 Nov 2024 15:55:57 +0800 Subject: [PATCH 12/12] fix: types --- packages/nutui-taro-demo/src/app.config.ts | 104 ++------------------- src/packages/countdown/index.taro.ts | 2 +- src/packages/countdown/index.ts | 2 +- 3 files changed, 10 insertions(+), 98 deletions(-) diff --git a/packages/nutui-taro-demo/src/app.config.ts b/packages/nutui-taro-demo/src/app.config.ts index 7357a2dbf7..584a92e8b6 100644 --- a/packages/nutui-taro-demo/src/app.config.ts +++ b/packages/nutui-taro-demo/src/app.config.ts @@ -2,125 +2,37 @@ const subPackages = [ { "root": "base", - "pages": [ - "pages/button/index", - "pages/cell/index", - "pages/configprovider/index", - "pages/icon/index", - "pages/image/index", - "pages/overlay/index" - ] + "pages": [] }, { "root": "layout", - "pages": [ - "pages/divider/index", - "pages/grid/index", - "pages/layout/index", - "pages/safearea/index", - "pages/space/index", - "pages/sticky/index" - ] + "pages": [] }, { "root": "nav", - "pages": [ - "pages/backtop/index", - "pages/elevator/index", - "pages/fixednav/index", - "pages/hoverbutton/index", - "pages/navbar/index", - "pages/sidenavbar/index", - "pages/tabbar/index", - "pages/tabs/index" - ] + "pages": [] }, { "root": "dentry", - "pages": [ - "pages/address/index", - "pages/calendar/index", - "pages/calendarcard/index", - "pages/cascader/index", - "pages/checkbox/index", - "pages/datepicker/index", - "pages/form/index", - "pages/input/index", - "pages/inputnumber/index" - ] + "pages": [] }, { "root": "dataentry", - "pages": [ - "pages/menu/index", - "pages/numberkeyboard/index", - "pages/picker/index", - "pages/radio/index", - "pages/range/index", - "pages/rate/index", - "pages/searchbar/index", - "pages/shortpassword/index", - "pages/signature/index", - "pages/switch/index", - "pages/textarea/index", - "pages/uploader/index" - ] + "pages": [] }, { "root": "feedback", - "pages": [ - "pages/actionsheet/index", - "pages/badge/index", - "pages/dialog/index", - "pages/drag/index", - "pages/empty/index", - "pages/infiniteloading/index", - "pages/loading/index", - "pages/noticebar/index", - "pages/notify/index", - "pages/popover/index", - "pages/popup/index", - "pages/pulltorefresh/index", - "pages/resultpage/index", - "pages/skeleton/index", - "pages/swipe/index", - "pages/toast/index" - ] + "pages": [] }, { "root": "exhibition", "pages": [ - "pages/animate/index", - "pages/animatingnumbers/index", - "pages/avatar/index", - "pages/circleprogress/index", - "pages/collapse/index", - "pages/countdown/index", - "pages/ellipsis/index", - "pages/imagepreview/index", - "pages/indicator/index", - "pages/pagination/index", - "pages/price/index", - "pages/progress/index", - "pages/steps/index", - "pages/swiper/index", - "pages/table/index", - "pages/tag/index", - "pages/tour/index", - "pages/video/index", - "pages/virtuallist/index" + "pages/countdown/index" ] }, { "root": "business", - "pages": [ - "pages/avatarcropper/index", - "pages/barrage/index", - "pages/card/index", - "pages/timeselect/index", - "pages/trendarrow/index", - "pages/watermark/index" - ] + "pages": [] } ]; diff --git a/src/packages/countdown/index.taro.ts b/src/packages/countdown/index.taro.ts index 0c0e63576f..f389d13d67 100644 --- a/src/packages/countdown/index.taro.ts +++ b/src/packages/countdown/index.taro.ts @@ -1,4 +1,4 @@ import { CountDown } from './countdown.taro' -export type { CountDownProps, CountDownType } from './types' +export type { CountDownProps, CountDownType, CountDownTimeProps } from './types' export default CountDown diff --git a/src/packages/countdown/index.ts b/src/packages/countdown/index.ts index d9a4cc13bc..d48a338dfd 100644 --- a/src/packages/countdown/index.ts +++ b/src/packages/countdown/index.ts @@ -1,4 +1,4 @@ import { CountDown } from './countdown' -export type { CountDownProps, CountDownType } from './types' +export type { CountDownProps, CountDownType, CountDownTimeProps } from './types' export default CountDown