Merge remote-tracking branch 'origin/next' into v3

tangjinzhou · tangjinzhou · commit 0d023911271d · 2021-06-07T14:31:07.000+08:00
# Conflicts:
#	components/avatar/style/index.less
#	v2-doc
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -10,6 +10,12 @@
 
 ---
 
+## 2.1.6
+
+`2021-05-13`
+
+- 🐞 Use vue@3.0.10 to rebuild to avoid console warning [#3998](https://github.com/vueComponent/ant-design-vue/issues/3998)
+
 ## 2.1.5
 
 `2021-05-12`
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -10,6 +10,12 @@
 
 ---
 
+## 2.1.6
+
+`2021-05-13`
+
+- 🐞 使用 vue@3.0.10 重新构建，避免控制台 warning [#3998](https://github.com/vueComponent/ant-design-vue/issues/3998)
+
 ## 2.1.5
 
 `2021-05-12`
diff --git a/components/_util/props-util/index.js b/components/_util/props-util/index.js
@@ -341,6 +341,10 @@ export function isEmptyElement(c) {
   );
 }
 
+export function isEmptySlot(c) {
+  return !c || c().every(isEmptyElement);
+}
+
 export function isStringElement(c) {
   return c && c.type === Text;
 }
diff --git a/components/auto-complete/index.tsx b/components/auto-complete/index.tsx
@@ -28,7 +28,7 @@ const AutoComplete = defineComponent({
   props: {
     ...AutoCompleteProps,
     prefixCls: PropTypes.string.def('ant-select'),
-    showSearch: PropTypes.looseBool.def(false),
+    showSearch: PropTypes.looseBool,
     transitionName: PropTypes.string.def('slide-up'),
     choiceTransitionName: PropTypes.string.def('zoom'),
     autofocus: PropTypes.looseBool,
diff --git a/components/date-picker/createPicker.tsx b/components/date-picker/createPicker.tsx
@@ -14,6 +14,7 @@ import { hasProp, getOptionProps, getComponent, isValidElement } from '../_util/
 import { cloneElement } from '../_util/vnode';
 import { formatDate } from './utils';
 import { getDataAndAriaProps } from '../_util/util';
+import { isEmptySlot } from '../_util/props-util';
 
 export interface PickerProps {
   value?: moment.Moment;
@@ -255,7 +256,7 @@ export default function createPicker<P>(
         >
           <VcDatePicker
             {...vcDatePickerProps}
-            v-slots={{ default: input, ...$slots }}
+            v-slots={{ ...$slots, default: isEmptySlot($slots.default) ? input : $slots.default }}
           ></VcDatePicker>
         </span>
       );
diff --git a/components/input-number/index.tsx b/components/input-number/index.tsx
@@ -1,4 +1,4 @@
-import { defineComponent, inject, nextTick, onMounted, ref, PropType } from 'vue';
+import { defineComponent, inject, nextTick, onMounted, ref, PropType, ExtractPropTypes } from 'vue';
 import PropTypes from '../_util/vue-types';
 import { getOptionProps } from '../_util/props-util';
 import classNames from '../_util/classNames';
@@ -8,7 +8,7 @@ import VcInputNumber from '../vc-input-number/src';
 import { defaultConfigProvider } from '../config-provider';
 import { tuple, withInstall } from '../_util/type';
 
-const InputNumberProps = {
+const inputNumberProps = {
   prefixCls: PropTypes.string,
   min: PropTypes.number,
   max: PropTypes.number,
@@ -32,10 +32,12 @@ const InputNumberProps = {
   onChange: Function as PropType<(num: number) => void>,
 };
 
+export type InputNumberProps = Partial<ExtractPropTypes<typeof inputNumberProps>>;
+
 const InputNumber = defineComponent({
   name: 'AInputNumber',
   inheritAttrs: false,
-  props: InputNumberProps,
+  props: inputNumberProps,
   setup(props) {
     const inputNumberRef = ref(null);
     const focus = () => {
diff --git a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap
diff --git a/components/time-picker/__tests__/__snapshots__/index.test.js.snap b/components/time-picker/__tests__/__snapshots__/index.test.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`TimePicker not render clean icon when allowClear is false 1`] = `
-<!----><span class="ant-time-picker"><input class="ant-time-picker-input" type="text" placeholder="Select time"><span class="ant-time-picker-icon"><span role="img" aria-label="clock-circle" class="anticon anticon-clock-circle ant-time-picker-clock-icon"><svg class="" data-icon="clock-circle" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"></path><path d="M686.7 638.6L544.1 535.5V288c0-4.4-3.6-8-8-8H488c-4.4 0-8 3.6-8 8v275.4c0 2.6 1.2 5 3.3 6.5l165.4 120.6c3.6 2.6 8.6 1.8 11.2-1.7l28.6-39c2.6-3.7 1.8-8.7-1.8-11.2z"></path></svg></span></span>
+<!----><span class="ant-time-picker"><input class="ant-time-picker-input" type="text" placeholder="Select time" readonly=""><span class="ant-time-picker-icon"><span role="img" aria-label="clock-circle" class="anticon anticon-clock-circle ant-time-picker-clock-icon"><svg class="" data-icon="clock-circle" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"></path><path d="M686.7 638.6L544.1 535.5V288c0-4.4-3.6-8-8-8H488c-4.4 0-8 3.6-8 8v275.4c0 2.6 1.2 5 3.3 6.5l165.4 120.6c3.6 2.6 8.6 1.8 11.2-1.7l28.6-39c2.6-3.7 1.8-8.7-1.8-11.2z"></path></svg></span></span>
 <!----></span>
 `;
 
diff --git a/components/tree-select/index.tsx b/components/tree-select/index.tsx
@@ -26,7 +26,6 @@ const TreeSelect = defineComponent({
   props: initDefaultProps(TreeSelectProps(), {
     transitionName: 'slide-up',
     choiceTransitionName: '',
-    showSearch: false,
   }),
   setup() {
     return {
diff --git a/components/vc-input-number/src/index.js b/components/vc-input-number/src/index.js
@@ -292,7 +292,7 @@ export default defineComponent({
       });
       const value = this.getCurrentValidValue(this.$data.inputValue);
       const newValue = this.setValue(value);
-      if (this.$attrs.onBlur) {
+      if (this.$attrs.onBlur && this.inputRef) {
         const originValue = this.inputRef.value;
         const inputValue = this.getInputDisplayValue({ focused: false, sValue: newValue });
         this.inputRef.value = inputValue;
diff --git a/components/vc-time-picker/TimePicker.jsx b/components/vc-time-picker/TimePicker.jsx
@@ -341,7 +341,6 @@ export default defineComponent({
       name,
       autocomplete,
       autofocus,
-      inputReadOnly,
       sOpen,
       sValue,
       onFocus,
@@ -381,7 +380,7 @@ export default defineComponent({
             onFocus={onFocus}
             onBlur={onBlur}
             autofocus={autofocus}
-            readonly={!!inputReadOnly}
+            readonly
             id={id}
           />
           {inputIcon || <span class={`${prefixCls}-icon`} />}
diff --git a/components/vc-tree-select/src/SearchInput.jsx b/components/vc-tree-select/src/SearchInput.jsx
@@ -21,6 +21,7 @@ const SearchInput = {
     needAlign: PropTypes.looseBool,
     ariaId: PropTypes.string,
     isMultiple: PropTypes.looseBool.def(true),
+    showSearch: PropTypes.looseBool,
   },
   emits: ['mirrorSearchValueChange'],
   setup(props, { emit }) {
@@ -126,6 +127,7 @@ const SearchInput = {
       open,
       ariaId,
       isMultiple,
+      showSearch,
     } = this.$props;
     const {
       vcTreeSelect: { onSearchInputKeyDown },
@@ -146,6 +148,7 @@ const SearchInput = {
             onKeydown={onSearchInputKeyDown}
             value={searchValue}
             disabled={disabled}
+            readonly={!showSearch}
             class={`${prefixCls}-selection-search-input`}
             aria-label="filter select"
             aria-autocomplete="list"
diff --git a/components/vc-virtual-list/List.tsx b/components/vc-virtual-list/List.tsx
@@ -144,6 +144,7 @@ const List = defineComponent({
           end: state.mergedData.length - 1,
           offset: undefined,
         };
+        return;
       }
 
       // Always use virtual scroll bar in avoid shaking
@@ -154,6 +155,7 @@ const List = defineComponent({
           end: state.mergedData.length - 1,
           offset: undefined,
         };
+        return;
       }
 
       let itemTop = 0;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ant-design-vue",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "title": "Ant Design Vue",
   "description": "An enterprise-class UI design language and Vue-based implementation",
   "keywords": [
@@ -89,7 +89,7 @@
     "@typescript-eslint/parser": "^4.1.0",
     "@vue/babel-plugin-jsx": "^1.0.0",
     "@vue/cli-plugin-eslint": "^4.0.0",
-    "@vue/compiler-sfc": "^3.0.9",
+    "@vue/compiler-sfc": "3.0.10",
     "@vue/eslint-config-prettier": "^6.0.0",
     "@vue/eslint-config-typescript": "^7.0.0",
     "@vue/test-utils": "^2.0.0-0",
@@ -112,7 +112,7 @@
     "compare-versions": "^3.3.0",
     "cross-env": "^7.0.0",
     "css-loader": "^5.0.0",
-    "css-minimizer-webpack-plugin": "^2.0.0",
+    "css-minimizer-webpack-plugin": "^3.0.0",
     "deep-assign": "^3.0.0",
     "docsearch.js": "^2.6.3",
     "enquire-js": "^0.2.1",
@@ -141,7 +141,7 @@
     "json-templater": "^1.2.0",
     "jsonp": "^0.2.1",
     "less": "^4.0.0",
-    "less-loader": "^8.0.0",
+    "less-loader": "^9.0.0",
     "less-plugin-npm-import": "^2.1.0",
     "less-vars-to-js": "^1.3.0",
     "lint-staged": "^11.0.0",
@@ -179,7 +179,7 @@
     "umi-mock-middleware": "^1.0.0",
     "umi-request": "^1.3.5",
     "url-loader": "^3.0.0",
-    "vue": "^3.0.9",
+    "vue": "3.0.10",
     "vue-antd-md-loader": "^1.2.1-beta.1",
     "vue-clipboard2": "0.3.1",
     "vue-draggable-resizable": "^2.1.0",

Original file line number	Diff line number	Diff line change
`@@ -341,6 +341,10 @@ export function isEmptyElement(c) {`
`341`	`341`	`);`
`342`	`342`	`}`
`343`	`343`
	`344`	`+export function isEmptySlot(c) {`
	`345`	`+ return !c \|\| c().every(isEmptyElement);`
	`346`	`+}`
	`347`	`+`
`344`	`348`	`export function isStringElement(c) {`
`345`	`349`	`return c && c.type === Text;`
`346`	`350`	`}`