Merge pull request #1068 from lowcoder-org/dev

Dev > Main - for version 2.4.4
lowcoder-org · Jul 26, 2024 · 0191722 · 0191722
2 parents 9ab8650 + 38b391c
commit 0191722
Show file tree

Hide file tree

Showing 101 changed files with 1,502 additions and 436 deletions.
diff --git a/client/VERSION b/client/VERSION
@@ -1 +1 @@
-2.4.3
+2.4.4
diff --git a/client/packages/lowcoder-comps/package.json b/client/packages/lowcoder-comps/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-comps",
-  "version": "2.4.8",
+  "version": "2.4.9",
   "type": "module",
   "license": "MIT",
   "dependencies": {
@@ -197,10 +197,10 @@
     }
   },
   "scripts": {
-    "start": "NODE_OPTIONS=--max_old_space_size=6144 vite",
-    "build": "yarn test && lowcoder-cli build",
-    "build_only": "lowcoder-cli build",
-    "build_publish": "lowcoder-cli build --publish",
+    "start": "NODE_OPTIONS=--max_old_space_size=6442 vite",
+    "build": "NODE_OPTIONS=--max_old_space_size=6442 yarn test && lowcoder-cli build",
+    "build_only": "NODE_OPTIONS=--max_old_space_size=6442 lowcoder-cli build",
+    "build_publish": "NODE_OPTIONS=--max_old_space_size=6442 lowcoder-cli build --publish",
     "test": "jest"
   },
   "devDependencies": {

diff --git a/client/packages/lowcoder-comps/src/comps/basicChartComp/chartComp.tsx b/client/packages/lowcoder-comps/src/comps/basicChartComp/chartComp.tsx
@@ -74,7 +74,7 @@ BasicChartTmpComp = withViewFn(BasicChartTmpComp, (comp) => {
     log.error('theme chart error: ', error);
   }
 
-  useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
+  useMergeCompStyles?.(childrenToProps(comp.children), comp.dispatch);
 
   const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
     await getPromiseAfterDispatch(

diff --git a/client/packages/lowcoder-comps/src/comps/basicChartComp/chartConstants.tsx b/client/packages/lowcoder-comps/src/comps/basicChartComp/chartConstants.tsx
@@ -249,16 +249,22 @@ export const chartUiModeChildren = {
   onUIEvent: eventHandlerControl(UIEventOptions),
 };
 
-const chartJsonModeChildren = {
+let chartJsonModeChildren: any = {
   echartsOption: jsonControl(toObject, i18nObjs.defaultEchartsJsonOption),
- echartsTitle: withDefault(StringControl, trans("echarts.defaultTitle")),
+  echartsTitle: withDefault(StringControl, trans("echarts.defaultTitle")),
   echartsLegendConfig: EchartsLegendConfig,
   echartsLabelConfig: EchartsLabelConfig,
   echartsConfig: EchartsOptionComp,
-  style: styleControl(EchartsStyle, 'style'),
+  // style: styleControl(EchartsStyle, 'style'),
   tooltip: withDefault(BoolControl, true),
   legendVisibility: withDefault(BoolControl, true),
 }
+if (EchartsStyle) {
+  chartJsonModeChildren = {
+    ...chartJsonModeChildren,
+    style: styleControl(EchartsStyle, 'style'),
+  }
+}
 
 const chartMapModeChildren = {
   mapInstance: stateComp(),

diff --git a/client/packages/lowcoder-comps/src/comps/calendarComp/calendarComp.tsx b/client/packages/lowcoder-comps/src/comps/calendarComp/calendarComp.tsx
@@ -39,6 +39,7 @@ import {
   ThemeContext,
   CalendarStyle,
   DateParser,
+  modalInstance,
   CustomModal,
   jsonValueExposingStateControl,
   CalendarDeleteIcon,
@@ -70,16 +71,13 @@ import {
   resourceTimeGridHeaderToolbar,
 } from "./calendarConstants";
 
-// this should ensure backwards compatibility with older versions of the SDK
-const safeDragEventHandlerControl = typeof DragEventHandlerControl !== 'undefined' ? DragEventHandlerControl : () => {};
-
-const childrenMap = {
+let childrenMap: any = {
   events: jsonValueExposingStateControl("events", defaultData),
   resourcesEvents: jsonValueExposingStateControl("resourcesEvents", resourcesEventsDefaultData),
   resources: jsonValueExposingStateControl("resources", resourcesDefaultData),
   resourceName: withDefault(StringControl, trans("calendar.resourcesDefault")),
   onEvent: ChangeEventHandlerControl,
-  onDropEvent: safeDragEventHandlerControl,
+  // onDropEvent: safeDragEventHandlerControl,
   editable: withDefault(BoolControl, true),
   showEventTime: withDefault(BoolControl, true),
   showWeekends: withDefault(BoolControl, true),
@@ -93,7 +91,13 @@ const childrenMap = {
   currentFreeView: dropdownControl(DefaultWithFreeViewOptions, "timeGridWeek"),
   currentPremiumView: dropdownControl(DefaultWithPremiumViewOptions, "resourceTimelineDay"),
 };
-
+// this should ensure backwards compatibility with older versions of the SDK
+if (DragEventHandlerControl) { 
+  childrenMap = {
+    ...childrenMap,
+    onDropEvent: DragEventHandlerControl,
+  }
+}
 let CalendarBasicComp = (function () {
   return new UICompBuilder(childrenMap, (props: { 
     events: any; 
@@ -124,7 +128,7 @@ let CalendarBasicComp = (function () {
     const [left, setLeft] = useState<number | undefined>(undefined);
     const [licensed, setLicensed] = useState<boolean>(props.licenseKey !== "");
 
-    useMergeCompStyles(props, dispatch);
+    useMergeCompStyles?.(props, dispatch);
 
     useEffect(() => {
       setLicensed(props.licenseKey !== "");
@@ -326,6 +330,8 @@ let CalendarBasicComp = (function () {
     };
 
     const showModal = (event: EventType, ifEdit: boolean) => {
+      if (!modalInstance) return;
+
       const modalTitle = ifEdit
         ? trans("calendar.editEvent")
         : trans("calendar.creatEvent");

diff --git a/client/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartConstants.tsx
@@ -247,16 +247,22 @@ export const chartUiModeChildren = {
   onUIEvent: eventHandlerControl(UIEventOptions),
 };
 
-const chartJsonModeChildren = {
+let chartJsonModeChildren: any = {
   echartsOption: jsonControl(toObject, i18nObjs.defaultCandleStickChartOption),
   echartsTitle: withDefault(StringControl, trans("candleStickChart.defaultTitle")),
   echartsLegendConfig: EchartsLegendConfig,
   echartsLabelConfig: EchartsLabelConfig,
   echartsConfig: EchartsOptionComp,
-  style: styleControl(EchartsStyle, 'style'),
+  // style: styleControl(EchartsStyle, 'style'),
   tooltip: withDefault(BoolControl, true),
   legendVisibility: withDefault(BoolControl, true),
 }
+if (EchartsStyle) {
+  chartJsonModeChildren = {
+    ...chartJsonModeChildren,
+    style: styleControl(EchartsStyle, 'style'),
+  }
+}
 
 const chartMapModeChildren = {
   mapInstance: stateComp(),

diff --git a/...t/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartPropertyView.tsx b/...t/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartPropertyView.tsx
@@ -38,7 +38,7 @@ export function candleStickChartPropertyView(
         {children.onEvent.propertyView()}
       </Section>
       <Section name={sectionNames.style}>
-         {children.style.getPropertyView()}
+         {children.style?.getPropertyView()}
       </Section>
       <Section name={sectionNames.layout}>{hiddenPropertyView(children)}</Section>
     </>

diff --git a/client/packages/lowcoder-comps/src/comps/chartComp/chartComp.tsx b/client/packages/lowcoder-comps/src/comps/chartComp/chartComp.tsx
@@ -78,7 +78,7 @@ ChartTmpComp = withViewFn(ChartTmpComp, (comp) => {
   }
 
   const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
-    await getPromiseAfterDispatch(
+    await getPromiseAfterDispatch?.(
       dispatch,
       action,
       { autoHandleAfterReduce: true }

diff --git a/client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartConstants.tsx
@@ -248,14 +248,14 @@ export const chartUiModeChildren = {
   onUIEvent: eventHandlerControl(UIEventOptions),
 };
 
-const chartJsonModeChildren = {
+let chartJsonModeChildren: any = {
   echartsOption: jsonControl(toObject, i18nObjs.defaultFunnelChartOption),
   echartsTitle: withDefault(StringControl, trans("funnelChart.defaultTitle")),
   echartsLegendConfig: EchartsLegendConfig,
   echartsLabelConfig: EchartsLabelConfig,
   echartsConfig: EchartsOptionComp,
   echartsTitleConfig:EchartsTitleConfig,
-  style: styleControl(EchartsStyle, 'style'),
+  // style: styleControl(EchartsStyle, 'style'),
   tooltip: withDefault(BoolControl, true),
   label: withDefault(BoolControl, true),
   legendVisibility: withDefault(BoolControl, true),
@@ -267,6 +267,12 @@ const chartJsonModeChildren = {
   max:withDefault(NumberControl,trans('funnelChart.defaultMax')),
   gap:withDefault(NumberControl,trans('funnelChart.defaultGap'))
 }
+if (EchartsStyle) {
+  chartJsonModeChildren = {
+    ...chartJsonModeChildren,
+    style: styleControl(EchartsStyle, 'style'),
+  }
+}
 
 const chartMapModeChildren = {
   mapInstance: stateComp(),

diff --git a/client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartPropertyView.tsx b/client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartPropertyView.tsx
@@ -50,7 +50,7 @@ export function funnelChartPropertyView(
         {children.onEvent.propertyView()}
       </Section>
       <Section name={sectionNames.style}>
-         {children.style.getPropertyView()}
+         {children.style?.getPropertyView()}
       </Section>
       <Section name={sectionNames.layout}>{hiddenPropertyView(children)}</Section>
     </>

diff --git a/client/packages/lowcoder-comps/src/comps/gaugeChartComp/gaugeChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/gaugeChartComp/gaugeChartConstants.tsx
@@ -248,14 +248,14 @@ export const chartUiModeChildren = {
   onUIEvent: eventHandlerControl(UIEventOptions),
 };
 
-const chartJsonModeChildren = {
+let chartJsonModeChildren: any = {
   echartsOption: jsonControl(toObject, i18nObjs.defaultGaugeChartOption),
   echartsTitle: withDefault(StringControl, trans("gaugeChart.defaultTitle")),
   echartsLegendConfig: EchartsLegendConfig,
   echartsLabelConfig: EchartsLabelConfig,
   echartsConfig: EchartsOptionComp,
   echartsTitleConfig:EchartsTitleConfig,
-  style: styleControl(EchartsStyle, 'style'),
+  // style: styleControl(EchartsStyle, 'style'),
   tooltip: withDefault(BoolControl, true),
   legendVisibility: withDefault(BoolControl, true),
   label: withDefault(BoolControl, true),
@@ -267,7 +267,12 @@ const chartJsonModeChildren = {
   max:withDefault(NumberControl,trans('gaugeChart.defaultMax')),
   gap:withDefault(NumberControl,trans('gaugeChart.defaultGap'))
 }
-
+if (EchartsStyle) {
+  chartJsonModeChildren = {
+    ...chartJsonModeChildren,
+    style: styleControl(EchartsStyle, 'style'),
+  }
+}
 const chartMapModeChildren = {
   mapInstance: stateComp(),
   getMapInstance: FunctionControl,

diff --git a/client/packages/lowcoder-comps/src/comps/gaugeChartComp/gaugeChartPropertyView.tsx b/client/packages/lowcoder-comps/src/comps/gaugeChartComp/gaugeChartPropertyView.tsx
@@ -46,7 +46,7 @@ export function gaugeChartPropertyView(
         {children.onEvent.propertyView()}
       </Section>
       <Section name={sectionNames.style}>
-         {children.style.getPropertyView()}
+         {children.style?.getPropertyView()}
       </Section>
       <Section name={sectionNames.layout}>{hiddenPropertyView(children)}</Section>
     </>

diff --git a/client/packages/lowcoder-comps/src/comps/graphChartComp/graphChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/graphChartComp/graphChartConstants.tsx
@@ -247,16 +247,22 @@ export const chartUiModeChildren = {
   onUIEvent: eventHandlerControl(UIEventOptions),
 };
 
-const chartJsonModeChildren = {
+let chartJsonModeChildren: any = {
   echartsOption: jsonControl(toObject, i18nObjs.defaultGraphChartOption),
   echartsTitle: withDefault(StringControl, trans("graphChart.defaultTitle")),
   echartsLegendConfig: EchartsLegendConfig,
   echartsLabelConfig: EchartsLabelConfig,
   echartsConfig: EchartsOptionComp,
-  style: styleControl(EchartsStyle, 'style'),
+  // style: styleControl(EchartsStyle, 'style'),
   tooltip: withDefault(BoolControl, true),
   legendVisibility: withDefault(BoolControl, true),
 }
+if (EchartsStyle) {
+  chartJsonModeChildren = {
+    ...chartJsonModeChildren,
+    style: styleControl(EchartsStyle, 'style'),
+  }
+}
 
 const chartMapModeChildren = {
   mapInstance: stateComp(),

diff --git a/client/packages/lowcoder-comps/src/comps/graphChartComp/graphChartPropertyView.tsx b/client/packages/lowcoder-comps/src/comps/graphChartComp/graphChartPropertyView.tsx
@@ -38,7 +38,7 @@ export function graphChartPropertyView(
         {children.onEvent.propertyView()}
       </Section>
       <Section name={sectionNames.style}>
-         {children.style.getPropertyView()}
+         {children.style?.getPropertyView()}
       </Section>
       <Section name={sectionNames.layout}>{hiddenPropertyView(children)}</Section>
     </>

diff --git a/client/packages/lowcoder-comps/src/comps/heatmapChartComp/heatmapChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/heatmapChartComp/heatmapChartConstants.tsx
@@ -247,16 +247,22 @@ export const chartUiModeChildren = {
   onUIEvent: eventHandlerControl(UIEventOptions),
 };
 
-const chartJsonModeChildren = {
+let chartJsonModeChildren: any = {
   echartsOption: jsonControl(toObject, i18nObjs.defaultHeatmapChartOption),
   echartsTitle: withDefault(StringControl, trans("heatmapChart.defaultTitle")),
   echartsLegendConfig: EchartsLegendConfig,
   echartsLabelConfig: EchartsLabelConfig,
   echartsConfig: EchartsOptionComp,
-  style: styleControl(EchartsStyle, 'style'),
+  // style: styleControl(EchartsStyle, 'style'),
   tooltip: withDefault(BoolControl, true),
   legendVisibility: withDefault(BoolControl, true),
 }
+if (EchartsStyle) {
+  chartJsonModeChildren = {
+    ...chartJsonModeChildren,
+    style: styleControl(EchartsStyle, 'style'),
+  }
+}
 
 const chartMapModeChildren = {
   mapInstance: stateComp(),

diff --git a/client/packages/lowcoder-comps/src/comps/heatmapChartComp/heatmapChartPropertyView.tsx b/client/packages/lowcoder-comps/src/comps/heatmapChartComp/heatmapChartPropertyView.tsx
@@ -38,7 +38,7 @@ export function heatmapChartPropertyView(
         {children.onEvent.propertyView()}
       </Section>
       <Section name={sectionNames.style}>
-         {children.style.getPropertyView()}
+         {children.style?.getPropertyView()}
       </Section>
       <Section name={sectionNames.layout}>{hiddenPropertyView(children)}</Section>
     </>

diff --git a/client/packages/lowcoder-comps/src/comps/radarChartComp/radarChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/radarChartComp/radarChartConstants.tsx
@@ -247,16 +247,22 @@ export const chartUiModeChildren = {
   onUIEvent: eventHandlerControl(UIEventOptions),
 };
 
-const chartJsonModeChildren = {
+let chartJsonModeChildren: any = {
   echartsOption: jsonControl(toObject, i18nObjs.defaultRadarChartOption),
   echartsTitle: withDefault(StringControl, trans("radarChart.defaultTitle")),
   echartsLegendConfig: EchartsLegendConfig,
   echartsLabelConfig: EchartsLabelConfig,
   echartsConfig: EchartsOptionComp,
-  style: styleControl(EchartsStyle, 'style'),
+  // style: styleControl(EchartsStyle, 'style'),
   tooltip: withDefault(BoolControl, true),
   legendVisibility: withDefault(BoolControl, true),
 }
+if (EchartsStyle) {
+  chartJsonModeChildren = {
+    ...chartJsonModeChildren,
+    style: styleControl(EchartsStyle, 'style'),
+  }
+}
 
 const chartMapModeChildren = {
   mapInstance: stateComp(),

diff --git a/client/packages/lowcoder-comps/src/comps/radarChartComp/radarChartPropertyView.tsx b/client/packages/lowcoder-comps/src/comps/radarChartComp/radarChartPropertyView.tsx
@@ -38,7 +38,7 @@ export function radarChartPropertyView(
         {children.onEvent.propertyView()}
       </Section>
       <Section name={sectionNames.style}>
-         {children.style.getPropertyView()}
+         {children.style?.getPropertyView()}
       </Section>
       <Section name={sectionNames.layout}>{hiddenPropertyView(children)}</Section>
     </>

diff --git a/client/packages/lowcoder-comps/src/comps/sankeyChartComp/sankeyChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/sankeyChartComp/sankeyChartConstants.tsx
@@ -247,16 +247,22 @@ export const chartUiModeChildren = {
   onUIEvent: eventHandlerControl(UIEventOptions),
 };
 
-const chartJsonModeChildren = {
+let chartJsonModeChildren: any = {
   echartsOption: jsonControl(toObject, i18nObjs.defaultSankeyChartOption),
   echartsTitle: withDefault(StringControl, trans("sankeyChart.defaultTitle")),
   echartsLegendConfig: EchartsLegendConfig,
   echartsLabelConfig: EchartsLabelConfig,
   echartsConfig: EchartsOptionComp,
-  style: styleControl(EchartsStyle, 'style'),
+  // style: styleControl(EchartsStyle, 'style'),
   tooltip: withDefault(BoolControl, true),
   legendVisibility: withDefault(BoolControl, true),
 }
+if (EchartsStyle) {
+  chartJsonModeChildren = {
+    ...chartJsonModeChildren,
+    style: styleControl(EchartsStyle, 'style'),
+  }
+}
 
 const chartMapModeChildren = {
   mapInstance: stateComp(),

diff --git a/client/packages/lowcoder-comps/src/comps/sankeyChartComp/sankeyChartPropertyView.tsx b/client/packages/lowcoder-comps/src/comps/sankeyChartComp/sankeyChartPropertyView.tsx
@@ -39,7 +39,7 @@ export function sankeyChartPropertyView(
         {children.onEvent.propertyView()}
       </Section>
       <Section name={sectionNames.style}>
-         {children.style.getPropertyView()}
+         {children.style?.getPropertyView()}
       </Section>
       <Section name={sectionNames.layout}>{hiddenPropertyView(children)}</Section>
     </>