Skip to content

Commit 4240e5f

Browse files
authored
Merge pull request #396 from lowcoder-org/fix-imeline-component
enhance Timeline Component
2 parents 216b20d + 8d53d6c commit 4240e5f

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

client/packages/lowcoder/src/comps/comps/timelineComp/timelineComp.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ import {
5959
import { timelineDate, timelineNode, TimelineDataTooltip } from "./timelineConstants";
6060
import { convertTimeLineData } from "./timelineUtils";
6161
import { Timeline } from "antd";
62-
import { ANTDICON } from "./antIcon";
62+
63+
import { ANTDICON } from "./antIcon"; // todo: select icons to not import all icons
6364

6465
const EventOptions = [
6566
clickEvent,
@@ -129,14 +130,13 @@ const TimelineComp = (
129130
<div
130131
style={{
131132
margin: style.margin ?? '3px',
132-
padding: style.padding ?? '3px',
133+
padding: style.padding !== '3px' ? style.padding : '20px 10px 0px 10px',
133134
width: widthCalculator(style.margin ?? '3px'),
134135
height: heightCalculator(style.margin ?? '3px'),
135136
background: style.background,
136137
overflow: "auto",
137138
overflowX: "hidden",
138139
borderRadius: style.radius,
139-
//height: '100%'
140140
}}
141141
>
142142
<Timeline

client/packages/lowcoder/src/comps/comps/timelineComp/timelineConstants.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ export const TimelineDataTooltip = (
3434

3535
export const timelineDate=[
3636
{
37-
title: "码匠发布",
37+
title: "Majiang Releases",
3838
subTitle: "Majiang Published in China",
3939
label: "2022-6-10",
4040
},
4141
{
42-
title: "openblocks开源",
42+
title: "Openblocks public release",
4343
subTitle: "Openblocks open source in GitHub",
4444
label: "2022-11-28",
4545
},
4646
{
47-
title: "最后一次提交代码",
47+
title: "Last code submission",
4848
subTitle: "Openblocks project abandoned",
4949
dot: "ExclamationCircleOutlined",
5050
label: "2023-3-28",
@@ -54,10 +54,10 @@ export const timelineDate=[
5454
lableColor: "red",
5555
},
5656
{
57-
title: "Lowcoder继续前行",
57+
title: "Lowcoder 2.0",
5858
subTitle: "Lowcoder, keep moving forward",
5959
dot: "LogoutOutlined",
6060
color: "green",
61-
label: "2023-4-26",
61+
label: "2023-6-20",
6262
},
6363
]

0 commit comments

Comments
 (0)