Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: naive CheckboxGroup and RadioGroup support options #5071

Merged
merged 1 commit into from
Dec 8, 2024

Conversation

mynetfan
Copy link
Collaborator

@mynetfan mynetfan commented Dec 8, 2024

Description

修改Naive的表单适配器,使CheckboxGroupRadioGroup可以通过options传入一个选项属性数组直接生成选项

close #4721

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

    • Introduced two new components: NRadio and NRadioButton.
    • Added a new form demo accessible via the route /demos/form.
    • Created a basic form interface with various input types, including text, number, radio groups, checkbox group, and date picker.
  • Localization

    • Added English and Chinese translations for the term "Form".
  • Bug Fixes

    • Enhanced rendering logic for CheckboxGroup and RadioGroup components.

@mynetfan mynetfan requested review from anncwb, vince292007 and a team as code owners December 8, 2024 10:23
Copy link

changeset-bot bot commented Dec 8, 2024

⚠️ No Changeset found

Latest commit: 96b07fc

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

Copy link
Contributor

coderabbitai bot commented Dec 8, 2024

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/adapter/component/index.ts

Oops! Something went wrong! :(

ESLint: 9.16.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 enhancements to the component adapter in the web-naive application, specifically in the index.ts file. It adds two new components, NRadio and NRadioButton, and refactors the CheckboxGroup and RadioGroup components to allow for more dynamic rendering based on the presence of slots and attributes. Additionally, new localization entries for the English and Chinese languages are added, and a new route for a form demo is established. A new Vue component for the form interface is also introduced, featuring various input types and form handling capabilities.

Changes

File Change Summary
apps/web-naive/src/adapter/component/index.ts Added NRadio and NRadioButton, refactored CheckboxGroup and RadioGroup for dynamic rendering.
apps/web-naive/src/locales/langs/en-US/demos.json Added key "form" with value "Form".
apps/web-naive/src/locales/langs/zh-CN/demos.json Added key "form" with value "表单".
apps/web-naive/src/router/routes/modules/demos.ts Added new route for form demo: name: 'Form', path: '/demos/form', dynamically imports component.
apps/web-naive/src/views/demos/form/basic.vue Introduced new Vue component with various input types and form handling logic.

Assessment against linked issues

Objective Addressed Explanation
Improve rendering of form components (4721)
Ensure dynamic rendering for radio and checkbox

Possibly related PRs

Suggested labels

feature, bug

Suggested reviewers

  • anncwb
  • vince292007

Poem

In the meadow where forms do play,
New buttons and radios come out to sway.
With slots and options, oh what a delight,
Our components now dance in the soft moonlight.
Hooray for the changes, let’s all cheer,
For a flexible form, we hold dear! 🐇✨


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:

  • 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 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.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

🧹 Outside diff range and nitpick comments (2)
apps/web-naive/src/views/demos/form/basic.vue (2)

9-82: Consider accessibility and i18n improvements

While the form implementation successfully adds options support for RadioGroup and CheckboxGroup, consider these improvements:

  1. Add ARIA labels for better accessibility
  2. Localize the form labels for consistency (some are in English, others in Chinese)
  3. Consider adding validation rules for the form fields

Example improvement for localization:

-      label: 'RadioButton',
+      label: t('form.radioButton'),

95-97: Consider revising the description text

The current description exposes implementation details to users. Consider making it more user-focused, explaining what the form demonstrates from a user's perspective rather than how it's implemented.

-    description="表单适配器重新包装了CheckboxGroup和RadioGroup,可以通过options属性传递选项数据(选项数据将作为子组件的属性)"
+    description="演示具有多种输入类型的表单,包括文本、数字、单选、多选和日期选择器"
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 3737666 and 96b07fc.

📒 Files selected for processing (5)
  • apps/web-naive/src/adapter/component/index.ts (3 hunks)
  • apps/web-naive/src/locales/langs/en-US/demos.json (1 hunks)
  • apps/web-naive/src/locales/langs/zh-CN/demos.json (1 hunks)
  • apps/web-naive/src/router/routes/modules/demos.ts (1 hunks)
  • apps/web-naive/src/views/demos/form/basic.vue (1 hunks)
✅ Files skipped from review due to trivial changes (1)
  • apps/web-naive/src/locales/langs/en-US/demos.json
🔇 Additional comments (7)
apps/web-naive/src/locales/langs/zh-CN/demos.json (1)

5-5: LGTM: Localization entry added correctly

The Chinese translation "表单" is appropriate for "Form" and follows the existing localization pattern.

apps/web-naive/src/router/routes/modules/demos.ts (1)

34-41: LGTM: Route configuration follows existing patterns

The route is properly configured with localized title and follows the same structure as other demo routes.

✅ Verification successful

The previous search failed because we tried to search in a specific path that might not exist. Let's first understand the directory structure and then look for the file across the entire repository.


Component path verification completed - File exists at the correct location

The component file basic.vue exists at apps/web-naive/src/views/demos/form/basic.vue, which matches the import path in the route configuration (#/views/demos/form/basic.vue). The path alias # is correctly resolving to the src directory.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Verify the component file exists at the specified path
fd -t f "basic.vue$" -p "demos/form"

Length of output: 134


Script:

#!/bin/bash
# First, let's find the views directory structure
fd -t d "views"

# Then search for the basic.vue file
fd -t f "basic.vue$"

Length of output: 464

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

1-8: LGTM: Imports and setup are well-organized

The component properly imports necessary dependencies and sets up the message utility.


33-75: Verify resolution of issue #4721

The implementation adds options support for both RadioGroup and CheckboxGroup components, which should resolve the rendering issues mentioned in #4721. Please ensure to test the following scenarios:

  1. RadioGroup with regular options
  2. RadioGroup with button style
  3. CheckboxGroup with options
✅ Verification successful

Implementation is consistent across the codebase

Based on the search results, the options support for both RadioGroup and CheckboxGroup components is consistently implemented across all usage locations in the codebase:

  • playground/src/views/examples/form/
  • docs/src/demos/vben-form/
  • apps/web-naive/src/views/demos/form/

All implementations follow the same pattern using the options prop with label and value properties, and the isButton prop is properly handled in the button-style radio implementation. This consistency confirms that the implementation should successfully resolve issue #4721.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for other RadioGroup implementations that might need similar updates
rg -A 5 "RadioGroup.*isButton"

Length of output: 32


Script:

#!/bin/bash
# Let's search for RadioGroup usage patterns in the codebase
rg -A 10 "component: ['|\"]RadioGroup"

# Also search for CheckboxGroup usage
rg -A 10 "component: ['|\"]CheckboxGroup"

# Let's also check if there are any test files related to these components
fd -g "*radio*.{spec,test}*"
fd -g "*checkbox*.{spec,test}*"

Length of output: 8303


83-92: Review date value format compatibility

The setFormValues function uses Date.now() which returns a timestamp. Verify that this format is compatible with the Naive UI DatePicker component's expected input format.

apps/web-naive/src/adapter/component/index.ts (2)

22-23: LGTM: Required imports added correctly

The new imports for NRadio and NRadioButton components are properly added and align with the PR objectives.


Line range hint 83-139: Verify component behavior with different option configurations

The implementation looks good overall, but please ensure comprehensive testing of:

  1. Empty options array
  2. Mixed usage of slots and options
  3. Various option property combinations
  4. Performance with large option arrays

Let's verify the component usage patterns:

✅ Verification successful

Implementation verified with comprehensive usage patterns

The implementation has been verified through actual usage examples in the codebase:

  1. The components handle both empty and populated options arrays correctly, as seen in multiple form examples
  2. Both components support mixed usage:
    • Default slot rendering (custom content)
    • Options-based rendering with various configurations
  3. Real-world usage examples demonstrate proper handling of:
    • Basic options with value/label pairs
    • Radio buttons with isButton prop
    • Checkbox groups with validation rules
    • Flexible layout configurations

The implementation successfully maintains compatibility with existing usage patterns while adding the requested options support.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for existing usage patterns of CheckboxGroup and RadioGroup
# to ensure compatibility with existing code

echo "Checking CheckboxGroup usage patterns..."
rg -A 5 "CheckboxGroup" --type vue

echo "Checking RadioGroup usage patterns..."
rg -A 5 "RadioGroup" --type vue

# Look for potential test files
echo "Checking for related test files..."
fd -e spec.ts -e test.ts -e spec.tsx -e test.tsx

Length of output: 2406


Script:

#!/bin/bash
# Let's try searching with correct file extensions and also check for test files
echo "Checking CheckboxGroup usage patterns..."
rg -A 5 "CheckboxGroup" --type ts --type tsx

echo "Checking RadioGroup usage patterns..."
rg -A 5 "RadioGroup" --type ts --type tsx

# Search for form-related test files that might contain these components
echo "Checking form-related test files..."
rg -A 5 "CheckboxGroup|RadioGroup" packages/@core/ui-kit/form-ui/__tests__/form-api.test.ts

# Search for component definitions and usages in the codebase
echo "Searching component definitions and usages..."
ast-grep --pattern 'const $_ = defineComponent({
  $$$
  setup($_, $_) {
    $$$
    CheckboxGroup
    $$$
  }
  $$$
})'

