Fixed Conditional statements.

Imiss-U1025 · Imiss-U1025 · commit b7af382bbd63 · 2024-12-20T16:05:01.000-05:00
diff --git a/client/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartConstants.tsx
@@ -257,7 +257,7 @@ let chartJsonModeChildren: any = {
   tooltip: withDefault(BoolControl, true),
   legendVisibility: withDefault(BoolControl, true),
 }
-if (EchartsStyle) {
+if (EchartDefaultChartStyle && EchartDefaultTextStyle) {
   chartJsonModeChildren = {
     ...chartJsonModeChildren,
     style: styleControl(EchartsStyle, 'style'),
diff --git a/client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartConstants.tsx
@@ -279,7 +279,7 @@ let chartJsonModeChildren: any = {
   opacity:withDefault(NumberControl,trans('funnelChart.defaultOpacity'))
 }
 
-if (EchartsStyle) {
+if (EchartDefaultChartStyle && EchartDefaultTextStyle) {
   chartJsonModeChildren = {
     ...chartJsonModeChildren,
     chartStyle: styleControl(EchartDefaultChartStyle, 'chartStyle'),
diff --git a/client/packages/lowcoder-comps/src/comps/gaugeChartComp/gaugeChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/gaugeChartComp/gaugeChartConstants.tsx
@@ -298,7 +298,7 @@ let chartJsonModeChildren: any = {
   progressBarWidth:withDefault(NumberControl,trans('gaugeChart.defaultProgressBarWidth')),
 
 }
-if (EchartsStyle) {
+if (EchartDefaultChartStyle && EchartDefaultTextStyle) {
   chartJsonModeChildren = {
     ...chartJsonModeChildren,
     chartStyle: styleControl(EchartDefaultChartStyle, 'chartStyle'),

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ let chartJsonModeChildren: any = {`
`257`	`257`	`tooltip: withDefault(BoolControl, true),`
`258`	`258`	`legendVisibility: withDefault(BoolControl, true),`
`259`	`259`	`}`
`260`		`-if (EchartsStyle) {`
	`260`	`+if (EchartDefaultChartStyle && EchartDefaultTextStyle) {`
`261`	`261`	`chartJsonModeChildren = {`
`262`	`262`	`...chartJsonModeChildren,`
`263`	`263`	`style: styleControl(EchartsStyle, 'style'),`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ let chartJsonModeChildren: any = {`
`279`	`279`	`opacity:withDefault(NumberControl,trans('funnelChart.defaultOpacity'))`
`280`	`280`	`}`
`281`	`281`
`282`		`-if (EchartsStyle) {`
	`282`	`+if (EchartDefaultChartStyle && EchartDefaultTextStyle) {`
`283`	`283`	`chartJsonModeChildren = {`
`284`	`284`	`...chartJsonModeChildren,`
`285`	`285`	`chartStyle: styleControl(EchartDefaultChartStyle, 'chartStyle'),`
Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ let chartJsonModeChildren: any = {`
`298`	`298`	`progressBarWidth:withDefault(NumberControl,trans('gaugeChart.defaultProgressBarWidth')),`
`299`	`299`
`300`	`300`	`}`
`301`		`-if (EchartsStyle) {`
	`301`	`+if (EchartDefaultChartStyle && EchartDefaultTextStyle) {`
`302`	`302`	`chartJsonModeChildren = {`
`303`	`303`	`...chartJsonModeChildren,`
`304`	`304`	`chartStyle: styleControl(EchartDefaultChartStyle, 'chartStyle'),`