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

udpate notice

Browse source
This commit is contained in:
zhigang.li 2017-12-21 16:42:23 +08:00
parent baa75b0aef
commit 3f7a5f1a27
7 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/tag/tag.vue
View file

@ -51,7 +51,7 @@
return [
`${prefixCls}`,
{
[`${prefixCls}-${this.color}`]: !!this.color,
[`${prefixCls}-${this.color}`]: !!this.color && oneOf(this.color, initColorList),
[`${prefixCls}-${this.type}`]: !!this.type,
[`${prefixCls}-closable`]: this.closable,
[`${prefixCls}-checked`]: this.isChecked
@ -75,7 +75,7 @@
if (this.type === 'dot') {
return '';
} else if (this.type === 'border') {
return `${prefixCls}-color-${this.color}`;
return oneOf(this.color, initColorList) ? `${prefixCls}-color-${this.color}` : '';
} else {
return this.color !== undefined ? (this.color === 'default' ? '' : 'rgb(255, 255, 255)') : '';
}