@univerjs-pro/sheets-chart 1.0.0-alpha.8 → 1.0.0-beta.1

package/lib/locale/zh-TW.js

@@ -1 +1 @@
-const _0x59a515=_0x5942;(function(_0x3ce87e,_0x3f5c63){const _0x552857=_0x5942,_0x4d3016=_0x3ce87e();while(!![]){try{const _0x448419=parseInt(_0x552857(0x138))/0x1*(parseInt(_0x552857(0x137))/0x2)+parseInt(_0x552857(0x127))/0x3*(parseInt(_0x552857(0x123))/0x4)+parseInt(_0x552857(0x134))/0x5+parseInt(_0x552857(0x130))/0x6*(parseInt(_0x552857(0x12d))/0x7)+parseInt(_0x552857(0x126))/0x8*(-parseInt(_0x552857(0x12b))/0x9)+parseInt(_0x552857(0x125))/0xa+-parseInt(_0x552857(0x132))/0xb;if(_0x448419===_0x3f5c63)break;else _0x4d3016['push'](_0x4d3016['shift']());}catch(_0x123dd1){_0x4d3016['push'](_0x4d3016['shift']());}}}(_0x31cf,0xc0398));const e={'sheets-chart':{'category':'類別','series':'系列','seriesDefaultName':'系列\x20{0}','categoryDefaultName':_0x59a515(0x12f),'blank':_0x59a515(0x128),'msg':{'emptyTips':'請先添加系列開始數據可視化','sankeyCircularTips':_0x59a515(0x13a)},'bubble':{'emptyTips':_0x59a515(0x12c)},'relation':{'emptyTips':_0x59a515(0x12a)},'cloud':{'word':'詞','frequency':'頻率'},'waterfall':{'positive':'正值','negative':'負值','subtotal':'小計'},'pareto':{'lineName':_0x59a515(0x124)},'candlestick':{'series':_0x59a515(0x129),'category':_0x59a515(0x135),'open':'Open','high':'High','low':_0x59a515(0x136),'close':'Close'},'boxplot':{'min':_0x59a515(0x139),'q1':_0x59a515(0x12e),'median':'中位數','q3':'第三四分位數','max':_0x59a515(0x133)},'histogram':{'frequency':'頻數'},'treemap':{'hierarchy':'層級','value':'值','ownValue':_0x59a515(0x131),'children':'子項'}}};function _0x5942(_0x4b2685,_0x1dc560){_0x4b2685=_0x4b2685-0x123;const _0x31cf08=_0x31cf();let _0x59423d=_0x31cf08[_0x4b2685];return _0x59423d;}function _0x31cf(){const _0x160633=['最小值','桑基圖不能包含循環數據','84052tiYQbz','累積占比','7797630fYoers','1588984THJLOG','3qfXKqm','(空)','OHLC','關係圖資料來源為額外新增類型欄在第二欄的共詞矩陣','63wGaZcn','氣泡圖至少需要2欄，X軸、Y軸。','116284xsEcnQ','第一四分位數','類別\x20{0}','102plgjOh','自身值','6337870ETgUXE','最大值','4071945xCwHXv','Category','Low','678XcsKxg','2526TkcsUq'];_0x31cf=function(){return _0x160633;};return _0x31cf();}export{e as default};
+const _0xa5ae37=_0x1183;(function(_0x3d00a1,_0x117974){const _0xa64fcf=_0x1183,_0x5dac38=_0x3d00a1();while(!![]){try{const _0x4c4857=parseInt(_0xa64fcf(0x151))/0x1*(-parseInt(_0xa64fcf(0x138))/0x2)+-parseInt(_0xa64fcf(0x148))/0x3*(parseInt(_0xa64fcf(0x132))/0x4)+-parseInt(_0xa64fcf(0x12d))/0x5*(-parseInt(_0xa64fcf(0x13b))/0x6)+parseInt(_0xa64fcf(0x136))/0x7+-parseInt(_0xa64fcf(0x129))/0x8+-parseInt(_0xa64fcf(0x14f))/0x9+parseInt(_0xa64fcf(0x12a))/0xa*(parseInt(_0xa64fcf(0x13f))/0xb);if(_0x4c4857===_0x117974)break;else _0x5dac38['push'](_0x5dac38['shift']());}catch(_0x2336e9){_0x5dac38['push'](_0x5dac38['shift']());}}}(_0x3dce,0xdfe5e));function _0x1183(_0x35a232,_0x4023de){_0x35a232=_0x35a232-0x129;const _0x3dce67=_0x3dce();let _0x1183fa=_0x3dce67[_0x35a232];return _0x1183fa;}function _0x3dce(){const _0x3fc9e8=['最大值','168aQhCoN','選取的欄位無法構成這個圖表所需的有效資料結構。','這個圖表需要更多標籤欄位。','關係數','33BRZaKo','最高價','旭日圖至少需要一個階層欄位和一個數值欄位。','選取的圖表欄位已無法使用。','儀表圖需要一個標籤欄位，而且只能有一個數值欄位。','儀表圖至少需要一個有限數值。','弦圖需要不同的來源與目標欄位，並可選擇一個與兩者不同的數值欄位。','第三四分位數','這個圖表需要更多數值欄位。','1452rOGfcg','累積占比','自身值','類別\x20{0}','儀表圖設定無效，請檢查刻度範圍、分段區間、比例和尺寸。','關聯值','最小值','202428oAXgOF','關係圖資料來源為額外新增類型欄在第二欄的共詞矩陣','2YeZjIb','8047112bhuZLd','11264410ErZPVr','收盤價','最低價','31905cuoFrJ','弦圖設定無效，請檢查角度、半徑、不透明度和尺寸。','開盤價','氣泡圖至少需要2欄，X軸、Y軸。','請先添加系列開始數據可視化','10312wDtLkm','第一四分位數','(空)','這個圖表類型沒有欄位使用規則。','7997822mnLnFj','OHLC\x20數列','1507318MyTuxu','中位數'];_0x3dce=function(){return _0x3fc9e8;};return _0x3dce();}const e={'sheets-chart':{'seriesDefaultName':'系列\x20{0}','categoryDefaultName':_0xa5ae37(0x14b),'blank':_0xa5ae37(0x134),'msg':{'emptyTips':_0xa5ae37(0x131),'sankeyCircularTips':'桑基圖不能包含循環數據'},'bubble':{'emptyTips':_0xa5ae37(0x130)},'relation':{'emptyTips':_0xa5ae37(0x150)},'cloud':{'word':'詞','frequency':'頻率'},'waterfall':{'positive':'正值','negative':'負值','subtotal':'小計'},'pareto':{'lineName':_0xa5ae37(0x149)},'boxplot':{'min':_0xa5ae37(0x14e),'q1':_0xa5ae37(0x133),'median':_0xa5ae37(0x139),'q3':_0xa5ae37(0x146),'max':_0xa5ae37(0x13a)},'candlestick':{'series':_0xa5ae37(0x137),'category':'Category','open':_0xa5ae37(0x12f),'high':_0xa5ae37(0x140),'low':_0xa5ae37(0x12c),'close':_0xa5ae37(0x12b)},'histogram':{'frequency':'頻數'},'pie':{'aggregateOther':'其他','aggregateMembers':'成員'},'treemap':{'hierarchy':'階層欄位','value':'數值欄位','ownValue':_0xa5ae37(0x14a),'children':'子項','diagnostic':'矩形樹圖至少需要一個階層欄位和一個數值欄位。'},'sunburst':{'hierarchy':'階層','value':'Value','ownValue':_0xa5ae37(0x14a),'children':'子項','diagnostic':_0xa5ae37(0x141)},'gauge':{'label':'標籤','value':'Value','emptyDiagnostic':_0xa5ae37(0x144),'mappingDiagnostic':_0xa5ae37(0x143),'configDiagnostic':_0xa5ae37(0x14c)},'chord':{'emptyDiagnostic':'弦圖至少需要兩個不同節點之間的一條正權重關係。','mappingDiagnostic':_0xa5ae37(0x145),'configDiagnostic':_0xa5ae37(0x12e),'source':'來源','target':'目標','value':'Value','count':_0xa5ae37(0x13e),'associatedValue':_0xa5ae37(0x14d)},'chartField':{'missingCategoryFields':_0xa5ae37(0x13d),'missingSeriesFields':_0xa5ae37(0x147),'invalidFieldIndex':_0xa5ae37(0x142),'invalidValueFieldType':'選取的數值欄位不包含數值資料。','invalidDataStructure':_0xa5ae37(0x13c),'unsupportedChartType':_0xa5ae37(0x135)}}};export{e as default};

