Merge branch 'main' into dev

Author: FalkWolsky

client/packages/lowcoder/src/appView/AppViewInstance.tsx

@@ -35,8 +35,8 @@ export class AppViewInstance<I = any, O = any> {
   private events = new Map<keyof EventHandlerMap, EventHandlerMap<O>[keyof EventHandlerMap]>();
   private dataPromise: Promise<{ appDsl: any; moduleDslMap: any }>;
   private options: AppViewInstanceOptions = {
-    baseUrl: "https://api.lowcoder.dev",
-    webUrl: "https://cloud.lowcoder.dev",
+    baseUrl: "https://api-service.lowcoder.cloud",
+    webUrl: "https://app.lowcoder.cloud",
   };
 
   constructor(private appId: string, private node: Element, options: AppViewInstanceOptions = {}) {

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

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",
   },
 ]

client/packages/lowcoder/src/i18n/locales/en.ts

@@ -2,7 +2,7 @@ import table from "./componentDocExtra/table.md?url";
 
 export const en = {
   productName: "Lowcoder",
-  productDesc: "Build internal tools fast, with no limitations",
+  productDesc: "Create software applications for your Company and your Customers with minimal coding experience. Lowcoder is the best Retool, Appsmith or Tooljet Alternative.",
   notSupportedBrowser:
     "Your current browser may have compatibility issues. For a better user experience, it is recommended to use the latest version of the Chrome browser.",
   create: "Create",
@@ -1292,7 +1292,7 @@ export const en = {
   },
   audio: {
     src: "Audio URL",
-    defaultSrcUrl: "https://cdn-files.lowcoder.dev/canon-excerpt.mp3",
+    defaultSrcUrl: "https://cdn-files.lowcoder.cloud/canon-excerpt.mp3",
     autoPlay: "Autoplay",
     loop: "Loop",
     srcDesc: "Current audio URL",
@@ -1650,7 +1650,7 @@ export const en = {
     phoneColumn: "Phone",
     subTitle: "Title",
     linkLabel: "Link",
-    linkUrl: "cloud.lowcoder.dev",
+    linkUrl: "app.lowcoder.cloud",
     progressLabel: "Progress",
     sliderLabel: "Slider",
     radioLabel: "Radio",
@@ -2129,7 +2129,7 @@ export const en = {
   },
   docUrls: {
     docHome: "https://docs.lowcoder.cloud/",
-    components: "https://cloud.lowcoder.dev/components?n={compType}",
+    components: "https://app.lowcoder.cloud/components?n={compType}",
     module: "",
     optionList: "",
     terms: "",
@@ -2171,9 +2171,9 @@ export const en = {
   },
   componentDoc: {
     markdownDemoText:
-      "**Lowcoder** is a _developer-friendly_ open-source low code platform to build internal apps within minutes.",
+      "**Lowcoder** | Create software applications for your Company and your Customers with minimal coding experience. Lowcoder is the best Retool, Appsmith or Tooljet Alternative.",
     demoText:
-      "Lowcoder is a developer-friendly open-source low code platform to build internal apps within minutes.",
+      "Lowcoder | Create software applications for your Company and your Customers with minimal coding experience. Lowcoder is the best Retool, Appsmith or Tooljet Alternative.",
     submit: "Submit",
     style: "style",
     danger: "Danger",

client/packages/lowcoder/src/i18n/locales/enObj.tsx

@@ -112,7 +112,7 @@ export const enObj: I18nObjects = {
     ],
   },
   editorTutorials: {
-    mockDataUrl: "https://63621db87521369cd06514c2.mockapi.io/api/lowcoder/users",
+    mockDataUrl: "https://6523073ef43b179384152c4f.mockapi.io/api/lowcoder/users",
     data: (code) => (
       <>
         The component and query data are listed here, which can be referenced through

client/packages/lowcoder/src/i18n/locales/zh.ts

@@ -1271,7 +1271,7 @@ jsonExplorer: {
 },
 audio: {
     src: "音频链接",
-    defaultSrcUrl: "https://cdn-files.lowcoder.dev/canon-excerpt.mp3",
+    defaultSrcUrl: "https://cdn-files.lowcoder.cloud/canon-excerpt.mp3",
     autoPlay: "自动播放",
     loop: "循环播放",
     srcDesc: "当前音频链接",
@@ -1627,7 +1627,7 @@ theme: {
     phoneColumn: "电话",
     subTitle: "标题",
     linkLabel: "链接",
-    linkUrl: "cloud.lowcoder.dev",
+    linkUrl: "app.lowcoder.cloud",
     progressLabel: "进度",
     sliderLabel: "滑块",
     radioLabel: "单选按钮",
@@ -2096,7 +2096,7 @@ toggleButton: {
 },
 docUrls: {
     docHome: "https://docs.lowcoder.cloud/",
-    components: "https://cloud.lowcoder.dev/components?n={compType}",
+    components: "https://app.lowcoder.cloud/components?n={compType}",
     module: "",
     optionList: "",
     terms: "",