From 66d6f4fc035793e5a1e034b91edf5f2c989d2bd3 Mon Sep 17 00:00:00 2001
From: Yao <chenyao1102@gmail.com>
Date: Tue, 10 Jul 2018 16:25:47 +0800
Subject: [PATCH] =?UTF-8?q?[improvement]=20=E5=A2=9E=E5=8A=A0=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BB=B6=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E7=B1=BB=EF=BC=8C=E6=96=B9=E4=BE=BF=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=A0=B7=E5=BC=8F=20(#352)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 增加自定义样式类，并开放部分，在文档上体现

* 增加 cell 外部样式类说明

* 增加自定义样式类
---
 example/pages/switch/index.wxml | 6 ++++++
 example/pages/switch/index.wxss | 9 ++++-----
 packages/btn/index.js           | 2 +-
 packages/btn/index.wxml         | 2 +-
 packages/capsule/index.js       | 1 +
 packages/capsule/index.wxml     | 2 +-
 packages/card/README.md         | 6 ++++++
 packages/card/index.js          | 2 +-
 packages/card/index.wxml        | 4 ++--
 packages/cell/README.md         | 5 +++++
 packages/cell/index.wxml        | 3 ++-
 packages/checkbox/index.wxml    | 2 +-
 packages/switch/README.md       | 6 ++++++
 packages/switch/index.js        | 2 ++
 packages/switch/index.wxml      | 2 +-
 packages/tag/README.md          | 6 ++++++
 packages/tag/index.js           | 2 ++
 packages/tag/index.wxml         | 2 +-
 18 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/example/pages/switch/index.wxml b/example/pages/switch/index.wxml
index fe24c507..a20db8ec 100644
--- a/example/pages/switch/index.wxml
+++ b/example/pages/switch/index.wxml
@@ -18,4 +18,10 @@
     </zan-cell>
   </zan-panel>
 
+  <zan-panel title='自定义高亮样式'>
+    <zan-cell>
+      <zan-switch theme-class="switch-theme" disabled="{{ false }}" checked/>
+    </zan-cell>
+  </zan-panel>
+
 </doc-page>
diff --git a/example/pages/switch/index.wxss b/example/pages/switch/index.wxss
index 87217462..cfb79a4e 100644
--- a/example/pages/switch/index.wxss
+++ b/example/pages/switch/index.wxss
@@ -1,6 +1,5 @@
-.zan-panel {
-  padding: 10px;
-}
-.zan-switch {
-  margin-right: 8px;
+
+.switch-theme {
+  background: #f44 !important;
+  border-color: #f44 !important;
 }
diff --git a/packages/btn/index.js b/packages/btn/index.js
index f65506f1..3d4db84d 100644
--- a/packages/btn/index.js
+++ b/packages/btn/index.js
@@ -1,7 +1,7 @@
 const nativeButtonBehavior = require('./native-button-behaviors');
 
 Component({
-  externalClasses: ['custom-class'],
+  externalClasses: ['custom-class', 'theme-class'],
   behaviors: [nativeButtonBehavior],
   relations: {
     '../btn-group/index': {
diff --git a/packages/btn/index.wxml b/packages/btn/index.wxml
index e1626d00..0a1703cc 100644
--- a/packages/btn/index.wxml
+++ b/packages/btn/index.wxml
@@ -1,5 +1,5 @@
 <button
-  class="custom-class zan-btn {{ inGroup ? 'zan-btn--group' : '' }} {{ isLast ? 'zan-btn--last' : '' }} {{size ? 'zan-btn--'+size : ''}} {{size === 'mini' ? 'zan-btn--plain' : ''}} {{plain ? 'zan-btn--plain' : ''}} {{type ? 'zan-btn--'+type : ''}} {{loading ? 'zan-btn--loading' : ''}} {{disabled ? 'zan-btn--disabled' : ''}}"
+  class="custom-class theme-class zan-btn {{ inGroup ? 'zan-btn--group' : '' }} {{ isLast ? 'zan-btn--last' : '' }} {{size ? 'zan-btn--'+size : ''}} {{size === 'mini' ? 'zan-btn--plain' : ''}} {{plain ? 'zan-btn--plain' : ''}} {{type ? 'zan-btn--'+type : ''}} {{loading ? 'zan-btn--loading' : ''}} {{disabled ? 'zan-btn--disabled' : ''}}"
   disabled="{{ disabled }}"
   hover-class="button-hover"
   open-type="{{ openType }}"
diff --git a/packages/capsule/index.js b/packages/capsule/index.js
index a950d011..903c027e 100644
--- a/packages/capsule/index.js
+++ b/packages/capsule/index.js
@@ -1,4 +1,5 @@
 Component({
+  externalClasses: ['custom-class'],
   /**
    * 组件的属性列表
    * 用于组件自定义设置
diff --git a/packages/capsule/index.wxml b/packages/capsule/index.wxml
index abee3b42..68f3c1c3 100644
--- a/packages/capsule/index.wxml
+++ b/packages/capsule/index.wxml
@@ -1,4 +1,4 @@
-<view class="zan-capsule zan-capsule--{{type}}">
+<view class="custom-class zan-capsule zan-capsule--{{type}}">
   <block wx:if="{{color}}">
     <view
       class="zan-capsule__left"
diff --git a/packages/card/README.md b/packages/card/README.md
index 700621bb..eb365615 100644
--- a/packages/card/README.md
+++ b/packages/card/README.md
@@ -53,3 +53,9 @@
 | num | 商品数量 | Number | -
 | status | 商品状态 | String | -
 | useDetailSlot | 是否使用detail-slot（true时需要添加对应slot） | Boolean | `false`
+
+### 外部样式类
+| 类名       | 说明      |
+|-----------|-----------|
+| card-class | 根节点自定义样式类，通过这个可以改变根节点上的样式 |
+| thumb-class | 左侧图片自定义样式类，可以通过这个修改图片的展示大小形式 |
diff --git a/packages/card/index.js b/packages/card/index.js
index d8e268f1..4def7a79 100644
--- a/packages/card/index.js
+++ b/packages/card/index.js
@@ -3,7 +3,7 @@ Component({
     multipleSlots: true
   },
 
-  externalClasses: ['card-class'],
+  externalClasses: ['card-class', 'thumb-class'],
 
   properties: {
     useThumbSlot: {
diff --git a/packages/card/index.wxml b/packages/card/index.wxml
index 98e26788..4ebc401f 100644
--- a/packages/card/index.wxml
+++ b/packages/card/index.wxml
@@ -1,7 +1,7 @@
-<view class="zan-card card-class">
+<view class="card-class zan-card">
   <!-- 左侧图片 -->
   
-  <view class="zan-card__thumb">
+  <view class="thumb-class zan-card__thumb">
     <image class="zan-card__img"
       src="{{ thumb }}"
       mode="aspectFit"
diff --git a/packages/cell/README.md b/packages/cell/README.md
index 88728337..db9f6ee9 100644
--- a/packages/cell/README.md
+++ b/packages/cell/README.md
@@ -61,3 +61,8 @@
 | 默认            | 否          | 无   | 左侧除了 `title`，`label` 外的自定义 wxml 内容                              |
 | icon          | 否          | 无   | 标题前自定义的 icon，可使用 `icon` 自定义组件，具体使用参考 icon 组件 |
 | footer          | 否          | 无   | 右侧自定义 wxml 内容，如果设置了 `value` 属性，则不生效 |
+
+### 外部样式类
+| 类名       | 说明      |
+|-----------|-----------|
+| cell-class | 根节点自定义样式类，通过这个可以改变根节点上的样式 |
diff --git a/packages/cell/index.wxml b/packages/cell/index.wxml
index 35bc362b..dc94e6a6 100644
--- a/packages/cell/index.wxml
+++ b/packages/cell/index.wxml
@@ -1,6 +1,7 @@
 <view 
   catchtap="cellTap"
-  class="cell-class zan-cell {{ isLastCell ? 'last-cell' : '' }} {{ isLink ? 'zan-cell--access' : '' }}">
+  class="cell-class zan-cell {{ isLastCell ? 'last-cell' : '' }} {{ isLink ? 'zan-cell--access' : '' }}"
+>
 
   <view class="zan-cell__icon">
     <slot name="icon"></slot>
diff --git a/packages/checkbox/index.wxml b/packages/checkbox/index.wxml
index 6684fd04..874c18a6 100644
--- a/packages/checkbox/index.wxml
+++ b/packages/checkbox/index.wxml
@@ -1,5 +1,5 @@
 <view
-  class="zan-checkbox checkbox-class {{ isInGroup ? 'zan-checkbox__item' : ''}} {{ type === 'list' ? 'zan-checkbox__list-item' : ''}}"
+  class="checkbox-class zan-checkbox {{ isInGroup ? 'zan-checkbox__item' : ''}} {{ type === 'list' ? 'zan-checkbox__list-item' : ''}}"
   bindtap="{{ labelDisabled ? '' : 'handleClick' }}"
   data-id="test"
   >
diff --git a/packages/switch/README.md b/packages/switch/README.md
index bd1188d6..b4d83b36 100644
--- a/packages/switch/README.md
+++ b/packages/switch/README.md
@@ -49,3 +49,9 @@ Page({
 | 事件名称       | 说明      | 回调参数       |
 |-----------|-----------|-----------|
 | change | 当绑定值变化时触发的事件 | event对象和数据对象（包含loading和checked） |
+
+### 外部样式类
+| 类名       | 说明      |
+|-----------|-----------|
+| custom-class | 根节点自定义样式类，通过这个可以改变根节点上的样式 |
+| theme-class | 根节点自定义样式类，用于更改根节点上的主题样式 |
diff --git a/packages/switch/index.js b/packages/switch/index.js
index 27e8d7b4..a86dbdd0 100644
--- a/packages/switch/index.js
+++ b/packages/switch/index.js
@@ -1,4 +1,6 @@
 Component({
+  externalClasses: ['custom-class', 'theme-class'],
+
   properties: {
     checked: {
       type: Boolean,
diff --git a/packages/switch/index.wxml b/packages/switch/index.wxml
index 9d8fa233..afd3468a 100644
--- a/packages/switch/index.wxml
+++ b/packages/switch/index.wxml
@@ -1,5 +1,5 @@
 <view
-  class="zan-switch zan-switch--{{ checked ? 'on' : 'off' }} {{ disabled ? 'zan-swtich--disabled' : '' }}"
+  class="custom-class theme-class zan-switch zan-switch--{{ checked ? 'on' : 'off' }} {{ disabled ? 'zan-swtich--disabled' : '' }}"
   checked="{{ checked }}"
   loading="{{ loading }}"
   disabled="{{ disabled }}"
diff --git a/packages/tag/README.md b/packages/tag/README.md
index b49b39c9..cbe24902 100644
--- a/packages/tag/README.md
+++ b/packages/tag/README.md
@@ -43,3 +43,9 @@ tag禁用状态
 | type    | String  | 否       | 空 | tag类型，值有primary、warn、danger |
 | plain   | Boolean | 否       | false | tag是否镂空，默认为false |
 | disabled | Boolean | 否      | false | tag是否禁用，默认为false |
+
+### 外部样式类
+| 类名       | 说明      |
+|-----------|-----------|
+| custom-class | 根节点自定义样式类，通过这个可以改变根节点上的样式 |
+| theme-class | 根节点自定义样式类，用于更改根节点上的主题样式 |
diff --git a/packages/tag/index.js b/packages/tag/index.js
index 24ea440e..8f936e68 100644
--- a/packages/tag/index.js
+++ b/packages/tag/index.js
@@ -1,4 +1,6 @@
 Component({
+  externalClasses: ['custom-class', 'theme-class'],
+
   properties: {
     type: {
       type: String,
diff --git a/packages/tag/index.wxml b/packages/tag/index.wxml
index 194034d9..d012ada4 100644
--- a/packages/tag/index.wxml
+++ b/packages/tag/index.wxml
@@ -1,6 +1,6 @@
 
 <view 
-  class="zan-tag {{type ? 'zan-tag--'+type : ''}} {{disabled ? 'zan-tag--disabled' : ''}} {{plain ? 'zan-tag--plain' : ''}}"
+  class="custom-class theme-class zan-tag {{type ? 'zan-tag--'+type : ''}} {{disabled ? 'zan-tag--disabled' : ''}} {{plain ? 'zan-tag--plain' : ''}}"
 >
   <slot></slot>
 </view>
\ No newline at end of file