fix: timeline loading not work

pull/2682/head
tanjinzhou 2020-08-04 18:00:09 +08:00
parent 61337aecef
commit cf24871d8d
5 changed files with 4 additions and 9 deletions

@ -1 +1 @@
Subproject commit a5c0b0c35c3b6d8284caa99b11229b709d035e6d Subproject commit f820889ec890c55d98fa3327e1af60b847cd023a

View File

@ -1,5 +1,4 @@
import { mount } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import VcTimePicker from '../../vc-time-picker/TimePicker';
import TimePicker from '..'; import TimePicker from '..';
import moment from 'moment'; import moment from 'moment';
import focusTest from '../../../tests/shared/focusTest'; import focusTest from '../../../tests/shared/focusTest';

View File

@ -57,8 +57,7 @@ export default {
// }) // })
// }) // })
const pendingItem = pending ? ( const pendingItem = pending ? (
<TimelineItem pending={!!pending}> <TimelineItem pending={!!pending} dot={pendingDot || <LoadingOutlined />}>
<template slot="dot">{pendingDot || <LoadingOutlined />}</template>
{pendingNode} {pendingNode}
</TimelineItem> </TimelineItem>
) : null; ) : null;

View File

@ -40,11 +40,8 @@ export default {
[`${prefixCls}-item-head-custom`]: dot, [`${prefixCls}-item-head-custom`]: dot,
[`${prefixCls}-item-head-${color}`]: true, [`${prefixCls}-item-head-${color}`]: true,
}); });
const liProps = {
class: itemClassName,
};
return ( return (
<li {...liProps}> <li class={itemClassName}>
<div class={`${prefixCls}-item-tail`} /> <div class={`${prefixCls}-item-tail`} />
<div <div
class={dotClassName} class={dotClassName}

View File

@ -4,7 +4,7 @@
</div> </div>
</template> </template>
<script> <script>
import demo from '../antdv-demo/docs/time-picker/demo/index'; import demo from '../antdv-demo/docs/timeline/demo/index';
export default { export default {
components: { components: {