pull from dev

Author: MenamAfzal

client/VERSION

@@ -1 +1 @@
-2.3.1
+2.4.0

client/package.json

@@ -13,6 +13,7 @@
     "start": "yarn workspace lowcoder start",
     "start-win": "LOWCODER_API_SERVICE_URL=http://localhost:3000 yarn start",
     "start:ee": "REACT_APP_EDITION=enterprise yarn workspace lowcoder start",
+    "translate": "node --loader ts-node/esm ./scripts/translate.js",
     "build": "yarn node ./scripts/build.js",
     "test": "jest && yarn workspace lowcoder-comps test",
     "prepare": "yarn workspace lowcoder prepare",
@@ -53,6 +54,7 @@
     "rimraf": "^3.0.2",
     "shelljs": "^0.8.5",
     "svgo": "^3.0.0",
+    "ts-node": "^10.4.0",
     "typescript": "^4.8.4",
     "whatwg-fetch": "^3.6.2"
   },

client/packages/lowcoder-comps/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-comps",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "type": "module",
   "license": "MIT",
   "dependencies": {

client/packages/lowcoder-comps/src/comps/chartsGeoMapComp/chartsGeoMapComp.tsx

@@ -5,13 +5,13 @@ import {
   CompActionTypes,
   wrapChildAction,
 } from "lowcoder-core";
-import { AxisFormatterComp, EchartsAxisType } from "../chartComp/chartConfigs/cartesianAxisConfig";
-import { chartChildrenMap, ChartSize, getDataKeys } from "../chartComp/chartConstants";
-import { chartPropertyView } from "../chartComp/chartPropertyView";
+import { AxisFormatterComp, EchartsAxisType } from "../basicChartComp/chartConfigs/cartesianAxisConfig";
+import { chartChildrenMap, ChartSize, getDataKeys } from "../basicChartComp/chartConstants";
+import { chartPropertyView } from "../basicChartComp/chartPropertyView";
 import _ from "lodash";
 import { useContext, useEffect, useMemo, useRef, useState } from "react";
 import ReactResizeDetector from "react-resize-detector";
-import ReactECharts from "../chartComp/reactEcharts";
+import ReactECharts from "../basicChartComp/reactEcharts";
 import {
   childrenToProps,
   depsConfig,
@@ -28,13 +28,13 @@ import {
   dropdownControl
 } from "lowcoder-sdk";
 import { getEchartsLocale, trans } from "i18n/comps";
-import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
+import { ItemColorComp } from "comps/basicChartComp/chartConfigs/lineChartConfig";
 import {
   echartsConfigOmitChildren,
   getEchartsConfig,
   getSelectedPoints,
   loadGoogleMapsScript,
-} from "comps/chartComp/chartUtils";
+} from "comps/basicChartComp/chartUtils";
 import 'echarts-extension-gmap';
 import log from "loglevel";
 

client/packages/lowcoder/src/app.tsx

@@ -131,7 +131,7 @@ class AppIndex extends React.Component<AppIndexProps, any> {
             <link key="preconnect-gstatic" rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="anonymous" />,
             <link key="font-ubuntu" href="https://fonts.googleapis.com/css2?family=Ubuntu:ital,wght@0,300;0,400;0,700;1,400&display=swap" rel="stylesheet" />,
             // adding Clearbit Support for Analytics
-            <script key="clearbit-script" src="https://tag.clearbitscripts.com/v1/pk_931b51e405557300e6a7c470e8247d5f/tags.js" referrerPolicy="strict-origin-when-cross-origin" type="text/javascript"></script>
+            <script key="clearbit-script" src="https://tag.clearbitscripts.com/v1/pk_dfbc0aeefb28dc63475b67134facf127/tags.js" referrerPolicy="strict-origin-when-cross-origin" type="text/javascript"></script>
           ]}
         </Helmet>
         <SystemWarning />

client/packages/lowcoder/src/components/CompName.tsx

