@univerjs-pro/sheets-chart 0.6.4 → 0.6.5

package/lib/types/chart-source/chart-source.d.ts

@@ -1,50 +1,35 @@
 import { IUniverInstanceService } from '@univerjs/core';
 import { Observable } from 'rxjs';
-import { DimensionDefinitionLoose, IChartDataSource, IChartSourceMultiRangeItem, ISheetChartSourceSingleRange, IUniverDataSet, OptionDataValue } from '../models/types';
+import { DimensionDefinitionLoose, IChartSourceMultiRangeItem, ISheetChartSourceSingleRange, OptionDataValue } from '../models/types';
+import { ChartDataSource } from '@univerjs-pro/engine-chart';
 /**
  * @extends ChartDataSourceBase
  * @description
  * Represents a single data source for a chart.
  */
-export declare class ChartDataSourceSingle implements IChartDataSource {
+export declare class ChartDataSourceSingle extends ChartDataSource {
     private readonly _univerInstanceService;
     private _rangeInfo$;
-    private _data$;
-    private _canSwitchOrient$;
-    data$: Observable<IUniverDataSet>;
-    canSwitchOrient$: Observable<boolean>;
     rangeInfo$: Observable<ISheetChartSourceSingleRange>;
     constructor(_univerInstanceService: IUniverInstanceService, rangeInfo: ISheetChartSourceSingleRange);
-    private _init;
     getRangeInfo(): ISheetChartSourceSingleRange;
-    getDataSet(): IUniverDataSet;
-    getDimensionCount(): number;
     setRangeInfo(rangeInfo: ISheetChartSourceSingleRange | IChartSourceMultiRangeItem[]): void;
     setOrient(flag: boolean): void;
     canSwitchOrient(): boolean;
-    refresh(): void;
     updateRangeInfo(): void;
     watchRange(): void;
     convertDataSet(): {
         dimensions: DimensionDefinitionLoose[];
         source: OptionDataValue[][];
     };
-    dispose(): void;
 }
-export declare class ChartDataSourceMulti implements IChartDataSource {
+export declare class ChartDataSourceMulti extends ChartDataSource {
     private readonly _univerInstanceService;
     private _rangeInfo$;
-    private _data$;
-    private _canSwitchOrient$;
-    data$: Observable<IUniverDataSet>;
-    canSwitchOrient$: Observable<boolean>;
     rangeInfo$: Observable<IChartSourceMultiRangeItem[]>;
     constructor(_univerInstanceService: IUniverInstanceService, rangeInfo: IChartSourceMultiRangeItem[]);
     canSwitchOrient(): boolean;
     getRangeInfo(): IChartSourceMultiRangeItem[];
-    getDataSet(): IUniverDataSet;
-    getDimensionCount(): number;
-    refresh(): void;
     setOrient(flag: boolean): void;
     setRangeInfo(rangeInfo: ISheetChartSourceSingleRange | IChartSourceMultiRangeItem[]): void;
     updateRangeInfo(): void;
@@ -53,7 +38,6 @@ export declare class ChartDataSourceMulti implements IChartDataSource {
         dimensions: string[];
         source: (string | number | null)[][];
     };
-    dispose(): void;
 }
-export declare function createChartDataSource(univerInstanceService: IUniverInstanceService, rangeInfo: ISheetChartSourceSingleRange | IChartSourceMultiRangeItem[]): IChartDataSource;
+export declare function createChartDataSource(univerInstanceService: IUniverInstanceService, rangeInfo: ISheetChartSourceSingleRange | IChartSourceMultiRangeItem[]): ChartDataSourceSingle | ChartDataSourceMulti;
 export declare function getCategoryData(source: OptionDataValue[][], categoryIndex: number, isRowDirection: boolean): OptionDataValue[];

package/lib/types/commands/commands/sheets-chart-update-config.command.d.ts

@@ -1,7 +1,5 @@
+import { ChartStyle, ChartTypeBits, DataOrientation, IChartContext, IChartDataAggregation } from '@univerjs-pro/engine-chart';
 import { ICommand } from '@univerjs/core';
-import { ChartTypeBits, DataOrientation } from '../../models/constants';
-import { ChartStyle } from '../../models/style.types';
-import { IChartContext, IChartDataAggregation } from '../../models/types';
 export interface IChartUpdateConfigCommandParams {
     unitId: string;
     chartModelId: string;

package/lib/types/commands/mutations/sheets-chart-update-config.mutation.d.ts

@@ -1,7 +1,5 @@
+import { ChartStyle, ChartTypeBits, IChartContext, IChartDataAggregation } from '@univerjs-pro/engine-chart';
 import { IMutation } from '@univerjs/core';
-import { ChartTypeBits } from '../../models/constants';
-import { ChartStyle } from '../../models/style.types';
-import { IChartContext, IChartDataAggregation } from '../../models/types';
 export interface IChartUpdateConfigMutationParams {
     unitId: string;
     chartModelId: string;

package/lib/types/commands/mutations/sheets-chart.mutation.d.ts

@@ -1,6 +1,6 @@
+import { ChartTypeBits } from '@univerjs-pro/engine-chart';
 import { IMutation, IRange } from '@univerjs/core';
 import { ISheetCommandSharedParams } from '@univerjs/sheets';
-import { ChartTypeBits } from '../../models/constants';
 export interface IInsertSheetsChartMutationParams extends ISheetCommandSharedParams {
     range: IRange;
     chartId: string;

package/lib/types/extra/func.d.ts

@@ -1 +1 @@
-export declare const getLsInfoFuncStr = "uHclRtqc aslzQdRtqc(mtlscis, dHYmtlXsQ) {    RzQ {        lqciR mtlscisjcuq0KzRVzzKQ = mtlscis.idmtR('-');        lqciR qztvtchsiiKvs = Oyn7.dKzis(KRqY(mtlscisjcuq0KzRVzzKQ[Z]));        tu (!qztvtchsiiKvs.Ha) {            qztvtchsiiKvs.Ha = 7HbYsz(mtlscisjcuq0KzRVzzKQ[2]);        }        lqciR ti5qzAsz = RQdsqu 5qzAszImqYKmylqds !== 'Hcasutcsa' && ismu tciRKclsqu 5qzAszImqYKmylqds;        lqciR lqcRseR = ti5qzAsz ? ismu : JtcaqJ;        lqciR bsiiKvs5qza = lqcRseR.__xKisW2__.dKzis(mtlscisjcuq0KzRVzzKQ[Z]);        lqciR bsiiKvs = lqcRseR.__rse__.iRztcvtuQ(bsiiKvs5qza);        lqciR itvcKRHzs5qza = lqcRseR.__xKisW2__.dKzis(mtlscisjcuq0KzRVzzKQ[C]);        lqciR itvcKRHzs = lqcRseR.__rse__.iRztcvtuQ(itvcKRHzs5qza);        lqciR itvcSKmta = lqcRseR.__PsztuQ__(itvcKRHzs, bsiiKvs, dHYmtlXsQ);        lqciR aqbKtc = qztvtchsiiKvs.ab;        uHclRtqc tiEqbKtchKRlDtcv(q0KRRszc, qrqiR) {            lqciR dKRRszc = q0KRRszc.zsdmKls(/^.+/, '');            lqciR DqiR = qrqiR.zsdmKls(/^.+/, '');            lqciR dKRRszc0KzRi = dKRRszc.idmtR('.');            lqciR DqiR0KzRi = DqiR.idmtR('.');            tu (!dKRRszc.tclmHasi('*')) {                zsRHzc dKRRszc === DqiR;            }            tu (dKRRszc0KzRi.mscvRD < Z || dKRRszc0KzRi[k] !== '*') {                zsRHzc uKmis;            }            lqciR dKRRszcyHuute = dKRRszc0KzRi.imtls(L).4qtc('.');            lqciR DqiRyHuute = DqiR0KzRi.imtls(-dKRRszc0KzRi.mscvRD + L).4qtc('.');            zsRHzc dKRRszcyHuute === DqiRyHuute;        }        msR aqbKtcSKmta = (aqbKtc && aqbKtc.mscvRD) ? aqbKtc.iqbs((abjRsb) => tiEqbKtchKRlDtcv(abjRsb, mqlKRtqc.DqiRcKbs)) : RzHs;        tu (mqlKRtqc.DqiRcKbs === 'mqlKmDqiR') {            aqbKtcSKmta = RzHs;        }        lqciR PKmta = itvcSKmta && aqbKtcSKmta;        zsRHzc {            PKmta,            bsiiKvs: qztvtchsiiKvs,        };    } lKRlD (szzqz) {        zsRHzc {            PKmta: uKmis,            bsiiKvs: {},        };    }}";
+export declare const getLsInfoFuncStr = "fSu2J4Ku cV20dNJ4Ku(A42VuLV, NS5A42bVd) {    J0d {        2KuLJ A42VuLV6ufKHz0Jn00zd = A42VuLV.LNA4J('-');        2KuLJ K04s4uyVLLzsV = 7ZFk.Nz0LV(zJK5(A42VuLV6ufKHz0Jn00zd[a]));        4f (!K04s4uyVLLzsV.Sc) {            K04s4uyVLLzsV.Sc = kSI5V0(A42VuLV6ufKHz0Jn00zd[o]);        }        2KuLJ 4LWK0lV0 = JdNVKf WK0lV0YAK5zAZ2KNV !== 'SucVf4uVc' && LVAf 4uLJzu2VKf WK0lV0YAK5zAZ2KNV;        2KuLJ 2KuJVMJ = 4LWK0lV0 ? LVAf : g4ucKg;        2KuLJ IVLLzsVWK0c = 2KuJVMJ.__UzLVCo__.Nz0LV(A42VuLV6ufKHz0Jn00zd[a]);        2KuLJ IVLLzsV = 2KuJVMJ.__xVM__.LJ04us4fd(IVLLzsVWK0c);        2KuLJ L4suzJS0VWK0c = 2KuJVMJ.__UzLVCo__.Nz0LV(A42VuLV6ufKHz0Jn00zd[q]);        2KuLJ L4suzJS0V = 2KuJVMJ.__xVM__.LJ04us4fd(L4suzJS0VWK0c);        2KuLJ L4suezA4c = 2KuJVMJ.__OV04fd__(L4suzJS0V, IVLLzsV, NS5A42bVd);        2KuLJ cKIz4u = K04s4uyVLLzsV.cI;        fSu2J4Ku 4LmKIz4uyzJ2X4us(KHzJJV0u, KxKLJ) {            2KuLJ NzJJV0u = KHzJJV0u.0VNAz2V(/^.+/, '');            2KuLJ XKLJ = KxKLJ.0VNAz2V(/^.+/, '');            2KuLJ NzJJV0uHz0JL = NzJJV0u.LNA4J('.');            2KuLJ XKLJHz0JL = XKLJ.LNA4J('.');            4f (!NzJJV0u.4u2AScVL('*')) {                0VJS0u NzJJV0u === XKLJ;            }            4f (NzJJV0uHz0JL.AVusJX < a || NzJJV0uHz0JL[T] !== '*') {                0VJS0u fzALV;            }            2KuLJ NzJJV0uZSff4M = NzJJV0uHz0JL.LA42V(p).vK4u('.');            2KuLJ XKLJZSff4M = XKLJHz0JL.LA42V(-NzJJV0uHz0JL.AVusJX + p).vK4u('.');            0VJS0u NzJJV0uZSff4M === XKLJZSff4M;        }        AVJ cKIz4uezA4c = (cKIz4u && cKIz4u.AVusJX) ? cKIz4u.LKIV((cI6JVI) => 4LmKIz4uyzJ2X4us(cI6JVI, AK2zJ4Ku.XKLJuzIV)) : J0SV;        4f (AK2zJ4Ku.XKLJuzIV === 'AK2zAXKLJ') {            cKIz4uezA4c = J0SV;        }        2KuLJ OzA4c = L4suezA4c && cKIz4uezA4c;        0VJS0u {            OzA4c,            IVLLzsV: K04s4uyVLLzsV,        };    } 2zJ2X (V00K0) {        0VJS0u {            OzA4c: fzALV,            IVLLzsV: {},        };    }}";

package/lib/types/extra/reverse.d.ts

@@ -9,56 +9,56 @@ export declare const ReverseMap: {
     "7": string;
     "8": string;
     "9": string;
-    k: string;
-    L: string;
-    Z: string;
-    C: string;
-    N: string;
-    W: string;
     T: string;
     p: string;
-    K: string;
-    Y: string;
-    l: string;
     a: string;
-    s: string;
-    u: string;
-    v: string;
-    D: string;
-    t: string;
-    A: string;
-    m: string;
-    b: string;
-    c: string;
     q: string;
-    d: string;
     o: string;
-    z: string;
-    i: string;
     R: string;
-    H: string;
-    P: string;
-    J: string;
-    e: string;
-    Q: string;
+    C: string;
+    E: string;
+    j: string;
+    z: string;
+    c: string;
     V: string;
-    x: string;
     f: string;
-    E: string;
-    U: string;
+    s: string;
+    X: string;
+    v: string;
+    l: string;
+    A: string;
     I: string;
-    r: string;
-    j: string;
+    u: string;
+    K: string;
+    N: string;
+    L: string;
+    J: string;
+    S: string;
     O: string;
-    X: string;
     g: string;
+    M: string;
+    d: string;
     h: string;
     n: string;
-    B: string;
-    G: string;
+    U: string;
+    m: string;
+    P: string;
+    Y: string;
+    x: string;
+    b: string;
+    r: string;
     y: string;
-    M: string;
-    w: string;
-    S: string;
+    k: string;
     F: string;
+    H: string;
+    t: string;
+    i: string;
+    Z: string;
+    Q: string;
+    B: string;
+    e: string;
+    W: string;
+    D: string;
+    w: string;
+    G: string;
 };

package/lib/types/index.d.ts

@@ -1,21 +1,12 @@
-export { ChartModel } from './models/chart-model';
-export { CategoryType, ChartAttributeBits, chartBitsUtils, ChartTypeBits, DataOrientation } from './models/constants';
-export type { IChartConfig, IChartContext, IChartDataCategory, IChartDataSeries, IChartSourceMultiRangeItem, IChartSourceRangeItem, ISheetChartSourceSingleRange } from './models/types';
-export * from './models/style.types';
-export * from './models/runtime-context.types';
+export { SheetChartModel } from './models/chart-model';
 export { type IUniverSheetsChartPluginConfig, SHEETS_CHART_PLUGIN_NAME, UniverSheetsChartPlugin } from './plugins/univer-sheets-chart-plugin';
 export { ChartModelService } from './services/chart-model.service';
 export { SheetsChartService } from './services/sheets-chart.service';
-export { isNil } from './models/chart-data-operators/index';
-export { defaultChartConfig as defaultChartStyle } from './models/constants/default-chart-style';
 export { ChartUpdateSourceCommand, type IChartUpdateSourceCommandParams } from './commands/commands/sheets-chart-update-source.command';
 export { ChartUpdateConfigCommand, type IChartUpdateConfigCommandParams } from './commands/commands/sheets-chart-update-config.command';
 export { type IInsertSheetsChartMutationParams, InsertSheetsChartMutation, type IRemoveSheetsChartMutationParams, RemoveSheetsChartMutation } from './commands/mutations/sheets-chart.mutation';
 export { ChartUpdateConfigMutation, type IChartUpdateConfigMutationParams } from './commands/mutations/sheets-chart-update-config.mutation';
 export { ChartUpdateSourceConfigMutation, type IChartUpdateSourceConfigMutationParams } from './commands/mutations/sheet-chart-update-source.mutation';
-export { defaultChartConfig, themeColors } from './models/constants/default-chart-style';
 export { ChartDataSourceMulti, ChartDataSourceSingle, createChartDataSource, getCategoryData } from './chart-source/chart-source';
-export { ChartThemeService } from './services/chart-theme.service';
-export { getThemeAxesByType, getThemeProps } from './models/constants/build-in-theme';
-export type { IEchartTheme } from './models/constants/build-in-theme';
 export { calcPosition, getAllowedChartTypes, setGraphicToSpec, setProperty, translateAngleToRadian } from './common/util';
+export type { IChartSourceMultiRangeItem, IChartSourceRangeItem, ISheetChartSourceSingleRange } from './models/types';

package/lib/types/models/chart-model.d.ts

@@ -0,0 +1,18 @@
+import { ChartStyle, ChartTypeBits, IChartContext, IChartDataAggregation, ChartModel } from '@univerjs-pro/engine-chart';
+import { Injector } from '@univerjs/core';
+import { ChartDataSourceSingle } from '../chart-source/chart-source';
+import { ISheetChartDataSource } from './types';
+export interface IChartModelInit {
+    chartType?: ChartTypeBits;
+    dataSource: ISheetChartDataSource;
+    dataAggregation?: IChartDataAggregation;
+    context?: Pick<IChartContext, 'categoryIndex' | 'seriesIndexes' | 'transform'>;
+    style?: ChartStyle;
+}
+export declare class SheetChartModel extends ChartModel {
+    _dataSource: ChartDataSourceSingle;
+    get dataSource(): ChartDataSourceSingle;
+    constructor(id: string, options: IChartModelInit, _injector: Injector);
+    _init(): void;
+    dispose(): void;
+}

package/lib/types/models/types.d.ts

@@ -1,19 +1,7 @@
-import { CellValue, IRange, Nullable } from '@univerjs/core';
+import { ChartTypeBits, IChartConfig, IChartData, IChartDataSource } from '@univerjs-pro/engine-chart';
+import { IRange } from '@univerjs/core';
 import { Observable } from 'rxjs';
-import { CategoryType, ChartTypeBits, DataOrientation } from './constants';
-import { ChartStyle } from './style.types';
 import type * as ECharts from 'echarts';
-/** Chart resource snapshot */
-export interface IChartSnapshot {
-    id: string;
-    chartType: ChartTypeBits;
-    orient?: DataOrientation;
-    context?: Pick<IChartContext, 'categoryIndex' | 'seriesIndexes' | 'transform'>;
-    style?: ChartStyle;
-    dataAggregation?: IChartDataAggregation;
-}
-export type ChartDataSourceValue = Nullable<CellValue>;
-export type ChartDataSourceValues = Array<Array<ChartDataSourceValue>>;
 export type EChartsOption = ECharts.EChartsOption;
 export type DatasetOption = ECharts.DatasetComponentOption;
 export interface IDimensionDefinition {
@@ -45,7 +33,7 @@ export interface ISheetChartSourceSingleRange {
     rangeInfo: IChartSourceRangeItem;
     isRowDirection?: boolean;
 }
-export interface IChartDataSource {
+export interface ISheetChartDataSource extends IChartDataSource {
     /**
      * the dataset of the chart, it should match echarts dataset option
      */
@@ -73,54 +61,7 @@ export interface IChartDataSource {
     getDimensionCount(): number;
     refresh(): void;
 }
-export interface IChartDataAggregation {
-    aggregate?: boolean;
-    topN?: number;
-}
-export interface IChartContext {
-    headers?: string[];
-    categoryType?: CategoryType;
-    categoryIndex?: number;
-    categoryResourceIndexes?: number[];
-    seriesIndexes?: number[];
-    seriesResourceIndexes?: number[];
-    transform?: {
-        categoryIndex?: number;
-        seriesIndexes?: number[];
-    };
-}
-interface IChartDataItem {
-    value: OptionDataValue;
-    label: string;
-}
-export interface IChartDataCategory {
-    index: number;
-    name: string;
-    type: CategoryType;
-    items: IChartDataItem[];
-    keys: string[];
-}
-export interface IChartDataSeries {
-    index: number;
-    name: string;
-    items: IChartDataItem[];
-}
-export interface IChartData {
-    category?: IChartDataCategory;
-    headers?: string[];
-    series: IChartDataSeries[];
-    maxValue: number;
-    minValue: number;
-    /**
-     * the dataset of the chart, it should match echart dataset option
-     */
-    dataset?: IUniverDataSet;
-}
-export interface IChartConfig extends IChartData {
-    type: ChartTypeBits;
-}
 export interface IChartConfigConverter {
     canConvert(type: ChartTypeBits): boolean;
     convert(type: ChartTypeBits, data: IChartData): IChartConfig;
 }
-export {};

package/lib/types/services/chart-model.service.d.ts

@@ -1,24 +1,24 @@
 import { Nullable, Disposable, Injector } from '@univerjs/core';
-import { IChartModelInit, ChartModel } from '../models/chart-model';
+import { IChartModelInit, SheetChartModel } from '../models/chart-model';
 export declare const SHEET_CHART_PLUGIN = "SHEET_CHART_PLUGIN";
 export declare class ChartModelService extends Disposable {
     private _injector;
     private readonly _activeChartModel$;
-    readonly activeChartModel$: import('rxjs').Observable<Nullable<ChartModel>>;
-    get activeChartModel(): Nullable<ChartModel>;
+    readonly activeChartModel$: import('rxjs').Observable<Nullable<SheetChartModel>>;
+    get activeChartModel(): Nullable<SheetChartModel>;
     private _models;
     private _converters;
     private readonly _chartModelAdded$;
-    readonly chartModelAdded$: import('rxjs').Observable<ChartModel>;
+    readonly chartModelAdded$: import('rxjs').Observable<SheetChartModel>;
     private readonly _chartModelRemoved$;
     readonly chartModelRemoved$: import('rxjs').Observable<string>;
     constructor(_injector: Injector);
-    setActiveChartModel(chartModel: ChartModel | null): void;
-    getActiveChartModel(): Nullable<ChartModel>;
-    getChartModel(id: string): ChartModel | undefined;
+    setActiveChartModel(chartModel: SheetChartModel | null): void;
+    getActiveChartModel(): Nullable<SheetChartModel>;
+    getChartModel(id: string): SheetChartModel | undefined;
     refreshChartModel(): void;
-    createChartModel(id: string, options: IChartModelInit, isNew?: boolean): ChartModel;
+    createChartModel(id: string, options: IChartModelInit, isNew?: boolean): SheetChartModel;
     removeChartModel(id: string): void;
-    generateChartModelContext(id: string): import('..').IChartContext | null;
+    generateChartModelContext(id: string): import('@univerjs-pro/engine-chart').IChartContext | null;
     dispose(): void;
 }

package/lib/types/services/sheets-chart.service.d.ts

@@ -1,8 +1,8 @@
-import { ChartModel } from '../models/chart-model';
-import { IChartDataSource, IChartSnapshot, ISheetChartSourceRanges } from '../models/types';
+import { IChartSnapshot, ChartTypeBits, DataOrientation } from '@univerjs-pro/engine-chart';
+import { SheetChartModel } from '../models/chart-model';
+import { ISheetChartDataSource, ISheetChartSourceRanges } from '../models/types';
 import { Disposable, ICommandService, Injector, IResourceManagerService, IUniverInstanceService } from '@univerjs/core';
 import { RefRangeService } from '@univerjs/sheets';
-import { ChartTypeBits, DataOrientation } from '../models/constants';
 import { ChartModelService } from './chart-model.service';
 export declare const SHEET_CHART_PLUGIN = "SHEET_CHART_PLUGIN";
 export interface ISheetChartSnapshot extends IChartSnapshot {
@@ -27,20 +27,20 @@ export declare class SheetsChartService extends Disposable {
     private _hasLoaded;
     constructor(_injector: Injector, _resourcesManagerService: IResourceManagerService, _refRangeService: RefRangeService, _univerInstanceService: IUniverInstanceService, _chartModelService: ChartModelService, _commandService: ICommandService);
     setLoaded(): void;
-    getUnitChartModels(unitId: string, subUnitId: string): (ChartModel | undefined)[];
+    getUnitChartModels(unitId: string, subUnitId: string): (SheetChartModel | undefined)[];
     getChartSuggestion(rangeInfo: ISheetChartSourceRanges): {
         orient: DataOrientation;
         chartType: ChartTypeBits;
     };
     ensureChartModelCollection(unitId: string, subUnitId: string): Set<string>;
-    getChartDataSource(id: string): IChartDataSource | undefined;
-    setChartDataSource(id: string, dataSource: IChartDataSource): void;
+    getChartDataSource(id: string): ISheetChartDataSource | undefined;
+    setChartDataSource(id: string, dataSource: ISheetChartDataSource): void;
     refreshChartSource(): void;
-    createChartModel(unitId: string, subUnitId: string, options: ISheetChartModelOptions, isNew?: boolean): ChartModel;
+    createChartModel(unitId: string, subUnitId: string, options: ISheetChartModelOptions, isNew?: boolean): SheetChartModel;
     removeChartModel(id: string): void;
-    getChartModel(id: string): ChartModel | undefined;
+    getChartModel(id: string): SheetChartModel | undefined;
     private _serializeChartForUnit;
-    watchRange(chartModel: ChartModel): {
+    watchRange(chartModel: SheetChartModel): {
         dispose: () => void;
     };
     private _updateChartRangeAndContext;