feat: merge master

Author: wangxueliang

.github/FUNDING.yml

@@ -1,8 +1,8 @@
 # These are supported funding model platforms
 
-github: [tangjinzhou]
-patreon: # Replace with a single Patreon username
+github: # [tangjinzhou]
 open_collective: ant-design-vue
+patreon: tangjinzhou
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 custom: # Replace with a single custom sponsorship URL

CHANGELOG.en-US.md

@@ -10,6 +10,31 @@
 
 ---
 
+## 1.3.13
+`2019-07-22`
+- 🐞 Fix `dist` missing `antd.less` file problem [#995](https://github.com/vueComponent/ant-design-vue/issues/995)
+
+## 1.3.12
+`2019-07-22`
+- 🐞 `package.json` `files` add `scripts`
+
+## 1.3.11
+`2019-07-22`
+
+- Dropdown
+  - 🐞 Uodate disable style [#912](https://github.com/vueComponent/ant-design-vue/pull/912) [#921](https://github.com/vueComponent/ant-design-vue/pull/921)
+  - 🐞 Fix `SubMenu` flashing problem [#975](https://github.com/vueComponent/ant-design-vue/issues/970)
+- 🌟 `AutoComplete` `Cascader` `DatePicker` `DropDown` `Select` `TimePicker` add an instance of the popup reference `popupRef`  [f9373e](https://github.com/vueComponent/ant-design-vue/commit/f9373e44ce229ab0ba94ababbd686e6ad6e9f10f)
+- 🐞 Fix `DatePicker` can not open when placeholder is chinese at ie 10 and 11 [#865](https://github.com/vueComponent/ant-design-vue/issues/865)
+- 🌟 `DatePicker` add custom render trigger [#957](https://github.com/vueComponent/ant-design-vue/pull/957)
+- 🌟 `@ant-design/icons-vue` update to `^2.0.0`
+- 🌟 `Icon` add `focusable="false"` [#924](https://github.com/vueComponent/ant-design-vue/issues/924)
+- 🐞 Fix custom `Form` prompts for custom components. `warning` problem [#915](https://github.com/vueComponent/ant-design-vue/issues/915)
+- 🐞 Fix `FormItem` `v-decorator` error [#930](https://github.com/vueComponent/ant-design-vue/issues/930)
+- 🐞 Fixed an issue where the `Upload` component reported an error in `form.resetFields()` [#929](https://github.com/vueComponent/ant-design-vue/pull/929)
+- 🐞 Fix `Select` shows bounce problem [#970](https://github.com/vueComponent/ant-design-vue/issues/970)
+- 🐞 Fix TypeScript type definitions.
+
 ## 1.3.10
 `2019-06-11`
 - 🐞 Remove useless `module.export` of package. [#850](https://github.com/vueComponent/ant-design-vue/issues/850)
@@ -32,7 +57,7 @@
 `2019-04-04`
 - 🐞 Fix `Table` unclickable problem under IE [#504](https://github.com/vueComponent/ant-design-vue/issues/504)
 - 🐞 Fix `Table` Header is not aligned under Firefox [#579](https://github.com/vueComponent/ant-design-vue/issues/579)
-- 🌟 Drawer `Drawer` add custom `handel` 
+- 🌟 Drawer `Drawer` add custom `handel`
 - 🐞 Fix TypeScript type definitions.
 
 ## 1.3.7

CHANGELOG.zh-CN.md

@@ -10,6 +10,31 @@
 
 ---
 
+## 1.3.13
+`2019-07-22`
+- 🐞 修复 dist 缺少 antd.less 文件问题 [#995](https://github.com/vueComponent/ant-design-vue/issues/995)
+
+## 1.3.12
+`2019-07-22`
+- 🐞 `package.json` `files` 添加 `scripts`
+
+## 1.3.11
+`2019-07-22`
+
+- Dropdown
+  - 🐞修复 `disable` 时的样式问题 [#912](https://github.com/vueComponent/ant-design-vue/pull/912) [#921](https://github.com/vueComponent/ant-design-vue/pull/921)
+  - 🐞修复 `SubMenu` 闪动问题 [#975](https://github.com/vueComponent/ant-design-vue/issues/970)
+- 🌟 `AutoComplete` `Cascader` `DatePicker` `DropDown` `Select` `TimePicker` 添加弹出内容的实例引用 `popupRef` [f9373e](https://github.com/vueComponent/ant-design-vue/commit/f9373e44ce229ab0ba94ababbd686e6ad6e9f10f)
+- 🐞 修复 `DatePicker` 在ie 10 11下 placeholder 为中文时不能打开的问题 [#865](https://github.com/vueComponent/ant-design-vue/issues/865)
+- 🌟 `DatePicker` 添加自定义渲染触发器功能  [#957](https://github.com/vueComponent/ant-design-vue/pull/957)
+- 🌟 `@ant-design/icons-vue` 升级为 `^2.0.0`
+- 🌟 `Icon` 添加属性 `focusable="false"` [#924](https://github.com/vueComponent/ant-design-vue/issues/924)
+- 🐞 修复自定义 `Form` 校验自定义组件时提示 `warning` 问题 [#915](https://github.com/vueComponent/ant-design-vue/issues/915)
+- 🐞 修复 `FormItem` `v-decorator` 指令报错问题 [#930](https://github.com/vueComponent/ant-design-vue/issues/930)
+- 🐞 修复 `Upload` 组件在 `form.resetFields()` 时报错问题 [#929](https://github.com/vueComponent/ant-design-vue/pull/929)
+- 🐞 修复 `Select` 显示跳动问题 [#970](https://github.com/vueComponent/ant-design-vue/issues/970)
+- 🐞 修复 TypeScript 类型定义。
+
 ## 1.3.10
 `2019-06-11`
 - 🐞 移除打包后多余的 `module.export` [#850](https://github.com/vueComponent/ant-design-vue/issues/850)

README-zh_CN.md

@@ -1,6 +1,6 @@
 <p align="center">
   <a href="https://vue.ant.design/">
-    <img width="200" src="https://cdn.nlark.com/yuque/0/2019/png/87084/1550242938266-assets/web-upload/6011a606-2f3e-4a7a-b58d-28116e39de04.png">
+    <img width="200" src="http://pvrd7go2h.bkt.clouddn.com/logo.png">
   </a>
 </p>
 
@@ -91,7 +91,7 @@ ant-design-vue是MIT协议的开源项目。为了项目能够更好的持续的
 - [Patreon](https://www.patreon.com/tangjinzhou)
 - [opencollective](https://opencollective.com/ant-design-vue)
 - [paypal](https://www.paypal.me/tangjinzhou)
-- [支付宝或微信](https://cdn.nlark.com/yuque/0/2019/png/87084/1548485701785-assets/web-upload/648ca181-a52f-4382-957c-97c5dbb3e1cc.png)
+- [支付宝或微信](http://pvrd7go2h.bkt.clouddn.com/alipay-and-wechat.png)
 
 ## Backers
 

README.md

@@ -1,6 +1,6 @@
 <p align="center">
   <a href="https://vue.ant.design/">
-    <img width="200" src="https://cdn.nlark.com/yuque/0/2019/png/87084/1550242938266-assets/web-upload/6011a606-2f3e-4a7a-b58d-28116e39de04.png">
+    <img width="200" src="http://pvrd7go2h.bkt.clouddn.com/logo.png">
   </a>
 </p>
 
@@ -86,7 +86,7 @@ ant-design-vue is an MIT-licensed open source project. In order to achieve bette
 - [Patreon](https://www.patreon.com/tangjinzhou)
 - [opencollective](https://opencollective.com/ant-design-vue)
 - [paypal](https://www.paypal.me/tangjinzhou)
-- [支付宝或微信](https://cdn.nlark.com/yuque/0/2019/png/87084/1548485701785-assets/web-upload/648ca181-a52f-4382-957c-97c5dbb3e1cc.png)
+- [支付宝或微信](http://pvrd7go2h.bkt.clouddn.com/alipay-and-wechat.png)
 
 ## Backers
 

antd-tools/cli/run.js

@@ -13,6 +13,28 @@ program.on('--help', () => {
 
 program.parse(process.argv);
 
+function runTask(toRun) {
+  const metadata = { task: toRun };
+  // Gulp >= 4.0.0 (doesn't support events)
+  const taskInstance = gulp.task(toRun);
+  if (taskInstance === undefined) {
+    gulp.emit('task_not_found', metadata);
+    return;
+  }
+  const start = process.hrtime();
+  gulp.emit('task_start', metadata);
+  try {
+    taskInstance.apply(gulp);
+    metadata.hrDuration = process.hrtime(start);
+    gulp.emit('task_stop', metadata);
+    gulp.emit('stop');
+  } catch (err) {
+    err.hrDuration = process.hrtime(start);
+    err.task = metadata.task;
+    gulp.emit('task_err', err);
+  }
+}
+
 const task = program.args[0];
 
 if (!task) {
@@ -22,5 +44,5 @@ if (!task) {
 
   require('../gulpfile');
 
-  gulp.start(task);
+  runTask(task);
 }

antd-tools/gulpfile.js

@@ -204,24 +204,30 @@ function githubRelease(done) {
     });
 }
 
-gulp.task('tag', done => {
-  tag();
-  githubRelease(done);
-});
+gulp.task(
+  'tag',
+  gulp.series(done => {
+    tag();
+    githubRelease(done);
+  }),
+);
 
-gulp.task('check-git', done => {
-  runCmd('git', ['status', '--porcelain'], (code, result) => {
-    if (/^\?\?/m.test(result)) {
-      return done(`There are untracked files in the working tree.\n${result}
+gulp.task(
+  'check-git',
+  gulp.series(done => {
+    runCmd('git', ['status', '--porcelain'], (code, result) => {
+      if (/^\?\?/m.test(result)) {
+        return done(`There are untracked files in the working tree.\n${result}
       `);
-    }
-    if (/^([ADRM]| [ADRM])/m.test(result)) {
-      return done(`There are uncommitted changes in the working tree.\n${result}
+      }
+      if (/^([ADRM]| [ADRM])/m.test(result)) {
+        return done(`There are uncommitted changes in the working tree.\n${result}
       `);
-    }
-    return done();
-  });
-});
+      }
+      return done();
+    });
+  }),
+);
 
 function publish(tagString, done) {
   let args = ['publish', '--with-antd-tools'];
@@ -265,86 +271,104 @@ function pub(done) {
   });
 }
 
-gulp.task('dist', ['compile'], done => {
-  dist(done);
-});
-gulp.task('compile', ['compile-with-es'], done => {
-  compile().on('finish', function() {
-    done();
-  });
-});
-gulp.task('compile-with-es', done => {
-  compile(false).on('finish', function() {
-    done();
-  });
-});
-
-gulp.task('pub', ['check-git', 'compile'], done => {
-  if (!process.env.GITHUB_TOKEN) {
-    console.log('no GitHub token found, skip');
-  } else {
-    pub(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,
+gulp.task(
+  'compile-with-es',
+  gulp.series(done => {
+    compile(false).on('finish', function() {
+      done();
     });
-    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 (.+)/) || []; // eslint-disable-line
-      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);
-      }
+  }),
+);
+
+gulp.task(
+  'compile',
+  gulp.series('compile-with-es', done => {
+    compile().on('finish', function() {
+      done();
     });
-  }
-});
+  }),
+);
 
-function reportError() {
-  console.log(chalk.bgRed('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'));
-  console.log(chalk.bgRed('!! `npm publish` is forbidden for this package. !!'));
-  console.log(chalk.bgRed('!! Use `npm run pub` instead.        !!'));
-  console.log(chalk.bgRed('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'));
-}
+gulp.task(
+  'dist',
+  gulp.series('compile', done => {
+    dist(done);
+  }),
+);
+
+gulp.task(
+  'pub',
+  gulp.series('check-git', 'compile', done => {
+    if (!process.env.GITHUB_TOKEN) {
+      console.log('no GitHub token found, skip');
+    } else {
+      pub(done);
+    }
+  }),
+);
+
+gulp.task(
+  'pub-with-ci',
+  gulp.series(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 listCommits = github.repos.listCommits({
+        owner,
+        repo,
+        per_page: 1,
+      });
+      Promise.all([getLatestRelease, listCommits]).then(([latestRelease, commits]) => {
+        const preVersion = latestRelease.data.tag_name;
+        const { version } = packageJson;
+        const [_, newVersion] = commits.data[0].commit.message.trim().match(/bump (.+)/) || []; // eslint-disable-line
+        if (
+          compareVersions(version, preVersion) === 1 &&
+          newVersion &&
+          newVersion.trim() === version
+        ) {
+          runCmd('npm', ['pub'], code => {
+            done();
+          });
+        } else {
+          console.log('donot need publish' + version);
+        }
+      });
+    }
+  }),
+);
 
-gulp.task('guard', done => {
-  const npmArgs = getNpmArgs();
-  if (npmArgs) {
-    for (let arg = npmArgs.shift(); arg; arg = npmArgs.shift()) {
-      if (/^pu(b(l(i(sh?)?)?)?)?$/.test(arg) && npmArgs.indexOf('--with-antd-tools') < 0) {
-        reportError();
-        done(1);
-        return;
+gulp.task(
+  'guard',
+  gulp.series(done => {
+    function reportError() {
+      console.log(chalk.bgRed('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'));
+      console.log(chalk.bgRed('!! `npm publish` is forbidden for this package. !!'));
+      console.log(chalk.bgRed('!! Use `npm run pub` instead.        !!'));
+      console.log(chalk.bgRed('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'));
+    }
+    const npmArgs = getNpmArgs();
+    if (npmArgs) {
+      for (let arg = npmArgs.shift(); arg; arg = npmArgs.shift()) {
+        if (/^pu(b(l(i(sh?)?)?)?)?$/.test(arg) && npmArgs.indexOf('--with-antd-tools') < 0) {
+          reportError();
+          done(1);
+          return;
+        }
       }
     }
-  }
-  done();
-});
+    done();
+  }),
+);