Explorar o código

fix: fixed header width (#1614)

柴茂源 %!s(int64=7) %!d(string=hai) anos
pai
achega
344c9f74c9
Modificáronse 1 ficheiros con 4 adicións e 8 borrados
  1. 4 8
      src/layouts/Header.js

+ 4 - 8
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;
-    if (!fixedHeader || layout === 'topmenu' || fixSiderbar) {
+    const { isMobile, collapsed, setting } = this.props;
+    const { fixedHeader, layout } = setting;
+    if (isMobile || !fixedHeader || layout === 'topmenu') {
       return '100%';
     }
-    if (!this.props.collapsed) {
-      return 'calc(100% - 256px)';
-    }
-    if (this.props.collapsed) {
-      return 'calc(100% - 80px)';
-    }
+    return collapsed ? 'calc(100% - 80px)' : 'calc(100% - 256px)';
   };
   handleNoticeClear = type => {
     message.success(`清空了${type}`);