Merge branch 'master' of https://github.com/vueComponent/ant-design

Author: wangxueliang

.travis.yml

@@ -5,8 +5,10 @@ node_js:
 before_script:
   - npm install vue vue-template-compiler
 script:
+  - cp ./scripts/.npmrc.template $HOME/.npmrc
   - COVERAGE=true npm run test
   - npm run codecov
+  - if [[ $TRAVIS_BRANCH == "master" && $TRAVIS_PULL_REQUEST == "false" ]]; then npm run pub-with-ci; fi
   - bash ./scripts/deploy-to-gh-pages.sh
 env:
   matrix:

BACKERS.md

@@ -0,0 +1,26 @@
+<h1 align="center">Sponsors &amp; Backers</h1>
+
+<br><br>
+
+<h2 align="center">Sponsors</h2>
+<p align="center">
+  <a href="https://www.patreon.com/tangjinzhou" target="_blank">
+    虚位以待...
+  </a>
+</p>
+
+<h2 align="center">Backers</h2>
+<p align="center">
+  <a href="https://www.patreon.com/tangjinzhou" target="_blank">
+    虚位以待...
+  </a>
+</p>
+
+<h2 align="center">支付宝/微信</h2>
+
+### 使用支付宝/微信的赞助的用户，如需要添加名单，赞助后可发github账号到邮箱(415800467@qq.com)
+
+- [fastgoo](https://github.com/fastgoo)
+- [sendya](https://github.com/sendya)
+- [limichange](https://github.com/limichange)
+

CHANGELOG.en-US.md

@@ -2,6 +2,12 @@
 
 ---
 
+## 1.0.0
+
+`2018-07-21`
+- 🌟 Add `Carousel` component [edddbd](https://github.com/vueComponent/ant-design/commit/edddbd982a279b62229ce825855c14c556866ece)
+- modify some error document
+
 ## 0.7.1
 
 `2018-07-17`

CHANGELOG.zh-CN.md

@@ -2,6 +2,12 @@
 
 ---
 
+## 1.0.0
+
+`2018-07-21`
+- 🌟 新增`Carousel 走马灯`组件[edddbd](https://github.com/vueComponent/ant-design/commit/edddbd982a279b62229ce825855c14c556866ece)
+- 更正了若干文档错误
+
 ## 0.7.1
 
 `2018-07-17`

README-zh_CN.md

@@ -22,6 +22,18 @@ Ant Design 3.X 的 Vue 实现，开发和服务于企业级后台产品。
 
 [README in English](README.md)
 
+## 赞助
+
+vue-antd-ui是一个开源的独立项目，为了项目能够更好的持续的发展，我们期望获得你的支持，你可以通过如下任何一种方式支持我们：
+
+- [Patreon](https://www.patreon.com/tangjinzhou)
+- [opencollective](https://opencollective.com/ant-design-278)
+- [paypal](https://www.paypal.me/tangjinzhou)
+
+<p align="center">
+  <img src="https://user-images.githubusercontent.com/6937879/43032487-932a5536-8cea-11e8-9175-9c006e938a82.png">
+</p>
+
 ## 特性
 
 - 提炼自企业级中后台产品的交互语言和视觉风格。

README.md

@@ -27,6 +27,17 @@ An enterprise-class UI components based on Ant Design 3.X and Vue.
 - A set of high-quality Vue components out of the box.
 - Shared [Ant Design of React](https://ant.design/docs/spec/introduce) design resources.
 
+## Donation
+
+vue-antd-ui is an open source independent project. In order to achieve better and sustainable development of the project, we hope to get your support. You can support us in any of the following ways:
+
+- [Patreon](https://www.patreon.com/tangjinzhou)
+- [opencollective](https://opencollective.com/ant-design-278)
+- [paypal](https://www.paypal.me/tangjinzhou)
+
+<p align="center">
+  <img src="https://user-images.githubusercontent.com/6937879/43032487-932a5536-8cea-11e8-9175-9c006e938a82.png">
+</p>
 
 ## Using npm or yarn
 

antd-tools/gulpfile.js

@@ -25,6 +25,7 @@ const fs = require('fs')
 const rimraf = require('rimraf')
 const replaceLib = require('./replaceLib')
 const stripCode = require('gulp-strip-code')
+const compareVersions = require('compare-versions')
 
 const cwd = process.cwd()
 const libDir = path.join(cwd, 'lib')
@@ -133,13 +134,15 @@ function compile (modules) {
 function tag () {
   console.log('tagging')
   const { version } = packageJson
+  execSync(`git config --global user.email ${process.env.GITHUB_USER_EMAIL}`)
+  execSync(`git config --global user.name ${process.env.GITHUB_USER_NAME}`)
   execSync(`git tag ${version}`)
   execSync(`git push origin ${version}:${version}`)
   execSync('git push origin master:master')
   console.log('tagged')
 }
 
-function githubRelease () {
+function githubRelease (done) {
   const changlogFiles = [
     path.join(cwd, 'CHANGELOG.en-US.md'),
     path.join(cwd, 'CHANGELOG.zh-CN.md'),
@@ -173,13 +176,14 @@ function githubRelease () {
   const [_, owner, repo] = execSync('git remote get-url origin') // eslint-disable-line
     .toString()
     .match(/github.com[:/](.+)\/(.+)\.git/)
-
   github.repos.createRelease({
     owner,
     repo,
     tag_name: version,
     name: version,
     body: changelog,
+  }).then(() => {
+    done()
   })
 }
 gulp.task('check-git', (done) => {
@@ -204,8 +208,9 @@ function publish (tagString, done) {
   const publishNpm = process.env.PUBLISH_NPM_CLI || 'npm'
   runCmd(publishNpm, args, (code) => {
     tag()
-    githubRelease()
-    done(code)
+    githubRelease(() => {
+      done(code)
+    })
   })
 }
 
@@ -261,6 +266,43 @@ gulp.task('pub', ['check-git', 'compile'], (done) => {
   }
 })
 
+gulp.task('pub-with-ci', (done) => {
+  if (!process.env.NPM_TOKEN) {
+    console.log('no NPM token found, skip')
+  } else {
+    const github = new GitHub()
+    github.authenticate({
+      type: 'oauth',
+      token: process.env.GITHUB_TOKEN,
+    })
+    const [_, owner, repo] = execSync('git remote get-url origin') // eslint-disable-line
+      .toString()
+      .match(/github.com[:/](.+)\/(.+)\.git/)
+    const getLatestRelease = github.repos.getLatestRelease({
+      owner,
+      repo,
+    })
+    const getCommits = github.repos.getCommits({
+      owner,
+      repo,
+      per_page: 1,
+    })
+    Promise.all([getLatestRelease, getCommits]).then(([latestRelease, commits]) => {
+      const preVersion = latestRelease.data.tag_name
+      const { version } = packageJson
+      const [_, newVersion] = commits.data[0].commit.message.trim().match(/bump (.+)/) || []
+      if (compareVersions(version, preVersion) === 1 && newVersion && newVersion.trim() === version) {
+        gulp.run('pub', (err) => {
+          err && console.log('err', err)
+          done()
+        })
+      } else {
+        console.log('donot need publish' + version)
+      }
+    })
+  }
+})
+
 function reportError () {
   console.log(chalk.bgRed('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'))
   console.log(chalk.bgRed('!! `npm publish` is forbidden for this package. !!'))

components/form/index.en-US.md

@@ -119,13 +119,11 @@ After wrapped by `getFieldDecorator`, `value`(or other property defined by `valu
 | options.initialValue | You can specify initial value, type, optional value of children node. (Note: Because `Form` will test equality with `===` internaly, we recommend to use vairable as `initialValue`, instead of literal) |  | n/a |
 | options.normalize | Normalize value to form component, [a select-all example](https://codesandbox.io/s/kw4l2vqqmv) | function(value, prevValue, allValues): any | - |
 | options.rules | Includes validation rules. Please refer to "Validation Rules" part for details. | object\[] | n/a |
-| options.trigger | When to collect the value of children node | string | 'onChange' |
+| options.trigger | When to collect the value of children node | string | 'change' |
 | options.validateFirst | Whether stop validate on first rule of error for this field. | boolean | false |
-| options.validateTrigger | When to validate the value of children node. | string\|string\[] | 'onChange' |
+| options.validateTrigger | When to validate the value of children node. | string\|string\[] | 'change' |
 | options.valuePropName | Props of children node, for example, the prop of Switch is 'checked'. | string | 'value' |
 
-More option can be referenced at [rc-form option](https://github.com/react-component/form#option-object)。
-
 ### Form.Item
 
 Note:

components/form/index.zh-CN.md

@@ -118,13 +118,11 @@ CustomizedForm = Form.create({})(CustomizedForm);
 | options.initialValue | 子节点的初始值，类型、可选值均由子节点决定(注意：由于内部校验时使用 `===` 判断是否变化，建议使用变量缓存所需设置的值而非直接使用字面量)) |  |  |
 | options.normalize | 转换默认的 value 给控件，[一个选择全部的例子](https://codesandbox.io/s/kw4l2vqqmv) | function(value, prevValue, allValues): any | - |
 | options.rules | 校验规则，参考下方文档 | object\[] |  |
-| options.trigger | 收集子节点的值的时机 | string | 'onChange' |
+| options.trigger | 收集子节点的值的时机 | string | 'change' |
 | options.validateFirst | 当某一规则校验不通过时，是否停止剩下的规则的校验 | boolean | false |
-| options.validateTrigger | 校验子节点值的时机 | string\|string\[] | 'onChange' |
+| options.validateTrigger | 校验子节点值的时机 | string\|string\[] | 'change' |
 | options.valuePropName | 子节点的值的属性，如 Switch 的是 'checked' | string | 'value' |
 
-更多参数可参考 [rc-form option](https://github.com/react-component/form#option-object)。
-
 ### Form.Item
 
 注意：