drip-public/iview
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update Dropdown

Browse source 
update Dropdown
This commit is contained in:
梁灏 2017-03-03 18:08:10 +08:00
parent b1c118d85e
commit 2d74744daf
5 changed files with 34 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGE.md
View file

@ -1,3 +1,5 @@
### Button
可以考虑是否支持 @click，而不用 @click.native
### Input ### Input
使用 v-model 使用 v-model
### RadioGroup ### RadioGroup

2
src/components/dropdown/dropdown-item.vue
View file

@ -42,7 +42,7 @@
if (this.disabled) { if (this.disabled) {
this.$nextTick(() => { this.$nextTick(() => {
$parent.visible = true; $parent.currentVisible = true;
}); });
} else if (hasChildren) { } else if (hasChildren) {
this.$parent.$emit('on-haschild-click'); this.$parent.$emit('on-haschild-click');

33
src/components/dropdown/dropdown.vue
View file

@ -99,7 +99,7 @@
this.currentVisible = false; this.currentVisible = false;
}, },
hasParent () { hasParent () {
const $parent = this.$parent.$parent; const $parent = this.$parent.$parent.$parent;
if ($parent && $parent.$options.name === 'Dropdown') { if ($parent && $parent.$options.name === 'Dropdown') {
return $parent; return $parent;
} else { } else {
@ -135,35 +135,6 @@
const $parent = this.hasParent(); const $parent = this.hasParent();
if ($parent) $parent.$emit('on-haschild-click'); if ($parent) $parent.$emit('on-haschild-click');
}); });
}, }
// events: {
// 'on-click' (key) {
// const $parent = this.hasParent();
// if ($parent ) $parent.$emit('on-click', key);
// },
// 'on-hover-click' () {
// const $parent = this.hasParent();
// if ($parent) {
// this.$nextTick(() => {
// if (this.trigger === 'custom') return false;
// this.currentVisible = false;
// });
// $parent.$emit('on-hover-click');
// } else {
// this.$nextTick(() => {
// if (this.trigger === 'custom') return false;
// this.currentVisible = false;
// });
// }
// },
// 'on-haschild-click' () {
// this.$nextTick(() => {
// if (this.trigger === 'custom') return false;
// this.currentVisible = true;
// });
// const $parent = this.hasParent();
// if ($parent) $parent.$emit('on-haschild-click');
// }
// }
}; };
</script> </script>

2
src/styles/components/dropdown.less
View file

@ -14,7 +14,7 @@
} }
&-rel{ &-rel{
display: inline-block; //display: inline-block;
position: relative; position: relative;
} }

50
test/routers/dropdown.vue
View file

@ -1,26 +1,32 @@
<template> <template>
<Dropdown> <div>
<a href="javascript:void(0)"> <Dropdown>
北京小吃 <a href="javascript:void(0)">
<Icon type="arrow-down-b"></Icon> 下拉菜单
</a> <Icon type="arrow-down-b"></Icon>
<Dropdown-menu slot="list"> </a>
<Dropdown-item>驴打滚</Dropdown-item> <Dropdown-menu slot="list">
<Dropdown-item>炸酱面</Dropdown-item> <Dropdown-item>驴打滚</Dropdown-item>
<Dropdown-item>豆汁儿</Dropdown-item> <Dropdown-item>炸酱面</Dropdown-item>
<Dropdown placement="right-start"> <Dropdown-item disabled>豆汁儿</Dropdown-item>
<Dropdown-item> <Dropdown-item>冰糖葫芦</Dropdown-item>
北京烤鸭 <Dropdown-item divided>北京烤鸭</Dropdown-item>
<Icon type="ios-arrow-right"></Icon> </Dropdown-menu>
</Dropdown-item> </Dropdown>
<Dropdown-menu slot="list"> <Dropdown style="margin-left: 20px">
<Dropdown-item>挂炉烤鸭</Dropdown-item> <Button type="primary">
<Dropdown-item>焖炉烤鸭</Dropdown-item> 下拉菜单
</Dropdown-menu> <Icon type="arrow-down-b"></Icon>
</Dropdown> </Button>
<Dropdown-item>冰糖葫芦</Dropdown-item> <Dropdown-menu slot="list">
</Dropdown-menu> <Dropdown-item>驴打滚</Dropdown-item>
</Dropdown> <Dropdown-item>炸酱面</Dropdown-item>
<Dropdown-item disabled>豆汁儿</Dropdown-item>
<Dropdown-item>冰糖葫芦</Dropdown-item>
<Dropdown-item divided>北京烤鸭</Dropdown-item>
</Dropdown-menu>
</Dropdown>
</div>
</template> </template>
<script> <script>
export default { export default {