fix: fix the occupancy problem of the folding button (#90)

vben
1 parent 9f8796ee
Showing 4 changed files with 16 additions and 8 deletions
CHANGELOG.zh_CN.md
package.json
src/layouts/default/header/LayoutHeader.tsx
yarn.lock
@@ -16,6 +16,7 @@
 ### 🐛 Bug Fixes
  
 - 修复表单 inputNumber 校验错误
+- 修复表单默认值设置错误
  
 ## 2.0.0-rc.10 (2020-11-13)
  
@@ -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",
@@ -119,6 +119,9 @@ export default defineComponent({
  
       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 @@ export default defineComponent({
                   <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
@@ -1850,7 +1850,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   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==