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

fix: config-provider renderEmpty

pull/2992/head
Amour1688 2020-10-12 15:39:11 +08:00
parent f48ccdac01
commit c04b9a0267
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/_util/props-util.js
View File

@ -40,10 +40,6 @@ const parseStyleText = (cssText = '', camel) => {
return res; return res;
}; };
const getComponentFromSetup = (props, slots, name, options) => {
return props[name] ? props[name] : slots[name]?.(options);
};
const hasProp = (instance, prop) => { const hasProp = (instance, prop) => {
return prop in getOptionProps(instance); return prop in getOptionProps(instance);
}; };
@ -394,7 +390,6 @@ function isValidElement(element) {
} }
export { export {
getComponentFromSetup,
splitAttrs, splitAttrs,
hasProp, hasProp,
getOptionProps, getOptionProps,

4
components/config-provider/index.tsx
View File

@ -1,6 +1,5 @@
import { reactive, provide, VNodeTypes, PropType, defineComponent, App } from 'vue'; import { reactive, provide, VNodeTypes, PropType, defineComponent, App } from 'vue';
import PropTypes from '../_util/vue-types'; import PropTypes from '../_util/vue-types';
import { getComponentFromSetup } from '../_util/props-util';
import defaultRenderEmpty, { RenderEmptyHandler } from './renderEmpty'; import defaultRenderEmpty, { RenderEmptyHandler } from './renderEmpty';
import LocaleProvider, { Locale, ANT_MARK } from '../locale-provider'; import LocaleProvider, { Locale, ANT_MARK } from '../locale-provider';
@ -117,7 +116,8 @@ const ConfigProvider = defineComponent({
}; };
const renderEmptyComponent = (name?: string) => { const renderEmptyComponent = (name?: string) => {
const renderEmpty = (getComponentFromSetup(props, slots, 'renderEmpty') || const renderEmpty = (props.renderEmpty ||
slots.renderEmpty ||
defaultRenderEmpty) as RenderEmptyHandler; defaultRenderEmpty) as RenderEmptyHandler;
return renderEmpty(name); return renderEmpty(name);
}; };