fix: merge conflict

components/_util/vue-types/index.ts

@@ -1,9 +1,5 @@
-<<<<<<< HEAD:components/_util/vue-types/index.ts
 import { PropType } from 'vue';
-import isPlainObject from 'lodash/isPlainObject';
-=======
 import isPlainObject from 'lodash-es/isPlainObject';
->>>>>>> @{-1}:components/_util/vue-types/index.js
 import { toType, getType, isFunction, validateType, isInteger, isArray, warn } from './utils';
 
 const VuePropTypes = {

components/empty/index.tsx

@@ -1,4 +1,4 @@
-import { CSSProperties, VNodeChild, inject, App, SetupContext } from 'vue';
+import { CSSProperties, VNodeTypes, inject, App, SetupContext } from 'vue';
 import classNames from 'classnames';
 import { ConfigConsumerProps } from '../config-provider';
 import LocaleReceiver from '../locale-provider/LocaleReceiver';
@@ -18,9 +18,9 @@ export interface EmptyProps {
   class?: string;
   style?: CSSProperties;
   imageStyle?: CSSProperties;
-  image?: VNodeChild | JSX.Element;
-  description?: VNodeChild | JSX.Element;
-  children?: VNodeChild | JSX.Element;
+  image?: VNodeTypes;
+  description?: VNodeTypes;
+  children?: VNodeTypes;
 }
 
 const Empty = (props: EmptyProps, { slots }: SetupContext) => {
@@ -35,7 +35,7 @@ const Empty = (props: EmptyProps, { slots }: SetupContext) => {
     ...restProps
   } = props;
 
-  return () => (
+  return (
     <LocaleReceiver
       componentName="Empty"
       children={(locale: TransferLocale) => {
@@ -69,7 +69,7 @@ const Empty = (props: EmptyProps, { slots }: SetupContext) => {
               <div class={`${prefixCls}-footer`}>{filterEmpty(slots.default())}</div>
             )}
           </div>
-        ) as VNodeChild;
+        );
       }}
     />
   );

components/locale-provider/LocaleReceiver.tsx

@@ -1,10 +1,10 @@
-import { inject, defineComponent, VNodeChild, PropType } from 'vue';
+import { inject, defineComponent, VNodeTypes, PropType } from 'vue';
 import defaultLocaleData from './default';
 
 export interface LocaleReceiverProps {
   componentName?: string;
   defaultLocale?: object | Function;
-  children: (locale: object, localeCode?: string, fullLocale?: object) => VNodeChild;
+  children: (locale: object, localeCode?: string, fullLocale?: object) => VNodeTypes;
 }
 
 interface LocaleInterface {
@@ -22,7 +22,7 @@ export default defineComponent({
     },
     children: {
       type: Function as PropType<
-        (locale: object, localeCode?: string, fullLocale?: object) => VNodeChild
+        (locale: object, localeCode?: string, fullLocale?: object) => VNodeTypes
       >,
     },
   },