@univerjs-pro/slides-chart-ui 1.0.0-alpha.7 → 1.0.0-beta.0

package/lib/types/services/slide-chart-ui.service.d.ts

@@ -1,118 +1,41 @@
-import type { ChartStyle, DeepPartial, IChartContext, IChartDataAggregation, IPieLabelStyle, IRuntimeAxis, TitlePositionEnum, WaterfallStackTypeEnum } from '@univerjs-pro/engine-chart';
+import type { IChartEditPanelRoute, IChartPanelRouteState, IChartSelectedElementState } from '@univerjs-pro/chart-ui';
+import type { IChartContext, IChartDataAggregation } from '@univerjs-pro/engine-chart';
 import type { ISlideChartRuntimeModel, IUpdateSlideChartConfigCommandParams } from '@univerjs-pro/slides-chart';
-import type { Nullable } from '@univerjs/core';
-import type { Observable } from 'rxjs';
-import type { IChartEditPanelRoute, IChartPanelRouteState, IChartSelectedElementState } from './chart-panel-route';
-import { ChartTypeBits, DataOrientation, StackType } from '@univerjs-pro/engine-chart';
+import { ChartUIService, ChartViewStateRegistry } from '@univerjs-pro/chart-ui';
 import { ISlideDrawingService } from '@univerjs-pro/slides';
 import { SlideChartModelService, SlideChartResourceService } from '@univerjs-pro/slides-chart';
