From caea1acfbe845ac12a92facda32ae7ed85e4ccc0 Mon Sep 17 00:00:00 2001
From: John60676 <John60676@qq.com>
Date: Tue, 29 Sep 2020 18:30:39 +0800
Subject: [PATCH 1/7] fix(select): click on the selected item can deselect
 (#2920)

---
 components/vc-select/Select.jsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/vc-select/Select.jsx b/components/vc-select/Select.jsx
index 3a4a74012..9941464d3 100644
--- a/components/vc-select/Select.jsx
+++ b/components/vc-select/Select.jsx
@@ -482,6 +482,11 @@ const Select = {
         }
         return;
       }
+
+      if (domEvent.type === 'click') {
+        this.removeSelected(getValuePropValue(item));
+      }
+
       if (this.autoClearSearchValue) {
         this.setInputValue('');
       }

From 51fb7cd8885cd6ba8ce91173b31a442c3eb6306b Mon Sep 17 00:00:00 2001
From: zkwolf <chenhao5866@gmail.com>
Date: Tue, 29 Sep 2020 22:09:29 +0800
Subject: [PATCH 2/7] feat: tree support global tree slot (#2904)

---
 components/tree/Tree.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/tree/Tree.jsx b/components/tree/Tree.jsx
index ef301c293..8a0fb12b1 100644
--- a/components/tree/Tree.jsx
+++ b/components/tree/Tree.jsx
@@ -161,7 +161,11 @@ export default {
             $slots[scopedSlots.switcherIcon] ||
             $slots[slots.switcherIcon] ||
             restProps.switcherIcon,
-          title: $slots[scopedSlots.title] || $slots[slots.title] || restProps[replaceFields.title],
+          title:
+            $slots[scopedSlots.title] ||
+            $slots[slots.title] ||
+            $slots.title ||
+            restProps[replaceFields.title],
           dataRef: item,
           key,
           class: cls,

From ca2c77e4bd913833583e617d971b933052484cfc Mon Sep 17 00:00:00 2001
From: John60676 <John60676@qq.com>
Date: Tue, 29 Sep 2020 22:11:06 +0800
Subject: [PATCH 3/7] refactor(input): update input style (#2876)

* refactor(input): update input style

* refactor(form): update form style about input component

* refactor(input): update clearable icon style
Modify the clearable icon style to prevent the width of the input box from changing due to the insertion of the icon
---
 components/form/style/index.less           | 12 ----
 components/input/ClearableLabeledInput.jsx | 26 +++++---
 components/input/Input.jsx                 | 26 +++++++-
 components/input/style/index.less          |  8 +++
 components/input/style/mixin.less          | 73 +++++++++++-----------
 components/style/themes/default.less       |  2 +-
 6 files changed, 87 insertions(+), 60 deletions(-)

diff --git a/components/form/style/index.less b/components/form/style/index.less
index 1967010e3..97d41fcfe 100644
--- a/components/form/style/index.less
+++ b/components/form/style/index.less
@@ -136,23 +136,11 @@
 
 form {
   .has-feedback {
-    .@{ant-prefix}-input {
-      padding-right: @input-padding-horizontal-base + @input-affix-width;
-    }
-
     // https://github.com/ant-design/ant-design/issues/19884
     .@{ant-prefix}-input-affix-wrapper {
       .@{ant-prefix}-input-suffix {
         padding-right: 18px;
       }
-      .@{ant-prefix}-input {
-        padding-right: @input-padding-horizontal-base + @input-affix-width * 2;
-      }
-      &.@{ant-prefix}-input-affix-wrapper-input-with-clear-btn {
-        .@{ant-prefix}-input {
-          padding-right: @input-padding-horizontal-base + @input-affix-width * 3;
-        }
-      }
     }
 
     // Fix overlapping between feedback icon and <Select>'s arrow.
diff --git a/components/input/ClearableLabeledInput.jsx b/components/input/ClearableLabeledInput.jsx
index bbeb170ef..dfac0c595 100644
--- a/components/input/ClearableLabeledInput.jsx
+++ b/components/input/ClearableLabeledInput.jsx
@@ -33,25 +33,30 @@ const ClearableLabeledInput = {
     addonBefore: PropTypes.any,
     addonAfter: PropTypes.any,
     readonly: PropTypes.bool,
+    isFocused: PropTypes.bool,
+    style: PropTypes.object,
   },
   methods: {
     renderClearIcon(prefixCls) {
       const { allowClear, value, disabled, readonly, inputType, handleReset } = this.$props;
-      if (
-        !allowClear ||
-        disabled ||
-        readonly ||
-        value === undefined ||
-        value === null ||
-        value === ''
-      ) {
+      if (!allowClear) {
         return null;
       }
+      const showClearIcon =
+        !disabled && !readonly && value !== undefined && value !== null && value !== '';
       const className =
         inputType === ClearableInputType[0]
           ? `${prefixCls}-textarea-clear-icon`
           : `${prefixCls}-clear-icon`;
-      return <CloseCircleFilled onClick={handleReset} class={className} role="button" />;
+      return (
+        <CloseCircleFilled
+          onClick={handleReset}
+          class={classNames(className, {
+            [`${className}-hidden`]: !showClearIcon,
+          })}
+          role="button"
+        />
+      );
     },
 
     renderSuffix(prefixCls) {
@@ -81,12 +86,13 @@ const ClearableLabeledInput = {
       ) : null;
 
       const affixWrapperCls = classNames(this.$attrs?.class, `${prefixCls}-affix-wrapper`, {
+        [`${prefixCls}-affix-wrapper-focused`]: props.isFocused,
+        [`${prefixCls}-affix-wrapper-disabled`]: props.disabled,
         [`${prefixCls}-affix-wrapper-sm`]: props.size === 'small',
         [`${prefixCls}-affix-wrapper-lg`]: props.size === 'large',
         [`${prefixCls}-affix-wrapper-input-with-clear-btn`]:
           props.suffix && props.allowClear && this.$props.value,
       });
-
       return (
         <span class={affixWrapperCls} style={props.style}>
           {prefix}
diff --git a/components/input/Input.jsx b/components/input/Input.jsx
index 8c6a24700..3dc66a7e9 100644
--- a/components/input/Input.jsx
+++ b/components/input/Input.jsx
@@ -64,6 +64,7 @@ export default {
     const value = typeof props.value === 'undefined' ? props.defaultValue : props.value;
     return {
       stateValue: typeof value === 'undefined' ? '' : value,
+      isFocused: false,
     };
   },
   watch: {
@@ -87,6 +88,16 @@ export default {
     }
   },
   methods: {
+    handleInputFocus(e) {
+      this.isFocused = true;
+      this.onFocus && this.onFocus(e);
+    },
+
+    handleInputBlur(e) {
+      this.isFocused = false;
+      this.onBlur && this.onBlur(e);
+    },
+
     focus() {
       this.input.focus();
     },
@@ -147,7 +158,15 @@ export default {
         'inputPrefixCls',
         'loading',
       ]);
-      const { handleKeyDown, handleChange, size, disabled, $attrs } = this;
+      const {
+        handleKeyDown,
+        handleChange,
+        handleInputFocus,
+        handleInputBlur,
+        size,
+        disabled,
+        $attrs,
+      } = this;
 
       const inputProps = {
         ...otherProps,
@@ -160,6 +179,8 @@ export default {
         key: 'ant-input',
         onInput: handleChange,
         onChange: handleChange,
+        onFocus: handleInputFocus,
+        onBlur: handleInputBlur,
       };
       if (!inputProps.autofocus) {
         delete inputProps.autofocus;
@@ -205,7 +226,7 @@ export default {
     //   return <TextArea {...textareaProps} ref="input" />;
     // }
     const { prefixCls: customizePrefixCls } = this.$props;
-    const { stateValue } = this.$data;
+    const { stateValue, isFocused } = this.$data;
     const getPrefixCls = this.configProvider.getPrefixCls;
     const prefixCls = getPrefixCls('input', customizePrefixCls);
     const addonAfter = getComponent(this, 'addonAfter');
@@ -224,6 +245,7 @@ export default {
       addonBefore,
       suffix,
       prefix,
+      isFocused,
     };
     return <ClearableLabeledInput {...props} ref={this.saveClearableInput} />;
   },
diff --git a/components/input/style/index.less b/components/input/style/index.less
index 2c99fe075..8acafd416 100644
--- a/components/input/style/index.less
+++ b/components/input/style/index.less
@@ -41,6 +41,14 @@
   vertical-align: 0;
 }
 
+.@{ant-prefix}-input-clear-icon-hidden {
+  visibility: hidden;
+}
+
+.@{ant-prefix}-input-textarea-clear-icon-hidden {
+  visibility: hidden;
+}
+
 .@{ant-prefix}-input-textarea-clear-icon {
   .clear-icon;
   position: absolute;
diff --git a/components/input/style/mixin.less b/components/input/style/mixin.less
index 21e7d3114..fdb71b65d 100644
--- a/components/input/style/mixin.less
+++ b/components/input/style/mixin.less
@@ -1,18 +1,17 @@
 @import '../../style/themes/index';
 @import '../../style/mixins/index';
 
+@input-affix-margin: 4px;
 @input-affix-width: 19px;
 @input-affix-with-clear-btn-width: 38px;
 
 // size mixins for input
 .input-lg() {
-  height: @input-height-lg;
   padding: @input-padding-vertical-lg @input-padding-horizontal-lg;
   font-size: @font-size-lg;
 }
 
 .input-sm() {
-  height: @input-height-sm;
   padding: @input-padding-vertical-sm @input-padding-horizontal-sm;
 }
 
@@ -47,7 +46,6 @@
   position: relative;
   display: inline-block;
   width: 100%;
-  height: @input-height-base;
   padding: @input-padding-vertical-base @input-padding-horizontal-base;
   color: @input-color;
   font-size: @font-size-base;
@@ -264,12 +262,6 @@
     height: @input-height-sm;
   }
 
-  .@{inputClass}-affix-wrapper {
-    display: table-cell;
-    float: left;
-    width: 100%;
-  }
-
   &&-compact {
     display: block;
     .clearfix;
@@ -297,6 +289,10 @@
       border-radius: 0;
     }
 
+    & > .@{inputClass}-affix-wrapper {
+      display: inline-flex;
+    }
+
     & > *:not(:last-child) {
       margin-right: -@border-width-base;
       border-right-width: @border-width-base;
@@ -364,17 +360,44 @@
 
 .input-affix-wrapper(@inputClass) {
   position: relative;
-  display: inline-block;
+  display: inline-flex;
+  border: @border-width-base @border-style-base @input-border-color;
+  border-radius: @border-radius-base;
+  padding: @input-padding-vertical-base @input-padding-horizontal-base;
   width: 100%;
   text-align: start;
 
-  &:hover .@{inputClass}:not(.@{inputClass}-disabled) {
+  &:hover {
     .hover();
   }
 
+  &-disabled {
+    .disabled();
+  }
+
+  &-focused {
+    .active();
+  }
+
+  // Size
+  &-lg {
+    .input-lg();
+  }
+
+  &-sm {
+    .input-sm();
+  }
+
   .@{inputClass} {
     position: relative;
     text-align: inherit;
+    border: none;
+    padding: 0;
+    &:focus {
+      border: none;
+      outline: none;
+      box-shadow: none;
+    }
   }
 
   // Should not break align of icon & text
@@ -385,14 +408,10 @@
   // https://codesandbox.io/embed/nifty-benz-gb7ml
   .@{inputClass}-prefix,
   .@{inputClass}-suffix {
-    position: absolute;
-    top: 50%;
-    z-index: 2;
     display: flex;
     align-items: center;
     color: @input-color;
-    line-height: 0;
-    transform: translateY(-50%);
+    white-space: nowrap;
 
     :not(.anticon) {
       line-height: @line-height-base;
@@ -407,27 +426,11 @@
   }
 
   .@{inputClass}-prefix {
-    left: @input-padding-horizontal-base + 1px;
+    margin-right: @input-affix-margin;
   }
 
   .@{inputClass}-suffix {
-    right: @input-padding-horizontal-base + 1px;
-  }
-
-  .@{inputClass}:not(:first-child) {
-    padding-left: @input-padding-horizontal-base + @input-affix-width;
-  }
-
-  .@{inputClass}:not(:last-child) {
-    padding-right: @input-padding-horizontal-base + @input-affix-width;
-  }
-
-  &.@{inputClass}-affix-wrapper-input-with-clear-btn .@{inputClass}:not(:last-child) {
-    padding-right: @input-padding-horizontal-base + @input-affix-with-clear-btn-width;
-  }
-
-  &.@{inputClass}-affix-wrapper-textarea-with-clear-btn .@{inputClass} {
-    padding-right: 22px;
+    margin-left: @input-affix-margin;
   }
 }
 
@@ -438,7 +441,7 @@
   // https://codesandbox.io/s/wizardly-sun-u10br
   cursor: pointer;
   transition: color 0.3s;
-
+  margin: 0 @input-affix-margin;
   &:hover {
     color: @text-color-secondary;
   }
diff --git a/components/style/themes/default.less b/components/style/themes/default.less
index 60e40df4b..9e245f9b1 100644
--- a/components/style/themes/default.less
+++ b/components/style/themes/default.less
@@ -318,7 +318,7 @@
 @input-padding-horizontal-lg: @input-padding-horizontal;
 @input-padding-vertical-base: 4px;
 @input-padding-vertical-sm: 1px;
-@input-padding-vertical-lg: 6px;
+@input-padding-vertical-lg: 6.5px;
 @input-placeholder-color: hsv(0, 0, 75%);
 @input-color: @text-color;
 @input-border-color: @border-color-base;

From 0bdaf14d1e6119cf794161ff5be21a681e68ae53 Mon Sep 17 00:00:00 2001
From: good luck <1204505056@qq.com>
Date: Sun, 4 Oct 2020 20:34:01 +0800
Subject: [PATCH 4/7] docs: update vue-admin-beautiful backer (#2938)

---
 BACKERS.md      | 1 +
 README-zh_CN.md | 2 +-
 README.md       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/BACKERS.md b/BACKERS.md
index 28457d76a..af4850a5e 100644
--- a/BACKERS.md
+++ b/BACKERS.md
@@ -24,6 +24,7 @@
 
 <h2 align="center">Backers</h2>
 <p align="center">
+  <a href="https://github.com/chuzhixin/vue-admin-beautiful" target="_blank"><img width="64" style="border-radius: 50%;" src="https://gitee.com/chu1204505056/image/raw/master/vue-admin-beautiful.png" title="vue-admin-beautiful"></a>
   <a href="https://github.com/limichange" target="_blank"><img width="64" style="border-radius: 50%;" src="https://avatars0.githubusercontent.com/u/1947344?s=400&v=4" title="limichange donation total 24$ by qq from 2018.9"></a>
   <a href="https://opencollective.com/ant-design-vue/backer/0/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/0/avatar.svg"></a>
   <a href="https://opencollective.com/ant-design-vue/backer/1/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/1/avatar.svg"></a>
diff --git a/README-zh_CN.md b/README-zh_CN.md
index 97c1d56d7..33bb6883e 100644
--- a/README-zh_CN.md
+++ b/README-zh_CN.md
@@ -104,7 +104,7 @@ Become a sponsor and get your logo on our README on Github with a link to your s
 ## Backers
 
 Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/ant-design-vue#backer)]
-
+<a href="https://github.com/chuzhixin/vue-admin-beautiful" target="_blank"><img width="64" style="border-radius: 50%;" src="https://gitee.com/chu1204505056/image/raw/master/vue-admin-beautiful.png" title="vue-admin-beautiful"></a>
 <a href="https://opencollective.com/ant-design-vue/backer/0/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/0/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/1/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/1/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/2/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/2/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/3/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/3/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/4/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/4/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/5/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/5/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/6/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/6/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/7/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/7/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/8/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/8/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/9/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/9/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/10/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/10/avatar.svg"></a>
 
 ## Patreon
diff --git a/README.md b/README.md
index 00d9b8670..da39bd6c8 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ Become a sponsor and get your logo on our README on Github with a link to your s
 ## Backers
 
 Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/ant-design-vue#backer)]
-
+<a href="https://github.com/chuzhixin/vue-admin-beautiful" target="_blank"><img width="64" style="border-radius: 50%;" src="https://gitee.com/chu1204505056/image/raw/master/vue-admin-beautiful.png" title="vue-admin-beautiful"></a>
 <a href="https://opencollective.com/ant-design-vue/backer/0/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/0/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/1/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/1/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/2/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/2/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/3/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/3/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/4/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/4/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/5/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/5/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/6/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/6/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/7/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/7/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/8/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/8/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/9/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/9/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/10/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/10/avatar.svg"></a><a href="https://opencollective.com/ant-design-vue/backer/9/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/9/avatar.svg"></a>
 
 ## Patreon

From 157d0e72e976c3419181bbddcfb14cf0bb1fde99 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Sun, 4 Oct 2020 20:38:35 +0800
Subject: [PATCH 5/7] docs: update readme

---
 README-zh_CN.md | 4 ++--
 README.md       | 4 ++--
 antdv-demo      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README-zh_CN.md b/README-zh_CN.md
index 33bb6883e..81680c027 100644
--- a/README-zh_CN.md
+++ b/README-zh_CN.md
@@ -104,8 +104,8 @@ Become a sponsor and get your logo on our README on Github with a link to your s
 ## Backers
 
 Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/ant-design-vue#backer)]
-<a href="https://github.com/chuzhixin/vue-admin-beautiful" target="_blank"><img width="64" style="border-radius: 50%;" src="https://gitee.com/chu1204505056/image/raw/master/vue-admin-beautiful.png" title="vue-admin-beautiful"></a>
-<a href="https://opencollective.com/ant-design-vue/backer/0/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/0/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/1/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/1/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/2/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/2/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/3/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/3/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/4/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/4/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/5/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/5/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/6/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/6/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/7/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/7/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/8/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/8/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/9/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/9/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/10/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/10/avatar.svg"></a>
+
+<a href="https://github.com/chuzhixin/vue-admin-beautiful" target="_blank"><img width="64" style="border-radius: 50%;" src="https://gitee.com/chu1204505056/image/raw/master/vue-admin-beautiful.png" title="vue-admin-beautiful"></a> <a href="https://opencollective.com/ant-design-vue/backer/0/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/0/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/1/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/1/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/2/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/2/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/3/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/3/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/4/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/4/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/5/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/5/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/6/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/6/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/7/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/7/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/8/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/8/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/9/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/9/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/10/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/10/avatar.svg"></a>
 
 ## Patreon
 
diff --git a/README.md b/README.md
index da39bd6c8..fc9abaea5 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ Become a sponsor and get your logo on our README on Github with a link to your s
 ## Backers
 
 Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/ant-design-vue#backer)]
-<a href="https://github.com/chuzhixin/vue-admin-beautiful" target="_blank"><img width="64" style="border-radius: 50%;" src="https://gitee.com/chu1204505056/image/raw/master/vue-admin-beautiful.png" title="vue-admin-beautiful"></a>
-<a href="https://opencollective.com/ant-design-vue/backer/0/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/0/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/1/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/1/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/2/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/2/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/3/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/3/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/4/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/4/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/5/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/5/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/6/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/6/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/7/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/7/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/8/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/8/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/9/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/9/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/10/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/10/avatar.svg"></a><a href="https://opencollective.com/ant-design-vue/backer/9/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/9/avatar.svg"></a>
+
+<a href="https://github.com/chuzhixin/vue-admin-beautiful" target="_blank"><img width="64" style="border-radius: 50%;" src="https://gitee.com/chu1204505056/image/raw/master/vue-admin-beautiful.png" title="vue-admin-beautiful"></a> <a href="https://opencollective.com/ant-design-vue/backer/0/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/0/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/1/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/1/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/2/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/2/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/3/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/3/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/4/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/4/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/5/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/5/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/6/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/6/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/7/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/7/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/8/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/8/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/9/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/9/avatar.svg"></a> <a href="https://opencollective.com/ant-design-vue/backer/10/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/10/avatar.svg"></a><a href="https://opencollective.com/ant-design-vue/backer/9/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/backer/9/avatar.svg"></a>
 
 ## Patreon
 
diff --git a/antdv-demo b/antdv-demo
index b2bd75fda..79d49c0ff 160000
--- a/antdv-demo
+++ b/antdv-demo
@@ -1 +1 @@
-Subproject commit b2bd75fdaad216ac1bb4e19a38ab5cf801116baf
+Subproject commit 79d49c0ff31a4f505ccd5bc3ad238c08f9925212

From 9ac18c5e520fdea64d6e289a9ab45d0ab032f0f6 Mon Sep 17 00:00:00 2001
From: John60676 <John60676@qq.com>
Date: Sat, 24 Oct 2020 23:01:20 +0800
Subject: [PATCH 6/7] fix(modal): title props support render function (#3031)

---
 components/modal/ConfirmDialog.jsx         | 4 +++-
 components/modal/__tests__/confirm.test.js | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/components/modal/ConfirmDialog.jsx b/components/modal/ConfirmDialog.jsx
index b51efb2b4..6ab9124a3 100644
--- a/components/modal/ConfirmDialog.jsx
+++ b/components/modal/ConfirmDialog.jsx
@@ -82,7 +82,9 @@ const ConfirmDialog = (_, { attrs }) => {
         <div class={`${contentPrefixCls}-body`}>
           {typeof icon === 'function' ? icon() : icon}
           {attrs.title === undefined ? null : (
-            <span class={`${contentPrefixCls}-title`}>{attrs.title}</span>
+            <span class={`${contentPrefixCls}-title`}>
+              {typeof attrs.title === 'function' ? attrs.title() : attrs.title}
+            </span>
           )}
           <div class={`${contentPrefixCls}-content`}>
             {typeof attrs.content === 'function' ? attrs.content() : attrs.content}
diff --git a/components/modal/__tests__/confirm.test.js b/components/modal/__tests__/confirm.test.js
index 224fe5f1e..d5d46ce2a 100644
--- a/components/modal/__tests__/confirm.test.js
+++ b/components/modal/__tests__/confirm.test.js
@@ -102,4 +102,12 @@ describe('Modal.confirm triggers callbacks correctly', () => {
       expect($$(`.ant-modal-confirm-${type}`)).toHaveLength(0);
     }
   });
+
+  it('should render title', async () => {
+    open({
+      title: h => <span>title</span>,
+    });
+    await sleep();
+    expect($$('.ant-modal-confirm-title')[0].innerHTML).toBe('<span>title</span>');
+  });
 });

From 2fb52d6e26dcd79a33692901a25026bc19c5fe79 Mon Sep 17 00:00:00 2001
From: John60676 <John60676@qq.com>
Date: Mon, 26 Oct 2020 11:28:56 +0800
Subject: [PATCH 7/7] feat: textarea support word count (#3009)

---
 components/input/ClearableLabeledInput.jsx    |  4 +-
 components/input/TextArea.jsx                 | 39 +++++++++++++++++--
 .../__snapshots__/index.test.js.snap          |  2 +
 components/input/__tests__/index.test.js      | 13 ++++++-
 components/input/style/index.less             |  9 +++++
 types/input/textarea.d.ts                     |  1 +
 6 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/components/input/ClearableLabeledInput.jsx b/components/input/ClearableLabeledInput.jsx
index dfac0c595..0ede750d1 100644
--- a/components/input/ClearableLabeledInput.jsx
+++ b/components/input/ClearableLabeledInput.jsx
@@ -34,7 +34,6 @@ const ClearableLabeledInput = {
     addonAfter: PropTypes.any,
     readonly: PropTypes.bool,
     isFocused: PropTypes.bool,
-    style: PropTypes.object,
   },
   methods: {
     renderClearIcon(prefixCls) {
@@ -74,6 +73,7 @@ const ClearableLabeledInput = {
 
     renderLabeledIcon(prefixCls, element) {
       const props = this.$props;
+      const { style } = this.$attrs;
       const suffix = this.renderSuffix(prefixCls);
       if (!hasPrefixSuffix(this)) {
         return cloneElement(element, {
@@ -94,7 +94,7 @@ const ClearableLabeledInput = {
           props.suffix && props.allowClear && this.$props.value,
       });
       return (
-        <span class={affixWrapperCls} style={props.style}>
+        <span class={affixWrapperCls} style={style}>
           {prefix}
           {cloneElement(element, {
             style: null,
diff --git a/components/input/TextArea.jsx b/components/input/TextArea.jsx
index 870e0ff8a..6572161b9 100644
--- a/components/input/TextArea.jsx
+++ b/components/input/TextArea.jsx
@@ -6,11 +6,13 @@ import { hasProp, getOptionProps } from '../_util/props-util';
 import { ConfigConsumerProps } from '../config-provider';
 import { fixControlledValue, resolveOnChange } from './Input';
 import PropTypes from '../_util/vue-types';
+import classNames from '../_util/classNames';
 
 const TextAreaProps = {
   ...inputProps,
   autosize: PropTypes.oneOfType([Object, Boolean]),
   autoSize: PropTypes.oneOfType([Object, Boolean]),
+  showCount: PropTypes.bool,
 };
 
 export default {
@@ -100,9 +102,13 @@ export default {
 
     renderTextArea(prefixCls) {
       const props = getOptionProps(this);
+      const { style, class: customClass } = this.$attrs;
       const resizeProps = {
         ...props,
         ...this.$attrs,
+        style: style && !props.showCount,
+        class: customClass && !props.showCount,
+        showCount: null,
         prefixCls,
         onInput: this.handleChange,
         onChange: this.handleChange,
@@ -112,19 +118,44 @@ export default {
     },
   },
   render() {
-    const { stateValue, prefixCls: customizePrefixCls } = this;
+    const { stateValue, prefixCls: customizePrefixCls, maxlength, showCount } = this;
+    const { style, class: customClass } = this.$attrs;
     const getPrefixCls = this.configProvider.getPrefixCls;
     const prefixCls = getPrefixCls('input', customizePrefixCls);
-
+    let value = fixControlledValue(stateValue);
+    // Max length value
+    const hasMaxlength = Number(maxlength) > 0;
+    value = hasMaxlength ? value.slice(0, maxlength) : value;
     const props = {
       ...getOptionProps(this),
       ...this.$attrs,
       prefixCls,
       inputType: 'text',
-      value: fixControlledValue(stateValue),
       element: this.renderTextArea(prefixCls),
       handleReset: this.handleReset,
     };
-    return <ClearableLabeledInput {...props} ref={this.saveClearableInput} />;
+
+    let textareaNode = (
+      <ClearableLabeledInput {...props} value={value} ref={this.saveClearableInput} />
+    );
+
+    if (showCount) {
+      const valueLength = [...value].length;
+      const dataCount = `${valueLength}${hasMaxlength ? ` / ${maxlength}` : ''}`;
+      textareaNode = (
+        <div
+          className={classNames(
+            `${prefixCls}-textarea`,
+            `${prefixCls}-textarea-show-count`,
+            customClass,
+          )}
+          style={style}
+          data-count={dataCount}
+        >
+          {textareaNode}
+        </div>
+      );
+    }
+    return textareaNode;
   },
 };
diff --git a/components/input/__tests__/__snapshots__/index.test.js.snap b/components/input/__tests__/__snapshots__/index.test.js.snap
index 9a9aba45c..9da98deac 100644
--- a/components/input/__tests__/__snapshots__/index.test.js.snap
+++ b/components/input/__tests__/__snapshots__/index.test.js.snap
@@ -7,3 +7,5 @@ exports[`Input.Search should support suffix 1`] = `<span class="ant-input-search
 exports[`TextArea should support disabled 1`] = `<textarea disabled="" class="ant-input ant-input-disabled"></textarea>`;
 
 exports[`TextArea should support maxlength 1`] = `<textarea maxlength="10" class="ant-input"></textarea>`;
+
+exports[`TextArea should support showCount 1`] = `<div class="ant-input-textarea ant-input-textarea-show-count" data-count="3 / 10"><textarea maxlength="10" class="ant-input"></textarea></div>`;
diff --git a/components/input/__tests__/index.test.js b/components/input/__tests__/index.test.js
index d70d261cf..684411905 100644
--- a/components/input/__tests__/index.test.js
+++ b/components/input/__tests__/index.test.js
@@ -29,7 +29,7 @@ describe('Input', () => {
       props: { allowClear: true, defaultValue: '111', disabled: true },
       sync: false,
     });
-    expect(wrapper.findAll('.ant-input-clear-icon').length).toBe(0);
+    expect(wrapper.findAll('.ant-input-clear-icon-hidden').length).toBeTruthy();
   });
 });
 
@@ -68,6 +68,17 @@ describe('TextArea', () => {
       expect(wrapper.html()).toMatchSnapshot();
     });
   });
+
+  it('should support showCount', async () => {
+    const wrapper = mount(TextArea, {
+      props: { showCount: true, defaultValue: '111', maxlength: 10 },
+      sync: false,
+    });
+    expect(wrapper.find('.ant-input-textarea-show-count')).toBeTruthy();
+    await asyncExpect(() => {
+      expect(wrapper.html()).toMatchSnapshot();
+    });
+  });
 });
 
 // describe('As Form Control', () => {
diff --git a/components/input/style/index.less b/components/input/style/index.less
index 8acafd416..c41058460 100644
--- a/components/input/style/index.less
+++ b/components/input/style/index.less
@@ -57,4 +57,13 @@
   margin: 8px 8px 0 0;
 }
 
+.@{ant-prefix}-input-textarea {
+  &-show-count::after {
+    display: block;
+    color: @text-color-secondary;
+    text-align: right;
+    content: attr(data-count);
+  }
+}
+
 @import './search-input';
diff --git a/types/input/textarea.d.ts b/types/input/textarea.d.ts
index a30389a27..0ea21fa15 100644
--- a/types/input/textarea.d.ts
+++ b/types/input/textarea.d.ts
@@ -31,5 +31,6 @@ export declare class TextArea extends AntdComponent {
        * @type boolean
        */
       allowClear?: boolean;
+      showCount?: boolean;
     };
 }