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: useEcharts return invalid instance #5360

Merged
merged 1 commit into from
Jan 12, 2025

Conversation

mynetfan
Copy link
Collaborator

@mynetfan mynetfan commented Jan 12, 2025

Description

修复useEcharts返回的instance值可能不正确的问题

fix #5354

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

    • Enhanced chart rendering functionality with improved type safety
    • Added a method to retrieve chart instance dynamically
  • Refactor

    • Updated asynchronous rendering logic for ECharts
    • Improved chart instance management and accessibility

Copy link

changeset-bot bot commented Jan 12, 2025

⚠️ No Changeset found

Latest commit: 3837b27

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

packages/effects/plugins/src/echarts/use-echarts.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

The pull request modifies the useEcharts function in the use-echarts.ts file, focusing on improving type safety and chart instance management. The changes introduce a new Nullable type import, update the renderEcharts function's return type, and modify the promise resolution logic. The function now returns a getter method for accessing the chart instance, providing more controlled access to the chart's internal state.

Changes

File Change Summary
packages/effects/plugins/src/echarts/use-echarts.ts - Added Nullable type import from @vben/types
- Updated renderEcharts return type to Promise<Nullable<echarts.ECharts>>
- Modified promise resolution logic in renderEcharts
- Introduced getChartInstance getter method

Possibly related PRs

Suggested reviewers

  • vince292007
  • anncwb

Poem

🐰 Echarts dance, a type-safe delight,
Promises resolved with getter's might,
Nullable magic, instance so neat,
Code refactored, now more complete!
A rabbit's code review, pure and bright 🎨

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

🧹 Nitpick comments (1)
packages/effects/plugins/src/echarts/use-echarts.ts (1)

66-67: Extract timeout duration to a constant.

The hardcoded timeout of 30ms is used in multiple places. Consider extracting it to a named constant for better maintainability.

+const RENDER_TIMEOUT_MS = 30;
+
 const renderEcharts = (/*...*/) => {
   // ...
   useTimeoutFn(async () => {
     resolve(await renderEcharts(currentOptions));
-  }, 30);
+  }, RENDER_TIMEOUT_MS);
   // ...
   useTimeoutFn(() => {
     // ...
     resolve(chartInstance);
-  }, 30);
+  }, RENDER_TIMEOUT_MS);

Also applies to: 79-79

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 6719e26 and 3837b27.

📒 Files selected for processing (1)
  • packages/effects/plugins/src/echarts/use-echarts.ts (4 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (9)
  • GitHub Check: CodeQL
  • GitHub Check: Lint (windows-latest)
  • GitHub Check: Lint (ubuntu-latest)
  • GitHub Check: Test (windows-latest)
  • GitHub Check: Check (windows-latest)
  • GitHub Check: post-update (windows-latest)
  • GitHub Check: Check (ubuntu-latest)
  • GitHub Check: post-update (ubuntu-latest)
  • GitHub Check: Analyze (javascript-typescript)
🔇 Additional comments (3)
packages/effects/plugins/src/echarts/use-echarts.ts (3)

5-5: LGTM! Type import enhances type safety.

The addition of the Nullable type import improves type safety for the chart instance handling.


116-116: LGTM! Good encapsulation practice.

The addition of getChartInstance getter provides better encapsulation of the chart instance and follows Vue.js best practices.


Line range hint 55-82: Verify usage of useEcharts in the codebase.

Let's ensure that all consumers of useEcharts are prepared for the new return type and getter method.

Also applies to: 116-116

✅ Verification successful

No breaking changes detected in useEcharts consumers

All current usages only utilize the renderEcharts method in a fire-and-forget style within onMounted, with no dependency on the return value or direct chart instance access. The changes are safe to proceed.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for useEcharts usage patterns
echo "Checking direct chartInstance access (should be updated to use getter):"
rg "const.*=.*useEcharts\(" -A 5

echo "Checking renderEcharts promise handling (should handle nullable return):"
rg "renderEcharts\(.*\).*then\(" -A 2

Length of output: 10861

@mynetfan mynetfan merged commit b785bc5 into vbenjs:main Jan 12, 2025
15 checks passed
@mynetfan mynetfan deleted the fix/use-echarts branch January 12, 2025 01:54
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.

Bug: useEcharts中返回的chartInstance始终为null
1 participant