From 3f4ec83145e5ec4d5239db5811553681d379d318 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Sun, 22 Sep 2019 17:26:56 +0800
Subject: [PATCH] feat(CheckboxGroup): add icon-size prop (#4530)

---
 src/checkbox-group/index.js                   |  1 +
 src/checkbox/README.md                        |  1 +
 src/checkbox/README.zh-CN.md                  |  3 +-
 .../test/__snapshots__/index.spec.js.snap     | 17 +++++++++++
 src/checkbox/test/index.spec.js               | 28 ++++++++++++++-----
 5 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/checkbox-group/index.js b/src/checkbox-group/index.js
index c902612c2..40bee352e 100644
--- a/src/checkbox-group/index.js
+++ b/src/checkbox-group/index.js
@@ -9,6 +9,7 @@ export default createComponent({
   props: {
     max: Number,
     disabled: Boolean,
+    iconSize: [Number, String],
     value: {
       type: Array,
       default: () => []
diff --git a/src/checkbox/README.md b/src/checkbox/README.md
index 79af97e38..48f13c4b2 100644
--- a/src/checkbox/README.md
+++ b/src/checkbox/README.md
@@ -162,6 +162,7 @@ export default {
 |------|------|------|------|------|
 | v-model | Names of all checked checkboxes | *any[]* | - | - |
 | disabled | Disable all checkboxes | *boolean* | `false` | - |
+| icon-size | Icon size of all checkboxes | *string \| number* | `20px` | 2.2.3 |
 | max | Maximum amount of checked options | *number* | `0`(Unlimited) | - |
 
 ### Checkbox Events
diff --git a/src/checkbox/README.zh-CN.md b/src/checkbox/README.zh-CN.md
index d907a5b68..9c4ca9fc5 100644
--- a/src/checkbox/README.zh-CN.md
+++ b/src/checkbox/README.zh-CN.md
@@ -153,7 +153,7 @@ export default {
 | shape | 形状，可选值为 `square` | *string* | `round` | - |
 | v-model | 是否为选中状态 | *boolean* | `false` | - |
 | disabled | 是否禁用复选框 | *boolean* | `false` | - |
-| icon-size | 图标大小，默认单位为`px` | *string \| number* | `20px` | - |
+| icon-size | 当前复选框的图标大小，默认单位为`px` | *string \| number* | `20px` | - |
 | label-disabled | 是否禁用复选框文本点击 | *boolean* | `false` | - |
 | label-position | 文本位置，可选值为 `left` | *string* | `right` | - |
 | checked-color | 选中状态颜色 | *string* | `#1989fa` | - |
@@ -164,6 +164,7 @@ export default {
 |------|------|------|------|------|
 | v-model | 所有选中项的标识符 | *any[]* | - | - |
 | disabled | 是否禁用所有复选框 | *boolean* | `false` | - |
+| icon-size | 所有复选框的图标大小，默认单位为`px` | *string \| number* | `20px` | 2.2.3 |
 | max | 设置最大可选数，0 为无限制 | *number* | `0` | - |
 
 ### Checkbox Events
diff --git a/src/checkbox/test/__snapshots__/index.spec.js.snap b/src/checkbox/test/__snapshots__/index.spec.js.snap
index 10f69f18b..5bd649fd9 100644
--- a/src/checkbox/test/__snapshots__/index.spec.js.snap
+++ b/src/checkbox/test/__snapshots__/index.spec.js.snap
@@ -1,5 +1,22 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`icon-size prop 1`] = `
+<div class="van-checkbox-group">
+  <div role="checkbox" tabindex="0" aria-checked="false" class="van-checkbox">
+    <div class="van-checkbox__icon van-checkbox__icon--round" style="font-size: 10rem;"><i class="van-icon van-icon-success">
+        <!----></i></div><span class="van-checkbox__label">label</span>
+  </div>
+  <div role="checkbox" tabindex="0" aria-checked="false" class="van-checkbox">
+    <div class="van-checkbox__icon van-checkbox__icon--round" style="font-size: 10rem;"><i class="van-icon van-icon-success">
+        <!----></i></div><span class="van-checkbox__label">label</span>
+  </div>
+  <div role="checkbox" tabindex="0" aria-checked="false" class="van-checkbox">
+    <div class="van-checkbox__icon van-checkbox__icon--round" style="font-size: 5rem;"><i class="van-icon van-icon-success">
+        <!----></i></div><span class="van-checkbox__label">label</span>
+  </div>
+</div>
+`;
+
 exports[`label disabled 1`] = `
 <div role="checkbox" tabindex="0" aria-checked="undefined" class="van-checkbox">
   <div class="van-checkbox__icon van-checkbox__icon--round"><i class="van-icon van-icon-success">
diff --git a/src/checkbox/test/index.spec.js b/src/checkbox/test/index.spec.js
index d42933bd1..4166b64b6 100644
--- a/src/checkbox/test/index.spec.js
+++ b/src/checkbox/test/index.spec.js
@@ -1,7 +1,11 @@
+import Vue from 'vue';
 import Checkbox from '..';
 import CheckboxGroup from '../../checkbox-group';
 import { mount, later } from '../../../test/utils';
 
+Vue.use(Checkbox);
+Vue.use(CheckboxGroup);
+
 test('switch checkbox', async () => {
   const wrapper = mount(Checkbox);
 
@@ -47,14 +51,10 @@ test('label disabled', () => {
 test('checkbox group', async () => {
   const wrapper = mount({
     template: `
-      <checkbox-group v-model="result" :max="2">
-        <checkbox v-for="item in list" :key="item" :name="item"></checkbox>
-      </checkbox-group>
+      <van-checkbox-group v-model="result" :max="2">
+        <van-checkbox v-for="item in list" :key="item" :name="item"></van-checkbox>
+      </van-checkbox-group>
     `,
-    components: {
-      Checkbox,
-      CheckboxGroup
-    },
     data() {
       return {
         result: [],
@@ -105,3 +105,17 @@ test('label-position prop', () => {
 
   expect(wrapper).toMatchSnapshot();
 });
+
+test('icon-size prop', () => {
+  const wrapper = mount({
+    template: `
+      <van-checkbox-group icon-size="10rem">
+        <van-checkbox>label</van-checkbox>
+        <van-checkbox>label</van-checkbox>
+        <van-checkbox icon-size="5rem">label</van-checkbox>
+      </van-checkbox-group>
+    `
+  });
+
+  expect(wrapper).toMatchSnapshot();
+});