From cf24871d8da4e0cf21718b36fd115389b9d70596 Mon Sep 17 00:00:00 2001 From: tanjinzhou <415800467@qq.com> Date: Tue, 4 Aug 2020 18:00:09 +0800 Subject: [PATCH] fix: timeline loading not work --- antdv-demo | 2 +- components/time-picker/__tests__/index.test.js | 1 - components/timeline/Timeline.jsx | 3 +-- components/timeline/TimelineItem.jsx | 5 +---- examples/App.vue | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/antdv-demo b/antdv-demo index a5c0b0c35..f820889ec 160000 --- a/antdv-demo +++ b/antdv-demo @@ -1 +1 @@ -Subproject commit a5c0b0c35c3b6d8284caa99b11229b709d035e6d +Subproject commit f820889ec890c55d98fa3327e1af60b847cd023a diff --git a/components/time-picker/__tests__/index.test.js b/components/time-picker/__tests__/index.test.js index e4fca9ad7..0536d7122 100644 --- a/components/time-picker/__tests__/index.test.js +++ b/components/time-picker/__tests__/index.test.js @@ -1,5 +1,4 @@ import { mount } from '@vue/test-utils'; -import VcTimePicker from '../../vc-time-picker/TimePicker'; import TimePicker from '..'; import moment from 'moment'; import focusTest from '../../../tests/shared/focusTest'; diff --git a/components/timeline/Timeline.jsx b/components/timeline/Timeline.jsx index 818cfba33..65e886639 100644 --- a/components/timeline/Timeline.jsx +++ b/components/timeline/Timeline.jsx @@ -57,8 +57,7 @@ export default { // }) // }) const pendingItem = pending ? ( - - + }> {pendingNode} ) : null; diff --git a/components/timeline/TimelineItem.jsx b/components/timeline/TimelineItem.jsx index 6bbba60c8..ad8e8920a 100644 --- a/components/timeline/TimelineItem.jsx +++ b/components/timeline/TimelineItem.jsx @@ -40,11 +40,8 @@ export default { [`${prefixCls}-item-head-custom`]: dot, [`${prefixCls}-item-head-${color}`]: true, }); - const liProps = { - class: itemClassName, - }; return ( -
  • +