diff --git a/CHANGE.md b/CHANGE.md
index 6f5d756..a36640b 100644
--- a/CHANGE.md
+++ b/CHANGE.md
@@ -38,4 +38,6 @@ DropdownItem key 改为 name, Dropdown 的 visible 要使用 @on-visible-change
DropdownItem 里,this.$parent.$parent 与1.0 有区别
### Menu
MenuItem 和 Submenu 的 key 改为了 name
-Menu 的 activeKey 改为 activeName,openKeys 改为 openNames
\ No newline at end of file
+Menu 的 activeKey 改为 activeName,openKeys 改为 openNames
+### Cascader
+Caspanel 的 sublist 从 prop -> data
diff --git a/README.md b/README.md
index 94328f2..0e707fa 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@
- [x] Slider
- [ ] DatePicker
- [ ] TimePicker
-- [ ] Cascader
+- [x] Cascader
- [ ] Transfer
- [x] InputNumber
- [x] Rate
diff --git a/examples/app.vue b/examples/app.vue
index a966f99..0f3fa75 100644
--- a/examples/app.vue
+++ b/examples/app.vue
@@ -42,6 +42,7 @@ li + li { border-left: solid 1px #bbb; padding-left: 10px; margin-left: 10px; }
Breadcrumb
Menu
Spin
+ Cascader
diff --git a/examples/main.js b/examples/main.js
index cc2ebdb..c3b505e 100644
--- a/examples/main.js
+++ b/examples/main.js
@@ -132,6 +132,10 @@ const router = new VueRouter({
{
path: '/spin',
component: require('./routers/spin.vue')
+ },
+ {
+ path: '/cascader',
+ component: require('./routers/cascader.vue')
}
]
});
diff --git a/examples/routers/cascader.vue b/examples/routers/cascader.vue
index d8ebc3f..595d367 100644
--- a/examples/routers/cascader.vue
+++ b/examples/routers/cascader.vue
@@ -1,24 +1,85 @@
-
- {{ text }}
-
- 选择
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- Disabled
-
-
-
-
-
+
+
+
+ {{ value2 }}
+
change
+
diff --git a/src/components/spin/spin.vue b/src/components/spin/spin.vue
index b4e8cc3..25a619d 100644
--- a/src/components/spin/spin.vue
+++ b/src/components/spin/spin.vue
@@ -14,6 +14,7 @@
const prefixCls = 'ivu-spin';
export default {
+ name: 'Spin',
props: {
size: {
validator (value) {
diff --git a/src/index.js b/src/index.js
index 8b9373f..eec82f8 100644
--- a/src/index.js
+++ b/src/index.js
@@ -9,7 +9,7 @@ import Breadcrumb from './components/breadcrumb';
import Button from './components/button';
import Card from './components/card';
import Carousel from './components/carousel';
-// import Cascader from './components/cascader';
+import Cascader from './components/cascader';
import Checkbox from './components/checkbox';
import Circle from './components/circle';
import Collapse from './components/collapse';
@@ -59,7 +59,7 @@ const iview = {
Card,
Carousel,
CarouselItem: Carousel.Item,
- // Cascader,
+ Cascader,
Checkbox,
CheckboxGroup: Checkbox.Group,
iCircle: Circle,
diff --git a/src/mixins/emitter.js b/src/mixins/emitter.js
index 422f5ac..e4bac47 100755
--- a/src/mixins/emitter.js
+++ b/src/mixins/emitter.js
@@ -5,6 +5,7 @@ function broadcast(componentName, eventName, params) {
if (name === componentName) {
child.$emit.apply(child, [eventName].concat(params));
} else {
+ // todo 如果 params 是空数组,接收到的会是 undefined
broadcast.apply(child, [componentName, eventName].concat([params]));
}
});
--
libgit2 0.21.4