Merge remote-tracking branch 'yuanlai/master' into upgrade-webpack5

Author: zhoudewei2526

.eslintrc

@@ -12,6 +12,14 @@
   },
   "extends": ["plugin:vue/recommended", "prettier"],
   "plugins": ["markdown"],
+  "overrides": [
+    {
+      "files": ["**/demo/**"],
+      "rules": {
+        "no-console": "off"
+      }
+    }
+  ],
   "rules": {
     "comma-dangle": [2, "always-multiline"],
     "no-var": "error",

CHANGELOG.en-US.md

@@ -10,6 +10,15 @@
 
 ---
 
+## 1.5.2
+
+`2020-04-09`
+
+- 🐞 Fix ts type of `FormModel` not introduced [# 1996](https://github.com/vueComponent/ant-design-vue/issues/1966)
+- 🐞 Fix `DatePicker.WeekPicker` type file error [# 2044](https://github.com/vueComponent/ant-design-vue/issues/2044)
+- 🐞 Fix "Tabs" tabClick event does not take effect [# 2030](https://github.com/vueComponent/ant-design-vue/issues/2030)
+- 🐞 Fix `Table` resize error issue [# 2033](https://github.com/vueComponent/ant-design-vue/issues/2033)
+
 ## 1.5.1
 
 `2020-04-02`
@@ -20,7 +29,7 @@
 - 🐞 Fix `Table` customRender cannot customize class style [#2004](https://github.com/vueComponent/ant-design-vue/pull/2004)
 - 🐞 Fix `Form` missing slot content when using Form.create [#1998](https://github.com/vueComponent/ant-design-vue/pull/1998)
 - 🐞 Fix `Textarea` scroll bar flickering problem [#1964](https://github.com/vueComponent/ant-design-vue/pull/1964)
-- 🌟 Add ts type file of `FormModel` [#1996](https://github.com/vueComponent/ant-design-vue/pull/1966)
+- 🌟 Add ts type file of `FormModel` [#1996](https://github.com/vueComponent/ant-design-vue/issues/1966)
 - 🌟 Add `modal` destroyAll type declaration [#1993](https://github.com/vueComponent/ant-design-vue/pull/1963)
 
 ## 1.5.0

CHANGELOG.zh-CN.md

@@ -10,6 +10,15 @@
 
 ---
 
+## 1.5.2
+
+`2020-04-09`
+
+- 🐞 修复 `FormModel` 的 ts 类型未引入 [#1996](https://github.com/vueComponent/ant-design-vue/issues/1966)
+- 🐞 修复 `DatePicker.WeekPicker` 的类型文件错误 [#2044](https://github.com/vueComponent/ant-design-vue/issues/2044)
+- 🐞 修复 `Tabs` tabClick 事件不生效问题 [#2030](https://github.com/vueComponent/ant-design-vue/issues/2030)
+- 🐞 修复 `Table` resize 时报错问题 [#2033](https://github.com/vueComponent/ant-design-vue/issues/2033)
+
 ## 1.5.1
 
 `2020-04-02`
@@ -20,7 +29,7 @@
 - 🐞 修复 `Table` customRender 不能自定义 class style 问题 [#2004](https://github.com/vueComponent/ant-design-vue/pull/2004)
 - 🐞 修复 `Form` 使用 Form.create 时，丢失插槽内容问题 [#1998](https://github.com/vueComponent/ant-design-vue/pull/1998)
 - 🐞 修复 `Textarea` 滚动条闪动问题 [#1964](https://github.com/vueComponent/ant-design-vue/pull/1964)
-- 🌟 添加 `FormModel` 的 ts 类型文件 [#1996](https://github.com/vueComponent/ant-design-vue/pull/1966)
+- 🌟 添加 `FormModel` 的 ts 类型文件 [#1996](https://github.com/vueComponent/ant-design-vue/issues/1966)
 - 🌟 添加 `Modal` 的 destroyAll 类型声明 [#1993](https://github.com/vueComponent/ant-design-vue/pull/1963)
 
 ## 1.5.0

antd-tools/gulpfile.js

@@ -11,7 +11,7 @@ const transformLess = require('./transformLess');
 const webpack = require('webpack');
 const babel = require('gulp-babel');
 const argv = require('minimist')(process.argv.slice(2));
-const GitHub = require('@octokit/rest');
+const { Octokit } = require('@octokit/rest');
 
 const packageJson = require(`${process.cwd()}/package.json`);
 // const getNpm = require('./getNpm')
@@ -168,10 +168,8 @@ function githubRelease(done) {
     console.log('no changelog found, skip');
     return;
   }
-  const github = new GitHub();
-  github.authenticate({
-    type: 'oauth',
-    token: process.env.GITHUB_TOKEN,
+  const github = new Octokit({
+    auth: process.env.GITHUB_TOKEN,
   });
   const date = new Date();
   const { version } = packageJson;
@@ -311,10 +309,8 @@ gulp.task(
     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 github = new Octokit({
+        auth: process.env.GITHUB_TOKEN,
       });
       const [_, owner, repo] = execSync('git remote get-url origin') // eslint-disable-line
         .toString()

antdv-demo

@@ -71,12 +71,18 @@ export default {
                 }
               });
             },
+            methods: {
+              forceRender(p) {
+                this.comProps = p;
+                this.$forceUpdate();
+              },
+            },
             render() {
               return self.getComponent(this.comProps);
             },
           });
         } else {
-          this._component.comProps = props;
+          this._component.forceRender(props);
         }
       }
     },

components/_util/ContainerRender.jsx

@@ -13,11 +13,7 @@ exports[`renders ./antdv-demo/docs/cascader/demo/change-on-select.md correctly 1
 `;
 
 exports[`renders ./antdv-demo/docs/cascader/demo/custom-render.md correctly 1`] = `
-<span tabindex="0" class="ant-cascader-picker" style="width: 100%;"><input type="text" readonly="true" class="ant-input ant-cascader-input "><span class="ant-cascader-picker-label"><span><span>
-        Zhejiang /
-      </span></span><span><span>
-        Hangzhou /
-      </span></span><span><span>
+<span tabindex="0" class="ant-cascader-picker" style="width: 100%;"><input type="text" readonly="true" class="ant-input ant-cascader-input "><span class="ant-cascader-picker-label"><span><span> Zhejiang / </span></span><span><span> Hangzhou / </span></span><span><span>
         West Lake (<a>752100</a>)
       </span></span></span><i aria-label="icon: close-circle" tabindex="-1" class="anticon anticon-close-circle ant-cascader-picker-clear"><svg viewBox="64 64 896 896" data-icon="close-circle" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
     <path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm165.4 618.2l-66-.3L512 563.4l-99.3 118.4-66.1.3c-4.4 0-8-3.5-8-8 0-1.9.7-3.7 1.9-5.2l130.1-155L340.5 359a8.32 8.32 0 0 1-1.9-5.2c0-4.4 3.6-8 8-8l66.1.3L512 464.6l99.3-118.4 66-.3c4.4 0 8 3.5 8 8 0 1.9-.7 3.7-1.9 5.2L553.5 514l130 155c1.2 1.5 1.9 3.3 1.9 5.2 0 4.4-3.6 8-8 8z"></path>

components/cascader/__tests__/__snapshots__/demo.test.js.snap

@@ -32,8 +32,8 @@ exports[`renders ./antdv-demo/docs/drawer/demo/render-in-current.md correctly 1`
 <div style="height: 200px; overflow: hidden; position: relative; border: 1px solid #ebedf0; border-radius: 2px; padding: 48px; text-align: center; background: rgb(250, 250, 250);">
   Render in this
   <div style="margin-top: 16px;"><button type="button" class="ant-btn ant-btn-primary"><span>Open</span></button></div>
-  <div tabindex="-1" class="" style="position: absolute;">
-    <div tabindex="-1" class="ant-drawer ant-drawer-right">
+  <div tabindex="-1" class="">
+    <div tabindex="-1" class="ant-drawer ant-drawer-right" style="position: absolute;">
       <div class="ant-drawer-mask"></div>
       <div class="ant-drawer-content-wrapper" style="transform: translateX(100%); width: 256px;">
         <div class="ant-drawer-content">

components/drawer/__tests__/__snapshots__/demo.test.js.snap

@@ -1,7 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`renders ./antdv-demo/docs/dropdown/demo/basic.md correctly 1`] = `
-<a class="ant-dropdown-link ant-dropdown-trigger"> Hover me <i aria-label="icon: down" class="anticon anticon-down"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
+<a class="ant-dropdown-link ant-dropdown-trigger">
+  Hover me <i aria-label="icon: down" class="anticon anticon-down"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
       <path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path>
     </svg></i></a>
 `;
@@ -29,19 +30,22 @@ exports[`renders ./antdv-demo/docs/dropdown/demo/dropdown-button.md correctly 1`
 `;
 
 exports[`renders ./antdv-demo/docs/dropdown/demo/event.md correctly 1`] = `
-<a class="ant-dropdown-link ant-dropdown-trigger"> Hover me, Click menu item <i aria-label="icon: down" class="anticon anticon-down"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
+<a class="ant-dropdown-link ant-dropdown-trigger">
+  Hover me, Click menu item <i aria-label="icon: down" class="anticon anticon-down"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
       <path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path>
     </svg></i></a>
 `;
 
 exports[`renders ./antdv-demo/docs/dropdown/demo/item.md correctly 1`] = `
-<a class="ant-dropdown-link ant-dropdown-trigger"> Hover me <i aria-label="icon: down" class="anticon anticon-down"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
+<a class="ant-dropdown-link ant-dropdown-trigger">
+  Hover me <i aria-label="icon: down" class="anticon anticon-down"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
       <path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path>
     </svg></i></a>
 `;
 
 exports[`renders ./antdv-demo/docs/dropdown/demo/overlay-visible.md correctly 1`] = `
-<a class="ant-dropdown-link ant-dropdown-trigger"> Hover me <i aria-label="icon: down" class="anticon anticon-down"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
+<a class="ant-dropdown-link ant-dropdown-trigger">
+  Hover me <i aria-label="icon: down" class="anticon anticon-down"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
       <path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path>
     </svg></i></a>
 `;
@@ -57,13 +61,15 @@ exports[`renders ./antdv-demo/docs/dropdown/demo/placement.md correctly 1`] = `
 `;
 
 exports[`renders ./antdv-demo/docs/dropdown/demo/sub-menu.md correctly 1`] = `
-<a class="ant-dropdown-link ant-dropdown-trigger"> Cascading menu <i aria-label="icon: down" class="anticon anticon-down"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
+<a class="ant-dropdown-link ant-dropdown-trigger">
+  Cascading menu <i aria-label="icon: down" class="anticon anticon-down"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
       <path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path>
     </svg></i></a>
 `;
 
 exports[`renders ./antdv-demo/docs/dropdown/demo/trigger.md correctly 1`] = `
-<a class="ant-dropdown-link ant-dropdown-trigger"> Click me <i aria-label="icon: down" class="anticon anticon-down"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
+<a class="ant-dropdown-link ant-dropdown-trigger">
+  Click me <i aria-label="icon: down" class="anticon anticon-down"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
       <path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path>
     </svg></i></a>
 `;

components/dropdown/__tests__/__snapshots__/demo.test.js.snap

@@ -772,8 +772,7 @@ exports[`renders ./antdv-demo/docs/form/demo/validate-static.vue correctly 1`] =
         <!---->
       </div>
     </div>
-  </div>
-  </span>
+  </div></span>
   <!---->
   </div>
   </div>