Commit 4240e5f

authored

Merge pull request #396 from lowcoder-org/fix-imeline-component

enhance Timeline Component

2 parents 216b20d + 8d53d6c commit 4240e5fCopy full SHA for 4240e5f

File tree

-8

lines changed

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

-8

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ import {`
`59`	`59`	`import { timelineDate, timelineNode, TimelineDataTooltip } from "./timelineConstants";`
`60`	`60`	`import { convertTimeLineData } from "./timelineUtils";`
`61`	`61`	`import { Timeline } from "antd";`
`62`		`-import { ANTDICON } from "./antIcon";`
	`62`	`+`
	`63`	`+import { ANTDICON } from "./antIcon"; // todo: select icons to not import all icons`
`63`	`64`
`64`	`65`	`const EventOptions = [`
`65`	`66`	`clickEvent,`
`@@ -129,14 +130,13 @@ const TimelineComp = (`
`129`	`130`	`<div`
`130`	`131`	`style={{`
`131`	`132`	`margin: style.margin ?? '3px',`
`132`		`- padding: style.padding ?? '3px',`
	`133`	`+ padding: style.padding !== '3px' ? style.padding : '20px 10px 0px 10px',`
`133`	`134`	`width: widthCalculator(style.margin ?? '3px'),`
`134`	`135`	`height: heightCalculator(style.margin ?? '3px'),`
`135`	`136`	`background: style.background,`
`136`	`137`	`overflow: "auto",`
`137`	`138`	`overflowX: "hidden",`
`138`	`139`	`borderRadius: style.radius,`
`139`		`- //height: '100%'`
`140`	`140`	`}}`
`141`	`141`	`>`
`142`	`142`	`<Timeline`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,17 +34,17 @@ export const TimelineDataTooltip = (`
`34`	`34`
`35`	`35`	`export const timelineDate=[`
`36`	`36`	`{`
`37`		`- title: "码匠发布",`
	`37`	`+ title: "Majiang Releases",`
`38`	`38`	`subTitle: "Majiang Published in China",`
`39`	`39`	`label: "2022年6月10日",`
`40`	`40`	`},`
`41`	`41`	`{`
`42`		`- title: "openblocks开源",`
	`42`	`+ title: "Openblocks public release",`
`43`	`43`	`subTitle: "Openblocks open source in GitHub",`
`44`	`44`	`label: "2022年11月28日",`
`45`	`45`	`},`
`46`	`46`	`{`
`47`		`- title: "最后一次提交代码",`
	`47`	`+ title: "Last code submission",`
`48`	`48`	`subTitle: "Openblocks project abandoned",`
`49`	`49`	`dot: "ExclamationCircleOutlined",`
`50`	`50`	`label: "2023年3月28日",`
`@@ -54,10 +54,10 @@ export const timelineDate=[`
`54`	`54`	`lableColor: "red",`
`55`	`55`	`},`
`56`	`56`	`{`
`57`		`- title: "Lowcoder继续前行",`
	`57`	`+ title: "Lowcoder 2.0",`
`58`	`58`	`subTitle: "Lowcoder, keep moving forward",`
`59`	`59`	`dot: "LogoutOutlined",`
`60`	`60`	`color: "green",`
`61`		`- label: "2023-4-26",`
	`61`	`+ label: "2023-6-20",`
`62`	`62`	`},`
`63`	`63`	`]`

Comments

(0)