Merge branch 'master' of https://github.com/iview/iview into carousel

src/components/cascader/cascader.vue

@@ -1,14 +1,17 @@
 <template>
     <div :class="classes" v-clickoutside="handleClose">
-        <i-input
-            readonly
-            :disabled="disabled"
-            :value.sync="displayRender"
-            :size="size"
-            :placeholder="placeholder"
-            @on-focus="onFocus"></i-input>
-        <Icon type="ios-close" :class="[prefixCls + '-arrow']" v-show="showCloseIcon" @click.stop="clearSelect"></Icon>
-        <Icon type="arrow-down-b" :class="[prefixCls + '-arrow']"></Icon>
+        <div :class="[prefixCls + '-rel']" @click="toggleOpen">
+            <slot>
+                <i-input
+                    readonly
+                    :disabled="disabled"
+                    :value.sync="displayRender"
+                    :size="size"
+                    :placeholder="placeholder"></i-input>
+                <Icon type="ios-close" :class="[prefixCls + '-arrow']" v-show="showCloseIcon" @click.stop="clearSelect"></Icon>
+                <Icon type="arrow-down-b" :class="[prefixCls + '-arrow']"></Icon>
+            </slot>
+        </div>
         <Dropdown v-show="visible" transition="slide-up">
             <div>
                 <Caspanel
@@ -125,6 +128,13 @@
             handleClose () {
                 this.visible = false;
             },
+            toggleOpen () {
+                if (this.visible) {
+                    this.handleClose();
+                } else {
+                    this.onFocus();
+                }
+            },
             onFocus () {
                 this.visible = true;
                 if (!this.value.length) {

src/components/select/option.vue

@@ -58,7 +58,7 @@
                 this.hidden = !new RegExp(val, 'i').test(this.searchLabel);
             }
         },
-        ready () {
+        compiled () {
             this.searchLabel = this.$el.innerHTML;
         },
         events: {

src/styles/components/cascader.less

@@ -2,9 +2,13 @@
 @cascader-item-prefix-cls: ~"@{css-prefix}cascader-menu-item";
 
 .@{cascader-prefix-cls} {
-    position: relative;
+    //position: relative;
     line-height: normal;
 
+    &-rel{
+        position: relative;
+    }
+
     .@{css-prefix}input{
         display: block;
         cursor: pointer;