package/lib/types/chart-builder/{sheet-chart-builder-adapter.d.ts → sheet-chart-config-adapter.d.ts}

@@ -1,14 +1,14 @@
-import type { ChartPendingConfig, IChartBuilderAdapter, IChartData, IChartDescription, IChartRenderModelImageExportOptions, IChartRenderModelImageExportResult, IUniverDataSet } from '@univerjs-pro/engine-chart';
-import type { Injector } from '@univerjs/core';
+import type { ChartPendingConfig, IChartBuilderAdapter, IChartCreateConfig, IChartData, IChartDescription, IChartLiveAdapter, IUniverDataSet } from '@univerjs-pro/engine-chart';
+import type { ArrangeTypeEnum, Injector } from '@univerjs/core';
 import type { ISheetChartDescriptionExtension } from './sheet-chart-description';
-import type { ChartSourceSpec, IChartLayoutPatch } from './types';
+import type { ChartSourceSpec, IChartLayoutPatch, ISheetChartInfo } from './types';
 /** Sheet-owned changes committed alongside engine chart configuration. */
 export interface ISheetChartHostPatch {
     source?: ChartSourceSpec;
     layout?: IChartLayoutPatch;
 }
 /** Persistence seam required by a Sheet chart builder. */
-export interface ISheetChartBuilderAdapter extends IChartBuilderAdapter<ISheetChartDescriptionExtension> {
+export interface ISheetChartConfigAdapter extends IChartBuilderAdapter<ISheetChartDescriptionExtension> {
     commitHost(patch: ISheetChartHostPatch): void;
     resolveData(config: ChartPendingConfig, source?: ChartSourceSpec): IChartData;
     resolveSource(source: ChartSourceSpec): {
@@ -17,25 +17,34 @@ export interface ISheetChartBuilderAdapter extends IChartBuilderAdapter<ISheetCh
     };
 }
 /** Stable Sheet identity and services used by the builder adapter. */
-export interface ISheetChartBuilderAdapterContext {
+export interface ISheetChartConfigAdapterContext {
     unitId: string;
     subUnitId: string;
     chartId: string;
     injector: Injector;
 }
 /** Commits Sheet chart changes using raw identity and package-owned commands. */
-export declare class SheetChartBuilderAdapter implements ISheetChartBuilderAdapter {
+export declare class SheetChartConfigAdapter implements ISheetChartConfigAdapter, IChartLiveAdapter<ChartSourceSpec, ISheetChartInfo> {
     private readonly _context;
     private readonly _injector;
-    constructor(_context: ISheetChartBuilderAdapterContext);
+    constructor(_context: ISheetChartConfigAdapterContext);
     describe(config?: ChartPendingConfig, dataSet?: IUniverDataSet): IChartDescription & ISheetChartDescriptionExtension;
+    getInfo(): ISheetChartInfo;
     commit(configChange: ChartPendingConfig): void;
+    update(info: ISheetChartInfo): Promise<void>;
+    commitChanges(source: ChartSourceSpec, config: IChartCreateConfig, layout: IChartLayoutPatch): Promise<void>;
+    private _replaceConfig;
+    setDataSource(source: ChartSourceSpec): void;
+    setAbsolutePosition(x: number, y: number): void;
+    setSize(width: number, height: number): void;
+    arrange(type: ArrangeTypeEnum): void;
+    setZOrder(zOrder: number): void;
     resolveData(configChange: ChartPendingConfig, source?: ChartSourceSpec): IChartData;
     resolveSource(source: ChartSourceSpec): {
         dataSet: IUniverDataSet;
         isRowDirection: boolean;
     };
     commitHost(patch: ISheetChartHostPatch): void;
-    exportImage(options?: IChartRenderModelImageExportOptions): Promise<IChartRenderModelImageExportResult | null>;
+    remove(): Promise<boolean>;
     private _resolveSourceRange;
 }

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

@@ -1,4 +1,4 @@
-import type { ChartTypeString, IChartCreateConfig, IChartDescription as IEngineChartDescription } from '@univerjs-pro/engine-chart';
+import type { ChartTypeString, IChartCreateConfig, IChartInfo, IChartDescription as IEngineChartDescription } from '@univerjs-pro/engine-chart';
 import type { IRange } from '@univerjs/core';
 export declare enum ChartSourceOrientation {
     Auto = "auto",
@@ -83,6 +83,10 @@ export interface IChartCreateSpec extends IChartCreateConfig {
     };
     size?: IChartSizeSpec;
 }
+/** Detached Sheet Chart information produced by the Facade builder. */
+export interface ISheetChartInfo extends IChartInfo<ChartSourceSpec> {
+    anchor?: ChartAnchorSpec;
+}
 export declare enum ChartDiagnosticCode {
     InvalidRange = "INVALID_RANGE",
     SingleCellSource = "SINGLE_CELL_SOURCE",

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

@@ -21,6 +21,7 @@ export declare class ChartDataSourceSingle extends ChartDataSource {
     watchRange(): void;
     convertDataSet(sourceInfo?: ISheetChartSourceSingleRange): IUniverDataSet;
     getDataSet(): IUniverDataSet;
+    getDimensionCount(): number;
     refresh(): void;
     private _emit;
 }
@@ -48,6 +49,7 @@ export declare class ChartDataSourceMulti extends ChartDataSource {
         sourceLabels: string[][];
     };
     getDataSet(): IUniverDataSet;
+    getDimensionCount(): number;
     refresh(): void;
     private _emit;
 }

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

@@ -1,34 +1,17 @@
 import type { ICellData, IDocumentData, IRange, Nullable, ObjectMatrix, Styles, Worksheet } from '@univerjs/core';
 import type { IChartSourceMultiRangeItem, ISheetChartSourceSingleRange, OptionDataValue } from '../models/types';
 import { ChartSourceDataTypeEnum } from '@univerjs-pro/engine-chart';
+import { numfmt } from '@univerjs/core';
+type ChartSourcePatternInfoRecord = Record<string, ReturnType<typeof numfmt.getFormatInfo>>;
 export interface IChartSourceCellEntry {
     value: OptionDataValue;
     label: string;
     sourceType: ChartSourceDataTypeEnum;
 }
 export declare const getStringFromDataStream: (data: IDocumentData) => string;
-/**
- * Get the cell data value as number for source
- * @param cellData The cell data
- * @returns {number|null} The number value
- */
-export declare function convertCellDataToNumber(cellData: Nullable<ICellData>, styles: Styles, patternInfoRecord: Record<string, any>): {
-    v: null | number | string;
-    t: ChartSourceDataTypeEnum;
-};
 export declare function convertArrayLikeRangeInfoToMatrix(sourceRange: IRange, sheet: Worksheet, index: number, matrix: ObjectMatrix<OptionDataValue>, sourceTypeMatrix: ObjectMatrix<ChartSourceDataTypeEnum>, sourceLabelsMatrix: ObjectMatrix<string>, styles: Styles): void;
-export declare function convertCellDataToSourceEntry(cellData: Nullable<ICellData>, styles: Styles, patternInfoRecord: Record<string, any>): IChartSourceCellEntry;
-/**
- *  transform cell data to dimension name
- * @param cellData the sheet cell data
- * @param styles workBook styles collection
- * @param patternInfoRecord The cache record for pattern info
- * @returns {string} The dimension name
- */
-export declare function convertCellDataToString(cellData: Nullable<ICellData>, styles: Styles, patternInfoRecord: Record<string, any>): {
-    v: string;
-    t: ChartSourceDataTypeEnum;
-};
+export declare function getCellSourceEntry(worksheet: Worksheet, row: number, column: number, styles: Styles, patternInfoRecord: ChartSourcePatternInfoRecord): IChartSourceCellEntry;
+export declare function convertCellDataToSourceEntry(cellData: Nullable<ICellData>, styles: Styles, patternInfoRecord: ChartSourcePatternInfoRecord, sourceCellData?: Nullable<ICellData>): IChartSourceCellEntry;
 /**
  * @description  this function is used to change the single range info to multi range info, we will split the single range to two range, one is the dimension range, the other is the value range
  * @param {ISheetChartSourceSingleRange} rangeInfo the single range info
@@ -41,3 +24,4 @@ export declare function changeSingleRangeInfoToMultiRangeInfo(rangeInfo: ISheetC
  * @returns {boolean} return the multi range info can switch orient or not
  */
 export declare function isMultiRangeCanSwitchOrient(rangeInfo: IChartSourceMultiRangeItem[]): boolean;
+export {};

package/lib/types/commands/chart-persisted-context.d.ts

@@ -0,0 +1,3 @@
+import type { IChartContext } from '@univerjs-pro/engine-chart';
+export type IChartPersistedContext = Pick<IChartContext, 'categoryIndexes' | 'seriesIndexes' | 'histogram'>;
+export declare function replacePersistedChartContext(current: IChartContext, persisted: IChartPersistedContext): IChartContext;

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

@@ -1,9 +1,13 @@
-import type { ChartPendingConfig, ChartStyle, ChartTypeBits, DataOrientation, IChartContext, IChartDataAggregation } from '@univerjs-pro/engine-chart';
+import type { ChartPendingConfig, ChartStyle, ChartTypeBits, DataOrientation, IChartDataAggregation } from '@univerjs-pro/engine-chart';
 import type { ICommand } from '@univerjs/core';
+import type { IChartPersistedContext } from '../chart-persisted-context';
 /** Switches supplied style, context, and aggregation groups from merge to replacement semantics. */
 export declare const ReplaceSheetChartConfig: unique symbol;
-type SheetChartStylePatch = Omit<ChartStyle, 'candlestick'> & {
+type SheetChartStylePatch = Omit<ChartStyle, 'candlestick' | 'sunburst' | 'gauge' | 'chord'> & {
     candlestick?: ChartPendingConfig['candlestick'];
+    sunburst?: ChartPendingConfig['sunburst'];
+    gauge?: ChartPendingConfig['gauge'];
+    chord?: ChartPendingConfig['chord'];
 };
 export interface IChartUpdateConfigCommandParams {
     unitId: string;
@@ -12,7 +16,7 @@ export interface IChartUpdateConfigCommandParams {
     chartType?: ChartTypeBits;
     dataAggregation?: Partial<IChartDataAggregation>;
     style?: SheetChartStylePatch;
-    context?: IChartContext;
+    context?: IChartPersistedContext;
     [ReplaceSheetChartConfig]?: true;
 }
 /**

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

@@ -1,6 +1,6 @@
-import type { ChartStyle, DeepNullish, IChartContext, IChartDataAggregation } from '@univerjs-pro/engine-chart';
+import type { ChartStyle, ChartTypeBits, DeepNullish, IChartDataAggregation } from '@univerjs-pro/engine-chart';
 import type { IMutation } from '@univerjs/core';
-import { ChartTypeBits } from '@univerjs-pro/engine-chart';
+import type { IChartPersistedContext } from '../chart-persisted-context';
 /**
  * Wire payload shared by incremental and replacement mutations.
  * Incremental mutations forward nested `null` values to the model; replacement callers should
@@ -12,7 +12,7 @@ export interface IChartUpdateConfigMutationParams {
     chartType?: ChartTypeBits;
     dataAggregation?: DeepNullish<IChartDataAggregation>;
     style?: DeepNullish<ChartStyle>;
-    context?: DeepNullish<IChartContext>;
+    context?: DeepNullish<IChartPersistedContext>;
 }
 /**
  * Incrementally updates the model by merging each supplied config group.

package/lib/types/common/util.d.ts

@@ -1,3 +1,4 @@
+import type { ChartRuntimeStyle } from '@univerjs-pro/engine-chart';
 import type { IAccessor } from '@univerjs/core';
 export declare const BUILD_TIMESTAMP: number;
 export declare const DefaultLimitedTypes: string[];
@@ -11,3 +12,4 @@ export declare const setProperty: (data: Record<string, any>, propertyPath: stri
 export declare const setGraphicToSpec: (spec: Record<string, any>, graphicElements: unknown[]) => void;
 export declare const translateAngleToRadian: (angle: number) => number;
 export declare function getAllowedChartTypes(accessor: IAccessor): string[];
+export declare function withSheetChartWatermark(style: ChartRuntimeStyle, accessor: IAccessor): ChartRuntimeStyle;

package/lib/types/config/config.d.ts

@@ -1,4 +1,4 @@
-import type { IWordCloudRenderConfig } from '@univerjs-pro/engine-chart';
+import type { IChartHostRect } from '@univerjs-pro/engine-chart';
 export declare const SHEETS_CHART_PLUGIN_CONFIG_KEY = "sheets-chart.config";
 export declare const configSymbol: unique symbol;
 export declare enum ChartRenderMode {
@@ -6,7 +6,7 @@ export declare enum ChartRenderMode {
     Image = "image"
 }
 export interface IUniverSheetsChartConfig {
-    wordCloudRenderConfig?: IWordCloudRenderConfig;
     chartRenderMode?: ChartRenderMode;
+    defaultChartSize?: IChartHostRect;
 }
 export declare const defaultPluginConfig: IUniverSheetsChartConfig;

package/lib/types/facade/f-enum.d.ts

@@ -2,8 +2,35 @@ import { ChartSourceOrientation } from '@univerjs-pro/sheets-chart';
 import { FEnum } from '@univerjs/core/facade';
 /** @ignore */
 export interface IFSheetsChartEnumMixin {
+    /**
+     * Controls how a Sheet range is interpreted as Chart series.
+     *
+     * - `Auto` lets Sheet Chart infer the orientation from the selected range.
+     * - `Row`, `Rows`, and `RowsAsSeries` are equivalent: each row is treated as a series.
+     * - `Column`, `Columns`, and `ColumnsAsSeries` are equivalent: each column is treated as a series.
+     *
+     * Pass a value through `orientation` when calling a Sheet Chart builder's
+     * `setSource()` method or a live Sheet Chart's `setDataSource()` method.
+     *
+     * @example
+     * ```ts
+     * const fWorkbook = univerAPI.getActiveWorkbook();
+     * const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+     *
+     * const chartInfo = fWorksheet
+     *   .newChart(univerAPI.Enum.ChartTypeString.Column)
+     *   .setSource({
+     *     range: 'A1:D8',
+     *     orientation: univerAPI.Enum.ChartSourceOrientation.Columns,
+     *   })
+     *   .build();
+     *
+     * await fWorksheet.insertChart(chartInfo);
+     * ```
+     */
     ChartSourceOrientation: typeof ChartSourceOrientation;
 }
+/** @ignore */
 export declare class FSheetsChartEnumMixin extends FEnum implements IFSheetsChartEnumMixin {
     get ChartSourceOrientation(): typeof ChartSourceOrientation;
 }

package/lib/types/facade/f-worksheet.d.ts

@@ -0,0 +1,134 @@
+import type { ChartTypeString } from '@univerjs-pro/engine-chart';
+import type { HostComposedChartBuilder, IChartBuilderTypeMap } from '@univerjs-pro/engine-chart/facade';
+import type { ChartAnchorSpec, ChartSourceSpec, ISheetChartInfo } from '@univerjs-pro/sheets-chart';
+import { FWorksheet } from '@univerjs/sheets/facade';
+import { FSheetChart } from './f-chart';
+/** Sheet-only methods composed onto every Sheet Chart Builder. */
+export interface ISheetChartMethods {
+    /**
+     * Sets the cell anchor used when inserting the Chart.
+     * @param {ChartAnchorSpec} anchor A1 notation or a zero-based row/column anchor with optional offsets.
+     * @returns {this} This Builder for chaining.
+     * @example
+     * ```ts
+     * const fWorkbook = univerAPI.getActiveWorkbook();
+     * const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+     *
+     * const chartInfo = fWorksheet
+     *   .newChart(univerAPI.Enum.ChartTypeString.Column)
+     *   .setSource({
+     *     range: 'A1:D8',
+     *     orientation: univerAPI.Enum.ChartSourceOrientation.Columns,
+     *   })
+     *   .setPosition({
+     *     row: 1,
+     *     column: 5,
+     *     rowOffset: 10,
+     *     columnOffset: 20,
+     *   })
+     *   .setSize(640, 360)
+     *   .setTitle('Quarterly sales')
+     *   .build();
+     * await fWorksheet.insertChart(chartInfo);
+     * ```
+     */
+    setPosition(anchor: ChartAnchorSpec): this;
+}
+/** A type-specific Chart Builder composed with Sheet-only insertion methods. */
+export type FSheetChartBuilderOf<T extends ChartTypeString> = HostComposedChartBuilder<IChartBuilderTypeMap<ChartSourceSpec, ChartSourceSpec, ISheetChartInfo>[T], ISheetChartMethods>;
+/** @ignore */
+export interface IFWorksheetChartMixin {
+    /**
+     * Creates a detached, type-specific Chart builder for this worksheet.
+     *
+     * @param {ChartTypeString} type The Chart type to create.
+     * @returns {FSheetChartBuilderOf<T>} A detached builder that produces insertable Sheet Chart information.
+     * @example
+     * ```ts
+     * const fWorkbook = univerAPI.getActiveWorkbook();
+     * const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+     *
+     * const chartInfo = fWorksheet
+     *   .newChart(univerAPI.Enum.ChartTypeString.Column)
+     *   .setSource({
+     *     range: 'A1:D8',
+     *     orientation: univerAPI.Enum.ChartSourceOrientation.Columns,
+     *   })
+     *   .setPosition('F2')
+     *   .setSize(640, 360)
+     *   .setTitle('Quarterly sales')
+     *   .build();
+     *
+     * const fChart = await fWorksheet.insertChart(chartInfo);
+     * console.log(fChart.getId());
+     * ```
+     */
+    newChart<T extends ChartTypeString>(type: T): FSheetChartBuilderOf<T>;
+    /**
+     * Inserts a Chart into this worksheet from detached Chart information.
+     *
+     * @param {ISheetChartInfo} info The Chart configuration, Sheet data source, and optional placement produced by a Chart builder.
+     * @returns {Promise<FSheetChart>} A live facade for the inserted Sheet Chart.
+     * @example
+     * ```ts
+     * const fWorkbook = univerAPI.getActiveWorkbook();
+     * const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+     *
+     * const chartInfo = fWorksheet
+     *   .newChart(univerAPI.Enum.ChartTypeString.Pie)
+     *   .setSource('A1:B8')
+     *   .setPosition('D2')
+     *   .setSize(480, 320)
+     *   .setDoughnutHole(0.4)
+     *   .build();
+     *
+     * const fChart = await fWorksheet.insertChart(chartInfo);
+     * fChart.setPosition('E3');
+     * ```
+     */
+    insertChart(info: ISheetChartInfo): Promise<FSheetChart>;
+    /**
+     * Returns a Chart on this worksheet by its stable Chart identifier.
+     *
+     * @param {string} chartId The identifier returned by {@link FSheetChart.getId}.
+     * @returns {FSheetChart | null} A live Sheet Chart facade, or `null` if the Chart does not exist on this worksheet.
+     * @example
+     * ```ts
+     * const fWorkbook = univerAPI.getActiveWorkbook();
+     * const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+     *
+     * const firstChart = fWorksheet.getCharts()[0];
+     * const fChart = firstChart ? fWorksheet.getChart(firstChart.getId()) : null;
+     * console.log(fChart?.getInfo());
+     * ```
+     */
+    getChart(chartId: string): FSheetChart | null;
+    /**
+     * Returns all Charts on this worksheet.
+     *
+     * @returns {FSheetChart[]} Live Sheet Chart facades in the worksheet's model order.
+     * @example
+     * ```ts
+     * const fWorkbook = univerAPI.getActiveWorkbook();
+     * const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+     *
+     * const fCharts = fWorksheet.getCharts();
+     * fCharts.forEach((fChart) => {
+     *   console.log(fChart.getId(), fChart.getInfo());
+     * });
+     * ```
+     */
+    getCharts(): FSheetChart[];
+}
+/** @ignore */
+export declare class FWorksheetChartMixin extends FWorksheet implements IFWorksheetChartMixin {
+    newChart<T extends ChartTypeString>(type: T): FSheetChartBuilderOf<T>;
+    insertChart(info: ISheetChartInfo): Promise<FSheetChart>;
+    getChart(chartId: string): FSheetChart | null;
+    getCharts(): FSheetChart[];
+    private _chartSourceContext;
+}
+declare module '@univerjs/sheets/facade' {
+    interface FWorksheet extends IFWorksheetChartMixin {
+    }
+}

package/lib/types/facade/index.d.ts

@@ -1,4 +1,4 @@
-import './f-worksheet-charts';
+import './f-worksheet';
 import './f-enum';
-export type { FSheetAnyChartBuilder, FSheetChartBuilder, FSheetChartBuilderOf, ISheetChartMethods } from './chart';
-export { FSheetCharts } from './chart';
+export { FSheetChart } from './f-chart';
+export type { FSheetChartBuilderOf, ISheetChartMethods } from './f-worksheet';

package/lib/types/index.d.ts

@@ -1,5 +1,11 @@
-export { ChartDiagnosticSeverity, ChartSourceKind, ChartSourceOrientation, resolveInitialChartPosition, resolveSourceSeries, resolveSourceSpec, SheetChartBuilder, SheetChartBuilderAdapter, toSheetChartCreateSpec, } from './chart-builder';
-export type { ChartAnchorSpec, ChartSourceSpec, IChartCreateSpec, IChartDiagnostic, ISheetChartBuilderAdapter, ISheetChartDescriptionExtension, ISheetChartHostPatch, ISheetChartSourceContext, } from './chart-builder';
+export { SheetChartConfigAdapter } from './chart-builder/sheet-chart-config-adapter';
+export type { ISheetChartConfigAdapter, ISheetChartHostPatch, } from './chart-builder/sheet-chart-config-adapter';
+export type { ISheetChartDescriptionExtension } from './chart-builder/sheet-chart-description';
+export { resolveInitialChartPosition } from './chart-builder/sheet-chart-layout';
+export { resolveSourceSeries, resolveSourceSpec } from './chart-builder/sheet-chart-source';
+export type { ISheetChartSourceContext, } from './chart-builder/sheet-chart-source';
+export { ChartDiagnosticSeverity, ChartSourceKind, ChartSourceOrientation, } from './chart-builder/types';
+export type { ChartAnchorSpec, ChartSourceSpec, IChartCreateSpec, IChartDiagnostic, ISheetChartInfo, } from './chart-builder/types';
 export { ChartUpdateConfigCommand, ReplaceSheetChartConfig } from './commands/commands/sheets-chart-update-config.command';
 export type { IChartUpdateConfigCommandParams } from './commands/commands/sheets-chart-update-config.command';
 export { ChartUpdateSourceCommand } from './commands/commands/sheets-chart-update-source.command';
@@ -15,7 +21,6 @@ export type { IInsertSheetsChartMutationParams, IRemoveSheetsChartMutationParams
 export { getAllowedChartTypes, setProperty, } from './common/util';
 export { ChartRenderMode, SHEETS_CHART_PLUGIN_CONFIG_KEY, } from './config/config';
 export type { IUniverSheetsChartConfig } from './config/config';
-export { SheetChartModel } from './models/chart-model';
 export type { IChartSourceMultiRangeItem, IChartSourceRangeItem, ISheetChartDataSource, ISheetChartSourceSingleRange, ISheetChartSourceSnapshot, } from './models/types';
 export { SHEETS_CHART_PLUGIN_NAME, UniverSheetsChartPlugin, } from './plugin';
 export { ChartModelService } from './services/chart-model.service';

package/lib/types/locale/en-US.d.ts

@@ -1,7 +1,5 @@
 declare const locale: {
     'sheets-chart': {
-        category: string;
-        series: string;
         seriesDefaultName: string;
         categoryDefaultName: string;
         blank: string;
@@ -45,11 +43,48 @@ declare const locale: {
         histogram: {
             frequency: string;
         };
+        pie: {
+            aggregateOther: string;
+            aggregateMembers: string;
+        };
         treemap: {
             hierarchy: string;
             value: string;
             ownValue: string;
             children: string;
+            diagnostic: string;
+        };
+        sunburst: {
+            hierarchy: string;
+            value: string;
+            ownValue: string;
+            children: string;
+            diagnostic: string;
+        };
+        gauge: {
+            label: string;
+            value: string;
+            emptyDiagnostic: string;
+            mappingDiagnostic: string;
+            configDiagnostic: string;
+        };
+        chord: {
+            emptyDiagnostic: string;
+            mappingDiagnostic: string;
+            configDiagnostic: string;
+            source: string;
+            target: string;
+            value: string;
+            count: string;
+            associatedValue: string;
+        };
+        chartField: {
+            missingCategoryFields: string;
+            missingSeriesFields: string;
+            invalidFieldIndex: string;
+            invalidValueFieldType: string;
+            invalidDataStructure: string;
+            unsupportedChartType: string;
         };
     };
 };

package/lib/types/plugin.d.ts

@@ -11,5 +11,4 @@ export declare class UniverSheetsChartPlugin extends Plugin {
     static version: string;
     constructor(_config: IUniverSheetsChartConfig | undefined, _injector: Injector, _configService: IConfigService);
     onStarting(): void;
-    private _getWatermark;
 }

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

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

package/lib/types/services/sheet-chart-range-watcher.d.ts

@@ -1,17 +1,17 @@
-import type { SheetChartModel } from '../models/chart-model';
-import type { ISheetChartSourceRanges } from '../models/types';
+import type { ChartModel } from '@univerjs-pro/engine-chart';
+import type { ISheetChartDataSource, ISheetChartSourceRanges } from '../models/types';
 import { Disposable, ICommandService } from '@univerjs/core';
 import { RefRangeService } from '@univerjs/sheets';
 export interface ISheetChartRangeWatcherCallbacks {
-    onDataChanged(model: SheetChartModel): void;
-    onRangeChanged(model: SheetChartModel, rangeInfo: ISheetChartSourceRanges): void;
+    onDataChanged(model: ChartModel<ISheetChartDataSource>): void;
+    onRangeChanged(model: ChartModel<ISheetChartDataSource>, rangeInfo: ISheetChartSourceRanges): void;
 }
 export declare class SheetChartRangeWatcher extends Disposable {
     private readonly _commandService;
     private readonly _refRangeService;
     private readonly _bindings;
     constructor(_commandService: ICommandService, _refRangeService: RefRangeService);
-    bind(model: SheetChartModel, callbacks: ISheetChartRangeWatcherCallbacks): void;
+    bind(model: ChartModel<ISheetChartDataSource>, callbacks: ISheetChartRangeWatcherCallbacks): void;
     unbind(chartId: string): void;
     private _watchRange;
     private _watchSingleRange;

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

@@ -1,6 +1,5 @@
-import type { IChartSnapshot } from '@univerjs-pro/engine-chart';
+import type { ChartModel, IChartSnapshot } from '@univerjs-pro/engine-chart';
 import type { Nullable } from '@univerjs/core';
-import type { SheetChartModel } from '../models/chart-model';
 import type { ISheetChartDataSource, ISheetChartSourceRanges } from '../models/types';
 import { ChartTypeBits, DataOrientation } from '@univerjs-pro/engine-chart';
 import { Disposable, IResourceManagerService, IUniverInstanceService } from '@univerjs/core';
@@ -28,11 +27,14 @@ export declare class SheetsChartService extends Disposable {
     constructor(_resourcesManagerService: IResourceManagerService, _univerInstanceService: IUniverInstanceService, _chartModelService: ChartModelService, _rangeWatcher: SheetChartRangeWatcher);
     setLoaded(): void;
     getSubUnitId(unitId: string, chartModelId: string): Nullable<string>;
-    getUnitChartModels(unitId: string, subUnitId: string): (SheetChartModel | undefined)[];
+    getUnitChartModels(unitId: string, subUnitId: string): (ChartModel<ISheetChartDataSource> | undefined)[];
     getChartSuggestion(rangeInfo: ISheetChartSourceRanges): {
         orient: DataOrientation;
         chartType: ChartTypeBits;
     };
+    private _getPrimaryChartSuggestion;
+    private _hasSeries;
+    private _getSuggestionForOrientation;
     private _normalizeInitialRangeInfo;
     private _hasNonNumberCellInSingleRow;
     ensureChartModelCollection(unitId: string, subUnitId: string): Set<string>;
@@ -41,9 +43,9 @@ export declare class SheetsChartService extends Disposable {
     replaceChartDataSource(id: string, rangeInfo: ISheetChartSourceRanges): boolean;
     generateChartModelContextForSource(id: string, rangeInfo: ISheetChartSourceRanges): import("@univerjs-pro/engine-chart").IChartContext | undefined;
     refreshChartSource(): void;
-    createChartModel(unitId: string, subUnitId: string, options: ISheetChartModelOptions, isNew?: boolean): SheetChartModel;
+    createChartModel(unitId: string, subUnitId: string, options: ISheetChartModelOptions, isNew?: boolean): ChartModel<ISheetChartDataSource>;
     removeChartModel(id: string): void;
-    getChartModel(id: string): SheetChartModel | undefined;
+    getChartModel(id: string): ChartModel<ISheetChartDataSource> | undefined;
     private _serializeChartForUnit;
     private _refreshChartDataAndContext;
     private _bindRangeWatcher;