-import { Disposable, ICommandService, LocaleService } from '@univerjs/core';
-export interface ISlideChartOption {
-    label: string;
-    value: string;
-}
-export interface ISlideChartConfigStateMap {
-    chartType: ISlideChartConfigState<ChartTypeBits>;
-    chartThemeColorType: ISlideChartConfigState<string | undefined, string | undefined>;
-    backgroundColor: ISlideChartConfigState<string | undefined, string | undefined>;
-    borderColor: ISlideChartConfigState<string | undefined, string | undefined>;
-    title: ISlideChartConfigState<string | undefined, string>;
-    dataRange: ISlideChartConfigState<string>;
-    gradientFill: ISlideChartConfigState<boolean | undefined, boolean | undefined>;
-    stackType: ISlideChartConfigState<StackType | undefined, StackType | ''>;
-    orient: ISlideChartConfigState<DataOrientation | undefined, DataOrientation>;
-    categoryIndex: ISlideChartConfigState<number | undefined, number>;
-    titles: ISlideChartConfigState<ChartStyle['titles'] | undefined, ChartStyle['titles']>;
-    titlePosition: ISlideChartConfigState<TitlePositionEnum | undefined, TitlePositionEnum | undefined>;
-    legendStyle: ISlideChartConfigState<ChartStyle['legend'] | undefined, ChartStyle['legend']>;
-    xAxisOptions: ISlideChartConfigState<ChartStyle['xAxis'] | undefined, ChartStyle['xAxis']>;
-    yAxisOptions: ISlideChartConfigState<ChartStyle['yAxis'] | undefined, ChartStyle['yAxis']>;
-    rightYAxisOptions: ISlideChartConfigState<ChartStyle['rightYAxis'] | undefined, ChartStyle['rightYAxis']>;
-    runtimeAxes: ISlideChartConfigState<IRuntimeAxis[] | undefined>;
-    indicator: ISlideChartConfigState<ChartStyle['tooltip'] | undefined, ChartStyle['tooltip']>;
-    pieLabelStyle: ISlideChartConfigState<DeepPartial<IPieLabelStyle> | undefined, DeepPartial<IPieLabelStyle>>;
-    padAngleStyle: ISlideChartConfigState<boolean | undefined, boolean>;
-    isHalfPie: ISlideChartConfigState<boolean | undefined, boolean>;
-    isRosePie: ISlideChartConfigState<boolean | undefined, boolean>;
-    showLabelLine: ISlideChartConfigState<boolean | undefined, boolean>;
-    doughnutHole: ISlideChartConfigState<Nullable<number>, number>;
-    pieBorderColor: ISlideChartConfigState<string | undefined, string>;
-    valueScale: ISlideChartConfigState<number | undefined, number>;
-    digitalFixed: ISlideChartConfigState<number | undefined, number>;
-    valueSuffix: ISlideChartConfigState<string | undefined, string>;
-    wordCloudMask: ISlideChartConfigState<string | undefined, string | undefined>;
-    wordCloudRepeat: ISlideChartConfigState<boolean | undefined, boolean>;
-    waterfallStack: ISlideChartConfigState<WaterfallStackTypeEnum | undefined, WaterfallStackTypeEnum>;
-    useSubtotal: ISlideChartConfigState<boolean | undefined, boolean>;
-    categoryList: ISlideChartConfigState<ISlideChartOption[]>;
-    seriesValues: ISlideChartConfigState<number[]>;
-    seriesResourceList: ISlideChartConfigState<ISlideChartOption[]>;
-}
-export type SlideChartConfigStateKey = keyof ISlideChartConfigStateMap;
-export type SlideChartConfigStateValue = InferSlideChartConfigStateValue<SlideChartConfigStateKey>;
-export type InferSlideChartConfigStateValue<T extends SlideChartConfigStateKey, M = ISlideChartConfigStateMap[T]> = M extends ISlideChartConfigState<infer V> ? V : never;
-export type ISlideChartConfigState<GetValue, SetValue = GetValue> = {
-    set?(value: SetValue): void;
-    get(): Observable<GetValue> | undefined;
-} | Observable<GetValue>;
-export interface ISlideChartUIService {
-    readonly activeRuntimeModel: ISlideChartRuntimeModel | null;
-    readonly activeRuntimeModel$: Observable<ISlideChartRuntimeModel | null>;
-    readonly activeEditChart: string | null;
-    readonly activeEditChart$: Observable<string | null>;
-    readonly selectedElement$: Observable<IChartSelectedElementState | null>;
-    readonly panelRoute$: Observable<IChartPanelRouteState | null>;
-    readonly localeService: LocaleService;
-    readonly resourceService: SlideChartResourceService;
-    registerViewState<T extends SlideChartConfigStateKey = SlideChartConfigStateKey>(id: T, state: (runtime: ISlideChartRuntimeModel) => ISlideChartConfigStateMap[T]): void;
-    getViewState<V extends SlideChartConfigStateValue = SlideChartConfigStateValue>(id: SlideChartConfigStateKey, runtime?: ISlideChartRuntimeModel | null): ISlideChartConfigState<V> | undefined;
-    executeChartUpdateConfig(params: Omit<IUpdateSlideChartConfigCommandParams, 'unitId' | 'chartId'> & {
-        unitId?: string;
-        chartId?: string;
-        context?: Partial<IChartContext>;
-        dataAggregation?: Partial<IChartDataAggregation>;
-    }): void;
-    getDrawingBorderColor(unitId: string, subUnitId: string, drawingId: string): string | undefined;
-    updateDrawingBorderColor(unitId: string, subUnitId: string, drawingId: string, color: string): boolean;
-    setActiveEditChart(chartId: string | null): void;
-    isElementEditModeActive(chartId: string): boolean;
-    setSelectedElement(state: IChartSelectedElementState | null): void;
-    setPanelRoute(chartId: string, route: IChartEditPanelRoute | null): void;
-    clearPanelRoute(): void;
-}
-export declare const ISlideChartUIService: import("@wendellhu/redi").IdentifierDecorator<ISlideChartUIService>;
-export declare function registerSlideChartConfigState(service: ISlideChartUIService): void;
-export declare class SlideChartUIService extends Disposable implements ISlideChartUIService {
+import { ICommandService } from '@univerjs/core';
+type SlideChartUpdateConfigParams = Omit<IUpdateSlideChartConfigCommandParams, 'unitId' | 'chartId'> & {
+    unitId?: string;
+    chartId?: string;
+    context?: Partial<IChartContext>;
+    dataAggregation?: Partial<IChartDataAggregation>;
+};
+export type ISlideChartUIService = SlideChartUIService;
+export declare const ISlideChartUIService: import("@wendellhu/redi").IdentifierDecorator<SlideChartUIService>;
+export declare class SlideChartUIService extends ChartUIService<ISlideChartRuntimeModel, SlideChartUpdateConfigParams> {
     private readonly _chartModelService;
     private readonly _commandService;
-    readonly localeService: LocaleService;
     readonly resourceService: SlideChartResourceService;
     private readonly _slideDrawingService;
-    private readonly _viewState;
     private readonly _activeEditChart$;
     private readonly _selectedElement$;
     private readonly _panelRoute$;
-    readonly activeEditChart$: Observable<string | null>;
-    readonly selectedElement$: Observable<IChartSelectedElementState | null>;
-    readonly panelRoute$: Observable<IChartPanelRouteState | null>;
-    constructor(_chartModelService: SlideChartModelService, _commandService: ICommandService, localeService: LocaleService, resourceService: SlideChartResourceService, _slideDrawingService: ISlideDrawingService);
+    readonly activeEditChart$: import("rxjs").Observable<string | null>;
+    readonly selectedElement$: import("rxjs").Observable<IChartSelectedElementState | null>;
+    readonly panelRoute$: import("rxjs").Observable<IChartPanelRouteState | null>;
+    constructor(_chartModelService: SlideChartModelService, _commandService: ICommandService, resourceService: SlideChartResourceService, _slideDrawingService: ISlideDrawingService, viewStates: ChartViewStateRegistry);
     get activeRuntimeModel(): ISlideChartRuntimeModel | null;
-    get activeRuntimeModel$(): Observable<ISlideChartRuntimeModel | null>;
+    get activeRuntimeModel$(): import("rxjs").Observable<ISlideChartRuntimeModel | null>;
     get activeEditChart(): string | null;
     setActiveEditChart(chartId: string | null): void;
     isElementEditModeActive(chartId: string): boolean;
     setSelectedElement(state: IChartSelectedElementState | null): void;
     setPanelRoute(chartId: string, route: IChartEditPanelRoute | null): void;
     clearPanelRoute(): void;
-    registerViewState<T extends SlideChartConfigStateKey = SlideChartConfigStateKey>(id: T, state: (runtime: ISlideChartRuntimeModel) => ISlideChartConfigStateMap[T]): void;
-    getViewState<V extends SlideChartConfigStateValue = SlideChartConfigStateValue>(id: SlideChartConfigStateKey, runtime?: ISlideChartRuntimeModel | null): ISlideChartConfigState<V> | undefined;
-    executeChartUpdateConfig(params: Omit<IUpdateSlideChartConfigCommandParams, 'unitId' | 'chartId'> & {
-        unitId?: string;
-        chartId?: string;
-        context?: Partial<IChartContext>;
-        dataAggregation?: Partial<IChartDataAggregation>;
-    }): void;
+    executeChartUpdateConfig(params: SlideChartUpdateConfigParams): void;
     getDrawingBorderColor(unitId: string, subUnitId: string, drawingId: string): string | undefined;
     updateDrawingBorderColor(unitId: string, subUnitId: string, drawingId: string, color: string): boolean;
     dispose(): void;
 }
+export {};

package/lib/types/views/render/chart-adaptor.d.ts

@@ -1,4 +1,5 @@
-import type { ISlideDrawing, ISlideLineStyle } from '@univerjs-pro/slides';
+import type { IShapeLineStyle } from '@univerjs-pro/engine-shape';
+import type { ISlideDrawing } from '@univerjs-pro/slides';
 import type { IRenderConvertContext } from '@univerjs-pro/slides-ui';
 import type { Nullable } from '@univerjs/core';
 import type { BaseObject, IViewportInfo, UniverRenderingContext } from '@univerjs/engine-render';
@@ -9,7 +10,7 @@ export declare class SlideChartImageObject extends SlideImageObject {
     private _chartStroke?;
     private _hideImage;
     constructor(key: string, props: SlideChartImageObjectProps);
-    setChartStroke(stroke?: ISlideLineStyle): void;
+    setChartStroke(stroke?: IShapeLineStyle): void;
     setImageHidden(hidden: boolean): void;
     changeChartSource(url: string): void;
     protected _draw(ctx: UniverRenderingContext, bounds?: IViewportInfo, renderWidth?: number, renderHeight?: number): void;