Skip to content

fix(menu): 移除iframe区域并修复布局选项显示#725

Merged
kanyxmo merged 1 commit into
masterfrom
fix-customLayout-link-and-iframe
Jun 11, 2026
Merged

fix(menu): 移除iframe区域并修复布局选项显示#725
kanyxmo merged 1 commit into
masterfrom
fix-customLayout-link-and-iframe

Conversation

@kanyxmo

@kanyxmo kanyxmo commented Jun 11, 2026

Copy link
Copy Markdown
Member

Summary by CodeRabbit

Release Notes

  • Bug Fixes

    • 修复了非默认布局路由的渲染逻辑,确保特定页面类型能够正确显示。
  • New Features

    • 菜单表单中新增布局配置项,特定菜单类型下可进行相关设置。

@kanyxmo
kanyxmo merged commit d562142 into master Jun 11, 2026
4 of 5 checks passed
@coderabbitai

coderabbitai Bot commented Jun 11, 2026

Copy link
Copy Markdown

Review Change Stack

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: e905ebd7-624f-4385-a7f4-3994c2506111

📥 Commits

Reviewing files that changed from the base of the PR and between 1f99cfd and 195c917.

📒 Files selected for processing (2)
  • web/src/layouts/index.tsx
  • web/src/modules/base/views/permission/menu/menu-form.vue

📝 Walkthrough

Walkthrough

PR 调整了默认布局逻辑在两处位置的条件渲染:移除 MineContainer 中非默认布局分支的 iframe 容器节点,使其仅在默认布局路径下按路由类型条件渲染;并在菜单表单中限制 useDefaultLayout 字段仅对菜单类型 'M' 可见。

Changes

布局与菜单表单 useDefaultLayout 配置

Layer / File(s) Summary
移除非默认布局分支中的 iframe 容器
web/src/layouts/index.tsx
useDefaultLayout === false 分支移除 MineIframe 节点,确保 iframe 区域仅在默认布局分支中根据 route.meta?.type === 'I' 条件进行渲染,调整了内容边界范围。
菜单表单 useDefaultLayout 字段条件显示
web/src/modules/base/views/permission/menu/menu-form.vue
formItems 中的 useDefaultLayout 项添加 show 过滤条件,使其仅在 model.meta.type === 'M' 时显示;调整 setData 方法赋值表达式的代码风格。

预估代码审查工作量

🎯 1 (Trivial) | ⏱️ ~5 minutes

可能相关的 PR

  • mineadmin/MineAdmin#469:在 web/src/layouts/index.tsxMineContainer 中调整 route.meta?.type === 'I' 的 iframe 可见性和布局逻辑。
  • mineadmin/MineAdmin#465:修改 web/src/layouts/index.tsxMineContainerMineIframeroute.meta.type === 'I' 条件下的渲染逻辑,集成 iframe keep-alive 缓存。
  • mineadmin/MineAdmin#374:修改 web/src/modules/base/views/permission/menu/menu-form.vuesetData 和表单项渲染控制流。

建议标签

bug, Frontend, size:XS

建议审查者

  • zds-s

Poem

🐰 布局新调整,iframe 各归其位,
菜单表单绽光彩,条件显示更细致。
小小改动大用处,逻辑清晰又顺畅!

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix-customLayout-link-and-iframe

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@dosubot dosubot Bot added size:XS This PR changes 0-9 lines, ignoring generated files. bug labels Jun 11, 2026
@kanyxmo
kanyxmo deleted the fix-customLayout-link-and-iframe branch June 11, 2026 07:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Frontend size:XS This PR changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant