From fc81749cd2f324308b15a0a95fb256ae635dc952 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Thu, 22 Apr 2021 19:28:41 +0800
Subject: [PATCH] fix(Tag): incorrect border color when using plain (#8602)

---
 src/tag/index.less                           |  4 +++-
 src/tag/index.tsx                            | 10 +++++++---
 src/tag/test/__snapshots__/demo.spec.js.snap |  6 +++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/tag/index.less b/src/tag/index.less
index e197edfac..a1e5660c7 100644
--- a/src/tag/index.less
+++ b/src/tag/index.less
@@ -52,6 +52,7 @@
 
   &--plain {
     background-color: @tag-plain-background-color;
+    border-color: currentColor;
 
     &::before {
       position: absolute;
@@ -59,7 +60,8 @@
       right: 0;
       bottom: 0;
       left: 0;
-      border: 1px solid currentColor;
+      border: 1px solid;
+      border-color: inherit;
       border-radius: inherit;
       content: '';
       pointer-events: none;
diff --git a/src/tag/index.tsx b/src/tag/index.tsx
index f33604ca0..dd9f84a4e 100644
--- a/src/tag/index.tsx
+++ b/src/tag/index.tsx
@@ -32,13 +32,17 @@ function Tag(
   slots: DefaultSlots,
   ctx: RenderContext<TagProps>
 ) {
-  const { type, mark, plain, color, round, size } = props;
+  const { type, mark, plain, color, round, size, textColor } = props;
 
   const key = plain ? 'color' : 'backgroundColor';
   const style = { [key]: color };
 
-  if (props.textColor) {
-    style.color = props.textColor;
+  if (plain) {
+    style.color = textColor || color;
+    style.borderColor = color;
+  } else {
+    style.color = textColor;
+    style.background = color;
   }
 
   const classes: { [key: string]: any } = { mark, plain, round };
diff --git a/src/tag/test/__snapshots__/demo.spec.js.snap b/src/tag/test/__snapshots__/demo.spec.js.snap
index 5a3bfb560..7ddaba1d5 100644
--- a/src/tag/test/__snapshots__/demo.spec.js.snap
+++ b/src/tag/test/__snapshots__/demo.spec.js.snap
@@ -57,15 +57,15 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="van-cell">
       <div class="van-cell__title"><span>背景颜色</span></div>
-      <div class="van-cell__value"><span class="van-tag van-tag--default" style="background-color: rgb(114, 50, 221);">标签</span></div>
+      <div class="van-cell__value"><span class="van-tag van-tag--default" style="background: rgb(114, 50, 221);">标签</span></div>
     </div>
     <div class="van-cell">
       <div class="van-cell__title"><span>文字颜色</span></div>
-      <div class="van-cell__value"><span class="van-tag van-tag--default" style="background-color: rgb(255, 225, 225); color: rgb(173, 0, 0);">标签</span></div>
+      <div class="van-cell__value"><span class="van-tag van-tag--default" style="color: rgb(173, 0, 0); background: rgb(255, 225, 225);">标签</span></div>
     </div>
     <div class="van-cell">
       <div class="van-cell__title"><span>空心颜色</span></div>
-      <div class="van-cell__value"><span class="van-tag van-tag--plain van-tag--default" style="color: rgb(114, 50, 221);">标签</span></div>
+      <div class="van-cell__value"><span class="van-tag van-tag--plain van-tag--default" style="color: rgb(114, 50, 221); border-color: #7232dd;">标签</span></div>
     </div>
   </div>
 </div>