@@ -115,6 +115,12 @@ export const CompName = (props: Iprops) => {
 
 
   if (compInfo.isRemote) {
+    // Falk: Displaying the current version of the component
+    items.push({
+      text: trans("history.currentVersion") + ": " + compInfo.packageVersion,
+      onClick: () => {
+      },
+    });
     items.push({
       text: trans("history.currentVersion") + ": " + compInfo.packageVersion,
       onClick: () => {
@@ -127,6 +133,7 @@ export const CompName = (props: Iprops) => {
       onClick: () => {
         handleUpgrade();
       },
+      
     });
   }
 

client/packages/lowcoder/src/components/table/EditableCell.tsx

@@ -128,6 +128,7 @@ export function EditableCell<T extends JSONValue>(props: EditableCellProps<T>) {
     >
       {status === "toSave" && !isEditing && <EditableChip />}
       <div
+        style={{minHeight: '24px'}}
         onDoubleClick={enterEditFn}
       >
         {normalView}

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

@@ -50,6 +50,11 @@ import { DateRangeUIView } from "comps/comps/dateComp/dateRangeUIView";
 
 import { EditorContext } from "comps/editorState";
 
+const defaultStyle = {
+  borderStyle: 'solid',
+  borderWidth: '1px',
+}
+
 const EventOptions = [changeEvent, focusEvent, blurEvent] as const;
 
 const validationChildren = {
@@ -76,7 +81,7 @@ const commonChildren = {
   suffixIcon: withDefault(IconControl, "/icon:regular/calendar"),
   ...validationChildren,
   viewRef: RefControl<CommonPickerMethods>,
-  inputFieldStyle:styleControl(DateTimeStyle)
+  inputFieldStyle: withDefault(styleControl(DateTimeStyle), defaultStyle),
 };
 type CommonChildrenType = RecordConstructorToComp<typeof commonChildren>;
 

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

@@ -38,18 +38,18 @@ function ViewLoading(props: { padding?: number }) {
   );
 }
 
-interface RemoteCompReadyAction {
-  type: "RemoteCompReady";
+export interface LazyCompReadyAction {
+  type: "LazyCompReady";
   comp: Comp;
 }
 
-interface RemoteCompViewProps {
+interface LazyCompViewProps {
   loadComp: () => Promise<void>;
   loadingElement?: () => React.ReactNode;
   errorElement?: (error: any) => React.ReactNode;
 }
 
-function RemoteCompView(props: React.PropsWithChildren<RemoteCompViewProps>) {
+function LazyCompView(props: React.PropsWithChildren<LazyCompViewProps>) {
   const { loadComp, loadingElement, errorElement } = props;
   const [error, setError] = useState<any>("");
 
@@ -103,14 +103,14 @@ export function lazyLoadComp(
       if (!compPath) {
         return;
       }
-      let RemoteExportedComp;
+      let LazyExportedComp;
       if (!loader) {
         const module = await import(`../../${compPath}.tsx`);
-        RemoteExportedComp = module[compName!];
+        LazyExportedComp = module[compName!];
       } else {
-        RemoteExportedComp = await loader();
+        LazyExportedComp = await loader();
       }
-      if (!RemoteExportedComp) {
+      if (!LazyExportedComp) {
         log.error("loader not found, lazy load info:", compPath);
         return;
       }
@@ -122,12 +122,12 @@ export function lazyLoadComp(
       if (this.compValue) {
         params.value = this.compValue;
       }
-      const RemoteCompWithErrorBound = withErrorBoundary(RemoteExportedComp);
+      const LazyCompWithErrorBound = withErrorBoundary(LazyExportedComp);
       this.dispatch(
-        customAction<RemoteCompReadyAction>(
+        customAction<LazyCompReadyAction>(
           {
-            type: "RemoteCompReady",
-            comp: new RemoteCompWithErrorBound(params),
+            type: "LazyCompReady",
+            comp: new LazyCompWithErrorBound(params),
           },
           false
         )
@@ -138,7 +138,7 @@ export function lazyLoadComp(
       // const key = `${remoteInfo?.packageName}-${remoteInfo?.packageVersion}-${remoteInfo?.compName}`;
       const key = `${compName}`;
       return (
-        <RemoteCompView key={key} loadComp={() => this.load()} loadingElement={loadingElement} />
+        <LazyCompView key={key} loadComp={() => this.load()} loadingElement={loadingElement} />
       );
     }
 
@@ -147,7 +147,7 @@ export function lazyLoadComp(
     }
 
     reduce(action: CompAction<any>): this {
-      if (isCustomAction<RemoteCompReadyAction>(action, "RemoteCompReady")) {
+      if (isCustomAction<LazyCompReadyAction>(action, "LazyCompReady")) {
         // use real remote comp instance to replace RemoteCompLoader
         return action.value.comp as this;
       }

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

@@ -68,7 +68,7 @@ type UpdateDslAction = {
   moduleDsl: Record<string, DSLType>;
 };
 
-type ModuleReadyAction = {
+export type ModuleReadyAction = {
   type: "moduleReady";
   comp: RootComp;
 };
@@ -263,7 +263,6 @@ class ModuleTmpComp extends ModuleCompBase {
 
   override reduce(action: CompAction<JSONValue>): this {
     const appId = this.children.appId.getView();
-
     // init
     if (isMyCustomAction<InitAction>(action, "init")) {
       if (getReduceContext().disableUpdateState) return this;