Skip to content

fix: 修复日历只有一个月的情况#3306

Merged
oasis-cloud merged 1 commit intojdf2e:feat_v3.xfrom
xiaoyatong:fix3/calendar0716
Jul 16, 2025
Merged

fix: 修复日历只有一个月的情况#3306
oasis-cloud merged 1 commit intojdf2e:feat_v3.xfrom
xiaoyatong:fix3/calendar0716

Conversation

@xiaoyatong
Copy link
Collaborator

@xiaoyatong xiaoyatong commented Jul 16, 2025 •
edited by coderabbitai bot
Loading

🤔 这个变动的性质是？

  • 新特性提交
  • 日常 bug 修复

🔗 相关 Issue

💡 需求背景和解决方案

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

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

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

Summary by CodeRabbit

  • Bug Fixes
    • 修正了日历组件中月份差为零时的处理逻辑，现在当开始和结束日期在同一个月时，月份数可为零，不再强制设为1。

@coderabbitai
Copy link

coderabbitai bot commented Jul 16, 2025 •
edited
Loading

Walkthrough

本次变更将 getMonthNum 函数以及相关逻辑中的条件判断从 monthNum <= 0 修改为 monthNum < 0。这样当计算出来的月份差为零时，不再强制将其重置为 1，而是允许零作为有效值。其余逻辑保持不变。

Changes

文件 变更摘要
src/packages/calendaritem/calendaritem.taro.tsx, src/packages/calendaritem/calendaritem.tsx 将月份差判断条件从 monthNum <= 0 改为 monthNum < 0，允许月份差为零时不重置为 1。

Suggested reviewers

  • Miles-hxy
  • oasis-cloud

Poem

兔子挥笔改代码，
月份判断细细裁。
零月也能被承认，
日历逻辑更明白。
跳跃思维新思路，
代码世界乐开怀！

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between c559879 and 29fabf5.

📒 Files selected for processing (2)
  • src/packages/calendaritem/calendaritem.taro.tsx (1 hunks)
  • src/packages/calendaritem/calendaritem.tsx (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (2)
  • GitHub Check: build
  • GitHub Check: test
🔇 Additional comments (2)
src/packages/calendaritem/calendaritem.tsx (1)

287-287: 修复逻辑正确，允许零月份差值

将条件从 monthNum <= 0 修改为 monthNum < 0 是正确的修复。当开始和结束日期在同一个月时，月份差应该为 0 而不是被强制重置为 1。这个改动修复了日历组件在单月情况下的显示问题。

src/packages/calendaritem/calendaritem.taro.tsx (1)

288-288: 修复逻辑一致，保持版本同步

与常规版本保持一致的修改，将条件从 monthNum <= 0 改为 monthNum < 0。这确保了 React 版本和 Taro 版本具有相同的月份计算逻辑，修复了单月日历的显示问题。

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • 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 explain this code block.
    • @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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 using 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 generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this 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.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration 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.

@github-actions github-actions bot added action:review This PR needs more reviews (less than 2 approvals) 3.x Target branch 3.x labels Jul 16, 2025
@xiaoyatong xiaoyatong requested a review from oasis-cloud July 16, 2025 02:36
@xiaoyatong xiaoyatong linked an issue Jul 16, 2025 that may be closed by this pull request
Calendar日历开始结束时间为一个月，实际展示出2个月日历 #3305
Open
@codecov
Copy link

codecov bot commented Jul 16, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.13%. Comparing base (c559879) to head (29fabf5).
Report is 1 commits behind head on feat_v3.x.

Additional details and impacted files 
@@              Coverage Diff              @@
##           feat_v3.x    #3306      +/-   ##
=============================================
- Coverage      88.14%   88.13%   -0.01%     
=============================================
  Files            290      290              
  Lines          19110    19110              
  Branches        2960     2959       -1     
=============================================
- Hits           16844    16843       -1     
- Misses          2261     2262       +1     
  Partials           5        5

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@oasis-cloud oasis-cloud merged commit 77de439 into jdf2e:feat_v3.x Jul 16, 2025
8 checks passed
@ws4715535
Copy link

ws4715535 commented Jan 22, 2026 •
edited
Loading

截屏2026-01-22 23 21 24 看起来是只修复了只有一个月的时候数据的显示，但是UI上面另外一个月是空白。

<Calendar popup={false} defaultValue={["2026-01-12"]} type="multiple" startDate={"2026-1-12"} endDate={"2026-1-13"} showTitle={false} showSubTitle={false} autoBackfill onDayClick={(day) => { console.log(day) }} />

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oasis-cloud oasis-cloud oasis-cloud approved these changes

Assignees

No one assigned

Labels

3.x Target branch 3.x action:review This PR needs more reviews (less than 2 approvals) size/XS

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Calendar日历开始结束时间为一个月，实际展示出2个月日历

3 participants

@xiaoyatong @ws4715535 @oasis-cloud