feat: update divider (#2357)

* feat: update divider

* chore: remove base import

* style: move up slot.default() judge
pull/2364/head^2
zkwolf 2020-06-06 14:51:12 +08:00 committed by GitHub
parent 5568be2fcb
commit 0935262334
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions

View File

@ -1,6 +1,6 @@
import { inject } from 'vue';
import PropTypes from '../_util/vue-types'; import PropTypes from '../_util/vue-types';
import { ConfigConsumerProps } from '../config-provider'; import { ConfigConsumerProps } from '../config-provider';
import Base from '../base';
const Divider = { const Divider = {
name: 'ADivider', name: 'ADivider',
@ -10,8 +10,10 @@ const Divider = {
dashed: PropTypes.bool, dashed: PropTypes.bool,
orientation: PropTypes.oneOf(['left', 'right', 'center']), orientation: PropTypes.oneOf(['left', 'right', 'center']),
}, },
inject: { setup() {
configProvider: { default: () => ConfigConsumerProps }, return {
configProvider: inject('configProvider', ConfigConsumerProps),
};
}, },
render() { render() {
const { prefixCls: customizePrefixCls, type, $slots, dashed, orientation = 'center' } = this; const { prefixCls: customizePrefixCls, type, $slots, dashed, orientation = 'center' } = this;
@ -28,16 +30,17 @@ const Divider = {
return ( return (
<div class={classString} role="separator"> <div class={classString} role="separator">
{$slots.default && <span class={`${prefixCls}-inner-text`}>{$slots.default}</span>} {$slots.default && $slots.default() && (
<span class={`${prefixCls}-inner-text`}>{$slots.default()}</span>
)}
</div> </div>
); );
}, },
}; };
/* istanbul ignore next */ /* istanbul ignore next */
Divider.install = function(Vue) { Divider.install = function(app) {
Vue.use(Base); app.component(Divider.name, Divider);
Vue.component(Divider.name, Divider);
}; };
export default Divider; export default Divider;

View File

@ -5,6 +5,7 @@ import Button from 'ant-design-vue/button';
import Drawer from 'ant-design-vue/drawer'; import Drawer from 'ant-design-vue/drawer';
import Affix from 'ant-design-vue/affix'; import Affix from 'ant-design-vue/affix';
import Alert from 'ant-design-vue/alert'; import Alert from 'ant-design-vue/alert';
import Divider from 'ant-design-vue/divider';
import ConfigProvider from 'ant-design-vue/config-provider'; import ConfigProvider from 'ant-design-vue/config-provider';
import Spin from 'ant-design-vue/Spin'; import Spin from 'ant-design-vue/Spin';
import Empty from 'ant-design-vue/empty'; import Empty from 'ant-design-vue/empty';
@ -16,6 +17,7 @@ createApp(App)
.use(Drawer) .use(Drawer)
.use(Affix) .use(Affix)
.use(Alert) .use(Alert)
.use(Divider)
.use(Spin) .use(Spin)
.use(Empty) .use(Empty)
.mount('#app'); .mount('#app');