Merge branch 'develop'

Former-commit-id: d6f701277314ffecfc3848f99573e5a99839e1d1 [formerly a5543a0a814d13385196a80c0eaff1d8d73f7753] [formerly d6f701277314ffecfc3848f99573e5a99839e1d1 [formerly a5543a0a814d13385196a80c0eaff1d8d73f7753] [formerly d6f701277314ffecfc3848f99573e5a99839e1d1 [formerly a5543a0a814d13385196a80c0eaff1d8d73f7753] [formerly a5543a0a814d13385196a80c0eaff1d8d73f7753 [formerly 9bc824245cc7e351fece3c695491dfb89fc8403d [formerly cd5be38dd0190177ff54ae8aca732b4ad34dc9e6]]]]]
Former-commit-id: 3fdd61affc77876c245210d2f60edf51641baf65
Former-commit-id: 355c6d66040d5cc8643d70384d4aa10a068c3287
Former-commit-id: 87ea2a588f5b1c524865b6ce88dad2923a4a4a0d [formerly b2843b3e1c0d2eca429f2dbb177658bb9acb80a1]
Former-commit-id: 01a2b96aa8bbe524c8f37462961dd63eff6fb6ea
Former-commit-id: 9fc9b5e59a8668f72fdd76b9fa85c47385645365
Former-commit-id: 19d950aa8d73a93f3d836070481ef846fe632f2a
Former-commit-id: 0b34fb68c3a0dbf4575fffa3e5c7bfbe9870e131
Former-commit-id: fb56dd08e6f3eb3c76db68787a3bc498a2066964
This commit is contained in:
liyang
2019-01-24 17:36:03 +08:00

View File

@@ -1,20 +1,16 @@
<template>
<el-dropdown placement="bottom" size="small" @command="handleChange">
<el-button class="d2-mr btn-text can-hover" type="text">
<d2-icon name="font" style="font-size: 16px;"/>
</el-button>
<el-tooltip
effect="dark"
content="控件尺寸"
placement="right">
<el-button class="d2-mr btn-text can-hover" type="text">
<d2-icon name="font" style="font-size: 16px;"/>
</el-button>
</el-tooltip>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="default">
<d2-icon :name="iconName('default')" class="d2-mr-5"/>默认
</el-dropdown-item>
<el-dropdown-item command="medium">
<d2-icon :name="iconName('medium')" class="d2-mr-5"/>
</el-dropdown-item>
<el-dropdown-item command="small">
<d2-icon :name="iconName('small')" class="d2-mr-5"/>
</el-dropdown-item>
<el-dropdown-item command="mini">
<d2-icon :name="iconName('mini')" class="d2-mr-5"/>最小
<el-dropdown-item v-for="item in options" :key="item.value" :command="item.value">
<d2-icon :name="iconName(item.value)" class="d2-mr-5"/>{{item.label}}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@@ -24,6 +20,16 @@
import { mapState, mapMutations, mapActions } from 'vuex'
export default {
name: 'd2-header-size',
data () {
return {
options: [
{ label: '默认', value: 'default' },
{ label: '中', value: 'medium' },
{ label: '小', value: 'small' },
{ label: '最小', value: 'mini' }
]
}
},
computed: {
...mapState('d2admin/size', [
'value'