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/wing pr #5368

Closed
wants to merge 4 commits into from
Closed

Feat/wing pr #5368

wants to merge 4 commits into from

Conversation

wingjie
Copy link

@wingjie wingjie commented Jan 13, 2025

Description

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

Release Notes

  • New Features

    • Added multipleRequired validation rule for form fields to enhance multiple selection validation
    • Introduced autoDefaultValue configuration option for more flexible form field handling
  • Improvements

    • Enhanced form validation capabilities across multiple UI libraries
    • Updated form component props to support more dynamic default value assignment
  • Technical Updates

    • Modified form validation logic to support more complex selection requirements
    • Updated interfaces and type definitions to accommodate new validation and configuration options

@wingjie wingjie requested review from anncwb, vince292007, mynetfan and a team as code owners January 13, 2025 06:24
Copy link

changeset-bot bot commented Jan 13, 2025

⚠️ No Changeset found

Latest commit: b7db377

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 Jan 13, 2025

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-antd/src/adapter/form.ts

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

This pull request introduces a new multipleRequired validation rule across multiple form adapters and components. The rule is designed to validate multiple selections by checking if a value is undefined, null, or an empty array. It returns a localized error message when validation fails. Additionally, a new optional autoDefaultValue property is added to form configurations, allowing more flexible default value handling. The changes are consistent across different UI libraries and form-related components, enhancing form validation and configuration capabilities.

Changes

File Change Summary
apps/web-*/src/adapter/form.ts Added multipleRequired validation rule to setupVbenForm function
docs/src/_env/adapter/form.ts Introduced multipleRequired validation rule
docs/src/components/common-ui/vben-form.md Updated FormCommonConfig interface with autoDefaultValue
packages/@core/ui-kit/form-ui/src/form-render/form-field.vue Added autoDefaultValue and defaultValue props, modified validation and event handling
packages/@core/ui-kit/form-ui/src/form-render/form.vue Integrated autoDefaultValue in form configuration
packages/@core/ui-kit/form-ui/src/types.ts Added autoDefaultValue to FormCommonConfig and multipleRequired method to validation rules
packages/@core/ui-kit/shadcn-ui/src/components/pin-input/input.vue Modified handleSendCode to return a boolean
playground/src/adapter/form.ts Added multipleRequired validation rule

Possibly related PRs

Suggested Reviewers

  • anncwb
  • vince292007

Poem

🐰 Validation's dance, a rabbit's delight,
Multiple choices now shine so bright!
multipleRequired leaps with grace,
Ensuring forms meet every case.
A bunny's logic, clean and clear! 🌟

Finishing Touches

  • 📝 Generate Docstrings (Beta)

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

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: 0

🧹 Nitpick comments (5)
apps/web-naive/src/adapter/form.ts (1)

35-40: Maintain consistency with Element Plus adapter

The same improvements suggested for the Element Plus adapter should be applied here for consistency:

  1. Extract common validation logic
  2. Use correct error message key
  3. Add documentation

Additionally, consider documenting the null vs undefined behavior mentioned in the config comment, as it affects validation.

playground/src/adapter/form.ts (1)

24-29: Maintain consistent rule ordering across adapters

The multipleRequired rule is placed before other rules, while in other adapters it's placed after. Maintain consistent ordering across all adapters for better maintainability.

Apply the same improvements as other adapters:

  1. Extract common validation logic
  2. Use correct error message key
  3. Add documentation
packages/@core/ui-kit/form-ui/src/types.ts (1)

140-143: Consider enhancing the documentation.

While the autoDefaultValue property is documented, it would be helpful to include:

  • The expected behavior when enabled/disabled
  • Examples of when to use this feature
  • Any implications on form validation
packages/@core/ui-kit/form-ui/src/form-render/form-field.vue (1)

168-177: Consider reducing code duplication

The computedItemProps computed property largely duplicates logic from computedProps. Consider refactoring to reuse the common logic:

-const computedItemProps = computed(() => {
-  const finalComponentProps = isFunction(componentProps)
-    ? componentProps(values.value, formApi!)
-    : componentProps;
-
-  return {
-    ...finalComponentProps,
-    ...dynamicComponentProps.value,
-  };
-});
+const getFinalComponentProps = () => 
+  isFunction(componentProps) ? componentProps(values.value, formApi!) : componentProps;
+
+const computedProps = computed(() => ({
+  ...commonComponentProps,
+  ...getFinalComponentProps(),
+  ...dynamicComponentProps.value,
+}));
+
+const computedItemProps = computed(() => ({
+  ...getFinalComponentProps(),
+  ...dynamicComponentProps.value,
+}));
docs/src/components/common-ui/vben-form.md (1)

368-371: Enhance property documentation

The autoDefaultValue property documentation could be more comprehensive. Consider adding:

  • Usage examples
  • Common use cases
  • Interaction with other form properties
  /**
   * 是否自动赋值
+  * @description 当设置为 true 时,组件会在挂载时自动设置默认值
+  * @example
+  * ```ts
+  * {
+  *   autoDefaultValue: true,
+  *   defaultValue: 'initial value',
+  *   // The component will automatically set this value on mount
+  * }
+  * ```
   */
  autoDefaultValue?: boolean;
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 42e3220 and b7db377.

