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

fix: vxeTable default sort data no effect in first query #5139

Closed
wants to merge 2 commits into from

Conversation

mynetfan
Copy link
Collaborator

@mynetfan mynetfan commented Dec 14, 2024

Description

修复VxeGrid在设置了默认排序数据时,首次加载数据时,proxyConfig.ajax.query函数的参数缺少排序数据的问题。
我认为这是一个VxeGrid的Bug,提交了一个Issue:https://gitee.com/x-extends/vxe-table/issues/IBBBJ2

这个PR是一个针对性的修复方案,在上述疑似BUG被修复后,这个PR的改动应当被撤销。

已找到更优的方法解决这个问题:#5141

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 a loading state indicator for improved data management.
    • Enhanced control over data loading, allowing for explicit loading based on component settings.
    • Added sorting capabilities to the grid for specific columns (category, productName, price).
  • Bug Fixes

    • Resolved issues with lost sorting parameters during initial data load.
  • Documentation

    • Added a warning for users regarding unsupported formConfig, recommending the use of formOptions instead.

Copy link

changeset-bot bot commented Dec 14, 2024

⚠️ No Changeset found

Latest commit: d81dc88

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 14, 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/backend-mock/api/table/list.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 use-vxe-grid.vue component, primarily focusing on state management and sorting functionality. A new reactive reference isLoaded tracks the loading state of data, while the options computed property is updated to control data loading explicitly. The init function is modified to handle the autoLoad property correctly, ensuring sorting parameters are preserved during the initial load. Additionally, a warning is added to guide users toward using formOptions instead of formConfig.

Changes

File Change Summary
packages/effects/plugins/src/vxe-table/use-vxe-grid.vue - Added isLoaded reactive reference
- Updated options computed property to control data loading
- Modified init function to handle autoLoad
- Added warning for formConfig usage
apps/backend-mock/api/table/list.ts - Enhanced eventHandler to support sorting in mock data response
- Created listData for sorting without altering original data
- Implemented sorting logic based on sortBy and sortOrder
playground/src/views/examples/vxe-table/remote.vue - Updated gridOptions to include sortable fields
- Modified query function to accept sort parameter
- Introduced sortConfig for default sorting behavior

Assessment against linked issues

