From 20bab61ccd3689a3965048016f071e778593e065 Mon Sep 17 00:00:00 2001 From: "weijun.wang" Date: Tue, 29 Oct 2019 11:19:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=97=B4=E8=B7=9Dmargin=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/menu/style/index.less | 1 + 1 file changed, 1 insertion(+) diff --git a/components/menu/style/index.less b/components/menu/style/index.less index 33bee5c6c4..5699a02d32 100644 --- a/components/menu/style/index.less +++ b/components/menu/style/index.less @@ -38,6 +38,7 @@ &-submenu, &-submenu-inline { + overflow: hidden; //fix margin bug transition: border-color 0.3s @ease-in-out, background 0.3s @ease-in-out, padding 0.15s @ease-in-out; } From d87073755f96ab6f9d508b5993c7cbd038c7f573 Mon Sep 17 00:00:00 2001 From: wangweijun0418 <40419952+wangweijun0418@users.noreply.github.com> Date: Wed, 30 Oct 2019 10:57:34 +0800 Subject: [PATCH 2/2] Update index.less MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 解决margin重合问题，overflow方式会有副作用，采用padding解决margin重合现象。 --- components/menu/style/index.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/menu/style/index.less b/components/menu/style/index.less index 5699a02d32..623ec03733 100644 --- a/components/menu/style/index.less +++ b/components/menu/style/index.less @@ -38,7 +38,6 @@ &-submenu, &-submenu-inline { - overflow: hidden; //fix margin bug transition: border-color 0.3s @ease-in-out, background 0.3s @ease-in-out, padding 0.15s @ease-in-out; } @@ -359,7 +358,7 @@ // disable margin collapsed .@{menu-prefix-cls}-submenu { - padding-bottom: 0.01px; + padding-bottom: 0.02px; } .@{menu-prefix-cls}-item:not(:last-child) {