Browse Source

fix: edge sider height

Sendya 6 years ago
parent
commit
d74030c3e0
1 changed files with 14 additions and 0 deletions
  1. 14 0
      src/components/page/GlobalLayout.vue

+ 14 - 0
src/components/page/GlobalLayout.vue

@@ -121,6 +121,18 @@ export default {
     this.menus = this.mainMenu.find((item) => item.path === '/').children
     this.menus = this.mainMenu.find((item) => item.path === '/').children
     this.collapsed = !this.sidebarOpened
     this.collapsed = !this.sidebarOpened
   },
   },
+  mounted () {
+    const userAgent = navigator.userAgent
+    if (userAgent.indexOf('Edge') > -1) {
+      this.$nextTick(() => {
+        this.collapsed = !this.collapsed
+        setTimeout(() => {
+          this.collapsed = !this.collapsed
+        }, 16)
+      })
+    }
+
+  },
   methods: {
   methods: {
     ...mapActions(['setSidebar']),
     ...mapActions(['setSidebar']),
     toggle () {
     toggle () {
@@ -158,6 +170,7 @@ export default {
   }
   }
 
 
   .layout.ant-layout {
   .layout.ant-layout {
+    height: auto;
     overflow-x: hidden;
     overflow-x: hidden;
 
 
     &.mobile,&.tablet {
     &.mobile,&.tablet {
@@ -488,6 +501,7 @@ export default {
     box-shadow: 2px 0 6px rgba(0, 21, 41, .35);
     box-shadow: 2px 0 6px rgba(0, 21, 41, .35);
     position: relative;
     position: relative;
     z-index: 10;
     z-index: 10;
+    height: auto;
 
 
     .ant-layout-sider-children:hover {
     .ant-layout-sider-children:hover {
       overflow-y: auto;
       overflow-y: auto;