From 65b41a2d6f73314771e6035f94ea5bbeee39e65c Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Mon, 10 Apr 2017 22:43:24 +0800
Subject: [PATCH] fixed #635

---
 examples/routers/cascader.vue        | 154 ++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------
 src/components/cascader/cascader.vue |   3 ++-
 2 files changed, 28 insertions(+), 129 deletions(-)

diff --git a/examples/routers/cascader.vue b/examples/routers/cascader.vue
index c1517c1..246881a 100644
--- a/examples/routers/cascader.vue
+++ b/examples/routers/cascader.vue
@@ -1,141 +1,39 @@
-<!--<template>-->
-    <!--<div>-->
-        <!--<Cascader :data="data" v-model="value1"></Cascader>-->
-        <!--{{ value1 }}-->
-        <!--<div @click="c">change</div>-->
-    <!--</div>-->
-<!--</template>-->
-<!--<script>-->
-    <!--export default {-->
-        <!--data () {-->
-            <!--return {-->
-                <!--value1: [],-->
-                <!--data: [{-->
-                    <!--value: 'beijing',-->
-                    <!--label: '北京',-->
-                    <!--children: [-->
-                        <!--{-->
-                            <!--value: 'gugong',-->
-                            <!--label: '故宫'-->
-                        <!--},-->
-                        <!--{-->
-                            <!--value: 'tiantan',-->
-                            <!--label: '天坛'-->
-                        <!--},-->
-                        <!--{-->
-                            <!--value: 'wangfujing',-->
-                            <!--label: '王府井'-->
-                        <!--}-->
-                    <!--]-->
-                <!--}, {-->
-                    <!--value: 'jiangsu',-->
-                    <!--label: '江苏',-->
-                    <!--children: [-->
-                        <!--{-->
-                            <!--value: 'nanjing',-->
-                            <!--label: '南京',-->
-                            <!--children: [-->
-                                <!--{-->
-                                    <!--value: 'fuzimiao',-->
-                                    <!--label: '夫子庙',-->
-                                <!--}-->
-                            <!--]-->
-                        <!--},-->
-                        <!--{-->
-                            <!--value: 'suzhou',-->
-                            <!--label: '苏州',-->
-                            <!--children: [-->
-                                <!--{-->
-                                    <!--value: 'zhuozhengyuan',-->
-                                    <!--label: '拙政园',-->
-                                <!--},-->
-                                <!--{-->
-                                    <!--value: 'shizilin',-->
-                                    <!--label: '狮子林',-->
-                                <!--}-->
-                            <!--]-->
-                        <!--}-->
-                    <!--],-->
-                <!--}]-->
-            <!--}-->
-        <!--},-->
-        <!--methods: {-->
-            <!--c () {-->
-                <!--this.value1 = ['jiangsu', 'suzhou', 'zhuozhengyuan']-->
-            <!--}-->
-        <!--}-->
-    <!--}-->
-<!--</script>-->
-
-
 <template>
     <div>
-        <Cascader :data="data" v-model="value2"></Cascader>
-        {{ value2 }}
-        <Button @click="c">clear</Button>
+        <Cascader :data="data2" v-model="v1" disabled clearable></Cascader>
+        <Cascader :data="data2" clearable></Cascader>
     </div>
 </template>
 <script>
     export default {
         data () {
             return {
-                value2: ['beijing', 'gugong'],
-                data: []
-            }
-        },
-        methods: {
-            c () {
-                this.value2 = []
-            }
-        },
-        mounted () {
-            this.data = [{
-                value: 'beijing',
-                label: '北京',
-                children: [
-                    {
-                        value: 'gugong',
-                        label: '故宫'
-                    },
-                    {
-                        value: 'tiantan',
-                        label: '天坛'
-                    },
-                    {
-                        value: 'wangfujing',
-                        label: '王府井'
-                    }
-                ]
-            }, {
-                value: 'jiangsu',
-                label: '江苏',
-                children: [
-                    {
+                v1: ['zhejiang', 'hangzhou', 'xihu'],
+                data2: [{
+                    value: 'zhejiang',
+                    label: '浙江',
+                    children: [{
+                        value: 'hangzhou',
+                        label: '杭州',
+                        children: [{
+                            value: 'xihu',
+                            label: '西湖'
+                        }]
+                    }]
+                }, {
+                    value: 'jiangsu',
+                    label: '江苏',
+                    disabled: true,
+                    children: [{
                         value: 'nanjing',
                         label: '南京',
-                        children: [
-                            {
-                                value: 'fuzimiao',
-                                label: '夫子庙',
-                            }
-                        ]
-                    },
-                    {
-                        value: 'suzhou',
-                        label: '苏州',
-                        children: [
-                            {
-                                value: 'zhuozhengyuan',
-                                label: '拙政园',
-                            },
-                            {
-                                value: 'shizilin',
-                                label: '狮子林',
-                            }
-                        ]
-                    }
-                ],
-            }]
+                        children: [{
+                            value: 'zhonghuamen',
+                            label: '中华门'
+                        }]
+                    }]
+                }]
+            }
         }
     }
 </script>
diff --git a/src/components/cascader/cascader.vue b/src/components/cascader/cascader.vue
index abc0074..5768d1e 100644
--- a/src/components/cascader/cascader.vue
+++ b/src/components/cascader/cascader.vue
@@ -112,7 +112,7 @@
                 ];
             },
             showCloseIcon () {
-                return this.currentValue && this.currentValue.length && this.clearable;
+                return this.currentValue && this.currentValue.length && this.clearable && !this.disabled;
             },
             displayRender () {
                 let label = [];
@@ -125,6 +125,7 @@
         },
         methods: {
             clearSelect () {
+                if (this.disabled) return false;
                 const oldVal = JSON.stringify(this.currentValue);
                 this.currentValue = this.selected = this.tmpSelected = [];
                 this.handleClose();
--
libgit2 0.21.4