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(MultipleTab): add tabs auto collapse interaction and setting #3256

Merged
merged 3 commits into from
Nov 9, 2023
Merged

feat(MultipleTab): add tabs auto collapse interaction and setting #3256

merged 3 commits into from
Nov 9, 2023

Conversation

xachary
Copy link
Contributor

@xachary xachary commented Nov 8, 2023

General

部分页面在开启“fold”模式下,希望达到“沉浸式”的全屏展示,同时不影响“tabs”的切换,且相比于“fullContent”模式需要点击2次才能切换,增加“fold”模式下“tabs”可以自动收起,可以1次点击即可切换。

  • Pull request template structure not broken

Type

ℹ️ What types of changes does your code introduce?

👉 Put an x in the boxes that apply

  • 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

Checklist

ℹ️ Check all checkboxes - this will indicate that you have done everything in accordance with the rules in CONTRIBUTING.

👉 Put an x in the boxes that apply.

  • My code follows the style guidelines of this project
  • Is the code format correct
  • Is the git submission information standard?
  • 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

@xachary
Copy link
Contributor Author

xachary commented Nov 8, 2023

我这边还有一个调整,上述的模式下,“fold”的时候"设置"按钮会移动到“tabs”栏上面(“刷新”按钮左边),先看看这个模式是否通过你们的评审。

@wangjue666 wangjue666 self-requested a review November 9, 2023 01:01
@wangjue666
Copy link
Collaborator

@xachary 我开启了 自动收起标签页 标签切换好像没有变化, 能否详细描述下或者录制个视频 这个功能该如何使用吗?

@xachary
Copy link
Contributor Author

xachary commented Nov 9, 2023

@wangjue666 好的,请看:

chrome_Yp7bbyYgqT.mp4

”fold“的时候才会生效获得”全屏“的体验

在这个前提下,还可以优化浮动的设置按钮显示逻辑,可以”fold“的时候可以显示在标签栏上(我项目中是这样优化的)。

@wangjue666 wangjue666 merged commit 191e809 into vbenjs:main Nov 9, 2023
2 checks passed
@wangjue666
Copy link
Collaborator

@xachary 可以,你可以重新fork下仓库,开个新分支进行pr,这样你之前提交的commit信息不会出现在新pr里面

image

每次pr前主动点下更新这样可以尽可能避免代码冲突

image

我这边还有一个调整,上述的模式下,“fold”的时候"设置"按钮会移动到“tabs”栏上面(“刷新”按钮左边),先看看这个模式是否通过你们的评审。

zyt520ham pushed a commit to zyt520ham/vue-vben-admin that referenced this pull request Dec 22, 2023
* main: (43 commits)
  fix(BasicForm): validate Form tip height (vbenjs#3286). close vbenjs#3281
  perf(IconPicker): input  trigger popover by click (vbenjs#3278)
  perf(breakpointEnum): 修改enum与breakpoint.less内一致 (vbenjs#3276)
  fix(DatePicker): zh-CN is not work in DatePicker (vbenjs#3273)
  perf(ImageUpload): 根据官方示例设置图片回显格式 (vbenjs#3252)
  chore(deps): bump ant-design-vue and  typescript to latest version
  chore(demo->form): 增加ApiTransfer使用示例. close vbenjs#1760
  feat(layout): move setting button to tabs when fold (vbenjs#3264)
  feat(MultipleTab): add tabs auto collapse interaction in fold mode and setting  (vbenjs#3256)
  chore(i18n): resolve ts type error
  chore(demo->BasicTree): 增加获取当前tree数据示例. resolve vbenjs#3253
  perf(BasicTree): 获取treeData改写成函数
  feat(BasicTree): BasicTree组件暴露treeData数据
  fix(dept): no parentDept can edit parentDept (vbenjs#3255)
  fix: validateFields await missing (vbenjs#3254)
  chore(demo): 自定义列的helpMessage增加tsx和h函数渲染的数据
  feat(Table-> CustomerCell):  helpMessage支持传递 tsx 和 h函数的数据
  refactor: fix type check (vbenjs#3246)
  refactor: remove cipher old (vbenjs#3245)
  feat: pinia persist plugin custom serializer (vbenjs#3244)
  ...

# Conflicts:
#	pnpm-lock.yaml
#	src/App.vue
#	src/hooks/web/useI18n.ts
#	src/layouts/default/header/MultipleHeader.vue
#	src/layouts/default/index.vue
#	src/locales/useLocale.ts
#	src/utils/cache/storageCache.ts
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.

None yet

2 participants