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
使用 v-model
### RadioGroup

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

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

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

@ -99,7 +99,7 @@
this.currentVisible = false;
},
hasParent () {
const $parent = this.$parent.$parent;
const $parent = this.$parent.$parent.$parent;
if ($parent && $parent.$options.name === 'Dropdown') {
return $parent;
} else {
@ -135,35 +135,6 @@
const $parent = this.hasParent();
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>

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

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

50
test/routers/dropdown.vue
View file

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