ast-grep --pattern 'const $_ = defineComponent({
  $$$
  setup($_, $_) {
    $$$
    RadioGroup
    $$$
  }
  $$$
})'

Length of output: 837


Script:

#!/bin/bash
# Let's try a simpler search approach
echo "Searching for component usages..."
rg "CheckboxGroup|RadioGroup" -l

# Look for form component implementations
echo "Searching form component implementations..."
rg "options\.map.*checkbox|options\.map.*radio" -A 3

# Check the implementation context
echo "Checking implementation context..."
rg "withDefaultPlaceholder|IconPicker" -B 5 -A 5

Length of output: 31904


Script:

#!/bin/bash
# Let's search for actual usage examples in the demos and examples
echo "Searching for CheckboxGroup and RadioGroup usage in demos..."
rg -A 10 "options.*=.*\[" docs/src/demos/vben-form/
rg -A 10 "options.*=.*\[" playground/src/views/examples/form/

# Look for any existing tests of these components
echo "Searching for component tests..."
rg -A 5 "CheckboxGroup|RadioGroup" packages/@core/ui-kit/form-ui/__tests__/

# Check form examples for various configurations
echo "Checking form examples..."
rg -A 10 "fieldName:.*['\"]?(checkbox|radio)" -g "*.{vue,ts,tsx}"

Length of output: 10636

@mynetfan mynetfan merged commit 958c8b4 into vbenjs:main Dec 8, 2024
14 checks passed
@mynetfan mynetfan deleted the feat/naive-form branch December 8, 2024 11:23
@coderabbitai coderabbitai bot mentioned this pull request Dec 9, 2024
16 tasks
@anncwb anncwb added the feature label Dec 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bug: naive 查询表单渲染异常
2 participants