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: header logo may not be collapsed in header-sidebar-nav layout #5274

Merged
merged 1 commit into from
Dec 31, 2024

Conversation

mynetfan
Copy link
Collaborator

@mynetfan mynetfan commented Dec 31, 2024

Description

修复侧边导航模式下,顶栏的LOGO在侧边栏折叠的时候也被折叠的问题。
这个布局下顶栏是独立的,不应受侧边栏状态的影响

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 new computed properties to support different navigation layout configurations
    • Enhanced layout responsiveness for header and sidebar navigation modes
  • Improvements

    • Refined logo and header navigation display logic based on navigation type
    • Improved flexibility in layout configuration options

Copy link

changeset-bot bot commented Dec 31, 2024

⚠️ No Changeset found

Latest commit: 7152c0b

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

packages/@core/preferences/src/use-preferences.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 introduces two new computed properties, isHeaderMixedNav and isHeaderSidebarNav, in the usePreferences function. These properties help determine the current layout configuration, specifically for 'header-mixed-nav' and 'header-sidebar-nav' layouts. The changes are implemented in the preferences and layout files, enhancing the system's ability to handle different navigation configurations with more granular control.

Changes

File Change Summary
packages/@core/preferences/src/use-preferences.ts Added two new computed properties: isHeaderMixedNav and isHeaderSidebarNav to detect specific layout types
packages/effects/layouts/src/basic/layout.vue Integrated isHeaderSidebarNav into logoCollapsed and showHeaderNav computed properties for more nuanced layout control

Suggested labels

feature, layout-enhancement

Suggested reviewers

  • anncwb
  • vince292007

Possibly related PRs

Poem

🐰 Layouts dancing, navigation's art,
Computed properties play their part!
Mixed and sidebar, headers align,
With rabbit's touch, design divine!
Code hops forward, preferences 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. We would love to hear your feedback on Discord.


📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 2135cb8 and 7152c0b.

📒 Files selected for processing (2)
  • packages/@core/preferences/src/use-preferences.ts (2 hunks)
  • packages/effects/layouts/src/basic/layout.vue (2 hunks)
🔇 Additional comments (5)
packages/@core/preferences/src/use-preferences.ts (3)

85-87: New computed property isHeaderMixedNav looks consistent.
Good addition matching the existing doc comment style and naming conventions.


92-98: isHeaderSidebarNav property is well introduced.
Nicely adheres to the codebase conventions and fosters clarity for upcoming logic using 'header-sidebar-nav'.


238-238: Exporting isHeaderSidebarNav improves composability.
Inclusion in the returned object ensures consistent usage in components.

packages/effects/layouts/src/basic/layout.vue (2)

43-43: Importing isHeaderSidebarNav ensures layout intelligence.
Including this property from usePreferences provides more precise control over the header’s interaction with sidebar navigation states.


85-85: logoCollapsed condition now accounts for isHeaderSidebarNav.
Excellent fix ensuring the header logo remains unaffected by sidebar collapse in ‘header-sidebar-nav’ mode, aligning with the PR objective.


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.

@mynetfan mynetfan merged commit 3af22f7 into vbenjs:main Dec 31, 2024
14 checks passed
@mynetfan mynetfan deleted the fix/layout branch December 31, 2024 03:36
little-alei pushed a commit to little-alei/vue-vben-admin that referenced this pull request Jan 6, 2025
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