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.

Sign up for GitHub

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

Jump to bottom

style: tabs bottom double line fix #3415

Merged
merged 1 commit into from
Dec 14, 2023
Merged

style: tabs bottom double line fix #3415

merged 1 commit into from
Dec 14, 2023

Conversation

xachary
Copy link
Contributor

@xachary xachary commented Dec 13, 2023

General

请问，下面 tabs 的 bottom 的”双眼皮“是故意如此设计的么？
如果是，麻烦关闭此 request 即可，谢谢~

image

  • 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

@wangjue666 wangjue666 merged commit af6e73b into vbenjs:main Dec 14, 2023
2 checks passed
zyt520ham pushed a commit to zyt520ham/vue-vben-admin that referenced this pull request Dec 14, 2023
@gavinZhang001
Merge branch 'main' into gavin/v4-dev
1d87733 
* main: (224 commits)
  fix:修复气泡确认框的底部按钮换行的问题 (vbenjs#3413)
  style: tabs bottom double line fix (vbenjs#3415)
  feat(IconPicker): IconPicker could allowClear and readonly for form (vbenjs#3414)
  fix(FormTable): Invert select bug (vbenjs#3412)
  chore: 自定义组件默认rule校验默认触发逻辑为blur
  chore(ApiRadioGroup): 移除多余的change事件
  fix(ApiSelect): 修复监听不到params的变动
  fix(BasicForm->ApiRadioGroup): when options click, duplicate requests. resolve vbenjs#3387
  Revert "feat: table搜索表单值发生改变可以触发reload (vbenjs#3378)" (vbenjs#3407)
  fix(BasicTable): ColumnSetting mistake when use setColumns (vbenjs#3408)
  fix: navigator.clipboard 兼容问题 vbenjs#3372 (vbenjs#3403)
  feat: ColumnSetting and SizeSetting persist (vbenjs#3398)
  fix(BasicDrawer): remove toRaw props (vbenjs#3399)
  feat(hooks): useWatermark添加水印防篡改功能(vbenjs#3395) (vbenjs#3397)
  fix: table height calc when fullcontent and footer visible change (vbenjs#3392)
  fix(BasicTable): table表格宽度自适应，隐藏的列导致宽度增加 (vbenjs#3388)
  fix: 使用suffix时，label没有垂直居中 (vbenjs#3384)
  feat: table搜索表单值发生改变可以触发reload (vbenjs#3378)
  feat(treeTable): add function collapseRows and demo (vbenjs#3375)
  perf(BasicTree): 外部获取treeData不必通过treeDataRef.value (vbenjs#3353)
  ...

# Conflicts:
#	internal/eslint-config/.eslintignore
#	internal/stylelint-config/.eslintignore
#	internal/vite-config/.eslintignore
#	package.json
#	pnpm-lock.yaml
#	src/locales/lang/en/sys.ts
#	src/locales/lang/zh-CN/sys.ts
#	src/store/modules/user.ts
#	src/views/demo/feat/session-timeout/index.vue
@xachary xachary deleted the fix-tabs-style branch December 15, 2023 09:48
WitMiao pushed a commit to WitMiao/vue-vben-admin that referenced this pull request Dec 17, 2023
@xachary @WitMiao
style: tabs bottom double line fix (vbenjs#3415)
7c71f81
zyt520ham pushed a commit to zyt520ham/vue-vben-admin that referenced this pull request Dec 22, 2023
@gavinZhang001
Merge branch 'gavin/v4-dev' into gavin/v4-dev-customrouter-merge1
0cd0667 
* gavin/v4-dev: (68 commits)
  feat: 组建修改
  fix:修复气泡确认框的底部按钮换行的问题 (vbenjs#3413)
  style: tabs bottom double line fix (vbenjs#3415)
  feat(IconPicker): IconPicker could allowClear and readonly for form (vbenjs#3414)
  fix(FormTable): Invert select bug (vbenjs#3412)
  chore: 自定义组件默认rule校验默认触发逻辑为blur
  chore(ApiRadioGroup): 移除多余的change事件
  fix(ApiSelect): 修复监听不到params的变动
  fix(BasicForm->ApiRadioGroup): when options click, duplicate requests. resolve vbenjs#3387
  Revert "feat: table搜索表单值发生改变可以触发reload (vbenjs#3378)" (vbenjs#3407)
  fix(BasicTable): ColumnSetting mistake when use setColumns (vbenjs#3408)
  fix: navigator.clipboard 兼容问题 vbenjs#3372 (vbenjs#3403)
  feat: ColumnSetting and SizeSetting persist (vbenjs#3398)
  fix(BasicDrawer): remove toRaw props (vbenjs#3399)
  feat(hooks): useWatermark添加水印防篡改功能(vbenjs#3395) (vbenjs#3397)
  fix: table height calc when fullcontent and footer visible change (vbenjs#3392)
  fix(BasicTable): table表格宽度自适应，隐藏的列导致宽度增加 (vbenjs#3388)
  fix: 使用suffix时，label没有垂直居中 (vbenjs#3384)
  feat: table搜索表单值发生改变可以触发reload (vbenjs#3378)
  feat(treeTable): add function collapseRows and demo (vbenjs#3375)
  ...

# Conflicts:
#	pnpm-lock.yaml
#	src/components/Application/src/AppProvider.vue
#	src/components/Container/src/ScrollContainer.vue
#	src/components/Drawer/src/BasicDrawer.vue
#	src/components/Form/src/BasicForm.vue
#	src/components/Form/src/componentMap.ts
#	src/components/Form/src/components/FormAction.vue
#	src/components/Form/src/hooks/useFormEvents.ts
#	src/components/Modal/src/BasicModal.vue
#	src/components/Modal/src/components/ModalWrapper.vue
#	src/components/Scrollbar/src/Scrollbar.vue
#	src/components/SimpleMenu/src/SimpleSubMenu.vue
#	src/hooks/web/usePermission.ts
#	src/layouts/default/content/index.vue
#	src/layouts/default/header/MultipleHeader.vue
#	src/layouts/default/menu/index.vue
#	src/layouts/default/tabs/components/TabContent.vue
#	src/layouts/default/tabs/index.vue
#	src/layouts/page/index.vue
#	src/locales/lang/en/common.json
#	src/locales/lang/en/sys.json
#	src/locales/lang/zh-CN/sys.json
#	src/router/guard/permissionGuard.ts
#	src/router/helper/routeHelper.ts
#	src/router/routes/basic.ts
#	src/router/routes/index.ts
#	src/router/routes/modules/about.ts
#	src/router/routes/modules/dashboard.ts
#	src/router/routes/modules/demo/charts.ts
#	src/router/routes/modules/demo/comp.ts
#	src/router/routes/modules/demo/feat.ts
#	src/router/routes/modules/demo/flow.ts
#	src/router/routes/modules/demo/iframe.ts
#	src/router/routes/modules/demo/level.ts
#	src/router/routes/modules/demo/page.ts
#	src/router/routes/modules/demo/permission.ts
#	src/router/routes/modules/demo/setup.ts
#	src/router/routes/modules/demo/system.ts
#	src/store/modules/multipleTab.ts
#	src/store/modules/permission.ts
#	src/store/modules/user.ts
#	src/utils/auth/index.ts
#	src/utils/env.ts
#	src/views/demo/form/UseForm.vue
#	src/views/demo/system/account/DeptTree.vue
#	src/views/sys/login/LoginForm.vue
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@xachary @wangjue666