From a0db71e571632697e75ae247cbc25d8216832027 Mon Sep 17 00:00:00 2001 From: Louis-7 Date: Mon, 3 Sep 2018 13:28:13 +0800 Subject: [PATCH 1/4] Revert "fix sidebar shake once mouse over it" This reverts commit 7fc14eddd9fdb718f6fbbbcd01fd01cb428c296b. --- src/components/Layout/Layout.less | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/components/Layout/Layout.less b/src/components/Layout/Layout.less index bf5adc4..7fb56e0 100644 --- a/src/components/Layout/Layout.less +++ b/src/components/Layout/Layout.less @@ -25,11 +25,6 @@ } .ant-menu { - &.ant-menu-inline { - .ant-menu-item { - width: 100%; - } - } .ant-menu-item, .ant-menu-submenu-title { overflow: hidden; From 843bd1a088441df5d9521e429e5d082b135c8711 Mon Sep 17 00:00:00 2001 From: Louis-7 Date: Mon, 3 Sep 2018 14:54:20 +0800 Subject: [PATCH 2/4] restrict rule Signed-off-by: Louis-7 --- src/components/Layout/Layout.less | 8 ++++++++ src/components/Layout/Menu.js | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/components/Layout/Layout.less b/src/components/Layout/Layout.less index 7fb56e0..1580b42 100644 --- a/src/components/Layout/Layout.less +++ b/src/components/Layout/Layout.less @@ -103,6 +103,14 @@ } } +.sidemenu { + :global{ + .ant-menu-item { + width: 100%; + } + } +} + .switchtheme { width: 100%; position: absolute; diff --git a/src/components/Layout/Menu.js b/src/components/Layout/Menu.js index 0ce46ab..9c0ce1e 100644 --- a/src/components/Layout/Menu.js +++ b/src/components/Layout/Menu.js @@ -4,6 +4,7 @@ import { Menu, Icon } from 'antd' import { Link } from 'react-router-dom' import { arrayToTree, queryArray } from 'utils' import pathToRegexp from 'path-to-regexp' +import styles from './Layout.less' const { SubMenu } = Menu let openKeysFlag = false @@ -123,6 +124,7 @@ const Menus = ({ mode={siderFold ? 'vertical' : 'inline'} theme={darkTheme ? 'dark' : 'light'} selectedKeys={defaultSelectedKeys} + className={styles.sidemenu} > {menuItems} From 43ef09dfed24dc18513fa9209c6b036014d7ff89 Mon Sep 17 00:00:00 2001 From: Louis-7 Date: Mon, 3 Sep 2018 14:57:04 +0800 Subject: [PATCH 3/4] Revert "restrict rule" This reverts commit 843bd1a088441df5d9521e429e5d082b135c8711. --- src/components/Layout/Layout.less | 8 -------- src/components/Layout/Menu.js | 2 -- 2 files changed, 10 deletions(-) diff --git a/src/components/Layout/Layout.less b/src/components/Layout/Layout.less index 1580b42..7fb56e0 100644 --- a/src/components/Layout/Layout.less +++ b/src/components/Layout/Layout.less @@ -103,14 +103,6 @@ } } -.sidemenu { - :global{ - .ant-menu-item { - width: 100%; - } - } -} - .switchtheme { width: 100%; position: absolute; diff --git a/src/components/Layout/Menu.js b/src/components/Layout/Menu.js index 9c0ce1e..0ce46ab 100644 --- a/src/components/Layout/Menu.js +++ b/src/components/Layout/Menu.js @@ -4,7 +4,6 @@ import { Menu, Icon } from 'antd' import { Link } from 'react-router-dom' import { arrayToTree, queryArray } from 'utils' import pathToRegexp from 'path-to-regexp' -import styles from './Layout.less' const { SubMenu } = Menu let openKeysFlag = false @@ -124,7 +123,6 @@ const Menus = ({ mode={siderFold ? 'vertical' : 'inline'} theme={darkTheme ? 'dark' : 'light'} selectedKeys={defaultSelectedKeys} - className={styles.sidemenu} > {menuItems} From 3407f9a0c100116dd39a63f24d2d705719b5a5ce Mon Sep 17 00:00:00 2001 From: Louis-7 Date: Mon, 3 Sep 2018 15:24:15 +0800 Subject: [PATCH 4/4] fix move mouse into chart will cause chart shake issue. --- src/pages/dashboard/components/sales.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/dashboard/components/sales.less b/src/pages/dashboard/components/sales.less index defc7f8..a298b44 100644 --- a/src/pages/dashboard/components/sales.less +++ b/src/pages/dashboard/components/sales.less @@ -1,6 +1,7 @@ @import "~themes/vars"; .sales { + overflow: hidden; .title { margin-left: 32px; font-size: 16px;