Objective Addressed Explanation
Fix default sort not working on first load [#5125]
Ensure sort parameters are not empty during initial query [#5125]

Possibly related PRs

Suggested labels

bug

Suggested reviewers

  • vince292007
  • anncwb

Poem

🐰 In the grid of code, a sorting tale unfolds,
Where parameters dance and data takes hold.
No more empty sorts, no more first-load strife,
With isLoaded magic, we bring data to life!
A rabbit's fix, precise and bright! 🔍✨

Tip

CodeRabbit's docstrings feature is now available as part of our Early Access Program! Simply use the command @coderabbitai generate docstrings to have CodeRabbit automatically generate docstrings for your pull request. This feature will be included in our Pro Plan when released.


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

🧹 Outside diff range and nitpick comments (1)
packages/effects/plugins/src/vxe-table/use-vxe-grid.vue (1)

163-172: Consider adding monitoring for this temporary fix

Since this is a temporary fix pending an upstream bug fix in VxeTable:

  1. Consider adding a TODO comment with the relevant VxeTable issue number
  2. Add monitoring or logging to track if this workaround causes any side effects
  3. Create a follow-up ticket to remove this code once VxeTable fixes the bug

Would you like me to help create a follow-up issue to track the removal of this workaround once VxeTable fixes the bug?

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 698daf4 and 31b27ea.

📒 Files selected for processing (1)
  • packages/effects/plugins/src/vxe-table/use-vxe-grid.vue (4 hunks)
🔇 Additional comments (3)
packages/effects/plugins/src/vxe-table/use-vxe-grid.vue (3)

144-145: LGTM: Clear and purposeful state management

The addition of isLoaded ref provides a clean way to track the grid's loading state.


Line range hint 255-261: LGTM: Proper initialization handling

The implementation correctly handles the autoLoad behavior while preventing form default values from interfering with the initial load.

Let's verify the autoLoad behavior across the codebase:

✅ Verification successful

LGTM: Proper autoLoad implementation verified

The implementation is correct and consistent with the codebase patterns. The search results show that:

  1. The default autoLoad is set to true in various adapter configurations (playground, docs, and apps)
  2. In use-vxe-grid.vue, the component explicitly sets autoLoad to false and takes control of the loading behavior
  3. The reviewed code properly checks both autoLoad from default options and enableProxyConfig before triggering the reload
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for autoLoad usage patterns
ast-grep --pattern 'proxyConfig: {
  $$$
  autoLoad: $_
  $$$
}'

Length of output: 66


Script:

#!/bin/bash
# Let's try a different approach to search for autoLoad configurations
rg -U "autoLoad.*=|autoLoad.*:" -A 3 -B 3

# Also search for proxyConfig patterns
rg -U "proxyConfig.*=" -A 3 -B 3

Length of output: 5848


163-172: Review the setTimeout workaround implementation

While the fix addresses the immediate issue with sorting parameters, the implementation has some concerns:

  1. Using setTimeout with 0 delay is a workaround that might be fragile
  2. The comment indicates this is temporary until VxeTable fixes the bug
  3. The approach might interfere with other grid configurations or custom query handlers

Let's verify if this is the minimal required fix:

Consider these alternatives:

 if (mergedOptions.proxyConfig.ajax?.query && !isLoaded.value) {
   mergedOptions.proxyConfig.ajax.query = async () => {
     isLoaded.value = true;
-    await nextTick();
-    setTimeout(() => {
-      props.api.query();
-    }, 0);
+    // Option 1: Use Vue's nextTick more explicitly
+    await nextTick();
+    return props.api.query();
+    
+    // Option 2: Handle the initialization in a more controlled way
+    // return props.api.query({
+    //   ...props.api.getTableState(),
+    //   sortConfig: mergedOptions.sortConfig
+    // });
   };
 }

@mynetfan mynetfan requested a review from a team as a code owner December 14, 2024 16:05
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

🧹 Outside diff range and nitpick comments (1)
apps/backend-mock/api/table/list.ts (1)

48-70: Consider enhancing the sorting implementation

While the current implementation works, consider these improvements:

  1. Use localeCompare for string comparisons to handle special characters and different locales properly
  2. Add validation for sortOrder values

Here's a suggested improvement:

 if (sortBy && Reflect.has(listData[0], sortBy as string)) {
+  const validSortOrders = ['asc', 'desc'];
+  if (!validSortOrders.includes(sortOrder as string)) {
+    sortOrder = 'asc'; // default fallback
+  }
   listData.sort((a, b) => {
     if (sortOrder === 'asc') {
       if (sortBy === 'price') {
         return (
           Number.parseFloat(a[sortBy as string]) -
           Number.parseFloat(b[sortBy as string])
         );
       } else {
-        return a[sortBy as string] > b[sortBy as string] ? 1 : -1;
+        return (a[sortBy as string] as string).localeCompare(b[sortBy as string] as string);
       }
     } else {
       if (sortBy === 'price') {
         return (
           Number.parseFloat(b[sortBy as string]) -
           Number.parseFloat(a[sortBy as string])
         );
       } else {
-        return a[sortBy as string] < b[sortBy as string] ? 1 : -1;
+        return (b[sortBy as string] as string).localeCompare(a[sortBy as string] as string);
       }
     }
   });
 }
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 31b27ea and d81dc88.

📒 Files selected for processing (2)
  • apps/backend-mock/api/table/list.ts (1 hunks)
  • playground/src/views/examples/vxe-table/remote.vue (1 hunks)
🔇 Additional comments (5)
playground/src/views/examples/vxe-table/remote.vue (4)

28-31: LGTM: Column sorting configuration is appropriate

The addition of sortable: true to category, productName, and price columns is well-chosen as these are common fields users would want to sort by.


39-46: LGTM: Query function properly handles sort parameters

The query function now correctly passes sorting information to the API, which is essential for server-side sorting functionality.


58-58: LGTM: Refresh configuration uses proper code-based approach

The update to use { code: 'query' } instead of a boolean provides more explicit refresh behavior control.


48-52: LGTM: Sort configuration properly implements default sorting

The configuration correctly enables remote sorting and sets a default sort on the category field. This addresses the core issue mentioned in the PR.

✅ Verification successful

Based on the search results, we can see that:

  1. The default sort configuration exists only in playground/src/views/examples/vxe-table/remote.vue
  2. No other conflicting sort configurations with the category field were found

Since this is the only instance of the sort configuration for the category field in the codebase, and it's properly implemented with remote sorting enabled, I can generate the final response:

✅ Sort configuration is correctly implemented and unique

The default sort configuration for the category field is only present in this file and properly implements remote sorting, which aligns with the PR's objective without causing any conflicts in the codebase.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Verify that this is the only instance of sortConfig to avoid conflicts
rg -l 'sortConfig.*defaultSort.*category' --type vue

Length of output: 82


Script:

#!/bin/bash
# Search for sortConfig patterns without file type restriction
rg -l 'sortConfig.*defaultSort.*category'

Length of output: 43


Script:

#!/bin/bash
# Search for any other default sort configurations that might conflict
rg 'defaultSort.*category'

Length of output: 134


Script:

#!/bin/bash
# List all vue files to ensure we're searching in the right place
fd '.*\.vue$'

Length of output: 29749

apps/backend-mock/api/table/list.ts (1)

46-47: LGTM: Query parameter handling is well-implemented

Good use of structuredClone to create a copy of the data before sorting, preventing modifications to the original dataset.

@mynetfan
Copy link
Collaborator Author

@anncwb @vince292007

@mynetfan
Copy link
Collaborator Author

已找到更好的解决方案

@mynetfan mynetfan closed this Dec 15, 2024
@mynetfan mynetfan deleted the fix/table-first-load branch December 16, 2024 14:35
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