From a234c97852f3864b20060a92d4389613406d2a4f Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 6 Nov 2018 14:49:38 +0800
Subject: [PATCH] [improvement] optimize wxml (#858)

---
 example/pages/radio/index.wxml     | 19 ++++++++++---
 packages/checkbox-group/index.wxml |  4 +--
 packages/radio-group/index.wxml    |  4 +--
 packages/search/index.wxml         | 45 +++++++++++++++---------------
 packages/swipe-cell/index.wxml     | 36 ++++++++++++------------
 packages/tabbar-item/index.wxml    |  8 ++----
 6 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/example/pages/radio/index.wxml b/example/pages/radio/index.wxml
index 85875ed3..a0d508d2 100644
--- a/example/pages/radio/index.wxml
+++ b/example/pages/radio/index.wxml
@@ -1,12 +1,23 @@
-<demo-block title="基本用法">
-  <van-radio-group value="{{ radio1 }}" data-key="radio1" bind:change="onChange" custom-class="demo-radio-group">
+<demo-block title="基本用法" padding>
+  <van-radio-group
+    value="{{ radio1 }}"
+    data-key="radio1"
+    custom-class="demo-radio-group"
+    bind:change="onChange"
+  >
     <van-radio name="1" custom-class="demo-radio">单选框 1</van-radio>
     <van-radio name="2" custom-class="demo-radio">单选框 2</van-radio>
   </van-radio-group>
 </demo-block>
 
-<demo-block title="禁用状态">
-  <van-radio-group value="{{ radio2 }}" data-key="radio2" bind:change="onChange" disabled custom-class="demo-radio-group">
+<demo-block title="禁用状态" padding>
+  <van-radio-group
+    disabled
+    value="{{ radio2 }}"
+    data-key="radio2"
+    custom-class="demo-radio-group"
+    bind:change="onChange"
+  >
     <van-radio name="1" custom-class="demo-radio">单选框 1</van-radio>
     <van-radio name="2" custom-class="demo-radio">单选框 2</van-radio>
   </van-radio-group>
diff --git a/packages/checkbox-group/index.wxml b/packages/checkbox-group/index.wxml
index 775ee3ce..4fa864ce 100644
--- a/packages/checkbox-group/index.wxml
+++ b/packages/checkbox-group/index.wxml
@@ -1,3 +1 @@
-<view class="custom-class">
-  <slot />
-</view>
+<slot />
diff --git a/packages/radio-group/index.wxml b/packages/radio-group/index.wxml
index 775ee3ce..4fa864ce 100644
--- a/packages/radio-group/index.wxml
+++ b/packages/radio-group/index.wxml
@@ -1,3 +1 @@
-<view class="custom-class">
-  <slot />
-</view>
+<slot />
diff --git a/packages/search/index.wxml b/packages/search/index.wxml
index b6c17508..dd392e9d 100644
--- a/packages/search/index.wxml
+++ b/packages/search/index.wxml
@@ -2,29 +2,28 @@
   class="van-search custom-class {{ showAction || useActionSlot ? 'van-search--show-action' : '' }}"
   style="background: {{ background }}"
 >
-  <view class="van-search__field">
-    <van-field
-      clearable
-      type="search"
-      left-icon="search"
-      focus="{{ focus }}"
-      error="{{ error }}"
-      border="{{ false }}"
-      confirm-type="search"
-      value="{{ value }}"
-      disabled="{{ disabled }}"
-      readonly="{{ readony }}"
-      maxlength="{{ maxlength }}"
-      input-align="{{ inputAlign }}"
-      placeholder="{{ placeholder }}"
-      placeholder-style="{{ placeholderStyle }}"
-      custom-style="padding: 3px 10px"
-      bind:blur="onBlur"
-      bind:focus="onFocus"
-      bind:change="onChange"
-      bind:confirm="onSearch"
-    />
-  </view>
+  <van-field
+    clearable
+    type="search"
+    left-icon="search"
+    focus="{{ focus }}"
+    error="{{ error }}"
+    border="{{ false }}"
+    confirm-type="search"
+    class="van-search__field"
+    value="{{ value }}"
+    disabled="{{ disabled }}"
+    readonly="{{ readony }}"
+    maxlength="{{ maxlength }}"
+    input-align="{{ inputAlign }}"
+    placeholder="{{ placeholder }}"
+    placeholder-style="{{ placeholderStyle }}"
+    custom-style="padding: 3px 10px"
+    bind:blur="onBlur"
+    bind:focus="onFocus"
+    bind:change="onChange"
+    bind:confirm="onSearch"
+  />
   <view wx:if="{{ showAction || useActionSlot }}" class="van-search__action">
     <slot wx:if="{{ useActionSlot }}" name="action" />
     <view wx:else bind:tap="onCancel" class="cancel-class">取消</view>
diff --git a/packages/swipe-cell/index.wxml b/packages/swipe-cell/index.wxml
index 45f05097..40fb06de 100644
--- a/packages/swipe-cell/index.wxml
+++ b/packages/swipe-cell/index.wxml
@@ -1,22 +1,22 @@
 <view
-    class="van-swipe-cell"
-    data-key="cell"
-    bindtap="onClick"
-    bindtouchstart="startDrag"
-    bindtouchmove="onDrag"
-    bindtouchend="endDrag"
-    bindtouchcancel="endDrag"
+  class="van-swipe-cell"
+  data-key="cell"
+  bindtap="onClick"
+  bindtouchstart="startDrag"
+  bindtouchmove="onDrag"
+  bindtouchend="endDrag"
+  bindtouchcancel="endDrag"
+>
+  <view
+    style="{{ wrapperStyle }}"
+    bindtransitionend="onTransitionend"
   >
-    <view
-      style="{{ wrapperStyle }}"
-      bindtransitionend="onTransitionend"
-    >
-      <view wx:if="{{ leftWidth }}" class="van-swipe-cell__left" data-key="left" catch:tap="onClick">
-        <slot name="left" />
-      </view>
-      <slot />
-      <view wx:if="{{ rightWidth }}" class="van-swipe-cell__right" data-key="right" catch:tap="onClick">
-        <slot name="right" />
-      </view>
+    <view wx:if="{{ leftWidth }}" class="van-swipe-cell__left" data-key="left" catch:tap="onClick">
+      <slot name="left" />
+    </view>
+    <slot />
+    <view wx:if="{{ rightWidth }}" class="van-swipe-cell__right" data-key="right" catch:tap="onClick">
+      <slot name="right" />
     </view>
   </view>
+</view>
diff --git a/packages/tabbar-item/index.wxml b/packages/tabbar-item/index.wxml
index 0d7b2764..5c0c2557 100644
--- a/packages/tabbar-item/index.wxml
+++ b/packages/tabbar-item/index.wxml
@@ -5,12 +5,8 @@
   <view class="van-tabbar-item__icon {{ dot ? 'van-tabbar-item__icon--dot' : '' }}">
     <van-icon wx:if="{{ icon }}" name="{{ icon }}" info="{{ info }}" />
     <block wx:else>
-      <block wx:if="{{ active }}">
-        <slot name="icon-active" />
-      </block>
-      <block wx:else>
-        <slot name="icon" />
-      </block>
+      <slot wx:if="{{ active }}" name="icon-active" />
+      <slot wx:else name="icon" />
       <view wx:if="{{ info !== null }}" class="van-icon__info">{{ info }}</view>
     </block>
   </view>