From cd35d3e0d16cb57cb15c2ca20c8a663f21e4bfbf Mon Sep 17 00:00:00 2001
From: vben <anncwb@126.com>
Date: 星期二, 17 十一月 2020 23:45:23 +0800
Subject: [PATCH] fix: fix the occupancy problem of the folding button (#90)
---
yarn.lock | 2 +-
package.json | 2 +-
CHANGELOG.zh_CN.md | 1 +
src/layouts/default/header/LayoutHeader.tsx | 19 +++++++++++++------
4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 9cbdcf7..8427647 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -16,6 +16,7 @@
### 馃悰 Bug Fixes
- 淇琛ㄥ崟 inputNumber 鏍￠獙閿欒
+- 淇琛ㄥ崟榛樿鍊艰缃敊璇�
## 2.0.0-rc.10 (2020-11-13)
diff --git a/package.json b/package.json
index 4cacd4a..79355d9 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
"dependencies": {
"@iconify/iconify": "^2.0.0-rc.2",
"@vueuse/core": "^4.0.0-beta.41",
- "ant-design-vue": "^2.0.0-beta.15",
+ "ant-design-vue": "^2.0.0-rc.1",
"apexcharts": "3.22.0",
"axios": "^0.21.0",
"echarts": "^4.9.0",
diff --git a/src/layouts/default/header/LayoutHeader.tsx b/src/layouts/default/header/LayoutHeader.tsx
index 2865414..0fa71aa 100644
--- a/src/layouts/default/header/LayoutHeader.tsx
+++ b/src/layouts/default/header/LayoutHeader.tsx
@@ -119,6 +119,9 @@
const width = unref(widthRef);
+ const showLeft =
+ (mode !== MenuModeEnum.HORIZONTAL && showBreadCrumb && !splitMenu) ||
+ unref(showHeaderTrigger);
return (
<Layout.Header class={['layout-header', 'flex p-0 px-4 ', unref(headerClass)]}>
{() => (
@@ -128,12 +131,16 @@
<Logo class={`layout-header__logo`} theme={headerTheme} />
)}
- <div class="layout-header__left">
- {unref(showHeaderTrigger) && <LayoutTrigger theme={headerTheme} sider={false} />}
- {mode !== MenuModeEnum.HORIZONTAL && showBreadCrumb && !splitMenu && (
- <LayoutBreadcrumb showIcon={showBreadCrumbIcon} />
- )}
- </div>
+ {showLeft && (
+ <div class="layout-header__left">
+ {unref(showHeaderTrigger) && (
+ <LayoutTrigger theme={headerTheme} sider={false} />
+ )}
+ {mode !== MenuModeEnum.HORIZONTAL && showBreadCrumb && !splitMenu && (
+ <LayoutBreadcrumb showIcon={showBreadCrumbIcon} />
+ )}
+ </div>
+ )}
{unref(showTopMenu) && (
<div
diff --git a/yarn.lock b/yarn.lock
index 7e9e80c..c39eda9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1850,7 +1850,7 @@
dependencies:
color-convert "^2.0.1"
-ant-design-vue@^2.0.0-beta.15:
+ant-design-vue@^2.0.0-rc.1:
version "2.0.0-rc.1"
resolved "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-2.0.0-rc.1.tgz#2ef02475f3aa4c1474f2fe3cf44a52c34787be02"
integrity sha512-iKXkFtTHarvLHV7LWmYh6g/Cmkv+xK+vS621A1Qvg37Z6lCGg3K9BGAizmklAYzOTiPz0Ltt63eSiNqYMGh52g==
--
Gitblit v1.8.0