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: add default placeholder for ApiSelect #5078

Merged
merged 1 commit into from
Dec 9, 2024

Conversation

mynetfan
Copy link
Collaborator

@mynetfan mynetfan commented Dec 9, 2024

Description

ApiSelectApiTreeSelect添加默认的placeholder
close #5076

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 default placeholder text for ApiSelect and ApiTreeSelect components across multiple applications.
  • Bug Fixes
    • Removed placeholder property from ApiSelect and ApiTreeSelect components in demo forms, affecting user guidance.
  • Documentation
    • Updated comments for improved clarity on component usage.

@mynetfan mynetfan requested review from anncwb, vince292007 and a team as code owners December 9, 2024 05:56
Copy link
Contributor

coderabbitai bot commented Dec 9, 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-antd/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 changes in this pull request involve modifications to the initComponentAdapter function across multiple files, specifically for the ApiSelect and ApiTreeSelect components. Default placeholder text is now set using the $t function to enhance user experience. In contrast, the basic.vue files have had the placeholder property removed from these components, which affects their display in forms. Overall, the changes focus on improving placeholder handling while retaining the existing structure and functionality of the components.

Changes

File Path Change Summary
apps/web-antd/src/adapter/component/index.ts Updated initComponentAdapter to include default placeholders for ApiSelect and ApiTreeSelect using $t('ui.placeholder.select').
apps/web-ele/src/adapter/component/index.ts Modified initComponentAdapter to add default placeholders for ApiSelect and ApiTreeSelect; updated comments for clarity.
apps/web-naive/src/adapter/component/index.ts Set default placeholders for ApiSelect and ApiTreeSelect in initComponentAdapter using $t.
playground/src/adapter/component/index.ts Added default placeholders for ApiSelect and ApiTreeSelect in initComponentAdapter, ensuring they display a default value when no specific placeholder is provided.
apps/web-ele/src/views/demos/form/basic.vue Removed placeholder property from ApiSelect and ApiTreeSelect, affecting their input prompts in the form.
apps/web-naive/src/views/demos/form/basic.vue Removed placeholder property from ApiSelect and ApiTreeSelect, impacting how these components present input fields.
playground/src/views/examples/form/basic.vue Removed placeholder property from ApiSelect and ApiTreeSelect, changing how users interact with these components.

Possibly related issues

Possibly related PRs

Suggested labels

feature

Suggested reviewers

  • vince292007
  • anncwb

Poem

🐰 In the fields where bunnies play,
New placeholders brighten the day!
ApiSelect and TreeSelect too,
Now guide with text, just for you.
Hop along, let’s fill the form,
With friendly prompts, we’ll keep it warm! 🌼


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

🧹 Outside diff range and nitpick comments (4)
playground/src/adapter/component/index.ts (1)

Line range hint 88-95: Consider using withDefaultPlaceholder HOC for consistency

Other select components in the file use the withDefaultPlaceholder HOC for handling placeholders. Consider refactoring ApiSelect and ApiTreeSelect to use the same pattern for better consistency and maintainability.

Example refactor:

-ApiSelect: (props, { attrs, slots }) => {
+ApiSelect: withDefaultPlaceholder((props, { attrs, slots }) => {
   return h(
     ApiSelect,
     {
-      placeholder: $t('ui.placeholder.select'),
       ...props,
       ...attrs,
       component: Select,
       loadingSlot: 'suffixIcon',
       modelPropName: 'value',
       visibleEvent: 'onVisibleChange',
     },
     slots,
   );
-},
+}, 'select'),

Also applies to: 103-111

apps/web-antd/src/adapter/component/index.ts (1)

Inconsistent dropdown visibility event names found in Ant Design adapter

The verification confirms there is an inconsistency in the event naming within the Ant Design adapter (apps/web-antd/src/adapter/component/index.ts):

  • Line 92: Uses onDropdownVisibleChange
  • Line 110: Uses onVisibleChange

While other adapters consistently use onVisibleChange:

  • Playground adapter: onVisibleChange
  • Naive UI adapter: onVisibleChange
  • Element Plus adapter: onVisibleChange
🔗 Analysis chain

Line range hint 91-91: Verify event name consistency across adapters

