New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added pendingDot to Timeline #9546

Merged
merged 8 commits into from Mar 9, 2018

Conversation

Projects
None yet
3 participants
@iannbing
Contributor

iannbing commented Mar 6, 2018

Fix #9514

Added pendingDot to Timeline. One can provide a React component to replace the default pending dot.

@@ -7,11 +7,11 @@ title:

## zh-CN

当任务状态正在发生,还在记录过程中,可用幽灵节点来表示当前的时间节点(用于时间正序排列)
当任务状态正在发生,还在记录过程中,可用幽灵节点来表示当前的时间节点(用于时间正序排列)。当pending值为false,可用定制元件替换默认时间图点。

This comment has been minimized.

@afc163

afc163 Mar 6, 2018

Member

中英文之间要加空格。

This comment has been minimized.

@iannbing

iannbing Mar 6, 2018

Contributor

Updated

iannbing added some commits Mar 6, 2018

@@ -33,7 +35,7 @@ export default class Timeline extends React.Component<TimelineProps, any> {
const pendingItem = (!!pending) ? (
<TimelineItem
pending={!!pending}
dot={<Icon type="loading" />}
dot={pendingDotNode}

This comment has been minimized.

@yutingzhao1991

yutingzhao1991 Mar 7, 2018

Contributor

似乎直接在这里写 doc={pendingDot || <Icon type="loading" />} 简洁一点,逻辑也更清楚一点。

This comment has been minimized.

@iannbing

iannbing Mar 7, 2018

Contributor

Make sense. Updated

@codecov

This comment has been minimized.

codecov bot commented Mar 7, 2018

Codecov Report

Merging #9546 into feature-3.3.0 will decrease coverage by 0.06%.
The diff coverage is 100%.

Impacted file tree graph

@@                Coverage Diff                @@
##           feature-3.3.0    #9546      +/-   ##
=================================================
- Coverage          85.92%   85.85%   -0.07%     
=================================================
  Files                195      195              
  Lines               4631     4632       +1     
  Branches            1289     1290       +1     
=================================================
- Hits                3979     3977       -2     
- Misses               648      652       +4     
+ Partials               4        3       -1
Impacted Files Coverage Δ
components/timeline/Timeline.tsx 100% <100%> (ø) ⬆️
components/_util/getRequestAnimationFrame.tsx 30% <0%> (-10%) ⬇️
components/layout/Sider.tsx 76.54% <0%> (ø) ⬆️
components/select/index.tsx 100% <0%> (ø) ⬆️
components/input/TextArea.tsx 85.18% <0%> (ø) ⬆️
components/grid/row.tsx 70.58% <0%> (ø) ⬆️
components/layout/layout.tsx 90.62% <0%> (ø) ⬆️
components/tree-select/index.tsx 100% <0%> (ø) ⬆️
components/grid/col.tsx 100% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9073237...43094b5. Read the comment docs.

@afc163 afc163 merged commit 528c6fa into ant-design:feature-3.3.0 Mar 9, 2018

4 checks passed

codecov/patch 100% of diff hit (target 85.92%)
Details
codecov/project Absolute coverage decreased by -0.06% but relative coverage increased by +14.07% compared to 9073237
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
security/snyk No dependency changes
Details

@dengfuping dengfuping referenced this pull request Mar 19, 2018

Closed

Timeline pending dot #9514

zheeeng added a commit to zheeeng/ant-design that referenced this pull request Apr 12, 2018

Added pendingDot to Timeline (ant-design#9546)
* Added selectionColumnWidth to TableRowSelection

* Updated documents

* Renamed selectionColumnWidth to columnWidth

* Added pendingDot to Timeline

* Added pendingDot to Timeline

* Minor update according to the feedback

* Updated according to feedback
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment