From 716d151a78a6790f9f638230b6374b98c0190e2e Mon Sep 17 00:00:00 2001
From: zhigang.li <zhigang.li@tendcloud.com>
Date: Wed, 20 Dec 2017 18:55:25 +0800
Subject: [PATCH] make it will not collapse when didn't set 'breakpoint'

---
 examples/routers/layout.vue     |  7 +++++++
 src/components/layout/sider.vue | 19 ++++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/examples/routers/layout.vue b/examples/routers/layout.vue
index 74f959e..3ff0559 100644
--- a/examples/routers/layout.vue
+++ b/examples/routers/layout.vue
@@ -4,6 +4,7 @@
             <Sider 
                 v-model="isCollapsed"
                 collapsed-width="0" 
+                hide-trigger
                 collapsible
                 ref="side"
                 width="200">
@@ -29,6 +30,7 @@
                         </MenuItem>
                     </MenuGroup>
                 </Menu>
+                <!-- <div slot="trigger"><Icon type="document-text"></Icon></div> -->
             </Sider>
             <Layout class-name="test-class">
                 <Header :style="{background: '#eee'}"><Button @click="toggleCollapse">菜单</Button></Header>
@@ -51,6 +53,11 @@ export default {
         toggleCollapse () {
             this.$refs.side.toggleCollapse();
         }
+    },
+    watch: {
+        isCollapsed (val) {
+            // console.log(val)
+        }
     }
 };
 </script>
diff --git a/src/components/layout/sider.vue b/src/components/layout/sider.vue
index e35df6c..c9a1ef4 100644
--- a/src/components/layout/sider.vue
+++ b/src/components/layout/sider.vue
@@ -8,9 +8,11 @@
         <div :class="childClasses">
             <slot></slot>
         </div>
-        <div v-show="showBottomTrigger" :class="triggerClasses" @click="toggleCollapse" :style="{width: siderWidth + 'px'}">
-            <i :class="triggerIconClasses"></i>
-        </div>
+        <slot name="trigger">
+            <div v-show="showBottomTrigger" :class="triggerClasses" @click="toggleCollapse" :style="{width: siderWidth + 'px'}">
+                <i :class="triggerIconClasses"></i>
+            </div>
+        </slot>
     </div>
 </template>
 <script>
@@ -39,7 +41,6 @@
             },
             breakpoint: {
                 type: String,
-                default: 'md',
                 validator (val) {
                     return oneOf(val, ['xs', 'sm', 'md', 'lg', 'xl']);
                 }
@@ -145,11 +146,15 @@
                     this.isCollapsed = this.value;
                 }
             }
-            on(window, 'resize', this.onWindowResize);
-            this.matchMedia();
+            if (this.breakpoint !== undefined) {
+                on(window, 'resize', this.onWindowResize);
+                this.matchMedia();
+            }
         },
         destroyed () {
-            off(window, 'resize', this.onWindowResize);
+            if (this.breakpoint !== undefined) {
+                off(window, 'resize', this.onWindowResize);
+            }
         }
     };
 </script>
\ No newline at end of file
--
libgit2 0.21.4