From 7a84f7b1bc1f3481c6eba756b360fa48c37fa884 Mon Sep 17 00:00:00 2001
From: zgrong <zhangfengguangrong@163.com>
Date: Thu, 13 Dec 2018 16:50:09 +0800
Subject: [PATCH] =?UTF-8?q?[bugfix]=20ActionSheet=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dactions=E5=8A=A8=E6=80=81=E5=8F=98=E5=8C=96=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=B8=B2=E6=9F=93=E5=90=8Ebutton=E8=A2=AB=E6=89=93?=
 =?UTF-8?q?=E6=95=A3=E7=9A=84=E9=97=AE=E9=A2=98=20(#1070)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/action-sheet/index.wxml | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/packages/action-sheet/index.wxml b/packages/action-sheet/index.wxml
index 2435c5c1..dd71adcb 100644
--- a/packages/action-sheet/index.wxml
+++ b/packages/action-sheet/index.wxml
@@ -16,20 +16,23 @@
       bind:click="onClose"
     />
   </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"
-  >
-    <block wx:if="{{ !item.loading }}">
-      {{ item.name }}
-      <text wx:if="{{ item.subname }}" class="van-action-sheet__subname" >{{ item.subname }}</text>
-    </block>
-    <van-loading wx:else size="20px" />
-  </button>
+  <view wx:if="{{ actions && actions.length }}">
+    <!-- button外包一层view，防止actions动态变化，导致渲染时button被打散 -->
+    <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"
+    >
+      <block wx:if="{{ !item.loading }}">
+        {{ item.name }}
+        <text wx:if="{{ item.subname }}" class="van-action-sheet__subname" >{{ item.subname }}</text>
+      </block>
+      <van-loading wx:else size="20px" />
+    </button>
+  </view>
   <view
     wx:if="{{ cancelText }}"
     class="van-action-sheet__cancel"