From 7788822dba0412681a0dde87655de57e0540fc87 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Fri, 12 Jun 2020 22:37:38 +0800
Subject: [PATCH] fix(CollapseItem): can't hide border (#6533)

---
 src/collapse-item/index.js   | 6 +++---
 src/collapse-item/index.less | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/collapse-item/index.js b/src/collapse-item/index.js
index 3bf08382d..d70bf0b01 100644
--- a/src/collapse-item/index.js
+++ b/src/collapse-item/index.js
@@ -125,7 +125,7 @@ export default createComponent({
     },
 
     genTitle() {
-      const { disabled, expanded } = this;
+      const { border, disabled, expanded } = this;
 
       const titleSlots = CELL_SLOTS.reduce((slots, name) => {
         if (this.slots(name)) {
@@ -142,7 +142,7 @@ export default createComponent({
       return (
         <Cell
           role="button"
-          class={bem('title', { disabled, expanded })}
+          class={bem('title', { disabled, expanded, borderless: !border })}
           onClick={this.onClick}
           scopedSlots={titleSlots}
           tabindex={disabled ? -1 : 0}
@@ -172,7 +172,7 @@ export default createComponent({
 
   render() {
     return (
-      <div class={[bem({ border: this.index })]}>
+      <div class={[bem({ border: this.index && this.border })]}>
         {this.genTitle()}
         {this.genContent()}
       </div>
diff --git a/src/collapse-item/index.less b/src/collapse-item/index.less
index b94951ebe..3d08a0b7a 100644
--- a/src/collapse-item/index.less
+++ b/src/collapse-item/index.less
@@ -31,6 +31,12 @@
       }
     }
 
+    &--borderless {
+      &::after {
+        display: none;
+      }
+    }
+
     &--disabled {
       cursor: not-allowed;