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: new layout sidebar nav with full header #5270

Merged
merged 1 commit into from
Dec 30, 2024

Conversation

mynetfan
Copy link
Collaborator

@mynetfan mynetfan commented Dec 30, 2024

Description

添加新的布局模式:顶部通栏+侧边导航模式
close #5253

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

Copy link

changeset-bot bot commented Dec 30, 2024

⚠️ No Changeset found

Latest commit: a1d4e88

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 30, 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/base/typings/src/app.d.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

This pull request introduces a new layout type called 'header-sidebar-nav' across multiple packages. The changes span type definitions, layout hooks, Vue components, and localization files. The new layout type enhances the flexibility of the application's navigation and layout system by adding a header with full-width and sidebar navigation mode. The modifications are consistent across different components and ensure proper integration of the new layout option.

Changes

File Change Summary
packages/@core/base/typings/src/app.d.ts Added 'header-sidebar-nav' to LayoutType
packages/@core/ui-kit/layout-ui/src/hooks/use-layout.ts Updated isMixedNav to include 'header-sidebar-nav'
packages/@core/ui-kit/layout-ui/src/vben-layout.vue Modified computed properties isSideMode, mainStyle, and showSidebar to support new layout type
packages/effects/layouts/src/widgets/preferences/blocks/layout/layout.vue Added HeaderSidebarNav component and new preset for 'header-sidebar-nav'
packages/effects/layouts/src/widgets/preferences/icons/header-sidebar-nav.vue New SVG component for header-sidebar-nav icon
packages/effects/layouts/src/widgets/preferences/icons/index.ts Added export for HeaderSidebarNav
packages/locales/src/langs/en-US/preferences.json Added localization entries for new layout type
packages/locales/src/langs/zh-CN/preferences.json Added Chinese localization entries for new layout type

Possibly related PRs

Suggested labels

documentation

Suggested reviewers

  • anncwb
  • vince292007

Poem

🐰 A layout dance, a new design unfurls
Header and sidebar, in elegant swirls
Navigation reimagined, with rabbit's delight
Flexibility blooms, a technological sight!
CodeRabbit hops, innovation takes flight 🚀

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.


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 (4)
packages/effects/layouts/src/widgets/preferences/icons/header-sidebar-nav.vue (3)

1-8: Consider adding a viewBox attribute for responsive scalability.

Currently, the <svg> element sets explicit width="104" and height="66". Adding a viewBox attribute (e.g., viewBox="0 0 104 66") makes the icon scale nicely in different contexts without distortion.


140-140: Use consistent color assignment or accept a prop for theming.

fill="hsl(var(--primary))" is a powerful approach, enabling theme-based coloring. For consistency, consider using similar dynamic color approaches or a prop-based color configuration for the other shapes if you want them to adapt to theme changes as well.


9-174: Remove unnecessary id, stroke="null", and extra attributes if not used.

This file includes several unused attributes (e.g., id="svg_1", stroke="null") that might clutter the SVG. Consider removing them to keep the markup clean and focused.

packages/locales/src/langs/en-US/preferences.json (1)

20-21: Clarify the naming of “Header Vertical.”

“Header Vertical” might confuse some users since there’s also a sidebar involved. Consider rephrasing to something like “Header & Sidebar” to emphasize both the top header and sidebar usage.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 376aad5 and a1d4e88.

📒 Files selected for processing (8)
  • packages/@core/base/typings/src/app.d.ts (1 hunks)
  • packages/@core/ui-kit/layout-ui/src/hooks/use-layout.ts (1 hunks)
  • packages/@core/ui-kit/layout-ui/src/vben-layout.vue (2 hunks)
  • packages/effects/layouts/src/widgets/preferences/blocks/layout/layout.vue (3 hunks)
  • packages/effects/layouts/src/widgets/preferences/icons/header-sidebar-nav.vue (1 hunks)
  • packages/effects/layouts/src/widgets/preferences/icons/index.ts (1 hunks)
  • packages/locales/src/langs/en-US/preferences.json (1 hunks)
  • packages/locales/src/langs/zh-CN/preferences.json (1 hunks)
🔇 Additional comments (9)
packages/effects/layouts/src/widgets/preferences/icons/index.ts (1)

6-6: New export looks good.

Exporting HeaderSidebarNav helps maintain a clear entry point for the new feature.

packages/@core/ui-kit/layout-ui/src/hooks/use-layout.ts (1)

32-36: Logical extension of 'isMixedNav'.

Expanding isMixedNav to recognize 'header-sidebar-nav' aligns well with the naming convention. Just ensure there’s no unexpected overlap between 'mixed-nav' and 'header-sidebar-nav' in UI logic or interactions.

packages/@core/base/typings/src/app.d.ts (1)

5-5: Clean and simple addition of new layout type.

You’ve cleanly extended the LayoutType to include 'header-sidebar-nav'. This change is straightforward and poses no conflicts.

packages/effects/layouts/src/widgets/preferences/blocks/layout/layout.vue (3)

14-14: Importing the new ‘HeaderSidebarNav’ component is consistent.

This step seamlessly integrates the new navigation layout component into the component set.


39-39: Adding 'header-sidebar-nav' to the component map.

This ensures the dynamic component rendering properly identifies and loads the new layout.


58-62: Registering the new layout in PRESET.

Your new localized entries and layout option in PRESET follow the existing pattern, providing a clear, user-friendly choice in the UI.

packages/@core/ui-kit/layout-ui/src/vben-layout.vue (2)

186-187: Ensure consistent naming for the new layout type.

The logic includes 'header-mixed-nav' and now 'header-sidebar-nav'. Confirm that your naming scheme is intuitive and consistent across the codebase so future contributors can understand the differences at a glance.


219-219: Double-check the conditional for currentLayout.value !== 'header-sidebar-nav'.

The new layout excludes the logic that adjusts the main content width in fixed mode. Verify whether 'header-sidebar-nav' should share this logic or truly be excluded. If it should also have a fixed sidebar width, consider removing it from this exclusion.

packages/locales/src/langs/zh-CN/preferences.json (1)

20-21: Great job localizing the new layout mode!

Adding "headerSidebarNav": "侧边导航" and "headerSidebarNavTip": "顶部通栏,侧边导航模式" neatly integrates the latest feature into the Chinese translation.

@mynetfan mynetfan merged commit 2135cb8 into vbenjs:main Dec 30, 2024
15 checks passed
@mynetfan mynetfan deleted the feat/new-layout branch December 30, 2024 16:30
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.

FEATURE: 关于布局,希望有两外两种模式
1 participant