chenhaodong / mew-iview

Commit 40365cfc52d30ac3b9a53e023f2b84ee7c1063bd

Authored by zhigang.li
1 parent 2a6f6058

update

Showing 1 changed file with 4 additions and 1 deletions   Show diff stats
Inline Side-by-side
src/components/tag/tag.vue
  Show/Hide comments   View file @40365cf
... ... @@ -59,7 +59,7 @@
59 59 ];
60 60 },
61 61 wraperStyles () {
62   - return oneOf(this.color, initColorList) ? {} : {background: this.isChecked ? this.defaultTypeColor : 'transparent', borderWidth: '1px', borderStyle: 'solid', borderColor: this.lineColor, color: this.lineColor};
  62 + return oneOf(this.color, initColorList) ? {} : {background: this.isChecked ? this.defaultTypeColor : 'transparent', borderWidth: '1px', borderStyle: 'solid', borderColor: ((this.type !== 'dot' && this.type !== 'border' && this.isChecked) ? this.borderColor : this.lineColor), color: this.lineColor};
63 63 },
64 64 textClasses () {
65 65 return [
... ... @@ -92,6 +92,9 @@
92 92 return this.color !== undefined ? (this.color === 'default' ? '' : 'rgb(255, 255, 255)') : '';
93 93 }
94 94 },
  95 + borderColor () {
  96 + return this.color !== undefined ? (this.color === 'default' ? '' : this.color) : '';
  97 + },
95 98 dotColor () {
96 99 return this.color !== undefined ? (oneOf(this.color, initColorList) ? '' : this.color) : '';
97 100 },
... ...