github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: merge conflict

pull/2926/head
Amour1688 2020-09-12 11:34:18 +08:00
parent a5eda35693
commit 87aa5ecbd8
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/_util/vue-types/index.ts
View File

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

12
components/empty/index.tsx
View File

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

6
components/locale-provider/LocaleReceiver.tsx
View File

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