fix: tickStyle传入基础类型报错 (#1292)

antvis · Nov 29, 2021 · fddc32b · fddc32b
1 parent c1d477f
commit fddc32b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/packages/f2/src/components/axis/types.ts b/packages/f2/src/components/axis/types.ts
@@ -28,9 +28,10 @@ export interface Style<Type = void> {
   label?: StyleText<Type>;
 }
 
-export interface StyleProps<Type = void> extends Omit<Style, 'label' | 'grid'> {
+export interface StyleProps<Type = void> extends Omit<Style, 'label' | 'grid' | 'labelOffset'> {
   label?: StyleText<Type> | LabelCallback<Type>;
   grid?: LineAttrs | GridCallBack;
+  labelOffset?: number | string;
 }
 
 interface Point {

diff --git a/packages/f2/src/components/axis/withAxis.tsx b/packages/f2/src/components/axis/withAxis.tsx
@@ -1,4 +1,4 @@
-import { deepMix, isFunction, mix, each, clone } from '@antv/util';
+import { deepMix, isFunction, mix, each, clone, isString, isNumber } from '@antv/util';
 import { jsx } from '../../jsx';
 import equal from '../../base/equal';
 import Component from '../../base/component';
@@ -132,10 +132,15 @@ export default (View) => {
         if (style[key] === null) {
           return;
         }
+        const styleValue = isFunction(style[key]) ? undefined : style[key]
 
-        this.style[key] = px2hd(
-          deepMix(clone(value), isFunction(style[key]) ? undefined : style[key])
-        );
+        if (isString(value) || isNumber(value)) {
+          this.style[key] = px2hd(styleValue) || value;
+        } else {
+          this.style[key] = px2hd(
+            deepMix(clone(value), styleValue)
+          );
+        }
       });
 
       return ticks.map((tick: Tick, index) => {

diff --git a/packages/f2/test/components/axis/axis.test.tsx b/packages/f2/test/components/axis/axis.test.tsx
@@ -248,6 +248,7 @@ describe('Axis 轴', () => {
                 stroke: '#e8e8e8',
                 lineWidth: 1,
               },
+              labelOffset: '50px',
             }}
           />
           <Axis