fix: primaryColor calculation

[mynetfan]

Description

修复先设置内置主题色后由深色主题改为浅色主题时，主题色可能计算错误的问题

fix #5228

Type of change

Please delete options that are not relevant.

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• This change requires a documentation update
• Please, don't make changes to pnpm-lock.yaml unless you introduce a new test example.

Checklist

ℹ️ Check all checkboxes - this will indicate that you have done everything in accordance with the rules in CONTRIBUTING.

• If you introduce new functionality, document it. You can run documentation with pnpm run docs:dev command.
• Run the tests with pnpm test.
• Changes in changelog are generated from PR name. Please, make sure that it explains your changes in an understandable manner. Please, prefix changeset messages with feat:, fix:, perf:, docs:, or chore:.
• My code follows the style guidelines of this project
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• My changes generate no new warnings
• I have added tests that prove my fix is effective or that my feature works
• New and existing unit tests pass locally with my changes
• Any dependent changes have been merged and published in downstream modules

Summary by CodeRabbit

• New Features

  • Added form validation rules for various form components
  • Introduced a new TextArea form field
  • Enhanced form input requirements across multiple input types

• Improvements

  • Simplified RadioButton options
  • Implemented stricter validation for form inputs
  • Added required field checks for ApiSelect, Input, DatePicker, and other components

[changeset-bot]

⚠️ No Changeset found

Latest commit: 2e0349d

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

[coderabbitai]

Warning

There were issues while running some tools. Please review the errors and either fix the tool’s configuration or disable the tool if it’s a critical failure.

🔧 eslint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

apps/web-naive/src/views/demos/form/basic.vue

Oops! Something went wrong! :(

ESLint: 9.17.0

Error [ERR_MODULE_NOT_FOUND]: Cannot find module '/node_modules/@vben/eslint-config/dist/index.mjs' imported from /eslint.config.mjs
at finalizeResolution (node:internal/modules/esm/resolve:257:11)
at moduleResolve (node:internal/modules/esm/resolve:914:10)
at defaultResolve (node:internal/modules/esm/resolve:1038:11)
at ModuleLoader.defaultResolve (node:internal/modules/esm/loader:557:12)
at ModuleLoader.resolve (node:internal/modules/esm/loader:525:25)
at ModuleLoader.getModuleJob (node:internal/modules/esm/loader:246:38)
at ModuleJob._link (node:internal/modules/esm/module_job:126:49)

Walkthrough

The pull request introduces two main changes: form validation enhancements in the basic.vue file and theme color selection logic in the builtin.vue file. In the form view, validation rules are added to multiple form components, making previously optional fields required and removing an unnecessary radio button option. In the theme preferences widget, a new reactive watch function is implemented to dynamically update the primary theme color based on the selected theme and dark mode status.

Changes

File	Change Summary
apps/web-naive/src/views/demos/form/basic.vue	Added rules: 'required' to multiple form fields (ApiSelect, ApiTreeSelect, Input, InputNumber, DatePicker, TextArea) and rules: 'selectRequired' to RadioGroup, RadioButton, and CheckboxGroup. Removed 'F' option from RadioButton.
packages/effects/layouts/src/widgets/preferences/blocks/theme/builtin.vue	Introduced a new watch function to dynamically update themeColorPrimary based on modelValue and props.isDark, replacing previous direct theme color setting logic.

Assessment against linked issues

Objective	Addressed	Explanation
Resolve invisible primary color in Neutral + Light mode [#5228]	✅

Possibly related PRs

• fix: fix known issues with the form #4696: Enhancing validation rules for form fields
• fix: form fieldMappingTime improve and modelPropName support #5335: Improving form handling and validation logic
• fix: form valid-error style in naive #5336: Styling for form validation errors

Suggested labels

bug

Suggested reviewers

• anncwb
• vince292007

Poem

🐰 A rabbit's tale of forms so bright,
Validation rules now shine with might!
From inputs to radios, no field left bare,
Theme colors dancing with utmost care.
Code transforms, bugs take flight! 🌈✨

Finishing Touches

• 📝 Generate Docstrings

---

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

• X
• Mastodon
• Reddit
• LinkedIn

🪧 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.
  • Generate unit testing code for this file.
  • 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 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 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 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 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. (Beta)
• @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.

[coderabbitai]

Actionable comments posted: 0

🧹 Nitpick comments (1)

packages/effects/layouts/src/widgets/preferences/blocks/theme/builtin.vue (1)

Line range hint 1-1: Summary of Review Findings

1. The theme color calculation fix in builtin.vue is well implemented and addresses the PR objective.
2. The form validation changes in basic.vue appear to be unrelated to the PR objective and should be moved to a separate PR.

Recommendation: Split this PR into two separate PRs:

1. Keep the theme color calculation fix
2. Move the form validation changes to a new PR with appropriate documentation and testing

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between c979c23 and 2e0349d.

📒 Files selected for processing (2)

• apps/web-naive/src/views/demos/form/basic.vue (5 hunks)
• packages/effects/layouts/src/widgets/preferences/blocks/theme/builtin.vue (2 hunks)

⏰ Context from checks skipped due to timeout of 90000ms (7)

• GitHub Check: Test (windows-latest)
• GitHub Check: Check (windows-latest)
• GitHub Check: Lint (windows-latest)
• GitHub Check: post-update (windows-latest)
• GitHub Check: post-update (ubuntu-latest)
• GitHub Check: Check (ubuntu-latest)
• GitHub Check: Lint (ubuntu-latest)

🔇 Additional comments (2)

packages/effects/layouts/src/widgets/preferences/blocks/theme/builtin.vue (2)

94-108: Good implementation of reactive theme color updates.

The watch function correctly handles theme color updates when switching between dark and light modes, addressing the original issue. The implementation:

1. Properly watches both theme selection and dark mode changes
2. Handles fallback to primaryColor when darkPrimaryColor is not available
3. Updates themeColorPrimary reactively

However, let's verify the theme presets to ensure all themes have the correct color values:

#!/bin/bash
# Search for BUILT_IN_THEME_PRESETS definition
ast-grep --pattern 'const BUILT_IN_THEME_PRESETS = $_'

---

Line range hint 84-86: Good simplification of handleSelect function.

The function now follows the single responsibility principle by only handling theme selection, while the theme color update logic is properly handled by the watch function.