Merge branch 'master' into feat-1.4.0

tangjinzhou · tangjinzhou · commit adbd82b910b6 · 2019-06-24T21:47:23.000+08:00
# Conflicts:
#	components/table/interface.js
#	components/vc-upload/demo/simple.jsx
diff --git a/.eslintignore b/.eslintignore
@@ -7,3 +7,4 @@ es/
 lib/
 _site/
 dist/
+package.json
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,8 @@
+# These are supported funding model platforms
+
+github: [tangjinzhou]
+patreon: # Replace with a single Patreon username
+open_collective: ant-design-vue
+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
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -10,6 +10,24 @@
 
 ---
 
+## 1.3.10
+`2019-06-11`
+- 🐞 Remove useless `module.export` of package. [#850](https://github.com/vueComponent/ant-design-vue/issues/850)
+
+## 1.3.9
+`2019-05-26`
+- 🐞 Fix `TreeSelect` without `dataRef` [#712](https://github.com/vueComponent/ant-design-vue/issues/712)
+- 🌟 `Tooltip` add `destroyTooltipOnHide` to identify whether to destroy tooltip after hiding [#727](https://github.com/vueComponent/ant-design-vue/issues/727)
+- 🐞 Fix `Avatar` does not update the problem when setting `src` dynamically [#731](https://github.com/vueComponent/ant-design-vue/issues/731)
+- 🐞 Fix `LocaleProvider` change `moment` language does not work [28b7a6](https://github.com/vueComponent/ant-design-vue/commit/28b7a68dc48a0a994e98063d462b99380e3ee547)
+- 🌟 `Modal.confirm` add `closable` configuration [#798](https://github.com/vueComponent/ant-design-vue/pull/798)
+- 🐞 Fixed a problem when `Select` custom `dropdownRender` was not automatically closed [#644](https://github.com/vueComponent/ant-design-vue/issues/644)
+- 🐞 Fix the problem of removing Dom error under ie9, no need to introduce polyfill separately [#705](https://github.com/vueComponent/ant-design-vue/issues/705)
+- 🐞 Fix `Input.Search` repeat mount id problem [#726](https://github.com/vueComponent/ant-design-vue/issues/726)
+- 🐞 Fix `Table` does not work when customizing expandIcon using function form [#751](https://github.com/vueComponent/ant-design-vue/issues/751)
+- 🐞 Fix `Icon` `extraCommonProps` property does not work [#737](https://github.com/vueComponent/ant-design-vue/issues/737)
+- 🐞 Fix `DirectoryTree` expandAction="doubleclick" does not work [#745](https://github.com/vueComponent/ant-design-vue/issues/745)
+
 ## 1.3.8
 `2019-04-04`
 - 🐞 Fix `Table` unclickable problem under IE [#504](https://github.com/vueComponent/ant-design-vue/issues/504)
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -10,6 +10,24 @@
 
 ---
 
+## 1.3.10
+`2019-06-11`
+- 🐞 移除打包后多余的 `module.export` [#850](https://github.com/vueComponent/ant-design-vue/issues/850)
+
+## 1.3.9
+`2019-05-26`
+- 🐞 修复 `TreeSelect` 没有 `dataRef` 的问题 [#712](https://github.com/vueComponent/ant-design-vue/issues/712)
+- 🌟 `Tooltip` 添加 `destroyTooltipOnHide` 用于标识隐藏后是否销毁tooltip [#727](https://github.com/vueComponent/ant-design-vue/issues/727)
+- 🐞 修复 `Avatar` 动态设置 src 时不更新问题 [#731](https://github.com/vueComponent/ant-design-vue/issues/731)
+- 🐞 修复 `LocaleProvider` 更改 `moment` 语言不生效问题 [28b7a6](https://github.com/vueComponent/ant-design-vue/commit/28b7a68dc48a0a994e98063d462b99380e3ee547)
+- 🌟 `Modal.confirm` 新增 `closable` 配置 [#798](https://github.com/vueComponent/ant-design-vue/pull/798)
+- 🐞 修复 `Select` 自定义 `dropdownRender` 时，没能自动关闭的问题 [#644](https://github.com/vueComponent/ant-design-vue/issues/644)
+- 🐞 修复在 ie9 下移除 Dom 报错问题，无需单独引入 polyfill [#705](https://github.com/vueComponent/ant-design-vue/issues/705)
+- 🐞 修复 `Input.Search` 重复挂载 id 问题 [#726](https://github.com/vueComponent/ant-design-vue/issues/726)
+- 🐞 修复 `Table` 使用函数形式自定义 expandIcon 时不生效问题 [#751](https://github.com/vueComponent/ant-design-vue/issues/751)
+- 🐞 修复 `Icon` extraCommonProps 属性不生效问题 [#737](https://github.com/vueComponent/ant-design-vue/issues/737)
+- 🐞 修复 `DirectoryTree` expandAction="doubleclick" 不生效问题 [#745](https://github.com/vueComponent/ant-design-vue/issues/745)
+
 ## 1.3.8
 `2019-04-04`
 - 🐞 修复 `Table` 在 IE 下不可点击问题 [#504](https://github.com/vueComponent/ant-design-vue/issues/504)
diff --git a/antd-tools/gulpfile.js b/antd-tools/gulpfile.js
@@ -74,8 +74,6 @@ function babelify(js, modules) {
   delete babelConfig.cacheDirectory;
   if (modules === false) {
     babelConfig.plugins.push(replaceLib);
-  } else {
-    babelConfig.plugins.push(require.resolve('babel-plugin-add-module-exports'));
   }
   let stream = js.pipe(babel(babelConfig)).pipe(
     through2.obj(function z(file, encoding, next) {
diff --git a/antd-tools/postcssConfig.js b/antd-tools/postcssConfig.js
@@ -2,10 +2,5 @@ const rucksack = require('rucksack-css');
 const autoprefixer = require('autoprefixer');
 
 module.exports = {
-  plugins: [
-    rucksack(),
-    autoprefixer({
-      browsers: ['last 2 versions', 'Firefox ESR', '> 1%', 'ie >= 9', 'iOS >= 8', 'Android >= 4'],
-    }),
-  ],
+  plugins: [rucksack(), autoprefixer()],
 };
diff --git a/components/form/demo/dynamic-form-item.vue b/components/form/demo/dynamic-form-item.vue
@@ -26,7 +26,6 @@ Add or remove form items dynamically.
           `names[${k}]`,
           {
             validateTrigger: ['change', 'blur'],
-            preserve: true,
             rules: [{
               required: true,
               whitespace: true,
diff --git a/components/form/index.zh-CN.md b/components/form/index.zh-CN.md
@@ -151,7 +151,7 @@ validateFields(['field1', 'field2'], options, (errors, values) => {
 | --- | --- | --- | --- |
 | id | 必填输入控件唯一标志。支持嵌套式的写法。 | string |  |
 | options.getValueFromEvent | 可以把 onChange 的参数（如 event）转化为控件的值 | function(..args) | [reference](https://github.com/react-component/form#option-object) |
-| options.initialValue | 子节点的初始值，类型、可选值均由子节点决定(注意：由于内部校验时使用 `===` 判断是否变化，建议使用变量缓存所需设置的值而非直接使用字面量)) |  |  |
+| options.initialValue | 子节点的初始值，类型、可选值均由子节点决定(注意：由于内部校验时使用 `===` 判断是否变化，建议使用变量缓存所需设置的值而非直接使用字面量) |  |  |
 | options.normalize | 转换默认的 value 给控件，[一个选择全部的例子](https://codesandbox.io/s/kw4l2vqqmv) | function(value, prevValue, allValues): any | - |
 | options.preserve | 即便字段不再使用，也保留该字段的值 | boolean | false |
 | options.rules | 校验规则，参考下方文档 | object\[] |  |
diff --git a/components/icon/IconFont.jsx b/components/icon/IconFont.jsx
@@ -1,9 +1,10 @@
 import Icon from './index';
+import { mergeProps } from '../_util/props-util';
 
 const customCache = new Set();
 
 export default function create(options) {
-  const { scriptUrl } = options;
+  const { scriptUrl, extraCommonProps = {} } = options;
 
   /**
    * DOM API required.
@@ -43,7 +44,8 @@ export default function create(options) {
       if (children) {
         content = children;
       }
-      return <Icon {...{ ...data, props: restProps, on: listeners }}>{content}</Icon>;
+      const iconProps = mergeProps(extraCommonProps, data, { props: restProps, on: listeners });
+      return <Icon {...iconProps}>{content}</Icon>;
     },
   };
   return Iconfont;
diff --git a/components/icon/index.en-US.md b/components/icon/index.en-US.md
@@ -73,7 +73,7 @@ The following options are available:
 | Property | Description | Type | Default |
 | --- | --- | --- | --- |
 | scriptUrl | The URL generated by [iconfont.cn](http://iconfont.cn/) project. | string | - |
-| extraCommonProps | Define extra properties to the component | `{ [key: string]: any }` | {} |
+| extraCommonProps | Define extra properties to the component | `{ class, attrs, props, on, style }` | {} |
 
 The property `scriptUrl` should be set to import the SVG sprite symbols.
 
diff --git a/components/icon/index.zh-CN.md b/components/icon/index.zh-CN.md
@@ -71,7 +71,7 @@ new Vue({
 | 参数 | 说明 | 类型 | 默认值 |
 | --- | --- | --- | --- |
 | scriptUrl | [iconfont.cn](http://iconfont.cn/) 项目在线生成的 `js` 地址 | string | - |
-| extraCommonProps | 给所有的 `svg` 图标 `<Icon />` 组件设置额外的属性 | `{ [key: string]: any }` | {} |
+| extraCommonProps | 给所有的 `svg` 图标 `<Icon />` 组件设置额外的属性 | `{ class, attrs, props, on, style }` | {} |
 
 在 `scriptUrl` 都设置有效的情况下，组件在渲染前会自动引入 [iconfont.cn](http://iconfont.cn/) 项目中的图标符号集，无需手动引入。
 
diff --git a/components/input/Search.jsx b/components/input/Search.jsx
@@ -10,6 +10,7 @@ import { ConfigConsumerProps } from '../config-provider';
 
 export default {
   name: 'AInputSearch',
+  inheritAttrs: false,
   model: {
     prop: 'value',
     event: 'change.value',
diff --git a/components/table/interface.js b/components/table/interface.js
@@ -128,6 +128,7 @@ export const TableProps = {
   childrenColumnName: PropTypes.oneOfType([PropTypes.array, PropTypes.string]),
   bodyStyle: PropTypes.any,
   sortDirections: PropTypes.array,
+  expandIcon: PropTypes.func,
   // className?: PropTypes.string,
   // style?: React.CSSProperties;
   // children?: React.ReactNode;
diff --git a/components/upload/__tests__/uploadlist.test.js b/components/upload/__tests__/uploadlist.test.js
@@ -97,7 +97,7 @@ describe('Upload List', () => {
   it('should be uploading when upload a file', done => {
     const props = {
       propsData: {
-        action: 'http://jsonplaceholder.typicode.com/posts/',
+        action: 'https://www.mocky.io/v2/5cc8019d300000980a055e76',
         customRequest: successRequest,
       },
       listeners: {
@@ -133,7 +133,7 @@ describe('Upload List', () => {
   it('handle error', done => {
     const props = {
       propsData: {
-        action: 'http://jsonplaceholder.typicode.com/posts/',
+        action: 'https://www.mocky.io/v2/5cc8019d300000980a055e76',
         customRequest: errorRequest,
       },
       listeners: {
@@ -166,7 +166,7 @@ describe('Upload List', () => {
     const handleChange = jest.fn();
     const props = {
       propsData: {
-        action: 'http://jsonplaceholder.typicode.com/posts/',
+        action: 'https://www.mocky.io/v2/5cc8019d300000980a055e76',
         listType: 'picture',
         defaultFileList: fileList,
         beforeUpload: () => false,
diff --git a/components/upload/demo/avatar.md b/components/upload/demo/avatar.md
@@ -17,7 +17,7 @@ The return value of function `beforeUpload` can be a Promise to check asynchrono
     listType="picture-card"
     class="avatar-uploader"
     :showUploadList="false"
-    action="//jsonplaceholder.typicode.com/posts/"
+    action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
     :beforeUpload="beforeUpload"
     @change="handleChange"
   >
diff --git a/components/upload/demo/basic.md b/components/upload/demo/basic.md
@@ -10,7 +10,7 @@ Classic mode. File selection dialog pops up when upload button is clicked.
 
 ```html
 <template>
-  <a-upload name="file" :multiple="true" action="//jsonplaceholder.typicode.com/posts/" :headers="headers" @change="handleChange">
+  <a-upload name="file" :multiple="true" action="https://www.mocky.io/v2/5cc8019d300000980a055e76" :headers="headers" @change="handleChange">
     <a-button>
       <a-icon type="upload" /> Click to Upload
     </a-button>
diff --git a/components/upload/demo/defaultFileList.md b/components/upload/demo/defaultFileList.md
@@ -10,7 +10,7 @@ Use `defaultFileList` for uploaded files when page init.
 
 ```html
 <template>
-  <a-upload action="//jsonplaceholder.typicode.com/posts/" :defaultFileList="defaultFileList">
+  <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76" :defaultFileList="defaultFileList">
     <a-button>
       <a-icon type="upload" /> Upload
     </a-button>
diff --git a/components/upload/demo/directory.md b/components/upload/demo/directory.md
@@ -10,7 +10,7 @@ You can select and upload a whole directory.
 
 ```html
 <template>
-  <a-upload action="//jsonplaceholder.typicode.com/posts/" directory>
+  <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76" directory>
     <a-button>
       <a-icon type="upload" /> Upload Directory
     </a-button>
diff --git a/components/upload/demo/drag.md b/components/upload/demo/drag.md
@@ -11,7 +11,7 @@ Classic mode. File selection dialog pops up when upload button is clicked.
 
 ```html
 <template>
-  <a-upload-dragger name="file" :multiple="true" action="//jsonplaceholder.typicode.com/posts/" @change="handleChange">
+  <a-upload-dragger name="file" :multiple="true" action="https://www.mocky.io/v2/5cc8019d300000980a055e76" @change="handleChange">
     <p class="ant-upload-drag-icon">
       <a-icon type="inbox" />
     </p>
diff --git a/components/upload/demo/fileList.md b/components/upload/demo/fileList.md
@@ -16,7 +16,7 @@ You can gain full control over filelist by configuring `fileList`. You can accom
 
 ```html
 <template>
-  <a-upload action="//jsonplaceholder.typicode.com/posts/" :multiple="true" :fileList="fileList" @change="handleChange">
+  <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76" :multiple="true" :fileList="fileList" @change="handleChange">
     <a-button>
       <a-icon type="upload" /> Upload
     </a-button>
@@ -36,7 +36,7 @@ export default {
   },
   methods: {
     handleChange(info) {
-      let fileList = info.fileList;
+      let fileList = [...info.fileList];
 
       // 1. Limit the number of uploaded files
       //    Only to show two recent uploaded files, and old ones will be replaced by the new
@@ -51,14 +51,6 @@ export default {
         return file;
       });
 
-      // 3. filter successfully uploaded files according to response from server
-      fileList = fileList.filter((file) => {
-        if (file.response) {
-          return file.response.status === 'success';
-        }
-        return false;
-      });
-
       this.fileList = fileList
     },
   },
diff --git a/components/upload/demo/picture-card.md b/components/upload/demo/picture-card.md
@@ -12,7 +12,7 @@ After users upload picture, the thumbnail will be shown in list. The upload butt
 <template>
   <div class="clearfix">
     <a-upload
-      action="//jsonplaceholder.typicode.com/posts/"
+      action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
       listType="picture-card"
       :fileList="fileList"
       @preview="handlePreview"
diff --git a/components/upload/demo/picture-style.md b/components/upload/demo/picture-style.md
@@ -12,7 +12,7 @@ If uploaded file is a picture, the thumbnail can be shown. `IE8/9` do not suppor
 <template>
   <div>
     <a-upload
-      action="//jsonplaceholder.typicode.com/posts/"
+      action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
       listType="picture"
       :defaultFileList="fileList"
     >
@@ -23,7 +23,7 @@ If uploaded file is a picture, the thumbnail can be shown. `IE8/9` do not suppor
     <br />
     <br />
     <a-upload
-      action="//jsonplaceholder.typicode.com/posts/"
+      action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
       listType="picture"
       :defaultFileList="fileList"
       class="upload-list-inline"
diff --git a/components/upload/demo/upload-manually.md b/components/upload/demo/upload-manually.md
@@ -61,7 +61,7 @@ export default {
 
       // You can use any AJAX library you like
       reqwest({
-        url: '//jsonplaceholder.typicode.com/posts/',
+        url: 'https://www.mocky.io/v2/5cc8019d300000980a055e76',
         method: 'post',
         processData: false,
         data: formData,
diff --git a/components/vc-select/Select.jsx b/components/vc-select/Select.jsx
@@ -1486,9 +1486,7 @@ const Select = {
       this.$emit('focus');
     },
     selectionRefBlur() {
-      this._focused = false;
-      this.updateFocusClassName();
-      this.$emit('blur');
+      this.inputBlur();
     },
   },
 
diff --git a/components/vc-tree/src/TreeNode.jsx b/components/vc-tree/src/TreeNode.jsx
@@ -435,7 +435,7 @@ const TreeNode = {
           onMouseleave={this.onMouseLeave}
           onContextmenu={this.onContextMenu}
           onClick={this.onSelectorClick}
-          onDoubleclick={this.onSelectorDoubleClick}
+          onDblclick={this.onSelectorDoubleClick}
           onDragstart={draggable ? this.onDragStart : noop}
         >
           {$icon}
diff --git a/components/vc-trigger/Popup.jsx b/components/vc-trigger/Popup.jsx
@@ -49,7 +49,11 @@ export default {
     });
   },
   beforeDestroy() {
-    this.$el.remove();
+    if (this.$el.parentNode) {
+      this.$el.parentNode.removeChild(this.$el);
+    } else if (this.$el.remove) {
+      this.$el.remove();
+    }
   },
   methods: {
     onAlign(popupDomNode, align) {
diff --git a/components/vc-upload/demo/asyncAction.jsx b/components/vc-upload/demo/asyncAction.jsx
@@ -7,7 +7,7 @@ export default {
         action: () => {
           return new Promise(resolve => {
             setTimeout(() => {
-              resolve('//jsonplaceholder.typicode.com/posts/');
+              resolve('https://www.mocky.io/v2/5cc8019d300000980a055e76');
             }, 2000);
           });
         },
@@ -23,7 +23,9 @@ export default {
           console.log('error', err);
         },
       },
-      style: { margin: '100px' },
+      style: {
+        margin: '100px',
+      },
     };
     return (
       <Upload {...uploaderProps}>
diff --git a/components/vc-upload/demo/beforeUpload.jsx b/components/vc-upload/demo/beforeUpload.jsx
@@ -4,7 +4,7 @@ export default {
   render() {
     const uploaderProps = {
       props: {
-        action: '//jsonplaceholder.typicode.com/posts/',
+        action: 'https://www.mocky.io/v2/5cc8019d300000980a055e76',
         multiple: true,
         beforeUpload(file, fileList) {
           console.log(file, fileList);
diff --git a/components/vc-upload/demo/customRequest.js b/components/vc-upload/demo/customRequest.js
@@ -5,9 +5,12 @@ export default {
   render() {
     const uploaderProps = {
       props: {
-        action: '//jsonplaceholder.typicode.com/posts/',
+        action: 'https://www.mocky.io/v2/5cc8019d300000980a055e76',
         multiple: false,
-        data: { a: 1, b: 2 },
+        data: {
+          a: 1,
+          b: 2,
+        },
         headers: {
           Authorization: '$prefix $token',
         },
@@ -36,7 +39,12 @@ export default {
               withCredentials,
               headers,
               onUploadProgress: ({ total, loaded }) => {
-                onProgress({ percent: Math.round((loaded / total) * 100).toFixed(2) }, file);
+                onProgress(
+                  {
+                    percent: Math.round((loaded / total) * 100).toFixed(2),
+                  },
+                  file,
+                );
               },
             })
             .then(({ data: response }) => {
diff --git a/components/vc-upload/demo/directoryUpload.js b/components/vc-upload/demo/directoryUpload.js
diff --git a/components/vc-upload/demo/drag.jsx b/components/vc-upload/demo/drag.jsx
diff --git a/components/vc-upload/demo/simple.jsx b/components/vc-upload/demo/simple.jsx
diff --git a/package.json b/package.json
diff --git a/site/index.html b/site/index.html
diff --git a/types/tootip/common.d.ts b/types/tootip/common.d.ts

-Original file line number
+Diff line change
 lib/
 _site/
 dist/
 +package.json
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,6 @@ function babelify(js, modules) {`
`74`	`74`	`delete babelConfig.cacheDirectory;`
`75`	`75`	`if (modules === false) {`
`76`	`76`	`babelConfig.plugins.push(replaceLib);`
`77`		`- } else {`
`78`		`- babelConfig.plugins.push(require.resolve('babel-plugin-add-module-exports'));`
`79`	`77`	`}`
`80`	`78`	`let stream = js.pipe(babel(babelConfig)).pipe(`
`81`	`79`	`through2.obj(function z(file, encoding, next) {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ Add or remove form items dynamically.`
`26`	`26`	`names[${k}]`,
`27`	`27`	`{`
`28`	`28`	`validateTrigger: ['change', 'blur'],`
`29`		`- preserve: true,`
`30`	`29`	`rules: [{`
`31`	`30`	`required: true,`
`32`	`31`	`whitespace: true,`