fix: fix conflicts with main

VisActor · May 30, 2024 · 1b55483 · 1b55483
2 parents 853fc7f + 5c33588
commit 1b55483
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/packages/vchart-types/types/animation/utils.d.ts b/packages/vchart-types/types/animation/utils.d.ts
@@ -10,9 +10,9 @@ export declare function animationConfig<Preset extends string>(defaultConfig?: M
     dataIndex: (datum: any, params: any) => number;
     dataCount: () => number;
 }): MarkAnimationSpec;
-export declare function userAnimationConfig<M extends string, Preset extends string>(markName: SeriesMarkNameEnum | string, spec: IAnimationSpec<M, Preset>, ctx: IModelMarkAttributeContext): Partial<Record<"none" | "normal" | "state" | "appear" | "enter" | "exit" | "disappear" | "update", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<Preset>>>;
+export declare function userAnimationConfig<M extends string, Preset extends string>(markName: SeriesMarkNameEnum | string, spec: IAnimationSpec<M, Preset>, ctx: IModelMarkAttributeContext): Partial<Record<"none" | "state" | "normal" | "enter" | "appear" | "disappear" | "update" | "exit", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<Preset>>>;
 export declare function shouldMarkDoMorph(spec: ISeriesSpec & IAnimationSpec<string, string>, markName: string): boolean;
 export declare function isTimeLineAnimation(animationConfig: IAnimationConfig): boolean;
 export declare function isChannelAnimation(animationConfig: IAnimationConfig): boolean;
-export declare function uniformAnimationConfig<Preset extends string>(config: Partial<Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>>, ctx: IModelMarkAttributeContext): Partial<Record<"none" | "normal" | "state" | "appear" | "enter" | "exit" | "disappear" | "update", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<Preset>>>;
+export declare function uniformAnimationConfig<Preset extends string>(config: Partial<Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>>, ctx: IModelMarkAttributeContext): Partial<Record<"none" | "state" | "normal" | "enter" | "appear" | "disappear" | "update" | "exit", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<Preset>>>;
 export declare function isAnimationEnabledForSeries(series: ISeries): boolean;
diff --git a/packages/vchart-types/types/component/axis/base-axis.d.ts b/packages/vchart-types/types/component/axis/base-axis.d.ts
@@ -14,7 +14,7 @@ export declare abstract class AxisComponent<T extends ICommonAxisSpec & Record<s
     static specKey: string;
     specKey: string;
     protected _orient: IPolarOrientType | IOrientType;
-    getOrient(): IOrientType | IPolarOrientType;
+    getOrient(): IPolarOrientType | IOrientType;
     protected _scale: IBaseScale;
     getScale(): IBaseScale;
     protected _scales: IBaseScale[];

diff --git a/packages/vchart-types/types/component/legend/util.d.ts b/packages/vchart-types/types/component/legend/util.d.ts
@@ -13,11 +13,11 @@ export declare function transformLegendTitleAttributes(title: ITitle): {
     };
     background?: {
         visible?: boolean;
-        style?: Omit<import("./interface").NoVisibleMarkStyle<import("../..").IRectMarkSpec>, "visible" | "width" | "height">;
+        style?: Omit<import("./interface").NoVisibleMarkStyle<import("../..").IRectMarkSpec>, "width" | "height" | "visible">;
     };
-    text?: string | number | number[] | string[] | {
+    text?: string | number | string[] | number[] | {
         type?: "text";
-        text: string | number | number[] | string[];
+        text: string | number | string[] | number[];
     } | {
         type: "rich";
         text: import("@visactor/vrender-core").IRichTextCharacter[];
@@ -36,6 +36,6 @@ export declare function transformLegendTitleAttributes(title: ITitle): {
     padding?: import("@visactor/vrender-components").Padding;
     maxWidth?: number;
     minWidth?: number;
+    align?: "center" | "start" | "end";
     space?: number;
-    align?: "start" | "end" | "center";
 };
diff --git a/packages/vchart-types/types/util/math.d.ts b/packages/vchart-types/types/util/math.d.ts
@@ -19,7 +19,7 @@ export declare function standardDeviation(data: any[], field?: string): number;
 export declare function median(data: any[], field?: string): number;
 export declare function regression(data: any[], fieldX?: string, fieldY?: string): any[];
 export declare function radiusLabelOrientAttribute(angle: number): {
-    align: "left" | "right" | "center";
+    align: "center" | "left" | "right";
     baseline: "top" | "bottom" | "middle";
 };
 export declare function vectorAngle(v1: IPoint, v2: IPoint): number;