From 78b61c37b6d4c07397dce1ac4d1e191085f3b615 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 6 Sep 2018 14:28:00 +0800
Subject: [PATCH] [improvement] ActionSheet: support open-type (#516)

---
 dist/action-sheet/index.wxml        | 5 +++--
 dist/action-sheet/index.wxss        | 2 +-
 example/pages/action-sheet/index.js | 4 ++--
 packages/action-sheet/README.md     | 9 +++++----
 packages/action-sheet/index.wxml    | 5 +++--
 packages/button/README.md           | 2 +-
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/dist/action-sheet/index.wxml b/dist/action-sheet/index.wxml
index 61ca171c..24b143d6 100644
--- a/dist/action-sheet/index.wxml
+++ b/dist/action-sheet/index.wxml
@@ -11,9 +11,10 @@
     <van-icon custom-class="van-action-sheet__close" name="close" bind:click="onClose" />
   </view>
   <view wx:else class="van-hairline--bottom">
-    <view
+    <button
       wx:for="{{ actions }}"
       wx:key="index"
+      open-type="{{ item.openType }}"
       class="van-action-sheet__item van-hairline--top {{ item.disabled || item.loading ? 'van-action-sheet__item--disabled' : '' }} {{ item.className || '' }}"
       data-index="{{ index }}"
       bind:tap="onSelect"
@@ -23,7 +24,7 @@
         <view class="van-action-sheet__subname" wx:if="{{ item.subname }}">{{ item.subname }}</view>
       </block>
       <van-loading wx:else custom-class="van-action-sheet__loading" size="20px" />
-    </view>
+    </button>
   </view>
   <view
     wx:if="{{ cancelText }}"
diff --git a/dist/action-sheet/index.wxss b/dist/action-sheet/index.wxss
index de0f424a..6137a280 100644
--- a/dist/action-sheet/index.wxss
+++ b/dist/action-sheet/index.wxss
@@ -1 +1 @@
-.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom::after,.van-hairline--left::after,.van-hairline--right::after,.van-hairline--surround::after,.van-hairline--top-bottom::after,.van-hairline--top::after,.van-hairline::after{content:'';position:absolute;top:0;left:0;width:200%;height:200%;-webkit-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;transform-origin:0 0;pointer-events:none;box-sizing:border-box;border:0 solid #e5e5e5}.van-hairline--top::after{border-top-width:1px}.van-hairline--left::after{border-left-width:1px}.van-hairline--right::after{border-right-width:1px}.van-hairline--bottom::after{border-bottom-width:1px}.van-hairline--top-bottom::after{border-width:1px 0}.van-hairline--surround::after{border-width:1px}.van-action-sheet{color:#333;max-height:90%;overflow-y:auto;-webkit-overflow-scrolling:touch;background-color:#f8f8f8}.van-action-sheet--withtitle{background-color:#fff}.van-action-sheet__cancel,.van-action-sheet__item{height:50px;line-height:50px;font-size:16px;text-align:center;background-color:#fff}.van-action-sheet__cancel:active,.van-action-sheet__item:active{background-color:#e8e8e8}.van-action-sheet__item--disabled{color:#c9c9c9}.van-action-sheet__item--disabled:active{background-color:#fff}.van-action-sheet__subname{font-size:12px;color:#666;margin-left:5px}.van-action-sheet__loading{display:inline-block}.van-action-sheet__cancel{margin-top:10px}.van-action-sheet__header{font-size:16px;line-height:44px;text-align:center}.van-action-sheet__close{top:0;right:0;padding:0 15px;font-size:18px!important;color:#999;position:absolute!important;line-height:inherit!important}
\ No newline at end of file
+.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom::after,.van-hairline--left::after,.van-hairline--right::after,.van-hairline--surround::after,.van-hairline--top-bottom::after,.van-hairline--top::after,.van-hairline::after{content:'';position:absolute;top:0;left:0;width:200%;height:200%;-webkit-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;transform-origin:0 0;pointer-events:none;box-sizing:border-box;border:0 solid #e5e5e5}.van-hairline--top::after{border-top-width:1px}.van-hairline--left::after{border-left-width:1px}.van-hairline--right::after{border-right-width:1px}.van-hairline--bottom::after{border-bottom-width:1px}.van-hairline--top-bottom::after{border-width:1px 0}.van-hairline--surround::after{border-width:1px}.van-action-sheet{color:#333;max-height:90%;overflow-y:auto;-webkit-overflow-scrolling:touch;background-color:#f8f8f8}.van-action-sheet--withtitle{background-color:#fff}.van-action-sheet__cancel,.van-action-sheet__item{height:50px;line-height:50px;font-size:16px;text-align:center;background-color:#fff}.van-action-sheet__cancel:active,.van-action-sheet__item:active{background-color:#e8e8e8}.van-action-sheet__item--disabled{color:#c9c9c9}.van-action-sheet__item--disabled:active{background-color:#fff}.van-action-sheet__name,.van-action-sheet__subname{display:inline-block}.van-action-sheet__subname{font-size:12px;color:#666;margin-left:5px}.van-action-sheet__loading{display:inline-block}.van-action-sheet__cancel{margin-top:10px}.van-action-sheet__header{font-size:16px;line-height:44px;text-align:center}.van-action-sheet__close{top:0;right:0;padding:0 15px;font-size:18px!important;color:#999;position:absolute!important;line-height:inherit!important}
\ No newline at end of file
diff --git a/example/pages/action-sheet/index.js b/example/pages/action-sheet/index.js
index 6e29d3ab..352b8a00 100644
--- a/example/pages/action-sheet/index.js
+++ b/example/pages/action-sheet/index.js
@@ -12,8 +12,8 @@ Page({
     this.setData({
       actions: [
         { name: '选项' },
-        { name: '选项', subname: '禁用' },
-        { name: '选项', loading: true },
+        { name: '分享', subname: '描述信息', openType: 'share' },
+        { loading: true },
         { name: '禁用选项', disabled: true }
       ]
     });
diff --git a/packages/action-sheet/README.md b/packages/action-sheet/README.md
index 1089b07d..70ca5317 100644
--- a/packages/action-sheet/README.md
+++ b/packages/action-sheet/README.md
@@ -32,11 +32,11 @@ Page({
           name: '选项'
         },
         {
-          name: '选项',
-          subname: '描述信息'
+          name: '分享',
+          subname: '描述信息',
+          openType: 'share'
         },
         {
-          name: '选项',
           loading: true
         },
         {
@@ -108,6 +108,7 @@ Page({
 |-----------|-----------|
 | name | 标题 |
 | subname | 二级标题 |
-| className | 为对应列添加额外的 class |
 | loading | 是否为加载状态 |
 | disabled | 是否为禁用状态 |
+| className | 为对应列添加额外的 class 类名 |
+| openType | 微信开放能力，具体支持可参考 [微信官方文档](https://mp.weixin.qq.com/debug/wxadoc/dev/component/button.html) |
diff --git a/packages/action-sheet/index.wxml b/packages/action-sheet/index.wxml
index 61ca171c..24b143d6 100644
--- a/packages/action-sheet/index.wxml
+++ b/packages/action-sheet/index.wxml
@@ -11,9 +11,10 @@
     <van-icon custom-class="van-action-sheet__close" name="close" bind:click="onClose" />
   </view>
   <view wx:else class="van-hairline--bottom">
-    <view
+    <button
       wx:for="{{ actions }}"
       wx:key="index"
+      open-type="{{ item.openType }}"
       class="van-action-sheet__item van-hairline--top {{ item.disabled || item.loading ? 'van-action-sheet__item--disabled' : '' }} {{ item.className || '' }}"
       data-index="{{ index }}"
       bind:tap="onSelect"
@@ -23,7 +24,7 @@
         <view class="van-action-sheet__subname" wx:if="{{ item.subname }}">{{ item.subname }}</view>
       </block>
       <van-loading wx:else custom-class="van-action-sheet__loading" size="20px" />
-    </view>
+    </button>
   </view>
   <view
     wx:if="{{ cancelText }}"
diff --git a/packages/button/README.md b/packages/button/README.md
index 556b2deb..9d330585 100644
--- a/packages/button/README.md
+++ b/packages/button/README.md
@@ -64,7 +64,7 @@
 | loading | 是否显示为加载状态 | `Boolean` | `false` |
 | block | 是否为块级元素 | `Boolean` | `false` |
 | square | 是否为方形按钮 | `Boolean` | `false` |
-| open-type | 微信开放能力 | `String` | - |
+| open-type | 微信开放能力，具体支持可参考 [微信官方文档](https://mp.weixin.qq.com/debug/wxadoc/dev/component/button.html) | `String` | - |
 | app-parameter | 打开 APP 时，向 APP 传递的参数 | `String` | - |
 | hover-start-time | 按住后多久出现点击态，单位毫秒 | `Number` | 20 |
 | hover-stay-time | 手指松开后点击态保留时间，单位毫秒 | `Number` | 70 |