From cb925a2ba5baa9cdade8e364738054f506a45767 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 13 Mar 2019 17:47:21 +0800
Subject: [PATCH] [new feature] Collapse: add border prop (#1408)

---
 packages/collapse-item/index.ts   | 2 +-
 packages/collapse-item/index.wxml | 2 +-
 packages/collapse/README.md       | 3 +++
 packages/collapse/index.less      | 1 +
 packages/collapse/index.ts        | 6 +++++-
 packages/collapse/index.wxml      | 2 +-
 6 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 packages/collapse/index.less

diff --git a/packages/collapse-item/index.ts b/packages/collapse-item/index.ts
index 52b118f4..86c5c40e 100644
--- a/packages/collapse-item/index.ts
+++ b/packages/collapse-item/index.ts
@@ -60,7 +60,7 @@ VantComponent({
         this.updateStyle(expanded);
       }
 
-      this.set({ expanded });
+      this.set({ index, expanded });
     },
 
     updateStyle(expanded: boolean) {
diff --git a/packages/collapse-item/index.wxml b/packages/collapse-item/index.wxml
index 4c52f6ca..b39e4cea 100644
--- 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 van-hairline--top custom-class">
+<view class="van-collapse-item custom-class {{ index !== 0 ? 'van-hairline--top' : '' }}">
   <van-cell
     title="{{ title }}"
     title-class="title-class"
diff --git a/packages/collapse/README.md b/packages/collapse/README.md
index 1326d2ec..67e3a349 100644
--- a/packages/collapse/README.md
+++ b/packages/collapse/README.md
@@ -12,6 +12,7 @@
 ### 代码演示
 
 #### 基础用法
+
 通过`value`控制展开的面板列表，`activeNames`为数组格式
 
 ```html
@@ -42,6 +43,7 @@ Page({
 ```
 
 #### 手风琴
+
 通过`accordion`可以设置为手风琴模式，最多展开一个面板，此时`activeName`为字符串格式
 
 ```html
@@ -104,6 +106,7 @@ Page({
 |------|------|------|------|------|
 | value | 当前展开面板的 name | `Array | String | Number` | - |
 | accordion | 是否开启手风琴模式 | `Boolean` | `false` |
+| border | 是否显示外边框 | `Boolean` | `true` |
 
 ### Collapse Event
 
diff --git a/packages/collapse/index.less b/packages/collapse/index.less
new file mode 100644
index 00000000..bd55c007
--- /dev/null
+++ b/packages/collapse/index.less
@@ -0,0 +1 @@
+@import '../common/style/var.less';
diff --git a/packages/collapse/index.ts b/packages/collapse/index.ts
index 401a9aa5..31ee1155 100644
--- a/packages/collapse/index.ts
+++ b/packages/collapse/index.ts
@@ -14,8 +14,12 @@ VantComponent({
   },
 
   props: {
+    value: null,
     accordion: Boolean,
-    value: null
+    border: {
+      type: Boolean,
+      value: true
+    }
   },
 
   data: {
diff --git a/packages/collapse/index.wxml b/packages/collapse/index.wxml
index 49667522..fd4e1719 100644
--- a/packages/collapse/index.wxml
+++ b/packages/collapse/index.wxml
@@ -1,3 +1,3 @@
-<view class="van-collapse van-hairline--top-bottom custom-class">
+<view class="custom-class van-collapse {{ border ? 'van-hairline--top-bottom' : '' }}">
   <slot />
 </view>