📒 Files selected for processing (10)
  • apps/web-antd/src/adapter/form.ts (1 hunks)
  • apps/web-ele/src/adapter/form.ts (1 hunks)
  • apps/web-naive/src/adapter/form.ts (1 hunks)
  • docs/src/_env/adapter/form.ts (1 hunks)
  • docs/src/components/common-ui/vben-form.md (2 hunks)
  • packages/@core/ui-kit/form-ui/src/form-render/form-field.vue (8 hunks)
  • packages/@core/ui-kit/form-ui/src/form-render/form.vue (2 hunks)
  • packages/@core/ui-kit/form-ui/src/types.ts (2 hunks)
  • packages/@core/ui-kit/shadcn-ui/src/components/pin-input/input.vue (2 hunks)
  • playground/src/adapter/form.ts (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: post-update (windows-latest)
🔇 Additional comments (12)
apps/web-ele/src/adapter/form.ts (1)

31-36: Refactor validation logic to avoid duplication

The multipleRequired rule duplicates the exact logic from the required rule. Consider extracting the common validation logic into a shared helper function.

+ const isEmptyValue = (value: any) => 
+   value === undefined || value === null || value.length === 0;

  defineRules: {
    required: (value, _params, ctx) => {
-     if (value === undefined || value === null || value.length === 0) {
+     if (isEmptyValue(value)) {
        return $t('ui.formRules.required', [ctx.label]);
      }
      return true;
    },
    multipleRequired: (value, _params, ctx) => {
-     if (value === undefined || value === null || value.length === 0) {
+     if (isEmptyValue(value)) {
-       return $t('ui.formRules.selectRequired', [ctx.label]);
+       return $t('ui.formRules.multipleRequired', [ctx.label]);
      }
      return true;
    },

Additionally:

  1. The error message key should be multipleRequired instead of selectRequired to distinguish between single and multiple selection requirements
  2. Consider adding JSDoc comments to document the rule's purpose and usage
apps/web-antd/src/adapter/form.ts (1)

39-44: Address PR-level concerns

The implementation needs the same improvements as other adapters. Additionally, there are several PR-level concerns that need to be addressed:

  1. Missing tests for the new validation rule
  2. Missing documentation in the form component docs
  3. Inconsistent implementation across adapters (rule ordering, validation logic duplication)

Would you like me to:

  1. Generate test cases for the new validation rule?
  2. Create documentation for the new rule?
  3. Provide a consistent implementation across all adapters?
docs/src/_env/adapter/form.ts (1)

27-32: LGTM! The new validation rule is well-implemented.

The multipleRequired rule follows the established pattern and properly handles all edge cases (undefined, null, empty array).

packages/@core/ui-kit/shadcn-ui/src/components/pin-input/input.vue (2)

17-19: Consider making the default implementation more explicit about success/failure.

The default implementation always returns true, which might mask potential failures in derived implementations. Consider documenting the expected return value semantics.


64-65: LGTM! Good error handling improvement.

The addition of the boolean check improves error handling by preventing the countdown from starting when the code sending fails.

packages/@core/ui-kit/form-ui/src/form-render/form.vue (2)

88-88: LGTM! Good default value choice.

The autoDefaultValue property is properly initialized with a safe default of false, maintaining backward compatibility.


115-115: LGTM! Proper property propagation.

The autoDefaultValue is correctly propagated to the schema, allowing child components to access this configuration.

packages/@core/ui-kit/form-ui/src/types.ts (1)

402-406: LGTM! Well-typed validation rule.

The multipleRequired validation rule is properly typed and follows the same pattern as other validation rules in the interface.

packages/@core/ui-kit/form-ui/src/form-render/form-field.vue (3)

114-116: LGTM: Validation rule extension

The addition of 'multipleRequired' to the validation rules list is consistent with the existing pattern and enhances form validation capabilities.


243-254: LGTM: Comprehensive change event handling

The implementation properly handles various change scenarios and maintains consistency with form state updates.

Also applies to: 294-323


216-231: LGTM: Default value initialization

The onMounted hook correctly implements the autoDefaultValue functionality. However, verify that all components using this feature properly handle the change event.

Run this script to verify components using autoDefaultValue:

✅ Verification successful

✅ Verified: autoDefaultValue usage is well-contained

The autoDefaultValue feature is only used within the form-ui module's form components (form.vue and form-field.vue), with proper parent-child relationship and consistent implementation. No additional verification is needed.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Find components that might be affected by autoDefaultValue
rg -l "autoDefaultValue.*=.*true" --type vue

Length of output: 74


Script:

#!/bin/bash
# Find .vue files containing autoDefaultValue
fd -e vue -x rg -l "autoDefaultValue"

# Search with context to understand usage patterns
fd -e vue -x rg -A 3 "autoDefaultValue"

# Use ast-grep to find prop declarations
ast-grep --pattern 'props: {
  $$$
  autoDefaultValue: {
    $$$
  }
  $$$
}'

Length of output: 653

docs/src/components/common-ui/vben-form.md (1)

51-56: LGTM: Clear validation rule documentation

The documentation for the multipleRequired validation rule is clear, consistent with other rules, and provides proper implementation details.

@wingjie wingjie closed this Jan 13, 2025
@wingjie wingjie reopened this Jan 13, 2025
@wingjie wingjie closed this Jan 13, 2025
@wingjie wingjie deleted the feat/wingPR branch January 13, 2025 08:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant