fix(countdown): 修改实现逻辑适配v13和四端 #2316

irisSong · 2024-06-04T06:01:33Z

🤔 这个变动的性质是？

🔗 相关 Issue

💡 需求背景和解决方案

☑️ 请求合并前的自查清单

⚠️ 请自检并全部勾选全部选项。⚠️

文档已补充或无须补充
代码演示已提供或无须提供
TypeScript 定义已补充或无须补充
fork仓库代码是否为最新避免文件冲突
Files changed 没有 package.json lock 等无关文件

Summary by CodeRabbit

新功能
- 为 CountDown 组件添加了新的 type 属性，支持 default 和 primary 类型。
- 在 CountDown 组件中添加了 CountDownType 枚举和相关逻辑。
样式
- 调整了 CountDown 组件的颜色、字体大小、对齐和布局属性。
- 更新了 CSS 变量，增加了对新样式属性的支持，包括字体粗细、宽度、高度、填充、边距、边框半径和背景颜色等。
文档
- 更新了中英双语文档，添加了新的 type 属性说明和相关样式变量的描述。

oasis-cloud · 2024-06-13T06:53:22Z

RN 下倒计时字体会导致展示跳动，可以给数字框加个最小宽度限制一下？

oasis-cloud · 2024-06-13T06:59:05Z

src/packages/countdown/countdown.taro.tsx

  })

+  // TODO: 后期统一替换
+  const harmonyAndRn = [


可以合并下代码，直接把这里替换一下

可以合并下代码，直接把这里替换一下

已修改

oasis-cloud · 2024-06-13T07:02:13Z

src/packages/countdown/demos/taro/demo8.tsx

-        height: pxTransform(25),
-        fontSize: pxTransform(14),
-        borderRadius: pxTransform(6),
+        height: pxTransform(20),


代码可以合并一下 dev-harmony , 使用 uitls 中的 pxTransform

代码可以合并一下 dev-harmony , 使用 uitls 中的 pxTransform
已修改

coderabbitai · 2024-06-19T08:31:25Z

Warning

Rate limit exceeded

@irisSong has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 36 minutes and 22 seconds before requesting another review.

How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

Commits

Files that changed from the base of the PR and between 0803528 and 6d7e0d9.

Walkthrough

此次更新主要集中在NutUI的倒计时组件和构建配置文件。这次更新包括对倒计时组件的样式进行优化，引入新的属性以增强自定义能力，同时更新了构建文件以标准化配置格式。

Changes

文件路径	变更摘要
`packages/nutui-harmony/build-profile.json5`	更新配置文件，使用字符串键定义不同字段。
`src/packages/countdown/countdown.harmony.css`, `countdown.scss`	优化倒计时组件样式，调整颜色、字体大小、对齐和布局属性。
`countdown.taro.tsx`, `countdown.tsx`	增加`CountDownType`枚举类型和`type`属性，更新时间格式化和渲染逻辑。
`demo1.tsx`, `demo8.tsx` （多个demo文件）	增加新的倒计时示例，调整样式和属性展示。
`doc.en-US.md`, `doc.md`, `doc.zh-TW.md`	更新倒计时组件文档，添加并调整组件属性和样式变量说明。
`src/styles/variables.scss`	添加新的样式变量，调整倒计时组件默认样式。

Poem

小兔提笔画倒计时，
样式多变更精致，
属性新添灵活用，
标准格式来助力。
组件更新迎新日，
一秒一刻皆美丽。

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

Tips

Chat

There are 3 ways to chat with CodeRabbit:

‼️ IMPORTANT
Auto-reply has been disabled for this repository in the CodeRabbit settings. The CodeRabbit bot will not respond to your replies unless it is explicitly tagged.

Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai generate interesting stats about this repository and render them as a table.
- @coderabbitai show all the console.log statements in this repository.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

coderabbitai

Actionable comments posted: 1

coderabbitai · 2024-06-19T08:37:17Z

src/styles/variables.scss

+$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, 14px) !default;
+$countdown-number-padding: var(
+  --nutui-countdown-number-padding,
+  0 1px
+) !default;
+$countdown-number-border-radius: var(
+  --nutui-countdown-number-border-radius,
+  2px
+) !default;
+$countdown-number-margin: var(--nutui-countdown-number-margin, 0 2px) !default;
+$countdown-number-border-color: var(
+  --nutui-countdown-number-border-color,
+  $color-primary-light
+) !default;
+$countdown-number-color: var(
+  --nutui-countdown-number-color,
+  $color-primary
+) !default;
+$countdown-number-background-color: var(
+  --nutui-countdown-number-background-color,
+  transparent
+) !default;
+$countdown-number-primary-border-color: var(
+  --nutui-countdown-number-primary-border-color,
+  $color-primary
+) !default;
+$countdown-number-primary-color: var(
+  --nutui-countdown-number-primary-color,
+  #ffffff
+) !default;
+$countdown-number-primary-background-color: var(
+  --nutui-countdown-number-primary-background-color,
+  $color-primary
+) !default;


