Merge branch 'develop'

Former-commit-id: 579572def91722ead31683406f4fa9e326e6c21d [formerly 579572def91722ead31683406f4fa9e326e6c21d [formerly 579572def91722ead31683406f4fa9e326e6c21d [formerly 579572def91722ead31683406f4fa9e326e6c21d [formerly 32b00e62f2f1dd171a72bbb9b42e07c9b3ef3676 [formerly aed4bf816b639071f685e12cbe51a0a09a9b7146]]]]]
Former-commit-id: 2d291f74719b3fd789c604ca403a5807cae13dee
Former-commit-id: d50f3c6806b8f19102201e1ed92eefcd6a9e111b
Former-commit-id: 7144ae07c4e4a892500c13a5d97e465324c487ff [formerly 225c3e47c2500dc65e9d4f0eb692d0f7176bbf09]
Former-commit-id: ebaf449404da54aee10ad0a81d51c3141f98e7a2
Former-commit-id: 0ea69c50ee994d684b51dd1ac967bbf0f17bfb3e
Former-commit-id: 431f113e8412ad26c900f0572a2b7483273c7cad
Former-commit-id: 977bf7d78d7a53a706ff1dfb79dbb5115d44d1b1
Former-commit-id: 246a7c2e9ea57535bfddb05dea4e7cde70093f2b
This commit is contained in:
liyang
2019-01-24 18:21:18 +08:00

View File

@@ -1,13 +1,8 @@
<template>
<el-dropdown placement="bottom" size="small" @command="handleChange">
<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-button class="d2-mr btn-text can-hover" type="text">
<d2-icon name="font" style="font-size: 16px;"/>
</el-button>
<el-dropdown-menu slot="dropdown">
<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}}