From 38cdd7edce5fc6e821359a6798d7898754f1f752 Mon Sep 17 00:00:00 2001 From: chenshuai2144 Date: Mon, 16 Dec 2019 12:53:48 +0800 Subject: [PATCH] bugfix: remove unuse style and add IE11 style close #5762 --- package.json | 2 +- src/global.less | 12 +++++++----- src/layouts/BlankLayout.tsx | 11 +---------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 1d17adf6..0091d64c 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "not ie <= 10" ], "dependencies": { - "@ant-design/pro-layout": "^4.8.7", + "@ant-design/pro-layout": "^4.9.11", "@antv/data-set": "^0.10.2", "antd": "^3.23.6", "classnames": "^2.2.6", diff --git a/src/global.less b/src/global.less index c5f3d49d..1b514012 100644 --- a/src/global.less +++ b/src/global.less @@ -24,11 +24,6 @@ body { -moz-osx-font-smoothing: grayscale; } -.ant-pro-basicLayout { - width: 100%; - height: 100%; -} - ul, ol { list-style: none; @@ -50,3 +45,10 @@ ol { } } } + +// 兼容IE11 +@media screen and(-ms-high-contrast: active), (-ms-high-contrast: none) { + body .ant-design-pro > .ant-layout { + min-height: 100vh; + } +} diff --git a/src/layouts/BlankLayout.tsx b/src/layouts/BlankLayout.tsx index 6b92cb93..cdc55b09 100644 --- a/src/layouts/BlankLayout.tsx +++ b/src/layouts/BlankLayout.tsx @@ -1,14 +1,5 @@ import React from 'react'; -const Layout: React.FC = ({ children }) => ( -
- {children} -
-); +const Layout: React.FC = ({ children }) => <>{children}; export default Layout;