Fixed direction and label style.

Imiss-U1025 · Imiss-U1025 · commit b2ee7513126b · 2024-12-19T11:14:46.000-05:00
diff --git a/client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartUtils.ts b/client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartUtils.ts
@@ -211,15 +211,15 @@ export function getEchartsConfig(
       "label": {
         "show": props.label,
         "position": props.echartsLabelConfig.top,
-        "fontFamily": props?.style?.fontFamily,
-        "fontSize": props?.style?.textSize,
-        "fontWeight": props?.style?.textWeight,
-        "color": props?.style?.text,
-        "fontStyle": props?.style?.fontStyle,
-        "textShadowColor": props?.style?.boxShadowColor,
-        "textShadowBlur": props?.style?.boxShadow?.split(' ')[0],
-        "textShadowOffsetX": props?.style?.boxShadow?.split(' ')[1],
-        "textShadowOffsetY": props?.style?.boxShadow?.split(' ')[2]
+        "fontFamily": props?.labelStyle?.fontFamily,
+        "fontSize": props?.labelStyle?.textSize,
+        "fontWeight": props?.labelStyle?.textWeight,
+        "color": props?.labelStyle?.text,
+        "fontStyle": props?.labelStyle?.fontStyle,
+        "textShadowColor": props?.labelStyle?.boxShadowColor,
+        "textShadowBlur": props?.labelStyle?.boxShadow?.split(' ')[0],
+        "textShadowOffsetX": props?.labelStyle?.boxShadow?.split(' ')[1],
+        "textShadowOffsetY": props?.labelStyle?.boxShadow?.split(' ')[2]
       },
       "data": props.echartsOption.data
     }
diff --git a/client/packages/lowcoder/src/comps/controls/styleControl.tsx b/client/packages/lowcoder/src/comps/controls/styleControl.tsx
@@ -188,7 +188,7 @@ function isBorderStyleConfig(config: SingleColorConfig): config is borderStyleCo
 }
 
 function isMarginConfig(config: SingleColorConfig): config is MarginConfig {
-  return config.hasOwnProperty("direction");
+  return config.hasOwnProperty("margin");
 }
 
 function isDirectionConfig(config: SingleColorConfig): config is DirectionConfig {
@@ -634,6 +634,9 @@ function calcColors<ColorMap extends Record<string, string>>(
     if (isMarginConfig(config)) {
       res[name] = themeWithDefault[config.margin];
     }
+    if (isDirectionConfig(config)) {
+      res[name] = themeWithDefault[config.direction] || '0 0 1 1';
+    }
     if (isPaddingConfig(config)) {
       res[name] = themeWithDefault[config.padding];
     }
@@ -998,6 +1001,7 @@ export function styleControl<T extends readonly SingleColorConfig[]>(
                     if (
                       name === 'radius' ||
                       name === 'margin' ||
+                      name === 'direction' ||
                       name === 'padding' ||
                       name === 'containerHeaderPadding' ||
                       name === 'containerSiderPadding' ||

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ function isBorderStyleConfig(config: SingleColorConfig): config is borderStyleCo`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`function isMarginConfig(config: SingleColorConfig): config is MarginConfig {`
`191`		`- return config.hasOwnProperty("direction");`
	`191`	`+ return config.hasOwnProperty("margin");`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`function isDirectionConfig(config: SingleColorConfig): config is DirectionConfig {`
`@@ -634,6 +634,9 @@ function calcColors<ColorMap extends Record<string, string>>(`
`634`	`634`	`if (isMarginConfig(config)) {`
`635`	`635`	`res[name] = themeWithDefault[config.margin];`
`636`	`636`	`}`
	`637`	`+ if (isDirectionConfig(config)) {`
	`638`	`+ res[name] = themeWithDefault[config.direction] \|\| '0 0 1 1';`
	`639`	`+ }`
`637`	`640`	`if (isPaddingConfig(config)) {`
`638`	`641`	`res[name] = themeWithDefault[config.padding];`
`639`	`642`	`}`
`@@ -998,6 +1001,7 @@ export function styleControl<T extends readonly SingleColorConfig[]>(`
`998`	`1001`	`if (`
`999`	`1002`	`name === 'radius' \|\|`
`1000`	`1003`	`name === 'margin' \|\|`
	`1004`	`+ name === 'direction' \|\|`
`1001`	`1005`	`name === 'padding' \|\|`
`1002`	`1006`	`name === 'containerHeaderPadding' \|\|`
`1003`	`1007`	`name === 'containerSiderPadding' \|\|`