From 9f128a1fe180bbb37ba4f06809daa4b19d81700c Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 28 Nov 2018 17:31:41 +0800
Subject: [PATCH] [improvement] move custom-class to template (#976)

---
 packages/button/index.ts   | 2 +-
 packages/button/index.wxml | 2 +-
 packages/cell/index.ts     | 2 +-
 packages/cell/index.wxml   | 2 +-
 packages/col/index.ts      | 2 +-
 packages/col/index.wxml    | 2 +-
 packages/switch/index.ts   | 2 +-
 packages/switch/index.wxml | 2 +-
 packages/tab/README.md     | 2 +-
 packages/tag/index.ts      | 2 +-
 packages/tag/index.wxml    | 5 ++++-
 11 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/button/index.ts b/packages/button/index.ts
index 6ef1b0aa..ccc246e9 100644
--- a/packages/button/index.ts
+++ b/packages/button/index.ts
@@ -27,7 +27,7 @@ VantComponent({
   computed: {
     classes(): string {
       const { type, size, block, plain, round, square, loading, disabled } = this.data;
-      return this.classNames('custom-class', 'van-button', `van-button--${type}`, `van-button--${size}`, {
+      return this.classNames('van-button', `van-button--${type}`, `van-button--${size}`, {
         'van-button--block': block,
         'van-button--round': round,
         'van-button--plain': plain,
diff --git a/packages/button/index.wxml b/packages/button/index.wxml
index 32c2b360..3480f938 100644
--- a/packages/button/index.wxml
+++ b/packages/button/index.wxml
@@ -1,7 +1,7 @@
 <button
   id="{{ id }}"
   lang="{{ lang }}"
-  class="{{ classes }}"
+  class="custom-class {{ classes }}"
   open-type="{{ openType }}"
   session-from="{{ sessionFrom }}"
   app-parameter="{{ appParameter }}"
diff --git a/packages/cell/index.ts b/packages/cell/index.ts
index 709a4412..4734bdc6 100644
--- a/packages/cell/index.ts
+++ b/packages/cell/index.ts
@@ -33,7 +33,7 @@ VantComponent({
   computed: {
     cellClass(): string {
       const { data } = this;
-      return this.classNames('custom-class', 'van-cell', {
+      return this.classNames('van-cell', {
         'van-cell--center': data.center,
         'van-cell--required': data.required,
         'van-cell--borderless': !data.border,
diff --git a/packages/cell/index.wxml b/packages/cell/index.wxml
index 17f06624..bfb24a1d 100644
--- a/packages/cell/index.wxml
+++ b/packages/cell/index.wxml
@@ -1,5 +1,5 @@
 <view
-  class="{{ cellClass }}"
+  class="custom-class {{ cellClass }}"
   style="{{ customStyle }}"
   bind:tap="onClick"
 >
diff --git a/packages/col/index.ts b/packages/col/index.ts
index e9d409d5..834c2e67 100644
--- a/packages/col/index.ts
+++ b/packages/col/index.ts
@@ -18,7 +18,7 @@ VantComponent({
   computed: {
     classes(): string {
       const { span, offset } = this.data;
-      return this.classNames('custom-class', 'van-col', {
+      return this.classNames('van-col', {
         [`van-col--${span}`]: span,
         [`van-col--offset-${offset}`]: offset
       });
diff --git a/packages/col/index.wxml b/packages/col/index.wxml
index f4cbabf7..69e74b16 100644
--- a/packages/col/index.wxml
+++ b/packages/col/index.wxml
@@ -1,5 +1,5 @@
 <view
-  class="{{ classes }}"
+  class="custom-class {{ classes }}"
   style="{{ style }}"
 >
   <slot />
diff --git a/packages/switch/index.ts b/packages/switch/index.ts
index f068743c..c7a1c9a6 100644
--- a/packages/switch/index.ts
+++ b/packages/switch/index.ts
@@ -25,7 +25,7 @@ VantComponent({
 
   computed: {
     classes(): string {
-      return this.classNames('custom-class', 'van-switch', {
+      return this.classNames('van-switch', {
         'van-switch--on': this.data.checked,
         'van-switch--disabled': this.data.disabled
       });
diff --git a/packages/switch/index.wxml b/packages/switch/index.wxml
index cae37436..6d0a3287 100644
--- a/packages/switch/index.wxml
+++ b/packages/switch/index.wxml
@@ -1,6 +1,6 @@
 <view
   style="{{ style }}"
-  class="{{ classes }}"
+  class="custom-class {{ classes }}"
   bind:tap="onClick"
 >
   <view class="van-switch__node node-class">
diff --git a/packages/tab/README.md b/packages/tab/README.md
index decab040..a1cbff72 100644
--- a/packages/tab/README.md
+++ b/packages/tab/README.md
@@ -136,7 +136,7 @@ Page({
 | duration | 动画时间 (单位秒)  | `Number` | `0.3` |
 | line-width | 底部条宽度 (px) | `Number` | 与当前标签等宽 |
 | swipe-threshold | 滚动阈值，设置标签数量超过多少个可滚动 | `Number` | `4` |
-| animated | 是否使用动画切换 Tabs | `Boolean` | - |
+| animated | 是否使用动画切换 Tabs | `Boolean` | `false` |
 
 ### Tab API
 
diff --git a/packages/tag/index.ts b/packages/tag/index.ts
index 6b0e7fb5..9db7bd8d 100644
--- a/packages/tag/index.ts
+++ b/packages/tag/index.ts
@@ -21,7 +21,7 @@ VantComponent({
   computed: {
     classes() {
       const { data } = this;
-      return this.classNames('van-tag', 'custom-class', {
+      return this.classNames('van-tag', {
         'van-tag--mark': data.mark,
         'van-tag--plain': data.plain,
         'van-tag--round': data.round,
diff --git a/packages/tag/index.wxml b/packages/tag/index.wxml
index 5a7a009f..69e74b16 100644
--- a/packages/tag/index.wxml
+++ b/packages/tag/index.wxml
@@ -1,3 +1,6 @@
-<view class="{{ classes }}" style="{{ style }}">
+<view
+  class="custom-class {{ classes }}"
+  style="{{ style }}"
+>
   <slot />
 </view>