Merge branch 'dev' into private-npm-repositories

Author: FalkWolsky

client/packages/lowcoder-comps/src/comps/basicChartComp/chartComp.tsx

@@ -26,7 +26,6 @@ import {
   chartColorPalette,
   getPromiseAfterDispatch,
   dropdownControl,
-  useMergeCompStyles,
 } from "lowcoder-sdk";
 import { getEchartsLocale, trans } from "i18n/comps";
 import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -74,8 +73,6 @@ BasicChartTmpComp = withViewFn(BasicChartTmpComp, (comp) => {
     log.error('theme chart error: ', error);
   }
 
-  useMergeCompStyles?.(childrenToProps(comp.children), comp.dispatch);
-
   const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
     await getPromiseAfterDispatch(
       dispatch,

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

@@ -45,7 +45,6 @@ import {
   jsonValueExposingStateControl,
   CalendarDeleteIcon,
   Tooltip,
-  useMergeCompStyles,
   EditorContext,
   CompNameContext,
 } from 'lowcoder-sdk';
@@ -137,8 +136,6 @@ let CalendarBasicComp = (function () {
     const [left, setLeft] = useState<number | undefined>(undefined);
     const [licensed, setLicensed] = useState<boolean>(props.licenseKey !== "");
 
-    useMergeCompStyles?.(props, dispatch);
-
     useEffect(() => {
       setLicensed(props.licenseKey !== "");
     }, [props.licenseKey]);

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

@@ -25,7 +25,6 @@ import {
   chartColorPalette,
   getPromiseAfterDispatch,
   dropdownControl,
-  useMergeCompStyles,
 } from "lowcoder-sdk";
 import { getEchartsLocale, trans } from "i18n/comps";
 import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -71,8 +70,6 @@ CandleStickChartTmpComp = withViewFn(CandleStickChartTmpComp, (comp) => {
     log.error('theme chart error: ', error);
   }
 
-  useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
-
   const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
     await getPromiseAfterDispatch(
       dispatch,

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

@@ -26,7 +26,6 @@ import {
   chartColorPalette,
   getPromiseAfterDispatch,
   dropdownControl,
-  useMergeCompStyles,
 } from "lowcoder-sdk";
 import { getEchartsLocale, trans } from "i18n/comps";
 import { ItemColorComp } from "comps/basicChartComp/chartConfigs/lineChartConfig";
@@ -83,8 +82,6 @@ MapTmpComp = withViewFn(MapTmpComp, (comp) => {
     log.error('theme chart error: ', error);
   }
 
-  useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
-
   const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
     await getPromiseAfterDispatch(
       dispatch,

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

@@ -25,7 +25,6 @@ import {
   chartColorPalette,
   getPromiseAfterDispatch,
   dropdownControl,
-  useMergeCompStyles,
 } from "lowcoder-sdk";
 import { getEchartsLocale, trans } from "i18n/comps";
 import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -72,8 +71,6 @@ FunnelChartTmpComp = withViewFn(FunnelChartTmpComp, (comp) => {
     log.error('theme chart error: ', error);
   }
 
-  useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
-
   const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
     await getPromiseAfterDispatch(
       dispatch,

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

@@ -26,7 +26,6 @@ import {
   getPromiseAfterDispatch,
   dropdownControl,
   JSONObject,
-  useMergeCompStyles,
 } from "lowcoder-sdk";
 import { getEchartsLocale, trans } from "i18n/comps";
 import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -73,8 +72,6 @@ GaugeChartTmpComp = withViewFn(GaugeChartTmpComp, (comp) => {
     log.error('theme chart error: ', error);
   }
 
-  useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
-
   const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
     await getPromiseAfterDispatch(
       dispatch,

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

@@ -26,7 +26,6 @@ import {
   getPromiseAfterDispatch,
   dropdownControl,
   JSONObject,
-  useMergeCompStyles,
 } from "lowcoder-sdk";
 import { getEchartsLocale, trans } from "i18n/comps";
 import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -73,8 +72,6 @@ GraphChartTmpComp = withViewFn(GraphChartTmpComp, (comp) => {
     log.error('theme chart error: ', error);
   }
 
-  useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
-
   const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
     await getPromiseAfterDispatch(
       dispatch,

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

@@ -25,7 +25,6 @@ import {
   chartColorPalette,
   getPromiseAfterDispatch,
   dropdownControl,
-  useMergeCompStyles,
 } from "lowcoder-sdk";
 import { getEchartsLocale, trans } from "i18n/comps";
 import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -72,8 +71,6 @@ HeatmapChartTmpComp = withViewFn(HeatmapChartTmpComp, (comp) => {
     log.error('theme chart error: ', error);
   }
 
-  useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
-
   const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
     await getPromiseAfterDispatch(
       dispatch,

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

@@ -25,7 +25,6 @@ import {
   chartColorPalette,
   getPromiseAfterDispatch,
   dropdownControl,
-  useMergeCompStyles,
 } from "lowcoder-sdk";
 import { getEchartsLocale, trans } from "i18n/comps";
 import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -72,8 +71,6 @@ RadarChartTmpComp = withViewFn(RadarChartTmpComp, (comp) => {
     log.error('theme chart error: ', error);
   }
 
-  useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
-
   const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
     await getPromiseAfterDispatch(
       dispatch,

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

@@ -25,7 +25,6 @@ import {
   chartColorPalette,
   getPromiseAfterDispatch,
   dropdownControl,
-  useMergeCompStyles,
 } from "lowcoder-sdk";
 import { getEchartsLocale, trans } from "i18n/comps";
 import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -72,8 +71,6 @@ SankeyChartTmpComp = withViewFn(SankeyChartTmpComp, (comp) => {
     log.error('theme chart error: ', error);
   }
 
-  useMergeCompStyles(childrenToProps(comp.children), comp.dispatch);
-
   const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
     await getPromiseAfterDispatch(
       dispatch,