fix(collapse): ensure border property correctly disables bottom border (

#5905)
youzan · Oct 14, 2024 · 08796b6 · 08796b6
1 parent 6187937
commit 08796b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/collapse-item/index.ts b/packages/collapse-item/index.ts
@@ -28,6 +28,7 @@ VantComponent({
 
   data: {
     expanded: false,
+    parentBorder: true,
   },
 
   mounted() {
@@ -41,7 +42,7 @@ VantComponent({
         return;
       }
 
-      const { value, accordion } = this.parent.data;
+      const { value, accordion, border } = this.parent.data;
       const { children = [] } = this.parent;
       const { name } = this.data;
 
@@ -56,7 +57,7 @@ VantComponent({
         setContentAnimate(this, expanded, this.mounted);
       }
 
-      this.setData({ index, expanded });
+      this.setData({ index, expanded, parentBorder: border });
     },
 
     onClick() {

diff --git a/packages/collapse-item/index.wxml b/packages/collapse-item/index.wxml
@@ -1,6 +1,6 @@
 <wxs src="../wxs/utils.wxs" module="utils" />
 
-<view class="van-collapse-item custom-class {{ index !== 0 ? 'van-hairline--top' : '' }}">
+<view class="van-collapse-item custom-class {{ index !== 0 && parentBorder ? 'van-hairline--top' : '' }}">
   <van-cell
     size="{{ size }}"
     title="{{ title }}"