变量 $coutdown-font-weight 名称拼写错误，应为 $countdown-font-weight。

- $coutdown-font-weight: var(--nutui-countdown-font-weight, 400) !default; + $countdown-font-weight: var(--nutui-countdown-font-weight, 400) !default;

Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

$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, 14px) !default;

$countdown-number-padding: var(

--nutui-countdown-number-padding,

0 1px

) !default;

$countdown-number-border-radius: var(

--nutui-countdown-number-border-radius,

2px

) !default;

$countdown-number-margin: var(--nutui-countdown-number-margin, 0 2px) !default;

$countdown-number-border-color: var(

--nutui-countdown-number-border-color,

$color-primary-light

) !default;

$countdown-number-color: var(

--nutui-countdown-number-color,

$color-primary

) !default;

$countdown-number-background-color: var(

--nutui-countdown-number-background-color,

transparent

) !default;

$countdown-number-primary-border-color: var(

--nutui-countdown-number-primary-border-color,

$color-primary

) !default;

$countdown-number-primary-color: var(

--nutui-countdown-number-primary-color,

#ffffff

) !default;

$countdown-number-primary-background-color: var(

--nutui-countdown-number-primary-background-color,

$color-primary

) !default;

$countdown-color: var(--nutui-countdown-color, $color-primary) !default;

$countdown-font-size: var(--nutui-countdown-font-size, 10px) !default;

$countdown-font-weight: var(--nutui-countdown-font-weight, 400) !default;

$countdown-height: var(--nutui-countdown-height, 14px) !default;

$countdown-width: var(--nutui-countdown-width, 14px) !default;

$countdown-number-padding: var(

--nutui-countdown-number-padding,

0 1px

) !default;

$countdown-number-border-radius: var(

--nutui-countdown-number-border-radius,

2px

) !default;

$countdown-number-margin: var(--nutui-countdown-number-margin, 0 2px) !default;

$countdown-number-border-color: var(

--nutui-countdown-number-border-color,

$color-primary-light

) !default;

$countdown-number-color: var(

--nutui-countdown-number-color,

$color-primary

) !default;

$countdown-number-background-color: var(

--nutui-countdown-number-background-color,

transparent

) !default;

$countdown-number-primary-border-color: var(

--nutui-countdown-number-primary-border-color,

$color-primary

) !default;

$countdown-number-primary-color: var(

--nutui-countdown-number-primary-color,

#ffffff

) !default;

$countdown-number-primary-background-color: var(

--nutui-countdown-number-primary-background-color,

$color-primary

) !default;

irisSong · 2024-06-19T08:52:42Z

RN 下倒计时字体会导致展示跳动，可以给数字框加个最小宽度限制一下？

已修改

coderabbitai

Actionable comments posted: 4

coderabbitai · 2024-06-19T08:52:44Z

src/packages/countdown/doc.zh-TW.md

+| \--nutui-countdown-color | 倒計時的文字顔色 | `$color-primary` |
+| \--nutui-countdown-font-size | 倒計時的字體大小 | `10px` |
+| \--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` |
+| \countdown-number-border-radius | 倒計時的時間區域圓角大小 | `2px` |
+| \--nutui-countdown-color | 倒計時的時間區域的文字顔色 | `$color-primary-light` |
+| \--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` |


coderabbitai · 2024-06-19T08:52:45Z

src/packages/countdown/doc.taro.md

+| \--nutui-countdown-color | 倒计时的文字颜色 | `$color-primary` |
+| \--nutui-countdown-font-size | 倒计时的字体大小 | `10px` |
+| \--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` |
+| \countdown-number-border-radius | 倒计时的时间区域圆角大小 | `2px` |
+| \--nutui-countdown-color | 倒计时的时间区域的文字颜色 | `$color-primary-light` |
+| \--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` |


