Skip to content
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

enhance Timeline Component #396

Merged
merged 1 commit into from
Oct 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ import {
import { timelineDate, timelineNode, TimelineDataTooltip } from "./timelineConstants";
import { convertTimeLineData } from "./timelineUtils";
import { Timeline } from "antd";
import { ANTDICON } from "./antIcon";

import { ANTDICON } from "./antIcon"; // todo: select icons to not import all icons

const EventOptions = [
clickEvent,
Expand Down Expand Up @@ -129,14 +130,13 @@ const TimelineComp = (
<div
style={{
margin: style.margin ?? '3px',
padding: style.padding ?? '3px',
padding: style.padding !== '3px' ? style.padding : '20px 10px 0px 10px',
width: widthCalculator(style.margin ?? '3px'),
height: heightCalculator(style.margin ?? '3px'),
background: style.background,
overflow: "auto",
overflowX: "hidden",
borderRadius: style.radius,
//height: '100%'
}}
>
<Timeline
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ export const TimelineDataTooltip = (

export const timelineDate=[
{
title: "码匠发布",
title: "Majiang Releases",
subTitle: "Majiang Published in China",
label: "2022-6-10",
},
{
title: "openblocks开源",
title: "Openblocks public release",
subTitle: "Openblocks open source in GitHub",
label: "2022-11-28",
},
{
title: "最后一次提交代码",
title: "Last code submission",
subTitle: "Openblocks project abandoned",
dot: "ExclamationCircleOutlined",
label: "2023-3-28",
Expand All @@ -54,10 +54,10 @@ export const timelineDate=[
lableColor: "red",
},
{
title: "Lowcoder继续前行",
title: "Lowcoder 2.0",
subTitle: "Lowcoder, keep moving forward",
dot: "LogoutOutlined",
color: "green",
label: "2023-4-26",
label: "2023-6-20",
},
]