From 9d31eca15f8afa684512baf09600f7afc816b100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Wed, 20 Sep 2017 20:10:47 +0800
Subject: [PATCH 1/2] Checkbox: support different shape

---
 docs/examples-docs/checkbox.md     |  79 ++++--------
 package.json                       |   3 +-
 packages/checkbox/index.vue        |  32 +++--
 packages/vant-css/src/checkbox.css |  68 +++++++---
 postcss.config.js                  |   9 +-
 test/unit/specs/checkbox.spec.js   |  12 ++
 yarn.lock                          | 192 +++++++++++++++--------------
 7 files changed, 209 insertions(+), 186 deletions(-)

diff --git a/docs/examples-docs/checkbox.md b/docs/examples-docs/checkbox.md
index d40c791b7..d43b284f1 100644
--- a/docs/examples-docs/checkbox.md
+++ b/docs/examples-docs/checkbox.md
@@ -1,10 +1,11 @@
 <style>
 .demo-checkbox {
-  .van-checkbox-wrapper {
-    padding: 0 20px;
-
+  .van-checkbox {
+    margin: 10px 0 0 20px;
+  }
+  .van-cell {
     .van-checkbox {
-      margin: 10px 0;
+      margin: 0;
     }
   }
 }
@@ -49,9 +50,7 @@ Vue.component(Checkbox.name, Checkbox);
 
 :::demo 基础用法
 ```html
-<div class="van-checkbox-wrapper">
-  <van-checkbox v-model="checkbox1">复选框1</van-checkbox>
-</div>
+<van-checkbox v-model="checkbox1">复选框1</van-checkbox>
 ```
 
 ```javascript
@@ -71,9 +70,7 @@ export default {
 
 :::demo 禁用状态
 ```html
-<div class="van-checkbox-wrapper">
-  <van-checkbox v-model="checkbox2" disabled>复选框2</van-checkbox>
-</div>
+<van-checkbox v-model="checkbox2" disabled>复选框2</van-checkbox>
 ```
 
 ```javascript
@@ -93,22 +90,22 @@ export default {
 
 :::demo Checkbox组
 ```html
-<div class="van-checkbox-wrapper">
-  <van-checkbox-group v-model="result">
-    <van-checkbox v-for="(item, index) in list" :key="index" :name="item">复选框{{item}}</van-checkbox>
-  </van-checkbox-group>
-</div>
+<van-checkbox-group v-model="result">
+  <van-checkbox
+    v-for="(item, index) in list"
+    :key="index"
+    :name="item"
+  >
+    复选框{{ item }}
+  </van-checkbox>
+</van-checkbox-group>
 ```
 
 ```javascript
 export default {
   data() {
     return {
-      list: [
-        'a',
-        'b',
-        'c'
-      ],
+      list: ['a', 'b', 'c'],
       result: ['a', 'b']
     };
   },
@@ -122,35 +119,6 @@ export default {
 ```
 :::
 
-#### 禁用Checkbox组
-
-禁用`van-checkbox-group`，此时整个组都不可点击。
-
-:::demo 禁用Checkbox组
-```html
-<div class="van-checkbox-wrapper">
-  <van-checkbox-group v-model="result" disabled>
-    <van-checkbox v-for="(item, index) in list" :key="index" :name="item">复选框{{item}}</van-checkbox>
-  </van-checkbox-group>
-</div>
-```
-
-```javascript
-export default {
-  data() {
-    return {
-      list: [
-        'a',
-        'b',
-        'c'
-      ],
-      result: ['a', 'b']
-    };
-  }
-};
-```
-:::
-
 #### 与Cell组件一起使用
 
 此时你需要再引入`Cell`和`CellGroup`组件。
@@ -160,7 +128,7 @@ export default {
 <van-checkbox-group v-model="result">
   <van-cell-group>
     <van-cell v-for="(item, index) in list" :key="index">
-      <van-checkbox :name="item">复选框{{item}}</van-checkbox>
+      <van-checkbox :name="item">复选框{{ item }}</van-checkbox>
     </van-cell>
   </van-cell-group>
 </van-checkbox-group>
@@ -170,11 +138,7 @@ export default {
 export default {
   data() {
     return {
-      list: [
-        'a',
-        'b',
-        'c'
-      ],
+      list: ['a', 'b', 'c'],
       result: ['a', 'b']
     };
   }
@@ -186,14 +150,15 @@ export default {
 
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
+| name | 标识 Checkbox 名称 | `Boolean`  | `false` | - |
 | disabled | 是否禁用单选框 | `Boolean`  | `false` | - |
-| name | 根据这个来判断radio是否选中 | `Boolean`  | `false` | - |
+| shape | 形状 | `String`  | `round` | `square` |
 
 ### CheckboxGroup API
 
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
-| disabled | 是否禁用单选框 | `Boolean` | `false` | - |
+| disabled | 是否禁用所有单选框 | `Boolean` | `false` | - |
 
 ### Checkbox Event
 
diff --git a/package.json b/package.json
index a3b520ce3..092e537ad 100644
--- a/package.json
+++ b/package.json
@@ -96,9 +96,10 @@
     "markdown-it-container": "^2.0.0",
     "mocha": "^3.4.2",
     "postcss": "^6.0.10",
+    "postcss-calc": "^6.0.0",
     "postcss-easy-import": "^2.1.0",
     "postcss-loader": "^2.0.6",
-    "precss": "^2.0.0",
+    "precss": "2.0.0",
     "progress-bar-webpack-plugin": "^1.10.0",
     "rimraf": "^2.5.4",
     "run-sequence": "^2.1.0",
diff --git a/packages/checkbox/index.vue b/packages/checkbox/index.vue
index 6ff5d91b2..9d9477809 100644
--- a/packages/checkbox/index.vue
+++ b/packages/checkbox/index.vue
@@ -1,39 +1,46 @@
 <template>
   <div
-    class="van-checkbox"
-    :class="{
+    :class="[
+      'van-checkbox',
+      `van-checkbox--${shape}`, {
       'van-checkbox--disabled': isDisabled
-    }">
+    }]">
     <span class="van-checkbox__input">
       <input
         v-model="currentValue"
         type="checkbox"
         class="van-checkbox__control"
-        :disabled="isDisabled">
-      <span class="van-icon" :class="{
-        'van-icon-checked': isChecked,
-        'van-icon-check': !isChecked
-      }">
-      </span>
+        :disabled="isDisabled"
+      />
+      <van-icon name="success" />
     </span>
-    <span class="van-checkbox__label" @click="handleLabelClick">
+    <span class="van-checkbox__label" @click="onClickLabel">
       <slot></slot>
     </span>
   </div>
 </template>
 
 <script>
+import Icon from '../Icon';
 import findParent from '../mixins/findParent';
 
 export default {
   name: 'van-checkbox',
 
+  components: {
+    [Icon.name]: Icon
+  },
+
   mixins: [findParent],
 
   props: {
     value: {},
     disabled: Boolean,
-    name: [String, Number]
+    name: [String, Number],
+    shape: {
+      type: String,
+      default: 'round'
+    }
   },
 
   watch: {
@@ -78,6 +85,7 @@ export default {
 
     isChecked() {
       const currentValue = this.currentValue;
+      console.log('this.currentValue:', this.currentValue);
       if ({}.toString.call(currentValue) === '[object Boolean]') {
         return currentValue;
       } else if (currentValue !== null && currentValue !== undefined) {
@@ -93,7 +101,7 @@ export default {
   },
 
   methods: {
-    handleLabelClick() {
+    onClickLabel() {
       if (this.isDisabled) {
         return;
       }
diff --git a/packages/vant-css/src/checkbox.css b/packages/vant-css/src/checkbox.css
index 0ab575902..bf70b993a 100644
--- a/packages/vant-css/src/checkbox.css
+++ b/packages/vant-css/src/checkbox.css
@@ -1,30 +1,31 @@
 @import './common/var.css';
 
+$van-checkbox-size: 18px;
+
 .van-checkbox {
   overflow: hidden;
 
-  .van-icon {
-    font-size: 22px;
-    line-height: 1;
-  }
+  .van-icon-success {
+    color: #fff;
+    display: block;
+    font-size: 14px;
+    text-align: center;
+    pointer-events: none;
+    border: 1px solid #aaa;
+    width: $van-checkbox-size;
+    height: $van-checkbox-size;
 
-  .van-icon-checked {
-    color: $green;
-  }
-
-  .van-icon-check {
-    color: $gray-dark;
-  }
-
-  &--disabled {
-    .van-icon {
-      color: #d1dbe5;
+    &::before {
+      margin: 0 auto;
+      line-height: $van-checkbox-size;
+      transition: all .2s cubic-bezier(.12,.4,.29,1.46) .1s;
+      transform: scale(0);
     }
   }
 
   &__input {
     position: relative;
-    height: 22px;
+    height: calc($van-checkbox-size + 2px);
     margin-right: 15px;
     float: left;
   }
@@ -33,15 +34,42 @@
     position: absolute;
     top: 0;
     left: 0;
-    width: 22px;
-    height: 22px;
     opacity: 0;
     margin: 0;
+    width: calc($van-checkbox-size + 2px);
+    height: calc($van-checkbox-size + 2px);
   }
 
   &__label {
-    line-height: 22px;
-    margin-left: 37px;
     display: block; 
+    margin-left: 37px;
+    line-height: calc($van-checkbox-size + 2px);
+  }
+
+  &--round {
+    .van-icon-success {
+      border-radius: 100%;
+    }
+  }
+
+  &__control:checked + .van-icon-success {
+    border-color: $green;
+    background-color: $green;
+
+    &::before {
+      transform: scale(1);
+    }
+  }
+
+  &--disabled {
+    .van-icon-success {
+      border-color: #d1dbe5;
+      background-color: transparent;
+    }
+
+    .van-checkbox__control:checked + .van-icon-success {
+      border-color: #d1dbe5;
+      background-color: #d1dbe5;      
+    }
   }
 }
diff --git a/postcss.config.js b/postcss.config.js
index e5b2291bc..1301a3587 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,11 +1,12 @@
 module.exports = {
   plugins: [
-    require("postcss-easy-import")({
+    require('postcss-easy-import')({
       extensions: ['pcss', 'css']
     }),
-    require("precss")(),
-    require("autoprefixer")({
-      browsers: ["Android >= 4.0", "iOS >= 7"]
+    require('precss')(),
+    require('postcss-calc')(),
+    require('autoprefixer')({
+      browsers: ['Android >= 4.0', 'iOS >= 7']
     })
   ]
 };
diff --git a/test/unit/specs/checkbox.spec.js b/test/unit/specs/checkbox.spec.js
index 4eacba7b4..c9e1c52fe 100644
--- a/test/unit/specs/checkbox.spec.js
+++ b/test/unit/specs/checkbox.spec.js
@@ -88,6 +88,18 @@ describe('Checkbox', () => {
     expect(wrapper.vm.isChecked).to.be.true;
   });
 
+  it('create a checkbox with name', () => {
+    wrapper = mount(Checkbox, {
+      propsData: {
+        name: 'a',
+        disabled: false
+      }
+    });
+
+    expect(wrapper.hasClass('van-checkbox')).to.be.true;
+    expect(!!wrapper.vm.isChecked).to.be.false;
+  });
+
   it('create a not boolean value checkbox', (done) => {
     wrapper = mount(Checkbox, {
       propsData: {
diff --git a/yarn.lock b/yarn.lock
index e34c64473..b7835ddc1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -960,7 +960,7 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.0.5, bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.4.7:
+bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.4.7:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
 
@@ -1447,7 +1447,7 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.11.x, commander@^2.11.0, commander@^2.9.0, commander@~2.11.0:
+commander@2.11.x, commander@^2.11.0, commander@~2.11.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
 
@@ -1513,13 +1513,6 @@ concat-stream@1.6.0, concat-stream@^1.5.2:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-config-chain@~1.1.5:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
-  dependencies:
-    ini "^1.3.4"
-    proto-list "~1.2.1"
-
 connect-history-api-fallback@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz#e51d17f8f0ef0db90a64fdb47de3051556e9f169"
@@ -1709,6 +1702,10 @@ css-selector-tokenizer@^0.7.0:
     fastparse "^1.1.1"
     regexpu-core "^1.0.0"
 
+css-unit-converter@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996"
+
 css-what@2.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
@@ -1866,6 +1863,13 @@ deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
+default-gateway@^2.2.2:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.5.0.tgz#78e24dbd2e1df7490c2b8050515b8e816bfa7da5"
+  dependencies:
+    execa "^0.7.0"
+    ip-regex "^2.1.0"
+
 defaults@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
@@ -2073,16 +2077,6 @@ ecc-jsbn@~0.1.1:
   dependencies:
     jsbn "~0.1.0"
 
-editorconfig@^0.13.2:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.13.3.tgz#e5219e587951d60958fd94ea9a9a008cdeff1b34"
-  dependencies:
-    bluebird "^3.0.5"
-    commander "^2.9.0"
-    lru-cache "^3.2.0"
-    semver "^5.1.0"
-    sigmund "^1.0.1"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -3577,11 +3571,12 @@ inquirer@^0.12.0:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-internal-ip@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c"
+internal-ip@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-2.0.3.tgz#ed3cf9b671ac7ff23037bfacad42eb439cd9546c"
   dependencies:
-    meow "^3.3.0"
+    default-gateway "^2.2.2"
+    ipaddr.js "^1.5.2"
 
 interpret@^1.0.0:
   version "1.0.3"
@@ -3597,6 +3592,10 @@ invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
 
+ip-regex@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+
 ip@^1.1.0, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
@@ -3605,6 +3604,10 @@ ipaddr.js@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.4.0.tgz#296aca878a821816e5b85d0a285a99bcff4582f0"
 
+ipaddr.js@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"
+
 is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
@@ -3815,6 +3818,10 @@ is-windows@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
 
+is-wsl@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -3892,15 +3899,6 @@ js-base64@^2.1.9:
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
 
-js-beautify@^1.6.14:
-  version "1.6.14"
-  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.6.14.tgz#d3b8f7322d02b9277d58bd238264c327e58044cd"
-  dependencies:
-    config-chain "~1.1.5"
-    editorconfig "^0.13.2"
-    mkdirp "~0.5.0"
-    nopt "~3.0.1"
-
 js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
@@ -4549,12 +4547,6 @@ lru-cache@2, lru-cache@2.2.x:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
 
-lru-cache@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee"
-  dependencies:
-    pseudomap "^1.0.1"
-
 lru-cache@^4.0.1, lru-cache@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
@@ -4893,7 +4885,7 @@ nomnomnomnom@^2.0.0:
     chalk "~0.4.0"
     underscore "~1.6.0"
 
-nopt@3.x, nopt@~3.0.1:
+nopt@3.x:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
   dependencies:
@@ -5059,12 +5051,11 @@ onetime@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
 
-opn@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95"
+opn@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.1.0.tgz#72ce2306a17dbea58ff1041853352b4a8fc77519"
   dependencies:
-    object-assign "^4.0.1"
-    pinkie-promise "^2.0.0"
+    is-wsl "^1.1.0"
 
 optimist@^0.6.1:
   version "0.6.1"
@@ -5404,6 +5395,15 @@ postcss-calc@^5.2.0:
     postcss-message-helpers "^2.0.0"
     reduce-css-calc "^1.2.6"
 
+postcss-calc@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-6.0.0.tgz#b681b279c6d24fbe0e33ed9045803705445d613b"
+  dependencies:
+    css-unit-converter "^1.1.1"
+    postcss "^6.0.0"
+    postcss-selector-parser "^2.2.2"
+    reduce-css-calc "^2.0.0"
+
 postcss-color-function@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/postcss-color-function/-/postcss-color-function-4.0.0.tgz#7e0106f4f6a1ecb1ad5b3a8553ace5e828aae187"
@@ -5527,11 +5527,11 @@ postcss-import@^9.1.0:
     resolve "^1.1.7"
 
 postcss-js@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-1.0.0.tgz#ccee5aa3b1970dd457008e79438165f66919ba30"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-1.0.1.tgz#ffaf29226e399ea74b5dce02cab1729d7addbc7b"
   dependencies:
     camelcase-css "^1.0.1"
-    postcss "^6.0.1"
+    postcss "^6.0.11"
 
 postcss-load-config@^1.1.0, postcss-load-config@^1.2.0:
   version "1.2.0"
@@ -5633,13 +5633,13 @@ postcss-minify-selectors@^2.0.4:
     postcss-selector-parser "^2.0.0"
 
 postcss-mixins@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-mixins/-/postcss-mixins-6.0.1.tgz#f5c9726259a6103733b43daa6a8b67dd0ed7aa47"
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-mixins/-/postcss-mixins-6.1.0.tgz#a7db09c34c3bfdf0d52cfb822abf2e574e6bf86b"
   dependencies:
     globby "^6.1.0"
-    postcss "^6.0.3"
+    postcss "^6.0.9"
     postcss-js "^1.0.0"
-    postcss-simple-vars "^4.0.0"
+    postcss-simple-vars "^4.1.0"
     sugarss "^1.0.0"
 
 postcss-modules-extract-imports@^1.0.0:
@@ -5677,10 +5677,10 @@ postcss-nested@^2.0.2:
     postcss-selector-parser "^2.2.3"
 
 postcss-nesting@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-4.0.1.tgz#8fc2ce40cbfcfab7ee24e7b68fb6ebe84b641469"
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-4.2.1.tgz#0483bce338b3f0828ced90ff530b29b98b00300d"
   dependencies:
-    postcss "^6.0.1"
+    postcss "^6.0.11"
 
 postcss-normalize-charset@^1.1.0:
   version "1.1.1"
@@ -5762,11 +5762,11 @@ postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2, postcss-selector
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-simple-vars@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-simple-vars/-/postcss-simple-vars-4.0.0.tgz#d49e082897d9a4824f2268fa91d969d943e2ea76"
+postcss-simple-vars@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-simple-vars/-/postcss-simple-vars-4.1.0.tgz#043248cfef8d3f51b3486a28c09f8375dbf1b2f9"
   dependencies:
-    postcss "^6.0.1"
+    postcss "^6.0.9"
 
 postcss-svgo@^2.1.1:
   version "2.1.6"
@@ -5806,7 +5806,7 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.2, postcss@^6.0.3, postcss@^6.0.6, postcss@^6.0.9:
+postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.2, postcss@^6.0.6:
   version "6.0.10"
   resolved "https://registry.npmjs.org/postcss/-/postcss-6.0.10.tgz#c311b89734483d87a91a56dc9e53f15f4e6e84e4"
   dependencies:
@@ -5814,7 +5814,7 @@ postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.2, postcss@^6.0.3, postcss@^6.0.6,
     source-map "^0.5.7"
     supports-color "^4.2.1"
 
-postcss@^6.0.10, postcss@^6.0.11:
+postcss@^6.0.10, postcss@^6.0.11, postcss@^6.0.3, postcss@^6.0.9:
   version "6.0.11"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.11.tgz#f48db210b1d37a7f7ab6499b7a54982997ab6f72"
   dependencies:
@@ -5822,7 +5822,7 @@ postcss@^6.0.10, postcss@^6.0.11:
     source-map "^0.5.7"
     supports-color "^4.4.0"
 
-precss@^2.0.0:
+precss@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/precss/-/precss-2.0.0.tgz#7f567e3318e06d44c8fdbf9e58452e8358bf4b71"
   dependencies:
@@ -5855,6 +5855,10 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
+prettier@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.7.0.tgz#47481588f41f7c90f63938feb202ac82554e7150"
+
 pretty-error@^2.0.2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
@@ -5896,10 +5900,6 @@ promise-each@^2.2.0:
   dependencies:
     any-promise "^0.1.0"
 
-proto-list@~1.2.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
-
 proxy-addr@~1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.5.tgz#71c0ee3b102de3f202f3b64f608d173fcba1a918"
@@ -5911,7 +5911,7 @@ prr@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
 
-pseudomap@^1.0.1, pseudomap@^1.0.2:
+pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
@@ -6116,6 +6116,13 @@ reduce-css-calc@^1.2.6:
     math-expression-evaluator "^1.2.14"
     reduce-function-call "^1.0.1"
 
+reduce-css-calc@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.0.5.tgz#33c97838c5d4c711a5c14ef85ce4fde41483f7bd"
+  dependencies:
+    css-unit-converter "^1.1.1"
+    postcss-value-parser "^3.3.0"
+
 reduce-function-call@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
@@ -6335,8 +6342,8 @@ run-async@^0.1.0:
     once "^1.3.0"
 
 run-sequence@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/run-sequence/-/run-sequence-2.1.0.tgz#149da012516f21dcf79db6dc99a2a95603631b21"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/run-sequence/-/run-sequence-2.2.0.tgz#b3f8d42836db89d08b2fe704eaf0c93dfd8335e2"
   dependencies:
     chalk "^1.1.3"
     gulp-util "^3.0.8"
@@ -6373,7 +6380,7 @@ selfsigned@^1.9.1:
   dependencies:
     node-forge "0.6.33"
 
-"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
@@ -6464,7 +6471,7 @@ shelljs@^0.7.5:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
-sigmund@^1.0.1, sigmund@~1.0.0:
+sigmund@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
 
@@ -6804,7 +6811,7 @@ sugarss@^1.0.0:
   dependencies:
     postcss "^6.0.0"
 
-supports-color@3.1.2, supports-color@^3.1.1:
+supports-color@3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
   dependencies:
@@ -7304,17 +7311,17 @@ vue-lazyload@^1.1.3:
   resolved "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.1.3.tgz#527a1e3e6ba6509fe27326d34f0ab9687c9a1e95"
 
 vue-loader@^13.0.4:
-  version "13.0.4"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.0.4.tgz#0a6d893698735fcf7037b20a23d724cb39eee7d4"
+  version "13.0.5"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.0.5.tgz#3639e9fb3940cded7f0fc34429277fb6de70a57c"
   dependencies:
     consolidate "^0.14.0"
     hash-sum "^1.0.2"
-    js-beautify "^1.6.14"
     loader-utils "^1.1.0"
     lru-cache "^4.1.1"
     postcss "^6.0.6"
     postcss-load-config "^1.1.0"
     postcss-selector-parser "^2.0.0"
+    prettier "^1.7.0"
     resolve "^1.3.3"
     source-map "^0.5.6"
     vue-hot-reload-api "^2.1.0"
@@ -7342,15 +7349,15 @@ vue-sfc-compiler@^0.0.2:
     vue-template-es2015-compiler "^1.5.3"
 
 vue-style-loader@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.0.2.tgz#eaeb299729fa3ee54717e907ce3c1e425ebae729"
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.0.3.tgz#623658f81506aef9d121cdc113a4f5c9cac32df7"
   dependencies:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
 vue-template-compiler@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.4.2.tgz#5a45d843f148b098f6c1d1e35ac20c4956d30ad1"
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.4.4.tgz#2cde3b704124985c27d50b5387c9691ba515fb57"
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
@@ -7360,8 +7367,8 @@ vue-template-es2015-compiler@^1.5.3:
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz#22787de4e37ebd9339b74223bc467d1adee30545"
 
 vue@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.2.tgz#a9855261f191c978cc0dc1150531b8d08149b58c"
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.4.tgz#ea9550b96a71465fd2b8b17b61673b3561861789"
 
 watchpack@^1.4.0:
   version "1.4.0"
@@ -7392,10 +7399,11 @@ webpack-dev-middleware@^1.0.11, webpack-dev-middleware@^1.11.0:
     time-stamp "^2.0.0"
 
 webpack-dev-server@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.7.1.tgz#21580f5a08cd065c71144cf6f61c345bca59a8b8"
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.8.2.tgz#abd61f410778cc4c843d7cebbf41465b1ab7734c"
   dependencies:
     ansi-html "0.0.7"
+    array-includes "^3.0.3"
     bonjour "^3.5.0"
     chokidar "^1.6.0"
     compression "^1.5.2"
@@ -7404,20 +7412,20 @@ webpack-dev-server@^2.7.1:
     express "^4.13.3"
     html-entities "^1.2.0"
     http-proxy-middleware "~0.17.4"
-    internal-ip "^1.2.0"
+    internal-ip "^2.0.2"
     ip "^1.1.5"
     loglevel "^1.4.1"
-    opn "4.0.2"
+    opn "^5.1.0"
     portfinder "^1.0.9"
     selfsigned "^1.9.1"
     serve-index "^1.7.2"
     sockjs "0.3.18"
     sockjs-client "1.1.4"
     spdy "^3.4.1"
-    strip-ansi "^3.0.0"
-    supports-color "^3.1.1"
+    strip-ansi "^3.0.1"
+    supports-color "^4.2.1"
     webpack-dev-middleware "^1.11.0"
-    yargs "^6.0.0"
+    yargs "^6.6.0"
 
 webpack-merge@^4.1.0:
   version "4.1.0"
@@ -7440,8 +7448,8 @@ webpack-sources@^1.0.1:
     source-map "~0.5.3"
 
 webpack@^3.5.5:
-  version "3.5.6"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.5.6.tgz#a492fb6c1ed7f573816f90e00c8fbb5a20cc5c36"
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.6.0.tgz#a89a929fbee205d35a4fa2cc487be9cbec8898bc"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
@@ -7596,7 +7604,7 @@ yargs-parser@^7.0.0:
   dependencies:
     camelcase "^4.1.0"
 
-yargs@^6.0.0:
+yargs@^6.6.0:
   version "6.6.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
   dependencies:
@@ -7652,8 +7660,8 @@ yeast@0.1.2:
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
 
 zan-doc@^0.2.12:
-  version "0.2.14"
-  resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.2.14.tgz#f5915e8e45fd10d2eae3e36d10949d22a7f9ac62"
+  version "0.2.15"
+  resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.2.15.tgz#f169ce77fce1323e257f7b5c674fc56092bf83ec"
   dependencies:
     cheerio "0.22.0"
     decamelize "^1.2.0"

From 62b48ee99f4221efdf04b6b2de0af11478873dbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Wed, 20 Sep 2017 20:19:47 +0800
Subject: [PATCH 2/2] fix: checkbox icon dependencies

---
 packages/checkbox/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/checkbox/index.vue b/packages/checkbox/index.vue
index 9d9477809..9518db5ee 100644
--- a/packages/checkbox/index.vue
+++ b/packages/checkbox/index.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import Icon from '../Icon';
+import Icon from '../icon';
 import findParent from '../mixins/findParent';
 
 export default {