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: modified fixed and unfixed logic, fixed #4640 #4709

Merged
merged 2 commits into from
Oct 22, 2024

Conversation

pingsanddoss
Copy link
Contributor

@pingsanddoss pingsanddoss commented Oct 22, 2024

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

  • New Features
    • Improved tab management with enhanced sorting for pinned tabs when they are pinned or unpinned.
    • Added functionality to reorder tabs dynamically based on user actions.

These updates provide a more intuitive experience for users managing their tabs, ensuring a seamless organization of pinned content.

Copy link

changeset-bot bot commented Oct 22, 2024

⚠️ No Changeset found

Latest commit: 72aff40

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 Oct 22, 2024

Walkthrough

The changes in this pull request enhance the useTabbarStore functionality by updating the pinTab and unpinTab methods to include sorting logic for pinned tabs. A new method, sortTabs, is introduced to manage the reordering of tabs based on their indices after they are pinned or unpinned. This ensures that the tabs are displayed in the correct order according to their new positions in the tab bar.

Changes

File Path Change Summary
packages/stores/src/modules/tabbar.ts - Updated pinTab and unpinTab methods to include sorting logic for pinned tabs.
- Added new method sortTabs(oldIndex: number, newIndex: number) to handle tab reordering.

Possibly related PRs

Suggested labels

bug

Suggested reviewers

  • anncwb
  • vince292007

🐰 In the tabbar, a dance we see,
Pinned and unpinned, oh so free!
With a sort and a twirl, they find their place,
Hopping along in a lively race.
Tabs in order, a joyful sight,
Thanks to the changes, everything's right! 🌟


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 (2)
packages/stores/src/modules/tabbar.ts (2)

314-321: Consider translating comments to English for consistency

The comments in this code segment are written in Chinese, whereas the rest of the codebase uses English for comments. For consistency and maintainability, it's recommended to use a single language throughout the codebase.


430-435: Consider translating comments to English for consistency

The comments in this code segment are written in Chinese, whereas the rest of the codebase uses English for comments. For consistency and maintainability, it's recommended to use a single language throughout the codebase.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 1b172b0 and bf6a3a5.

📒 Files selected for processing (1)
  • packages/stores/src/modules/tabbar.ts (2 hunks)
🧰 Additional context used
🔇 Additional comments (1)
packages/stores/src/modules/tabbar.ts (1)

430-435: Verify the sorting logic when unpinning tabs

When unpinning a tab, the newIndex is set to affixTabs.length, which calculates the index for non-affix (unpinned) tabs. Ensure that this index correctly positions the unpinned tab among the non-affix tabs to maintain the intended tab order.

packages/stores/src/modules/tabbar.ts Outdated Show resolved Hide resolved
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 (2)
packages/stores/src/modules/tabbar.ts (2)

315-322: LGTM! Consider setting affixTabOrder for consistent sorting.

The added code improves the pinning functionality by ensuring proper sorting of pinned tabs. However, as noted in the comment, affixTabOrder is not set, which could lead to inconsistent sorting in the future.

Consider setting affixTabOrder when pinning a tab to ensure consistent sorting:

 tab.meta.affixTab = true;
 tab.meta.title = oldTab?.meta?.title as string;
 this.tabs.splice(index, 1, tab);
+tab.meta.affixTabOrder = affixTabs.length; // Set affixTabOrder to the current number of pinned tabs

430-435: LGTM! Consider updating affixTabOrder for remaining pinned tabs.

The added code improves the unpinning functionality by ensuring proper sorting of tabs after unpinning. However, as noted in the comment, affixTabOrder is not updated, which could lead to inconsistent sorting of remaining pinned tabs.

Consider updating affixTabOrder for remaining pinned tabs after unpinning:

 tab.meta.affixTab = false;
 tab.meta.title = oldTab?.meta?.title as string;
 this.tabs.splice(index, 1, tab);
+
+// Update affixTabOrder for remaining pinned tabs
+this.tabs.forEach((t, i) => {
+  if (t.meta.affixTab) {
+    t.meta.affixTabOrder = i;
+  }
+});
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between bf6a3a5 and 72aff40.

📒 Files selected for processing (1)
  • packages/stores/src/modules/tabbar.ts (2 hunks)
🧰 Additional context used
🔇 Additional comments (2)
packages/stores/src/modules/tabbar.ts (2)

Line range hint 391-398: LGTM! Please clarify the purpose of incrementing dragEndIndex.

The sortTabs method correctly implements the logic for reordering tabs. However, the purpose of incrementing dragEndIndex is not clear from the context.

Could you please clarify the purpose of incrementing dragEndIndex? Is it related to drag-and-drop functionality? If it's not necessary, consider removing it:

 async sortTabs(oldIndex: number, newIndex: number) {
   const currentTab = this.tabs[oldIndex];
   if (!currentTab) {
     return;
   }
   this.tabs.splice(oldIndex, 1);
   this.tabs.splice(newIndex, 0, currentTab);
-  this.dragEndIndex = this.dragEndIndex + 1;
 }

Line range hint 1-568: Overall, good improvements to tab management functionality.

The changes enhance the pinning, unpinning, and sorting of tabs. Consider implementing the suggested improvements for affixTabOrder management to ensure consistent sorting. Also, please clarify the purpose of dragEndIndex in the sortTabs method.

@vince292007 vince292007 merged commit f60796f into vbenjs:main Oct 22, 2024
14 checks passed
GavinLucky pushed a commit to GavinLucky/vue-vben-admin that referenced this pull request Oct 23, 2024
… (vbenjs#4709)

* fix: modified fixed and unfixed logic, fixed vbenjs#4640

* fix: modified fixed and unfixed logic, fixed vbenjs#4640
@github-actions github-actions bot locked and limited conversation to collaborators Nov 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants