From 05b5dd7b8dfcc30e6e2af46323343a77503913e9 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Wed, 16 Nov 2016 12:44:47 +0800
Subject: [PATCH] update Cascader

---
 src/components/cascader/cascader.vue | 5 +++--
 src/styles/components/cascader.less  | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/cascader/cascader.vue b/src/components/cascader/cascader.vue
index c14c86f..1c35040 100644
--- a/src/components/cascader/cascader.vue
+++ b/src/components/cascader/cascader.vue
@@ -77,7 +77,7 @@
             },
             renderFormat: {
                 type: Function,
-                default (label, selectedData) {
+                default (label) {
                     return label.join(' / ');
                 }
             }
@@ -96,7 +96,8 @@
                     `${prefixCls}`,
                     {
                         [`${prefixCls}-show-clear`]: this.showCloseIcon,
-                        [`${prefixCls}-visible`]: this.visible
+                        [`${prefixCls}-visible`]: this.visible,
+                        [`${prefixCls}-disabled`]: this.disabled
                     }
                 ]
             },
diff --git a/src/styles/components/cascader.less b/src/styles/components/cascader.less
index 1d04dc0..036c913 100644
--- a/src/styles/components/cascader.less
+++ b/src/styles/components/cascader.less
@@ -8,6 +8,9 @@
         display: block;
         cursor: pointer;
     }
+    &-disabled .@{css-prefix}input{
+        cursor: @cursor-disabled;
+    }
 
     .@{cascader-prefix-cls}-arrow:nth-of-type(1) {
         display: none;
--
libgit2 0.21.4