fix: fixed header width (#1614)

344c9f74 · 柴茂源 · 陈帅 · e0cf86a3 · 344c9f74
Commit 344c9f74 authored Jun 06, 2018 by 柴茂源 Committed by 陈帅 Jun 06, 2018
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

src/layouts/Header.js src/layouts/Header.js +4 -8

No files found.
--- a/src/layouts/Header.js
+++ b/src/layouts/Header.js
@@ -21,16 +21,12 @@ class HeaderView extends PureComponent {
    document.getElementById('root').removeEventListener('scroll', this.handScroll);
  }
  getHeadWidth = () => {
-    const { fixedHeader, layout, fixSiderbar } = this.props.setting;
+    const { isMobile, collapsed, setting } = this.props;
-    if (!fixedHeader || layout === 'topmenu' || fixSiderbar) {
+    const { fixedHeader, layout } = setting;
+    if (isMobile || !fixedHeader || layout === 'topmenu') {
      return '100%';
    }
-    if (!this.props.collapsed) {
+    return collapsed ? 'calc(100% - 80px)' : 'calc(100% - 256px)';
-      return 'calc(100% - 256px)';
-    }
-    if (this.props.collapsed) {
-      return 'calc(100% - 80px)';
-    }
  };
  handleNoticeClear = type => {
    message.success(`清空了${type}`);