fix: lineDash支持多位数组

antvis · Dec 10, 2024 · 7ac7d37 · 7ac7d37
1 parent db6f50b
commit 7ac7d37
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/packages/g-lite/src/css/StyleValueRegistry.ts b/packages/g-lite/src/css/StyleValueRegistry.ts
@@ -700,7 +700,6 @@ export class DefaultStyleValueRegistry implements StyleValueRegistry {
     if (list.has('lineDash') && !isNil(attributes.lineDash)) {
       object.parsedStyle.lineDash = parseDimensionArrayFormat(
         attributes.lineDash,
-        2,
       );
     }
     // @ts-ignore

diff --git a/packages/g-lite/src/css/parser/dimension.ts b/packages/g-lite/src/css/parser/dimension.ts
@@ -166,7 +166,7 @@ export function convertAngleUnit(value: CSSUnitValue) {
 
 export function parseDimensionArrayFormat(
   string: string | number | (string | number)[],
-  size: number,
+  size?: 2 | 4,
 ): number[] {
   let parsed: number[];
 
@@ -185,16 +185,19 @@ export function parseDimensionArrayFormat(
     }
     return [parsed[0], parsed[1]];
   }
-  if (parsed.length === 1) {
-    return [parsed[0], parsed[0], parsed[0], parsed[0]];
-  }
-  if (parsed.length === 2) {
-    return [parsed[0], parsed[1], parsed[0], parsed[1]];
-  }
-  if (parsed.length === 3) {
-    return [parsed[0], parsed[1], parsed[2], parsed[1]];
+  if (size === 4) {
+    if (parsed.length === 1) {
+      return [parsed[0], parsed[0], parsed[0], parsed[0]];
+    }
+    if (parsed.length === 2) {
+      return [parsed[0], parsed[1], parsed[0], parsed[1]];
+    }
+    if (parsed.length === 3) {
+      return [parsed[0], parsed[1], parsed[2], parsed[1]];
+    }
+    return [parsed[0], parsed[1], parsed[2], parsed[3]];
   }
-  return [parsed[0], parsed[1], parsed[2], parsed[3]];
+  return parsed;
 }
 
 export function parseDimensionArray(