Merge branch 'next' of https://github.com/vueComponent/ant-design-vue into next

Author: tangjinzhou

components/calendar/Header.tsx

@@ -4,6 +4,7 @@ import { Group, Button } from '../radio';
 import PropTypes from '../_util/vue-types';
 import { defaultConfigProvider } from '../config-provider';
 import { VueNode } from '../_util/type';
+import moment from 'moment';
 
 function getMonthsLocale(value: moment.Moment): string[] {
   const current = value.clone();

components/date-picker/WeekPicker.tsx

@@ -28,7 +28,6 @@ export default defineComponent({
   mixins: [BaseMixin],
   inheritAttrs: false,
   props: initDefaultProps(WeekPickerProps, {
-    format: 'gggg-wo',
     allowClear: true,
   }),
   setup() {

components/date-picker/index.ts

@@ -56,9 +56,4 @@ DatePicker.install = function(app: App) {
   return app;
 };
 
-export default DatePicker as typeof DatePicker &
-  Plugin & {
-    readonly RangePicker: typeof RangePicker;
-    readonly MonthPicker: typeof MonthPicker;
-    readonly WeekPicker: typeof WeekPicker;
-  };
+export default DatePicker as typeof DatePicker & Plugin;

components/date-picker/props.ts

@@ -1,4 +1,5 @@
 import { PropType } from 'vue';
+import moment from 'moment';
 import PropTypes, { withUndefined } from '../_util/vue-types';
 import { tuple } from '../_util/type';
 

components/date-picker/utils.ts

@@ -1,3 +1,5 @@
+import moment from 'moment';
+
 type Value = moment.Moment | undefined | null;
 type Format = string | string[] | undefined | ((val?: Value) => string | string[] | undefined);
 export function formatDate(value: Value, format: Format) {

components/select/index.tsx

@@ -215,6 +215,7 @@ const Select = defineComponent({
         getPopupContainer={getPopupContainer || getContextPopupContainer}
         dropdownClassName={rcSelectRtlDropDownClassName}
         onChange={triggerChange}
+        dropdownRender={selectProps.dropdownRender || this.$slots.dropdownRender}
       >
         {slots.default?.()}
       </RcSelect>

components/vc-collapse/src/commonProps.js

@@ -24,7 +24,7 @@ const collapseProps = () => ({
 const panelProps = () => ({
   openAnimation: PropTypes.object,
   prefixCls: PropTypes.string,
-  header: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.node]),
+  header: PropTypes.any,
   headerClass: PropTypes.string,
   showArrow: PropTypes.looseBool,
   isActive: PropTypes.looseBool,

components/vc-menu/DOMWrap.jsx

@@ -286,7 +286,7 @@ DOMWrap.props = {
   prefixCls: PropTypes.string,
   level: PropTypes.number,
   theme: PropTypes.string,
-  overflowedIndicator: PropTypes.node,
+  overflowedIndicator: PropTypes.any,
   visible: PropTypes.looseBool,
   hiddenClassName: PropTypes.string,
   tag: PropTypes.string.def('div'),

components/vc-select/generate.tsx

@@ -882,12 +882,12 @@ export default function generateSelector<
         if (props.disabled) {
           return;
         }
-
-        if (mergedSearchValue.value) {
+        const serachVal = mergedSearchValue.value;
+        if (serachVal) {
           // `tags` mode should move `searchValue` into values
           if (props.mode === 'tags') {
             triggerSearch('', false, false);
-            triggerChange(Array.from(new Set([...mergedRawValue.value, mergedSearchValue.value])));
+            triggerChange(Array.from(new Set([...mergedRawValue.value, serachVal])));
           } else if (props.mode === 'multiple') {
             // `multiple` mode only clean the search value but not trigger event
             setInnerSearchValue('');

components/vc-tree-select/src/SelectTrigger.jsx

@@ -46,7 +46,7 @@ const SelectTrigger = {
     isMultiple: PropTypes.looseBool,
     dropdownPrefixCls: PropTypes.string,
     dropdownVisibleChange: PropTypes.func,
-    popupElement: PropTypes.node,
+    popupElement: PropTypes.any,
     open: PropTypes.looseBool,
   },
   created() {

components/vc-tree-select/src/propTypes.js

@@ -18,7 +18,7 @@ export function valueProp(...args) {
   if (isLabelInValue(props)) {
     const err = genArrProps(
       PropTypes.shape({
-        label: PropTypes.node,
+        label: PropTypes.any,
         value: internalValProp,
       }).loose,
     )(...args);