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

enhance Timeline Component
lowcoder-org · Oct 9, 2023 · 4240e5f · 4240e5f
2 parents 216b20d + 8d53d6c
commit 4240e5f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/client/packages/lowcoder/src/comps/comps/timelineComp/timelineComp.tsx b/client/packages/lowcoder/src/comps/comps/timelineComp/timelineComp.tsx
@@ -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,
@@ -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

diff --git a/client/packages/lowcoder/src/comps/comps/timelineComp/timelineConstants.tsx b/client/packages/lowcoder/src/comps/comps/timelineComp/timelineConstants.tsx
@@ -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",
@@ -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",
   },
 ]