The ApiSelect component uses onDropdownVisibleChange here but onVisibleChange in the playground adapter. This inconsistency might cause issues.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check for inconsistent visible event names across adapters
echo "Checking visible event names in ApiSelect components:"
rg -n "visibleEvent.*['\"]on\w+Change['\"]" apps/*/src/adapter/component/index.ts playground/src/adapter/component/index.ts

Length of output: 983

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

Line range hint 77-85: Consider reordering props to allow placeholder override.

The current implementation might prevent users from overriding the default placeholder since it's defined before spreading props. Consider reordering to allow proper prop override.

Here's the suggested change:

  return h(
    ApiSelect,
    {
-     placeholder: $t('ui.placeholder.select'),
      ...props,
      ...attrs,
+     placeholder: props?.placeholder ?? $t('ui.placeholder.select'),
      component: ElSelectV2,
      loadingSlot: 'loading',
      visibleEvent: 'onVisibleChange',
    },
    slots,
  );

Line range hint 91-101: Apply the same placeholder override fix for consistency.

For consistency with ApiSelect, the placeholder implementation should follow the same pattern to allow proper prop override.

Here's the suggested change:

  return h(
    ApiSelect,
    {
-     placeholder: $t('ui.placeholder.select'),
      ...props,
      ...attrs,
+     placeholder: props?.placeholder ?? $t('ui.placeholder.select'),
      component: ElTreeSelect,
      props: { label: 'label', children: 'children' },
      nodeKey: 'value',
      loadingSlot: 'loading',
      optionsPropName: 'data',
      visibleEvent: 'onVisibleChange',
    },
    slots,
  );
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between d085736 and fe6c5b3.

📒 Files selected for processing (7)
  • apps/web-antd/src/adapter/component/index.ts (2 hunks)
  • apps/web-ele/src/adapter/component/index.ts (2 hunks)
  • apps/web-ele/src/views/demos/form/basic.vue (0 hunks)
  • apps/web-naive/src/adapter/component/index.ts (2 hunks)
  • apps/web-naive/src/views/demos/form/basic.vue (0 hunks)
  • playground/src/adapter/component/index.ts (2 hunks)
  • playground/src/views/examples/form/basic.vue (0 hunks)
💤 Files with no reviewable changes (3)
  • playground/src/views/examples/form/basic.vue
  • apps/web-naive/src/views/demos/form/basic.vue
  • apps/web-ele/src/views/demos/form/basic.vue
🔇 Additional comments (5)
apps/web-antd/src/adapter/component/index.ts (1)

87-87: ⚠️ Potential issue

Fix props ordering to ensure default placeholder works correctly

Same issue as in playground adapter: placeholder property can be overridden by props.

Apply the same fix as suggested for the playground adapter.

Also applies to: 102-102

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

Line range hint 89-97: LGTM! Proper handling of Naive UI specific configuration

The implementation correctly handles Naive UI specific props like nodeKey, keyField, and appropriate slot names.


75-75: ⚠️ Potential issue

Fix props ordering to ensure default placeholder works correctly

Same issue as in other adapters: placeholder property can be overridden by props.

Apply the same fix as suggested for the playground adapter.

Also applies to: 88-88

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

Line range hint 1-30: Well-structured component adapter implementation!

The adapter pattern implementation is clean and maintainable, with good type safety and consistent component wrapping approach. The withDefaultPlaceholder utility function is particularly well-designed for reuse.


Line range hint 77-101: Verify consistent implementation across adapters.

Let's verify that the placeholder implementation is consistent across all adapter files and that form components are properly handling the new default placeholders.

✅ Verification successful

Placeholder implementation is consistent across all adapter variants

The verification shows that the placeholder implementation using $t('ui.placeholder.select') is consistently implemented across all adapter variants:

  • web-antd adapter
  • web-ele adapter
  • web-naive adapter
  • playground adapter

The implementation is uniform for both ApiSelect and ApiTreeSelect components in each adapter, and the components are properly used in form components across different views.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check for placeholder implementation across adapter files
echo "Checking placeholder implementation in adapter files..."
rg -A 5 "placeholder.*ui\.placeholder\.select" "apps/*/src/adapter/component/"

# Check form component usage
echo "Checking form component usage..."
rg -A 5 "ApiSelect|ApiTreeSelect" "apps/*/src/views/"

Length of output: 460


Script:

#!/bin/bash
# First, let's find the adapter files
echo "Finding adapter files..."
fd "component" --type d

# Then check for placeholder implementation
echo "Checking placeholder implementation in adapter files..."
rg -A 5 "placeholder.*ui\.placeholder\.select"

# Check form component usage
echo "Checking form component usage..."
rg -A 5 "ApiSelect|ApiTreeSelect"

Length of output: 18218

playground/src/adapter/component/index.ts Show resolved Hide resolved
@mynetfan mynetfan merged commit 018ddc7 into vbenjs:main Dec 9, 2024
15 checks passed
@mynetfan mynetfan deleted the feat/default-placeholder-api-select branch December 9, 2024 06:03
@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: ApiSelect&&ApiTreeSelect 没有默认的placeholder
2 participants