Commit 05b5dd7b8dfcc30e6e2af46323343a77503913e9
1 parent
9ec927b1
update Cascader
update Cascader
Showing
2 changed files
with
6 additions
and
2 deletions
Show diff stats
src/components/cascader/cascader.vue
@@ -77,7 +77,7 @@ | @@ -77,7 +77,7 @@ | ||
77 | }, | 77 | }, |
78 | renderFormat: { | 78 | renderFormat: { |
79 | type: Function, | 79 | type: Function, |
80 | - default (label, selectedData) { | 80 | + default (label) { |
81 | return label.join(' / '); | 81 | return label.join(' / '); |
82 | } | 82 | } |
83 | } | 83 | } |
@@ -96,7 +96,8 @@ | @@ -96,7 +96,8 @@ | ||
96 | `${prefixCls}`, | 96 | `${prefixCls}`, |
97 | { | 97 | { |
98 | [`${prefixCls}-show-clear`]: this.showCloseIcon, | 98 | [`${prefixCls}-show-clear`]: this.showCloseIcon, |
99 | - [`${prefixCls}-visible`]: this.visible | 99 | + [`${prefixCls}-visible`]: this.visible, |
100 | + [`${prefixCls}-disabled`]: this.disabled | ||
100 | } | 101 | } |
101 | ] | 102 | ] |
102 | }, | 103 | }, |
src/styles/components/cascader.less
@@ -8,6 +8,9 @@ | @@ -8,6 +8,9 @@ | ||
8 | display: block; | 8 | display: block; |
9 | cursor: pointer; | 9 | cursor: pointer; |
10 | } | 10 | } |
11 | + &-disabled .@{css-prefix}input{ | ||
12 | + cursor: @cursor-disabled; | ||
13 | + } | ||
11 | 14 | ||
12 | .@{cascader-prefix-cls}-arrow:nth-of-type(1) { | 15 | .@{cascader-prefix-cls}-arrow:nth-of-type(1) { |
13 | display: none; | 16 | display: none; |