coderabbitai · 2024-06-19T08:52:45Z

src/packages/countdown/doc.md

+| \--nutui-countdown-color | 倒计时的文字颜色 | `$color-primary` |
+| \--nutui-countdown-font-size | 倒计时的字体大小 | `10px` |
+| \--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` |
+| \countdown-number-border-radius | 倒计时的时间区域圆角大小 | `2px` |
+| \--nutui-countdown-color | 倒计时的时间区域的文字颜色 | `$color-primary-light` |
+| \--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` |


coderabbitai · 2024-06-19T08:52:45Z

src/packages/countdown/doc.en-US.md

+| \--nutui-countdown-display | 倒计时的布局方式 | `flex` |
+| \--nutui-countdown-color | Countdown text color | `$color-primary` |
+| \--nutui-countdown-font-size | Countdown font size | `10px` |
+| \--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` |
+| \countdown-number-border-radius | Countdown time area border radius | `2px` |
+| \--nutui-countdown-color | Countdown time area text color | `$color-primary-light` |
+| \--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` |


irisSong added 2 commits June 4, 2024 13:57

fix(countdown): 修改展示逻辑适配v13和四端

aa9ff79

fix: 取消col修改

05e0eeb

pull-request-size bot added the size/XL label Jun 4, 2024

oasis-cloud requested changes Jun 13, 2024

View reviewed changes

chore: 合并远程分支

98d5c80

pull-request-size bot added size/L and removed size/XL labels Jun 19, 2024

coderabbitai bot reviewed Jun 19, 2024

View reviewed changes

fix: cr修改

0803528

coderabbitai bot reviewed Jun 19, 2024

View reviewed changes

chore: update docs

6d7e0d9

oasis-cloud merged commit 5057098 into jdf2e:dev-harmony Jun 21, 2024

coderabbitai bot mentioned this pull request Sep 9, 2024

fix(props): add mergeProps utility to resolve all defaultProps warnings #2581

Merged

3 tasks

coderabbitai bot mentioned this pull request Oct 24, 2024

feat: 添加jrkf主题和变量文件 #2661

Closed

20 tasks

This was referenced Nov 5, 2024

fix(countdown): 适配v14 && type增加text类型 #2701

Merged

fix(resultpage): 适配 V14 #2741

Merged

This was referenced Nov 19, 2024

feat(grid): v14 #2771

Merged

feat(switch): v14&代码重构 #2779

Merged

feat(toast): v14 #2795

Merged

This was referenced Dec 3, 2024

feat(hoverbutton): v14 #2810

Merged

fix(countdown): update the v15 style #2843

Merged

irisSong deleted the dev-harmony-countdown-v13 branch January 7, 2025 02:46

fix(countdown): 修改实现逻辑适配v13和四端 #2316

fix(countdown): 修改实现逻辑适配v13和四端 #2316

Uh oh!

Conversation

irisSong commented Jun 4, 2024 • edited by coderabbitai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🤔 这个变动的性质是？

🔗 相关 Issue

💡 需求背景和解决方案

☑️ 请求合并前的自查清单

Summary by CodeRabbit

Uh oh!

oasis-cloud commented Jun 13, 2024

Uh oh!

oasis-cloud Jun 13, 2024

Choose a reason for hiding this comment

Uh oh!

irisSong Jun 19, 2024

Choose a reason for hiding this comment

Uh oh!

oasis-cloud Jun 13, 2024

Choose a reason for hiding this comment

Uh oh!

irisSong Jun 19, 2024

Choose a reason for hiding this comment

Uh oh!

coderabbitai bot commented Jun 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Rate limit exceeded

Walkthrough

Changes

Poem

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

coderabbitai bot Jun 19, 2024

Choose a reason for hiding this comment

Uh oh!

irisSong commented Jun 19, 2024

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

coderabbitai bot Jun 19, 2024

Choose a reason for hiding this comment

Uh oh!

coderabbitai bot Jun 19, 2024

Choose a reason for hiding this comment

Uh oh!

coderabbitai bot Jun 19, 2024

Choose a reason for hiding this comment

Uh oh!

coderabbitai bot Jun 19, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

irisSong commented Jun 4, 2024 •

edited by coderabbitai bot

Loading

coderabbitai bot commented Jun 19, 2024 •

edited

Loading

CodeRabbit Configration File (`.coderabbit.yaml`)