Added font settings.

Imiss-U1025 · Imiss-U1025 · commit ee0161bb04f5 · 2024-12-19T11:14:41.000-05:00
diff --git a/client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartConstants.tsx
@@ -16,7 +16,10 @@ import {
   uiChildren,
   clickEvent,
   styleControl,
-  EchartsStyle
+  EchartsStyle,
+  TextStyle,
+  FunnelStyle,
+  FunnelChartStyle
 } from "lowcoder-sdk";
 import { RecordConstructorToComp, RecordConstructorToView } from "lowcoder-core";
 import { BarChartConfig } from "../chartComp/chartConfigs/barChartConfig";
@@ -33,7 +36,7 @@ import { EChartsOption } from "echarts";
 import { i18nObjs, trans } from "i18n/comps";
 import { FunnelChartConfig} from "../chartComp/chartConfigs/funnelChartConfig";
 import { EchartsTitleConfig } from "comps/chartComp/chartConfigs/echartsTitleConfig";
-import {EchartsSortingConfig} from "../chartComp/chartConfigs/echartsSortingConfig";
+import { EchartsSortingConfig } from "../chartComp/chartConfigs/echartsSortingConfig";
 
 export const ChartTypeOptions = [
   {
@@ -272,13 +275,17 @@ let chartJsonModeChildren: any = {
   gap:withDefault(NumberControl,trans('funnelChart.defaultGap')),
   opacity:withDefault(NumberControl,trans('funnelChart.defaultOpacity'))
 }
+
 if (EchartsStyle) {
   chartJsonModeChildren = {
     ...chartJsonModeChildren,
-    style: styleControl(EchartsStyle, 'style'),
+    style: styleControl(FunnelStyle, 'style'),
+    chartStyle: styleControl(FunnelChartStyle, 'style')
   }
 }
 
+console.log(FunnelStyle)
+
 const chartMapModeChildren = {
   mapInstance: stateComp(),
   getMapInstance: FunctionControl,
diff --git a/client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartUtils.ts b/client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartUtils.ts
@@ -168,7 +168,16 @@ export function getEchartsConfig(
       },
       "label": {
         "show": props.label,
-        "position": props.echartsLabelConfig.top
+        "position": props.echartsLabelConfig.top,
+        "fontFamily": props?.style?.fontFamily || theme?.style?.fontFamily,
+        "fontSize": props?.style?.textSize || theme?.style?.textSize,
+        "fontWeight": props?.style?.textWeight || theme?.style?.textWeight,
+        "color": props?.style?.text || theme?.style?.text,
+        "fontStyle": props?.style?.fontStyle || theme?.style?.fontStyle,
+        "textShadowColor": props?.style?.boxShadowColor || theme?.style?.boxShadowColor,
+        "textShadowBlur": props?.style?.boxShadow?.split(' ')[0],
+        "textShadowOffsetX": props?.style?.boxShadow?.split(' ')[1],
+        "textShadowOffsetY": props?.style?.boxShadow?.split(' ')[2]
       },
       "data": props.echartsOption.data
     }
diff --git a/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx b/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx
@@ -1793,6 +1793,25 @@ export const JsonEditorStyle = [LABEL] as const;
 
 export const EchartsStyle = [getBackground("primarySurface")] as const;
 
+export const FunnelStyle = [
+  getBackground("primarySurface"),
+  TEXT,
+  TEXT_SIZE,
+  TEXT_WEIGHT,
+  FONT_FAMILY,
+  FONT_STYLE,
+  BOXSHADOWCOLOR,
+  BOXSHADOW,
+] as const;
+
+export const FunnelChartStyle = [
+  OPACITY,
+  BORDER,
+  BORDER_STYLE,
+  RADIUS,
+  BORDER_WIDTH,
+] as const;
+
 export const CalendarStyle = [
   getBackground("primarySurface"),
   {
