diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index 9cbdcf7c542c426e726ca3b0f48b9c75741bdcff..8427647b0137fd4c2dd2e53b5084684170bdd383 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 4cacd4a7fa48efd3063a8fe92e4c1e464ce4e08e..79355d9a8fc2ec720f84c9ceeb88fccc0ae15504 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 2865414e8aff2a57dce4f02310a1904befde9849..0fa71aabf398fddbb0817dd55e79dcc6b606c3ab 100644 --- a/src/layouts/default/header/LayoutHeader.tsx +++ b/src/layouts/default/header/LayoutHeader.tsx @@ -119,6 +119,9 @@ export default defineComponent({ const width = unref(widthRef); + const showLeft = + (mode !== MenuModeEnum.HORIZONTAL && showBreadCrumb && !splitMenu) || + unref(showHeaderTrigger); return ( {() => ( @@ -128,12 +131,16 @@ export default defineComponent({ )} -
- {unref(showHeaderTrigger) && } - {mode !== MenuModeEnum.HORIZONTAL && showBreadCrumb && !splitMenu && ( - - )} -
+ {showLeft && ( +
+ {unref(showHeaderTrigger) && ( + + )} + {mode !== MenuModeEnum.HORIZONTAL && showBreadCrumb && !splitMenu && ( + + )} +
+ )} {unref(showTopMenu) && (