@advt-gpt-chart/package 3.2.1 → 3.2.4

package/dist/Chart/ChartBase/constants.d.ts

@@ -4,7 +4,7 @@ import { AxesType } from './utils';
 type CartesianOptions = {
     xField: string;
     yField: string;
-    yFields?: string[];
+    isMetricFolded?: boolean;
 };
 type CartesianTooltipOptions = CartesianOptions & {
     seriesField?: string;
@@ -18,23 +18,13 @@ type PolarTooltipOptions = {
     categoryFieldType?: AxesType;
     isMetricFolded?: boolean;
 };
-type CompositeAxisSpec = {
-    orient: 'left' | 'right' | 'bottom' | 'top';
-    seriesIndex?: number[];
-    seriesId?: string[];
-    type?: string;
-    label?: any;
-    grid?: any;
-    title?: any;
-    offset?: number;
-    min?: number;
-    max?: number;
-    [key: string]: any;
-};
 export type Tools = {
     formatValue: (field: string, value: any) => any;
+    formatValueWithoutUnit: (field: string, value: any) => any;
     getAxesType: (field: string) => 'band' | 'linear';
     getFieldType: (fieldName: string, value?: any) => GenericDataType | undefined;
+    createLabelFormatMethod: (axesConfig: any, isMetricFolded?: boolean) => (val: any, datum: any) => any;
+    getUnit: (field: string) => string;
 };
 export declare const getPolarLegendSpec: (seriesField: string | boolean | undefined, categoryField: string, tools?: Tools) => {
     visible: boolean;
@@ -51,18 +41,18 @@ export declare const getPolarTooltipSpec: ({ categoryField, valueField, seriesFi
             value: (datum: any) => any;
         };
         content: {
-            key: () => string;
+            key: (datum: any) => any;
             value: (datum: any) => any;
-        } | undefined;
+        };
     };
     dimension: {
         title: {
             value: (datum: any) => any;
         };
         content: {
-            key: () => string;
+            key: (datum: any) => any;
             value: (datum: any) => any;
-        } | undefined;
+        };
     };
 };
 export declare const getLineStyle: () => {
@@ -88,7 +78,6 @@ export declare const getLineStyle: () => {
     };
 };
 export declare const getCartesianAxesSpec: (options: CartesianOptions, tools?: Tools) => ICartesianAxisSpec[];
-export declare const getCompositeAxesSpec: (series: any[], yFields: string[], yAxesConfig?: any[], seriesIds?: string[]) => CompositeAxisSpec[];
 export declare const getCartesianTootipSpec: ({ xField, yField, seriesField, isMetricFolded }: CartesianTooltipOptions, tools?: Tools) => {
     mark: {
         updateTitle: (prev: any) => any;

package/dist/Chart/ChartBase/transformed.d.ts

@@ -1,4 +1,4 @@
-import { Dataset } from '../Dataset/types';
+import { Dataset } from '../../DataView/Dataset/types';
 export interface CartesianParams {
     xField: string;
     yField: string;

package/dist/Chart/ChartBase/types.d.ts

@@ -1,10 +1,10 @@
 import type { IChartSpec } from '@visactor/vchart';
 import type { ComponentType } from 'react';
 import type { ChartProps } from '../../Chart/ChartCodeRender/type';
+import { Dataset, FieldInfoItem } from '../../DataView/Dataset/types';
+import { DataSource } from '../../DataView/DataSource/types';
 import { ContextMenu } from '../../GPTVis/hooks/useChartStore';
 import { BaseChartProps, DataItem } from '../../types';
-import { Dataset, FieldInfoItem } from '../Dataset/types';
-import { DataSource } from '../DataSource/types';
 /**
  * 合并后的属性类型，包含上下文菜单回调
  */

package/dist/Chart/ChartCodeRender/type.d.ts

@@ -1,10 +1,10 @@
 import type React from 'react';
 import type { FC } from 'react';
 import type { Components, ExtraProps } from 'react-markdown';
+import { DataFormat, Dataset, FieldInfoItem } from '../../DataView/Dataset/types';
+import { DataSource } from '../../DataView/DataSource/types';
 import { ChartType, DataItem } from '../../types';
 import { TimeGrainType } from '../../utils';
-import { DataFormat, Dataset, FieldInfoItem } from '../Dataset/types';
-import { DataSource } from '../DataSource/types';
 export interface MetricItem {
     id: string;
     name: string;

package/dist/Chart/ChartControllers/ChartDetailData/index.d.ts

@@ -1,4 +1,4 @@
-import { DataSource } from '../../DataSource/types';
+import { DataSource } from '../../../DataView/DataSource/types';
 interface ChartDetailDataTableProps {
     dataSource: DataSource;
 }

package/dist/Chart/ChartControllers/index.d.ts

@@ -1,6 +1,6 @@
 import { OptionType, TimeRange } from '../../components/CustomTimeRange/types';
+import { DataSource } from '../../DataView/DataSource/types';
 import { TimeGrainType } from '../../utils/date';
-import { DataSource } from '../DataSource/types';
 import { FilterItemType } from './Filter/types';
 import { OrderItemType } from './Orders/types';
 import { dimensionsOptionType } from './types';

package/dist/Chart/ChartEvents/ChartContextMenu/utils.d.ts

@@ -1,4 +1,4 @@
-import { FieldInfoItem } from '../../Dataset/types';
+import { FieldInfoItem } from '../../../DataView/Dataset/types';
 export declare function getRightClickInfo(rightClickValue: any[], fieldInfo: FieldInfoItem[] | undefined, metricTime: {
     label: string;
     value: string;

package/dist/Chart/ChartEvents/DrillBy/DrillByChart.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { DataSource } from '../../DataSource/types';
+import { DataSource } from '../../../DataView/DataSource/types';
 interface DrillByChartProps {
     dataSource: DataSource;
 }

package/dist/Chart/ChartWrapper/ChartHeader.d.ts

@@ -1,4 +1,4 @@
-import { DataSource } from '../DataSource/types';
+import { DataSource } from '../../DataView/DataSource/types';
 export interface ChartHeaderProps {
     dataSource?: DataSource | null;
     isFullScreen?: boolean;

package/dist/Chart/ChartWrapper/ChartMenu.d.ts

@@ -1,4 +1,4 @@
-import { DataSource } from '../DataSource/types';
+import { DataSource } from '../../DataView/DataSource/types';
 interface ChartMenuProps {
     dataSource?: DataSource | null;
 }

package/dist/Chart/ChartWrapper/utils.d.ts

@@ -1,4 +1,5 @@
 import VMind from '@visactor/vmind';
+import { MetricFormat } from '../../DataView/Dataset/types';
 import { ChartType } from '../../types';
 import { ChartJson } from '../ChartCodeRender/type';
 export declare const vmind: VMind;
@@ -9,7 +10,7 @@ export declare function isChartAdvisor(chartJson: ChartJson): boolean;
 export declare function chartAdvisor(chartJson: ChartJson): Promise<{
     type: any;
     data: import("../..").DataItem[];
-    dataset?: import("../Dataset/types").Dataset;
+    dataset?: import("../../DataView/Dataset/types").Dataset;
     chartId?: string;
     chartName?: string;
     xField?: string;
@@ -18,16 +19,43 @@ export declare function chartAdvisor(chartJson: ChartJson): Promise<{
     valField?: string;
     dimensions?: string[];
     metrics?: string[];
-    dataSource?: import("../DataSource/types").DataSource;
-    columns?: import("../Dataset/types").FieldInfoItem[];
+    dataSource?: import("../../DataView/DataSource/types").DataSource;
+    columns?: import("../../DataView/Dataset/types").FieldInfoItem[];
     timeGrain?: import("../../utils").TimeGrainType;
-    dataFormat?: import("../Dataset/types").DataFormat;
+    dataFormat?: import("../../DataView/Dataset/types").DataFormat;
     hideChartHeader?: boolean;
     series?: any[];
     agent?: import("../ChartCodeRender/type").AgentConfig;
     availableChartTypes?: string[];
 }>;
-export declare function exportToExcel(data: any[], fileName: string): void;
+/**
+ * 计算饼图/环形图数据的占比
+ * @param data - 数据数组
+ * @param metrics - 指标数组（优先使用）
+ * @param valField - 值字段名称（当metrics不存在时使用）
+ * @returns 添加了占比列的新数据数组
+ */
+export declare function calculatePieDonutPercentage(data: any[], metrics?: string[], valField?: string): any[];
+/**
+ * 合并组合图数据
+ * 将多个 series 的数据按公共维度字段合并，每个维度值只保留一行
+ * @param series - 组合图的 series 数组
+ * @returns 合并后的数据数组
+ */
+export declare function mergeCompositeSeriesData(series: any[]): {
+    data: any[];
+    metrics: string[];
+};
+export interface ExportToExcelOptions {
+    data: any[];
+    fileName: string;
+    dataFormat?: Record<string, MetricFormat>;
+    formatValueWithoutUnit?: (fieldName: string, value: any, formatTimeStr?: any) => any;
+    chartType?: ChartType;
+    metrics?: string[];
+    valField?: string;
+}
+export declare function exportToExcel({ data, fileName, dataFormat, formatValueWithoutUnit, chartType, metrics, valField, }: ExportToExcelOptions): void;
 export declare function exportToExcelWithSheets(sheets: Array<{
     name: string;
     data: any[];

package/dist/Charts/Area/index.d.ts

@@ -1,3 +1,2 @@
-import { AreaProps } from './types';
-declare const Area: (props: AreaProps) => import("react/jsx-runtime").JSX.Element;
+declare const Area: (props: any) => import("react/jsx-runtime").JSX.Element;
 export default Area;

package/dist/Charts/Bar/index.d.ts

@@ -1,3 +1,2 @@
-import type { BarProps } from './types';
-declare const Bar: (props: BarProps) => import("react/jsx-runtime").JSX.Element;
+declare const Bar: (props: any) => import("react/jsx-runtime").JSX.Element;
 export default Bar;

package/dist/Charts/Composite/index.d.ts

@@ -1,3 +1,2 @@
-import type { CompositeProps } from './types';
-declare const Composite: (props: CompositeProps) => import("react/jsx-runtime").JSX.Element;
+declare const Composite: (props: any) => import("react/jsx-runtime").JSX.Element;
 export default Composite;

package/dist/Charts/Composite/transform.d.ts

@@ -0,0 +1,13 @@
+import { CompositeSeries } from './types';
+/**
+ * 将 series 配置转换为内部使用的 xField/yField 格式
+ * 支持 dimensions/metrics 和 xField/yField 两种方式
+ *
+ * 优先级：xField/yField > dimensions/metrics
+ */
+export declare function normalizeSeriesField(series: CompositeSeries): {
+    xField: string;
+    yField: string;
+    dimensions: string[];
+    metrics: string[];
+};

package/dist/Charts/Composite/types.d.ts

@@ -1,31 +1,22 @@
 import type { BaseVChartConfig, BaseVChartProps, DataItem } from '../../types';
-import { BarConfig } from '../Bar/types';
 export type CompositeSeriesType = 'bar' | 'line' | 'area' | 'scatter';
-export type YAxisOrient = 'left' | 'right';
-export type YAxisConfig = {
-    id?: string;
-    orient?: YAxisOrient;
-    title?: {
-        visible?: boolean;
-        text?: string;
-    };
-    label?: Record<string, any>;
-    type?: string;
-    min?: number;
-    max?: number;
-    grid?: {
-        visible?: boolean;
-    };
-    offset?: number;
-    [key: string]: any;
-};
-export type CompositeSeries = Omit<BarConfig, 'data' | 'chartName'> & {
+/**
+ * Composite 组合图的 series 配置
+ * 只包含数据相关的配置，格式化等全局配置在顶层
+ */
+export type CompositeSeries = {
     type: CompositeSeriesType;
     data?: DataItem[];
-    yAxisId?: string;
+    dimensions?: string[];
+    metrics?: string[];
+    xField?: string;
+    yField?: string;
 };
-export type CompositeConfig = Omit<BaseVChartConfig, 'data'> & {
+/**
+ * Composite 组合图配置
+ * 全局配置（dataFormat、columns、timeGrain 等）在顶层，与单图表保持一致
+ */
+export type CompositeConfig = BaseVChartConfig & {
     series: CompositeSeries[];
-    yAxes?: YAxisConfig[];
 };
 export type CompositeProps = BaseVChartProps & Partial<CompositeConfig>;

package/dist/Charts/Composite/util.d.ts

@@ -1,18 +1,38 @@
+import type { Tools } from '../../Chart/ChartBase/constants';
 import { DataItem } from '../../types';
-import { CompositeSeries } from './types';
+import type { CompositeSeries } from './types';
 /**
- * 合并所有系列的数据到一个数据源
+ * 构建多 Y 轴配置
+ * - 第 1 个系列：左轴
+ * - 第 2-5 个系列：右轴（带偏移）
+ * 注意：不包含 X 轴，X 轴由 getCartesianAxesSpec 生成
  */
-export declare function mergeSeriesData(series: CompositeSeries[]): DataItem[];
+export declare function buildCompositeAxesSpec(series: CompositeSeries[], tools: Tools): any[];
 /**
- * 为每个系列生成数据ID和索引映射
+ * 为 series 创建 label 格式化函数
+ * 使用顶层的 dataFormat 配置（与单图表保持一致）
  */
-export declare function generateSeriesDataMapping(series: CompositeSeries[]): Record<string, number>;
+export declare function createSeriesLabelFormatMethod(series: CompositeSeries, tools: Tools): (val: any) => any;
 /**
- * 获取系列的 yField 列表（用于轴配置）
+ * 为数据添加 series 标识字段
  */
-export declare function getYFields(series: CompositeSeries[]): string[];
+export declare function addSeriesMetadata(data: DataItem[] | undefined, seriesType: string, seriesIndex: number): DataItem[];
 /**
- * 获取系列的 xField
+ * 构建 tooltip 配置
  */
-export declare function getXField(series: CompositeSeries[]): string;
+export declare function buildCompositeTooltip(series: CompositeSeries[], xField: string, tools: Tools): {
+    mark: {
+        updateTitle: (prev: any) => any;
+        content: {
+            key: (datum: any) => string;
+            value: (datum: any) => any;
+        };
+    };
+    dimension: {
+        updateTitle: (prev: any) => any;
+        content: {
+            key: (datum: any) => string;
+            value: (datum: any) => any;
+        };
+    };
+};

package/dist/Charts/Donut/index.d.ts

@@ -1,3 +1,2 @@
-import { DonutProps } from './types';
-declare const Donut: (props: DonutProps) => import("react/jsx-runtime").JSX.Element;
+declare const Donut: (props: any) => import("react/jsx-runtime").JSX.Element;
 export default Donut;

package/dist/Charts/Funnel/index.d.ts

@@ -1,3 +1,2 @@
-import { FunnelProps } from './types';
-declare const Funnel: (props: FunnelProps) => import("react/jsx-runtime").JSX.Element;
+declare const Funnel: (props: any) => import("react/jsx-runtime").JSX.Element;
 export default Funnel;

package/dist/Charts/Gauge/index.d.ts

@@ -1,3 +1,2 @@
-import { GaugeProps } from './types';
-declare const Gauge: (props: GaugeProps) => import("react/jsx-runtime").JSX.Element;
+declare const Gauge: (props: any) => import("react/jsx-runtime").JSX.Element;
 export default Gauge;

package/dist/Charts/Heatmap/index.d.ts

@@ -1,3 +1,2 @@
-import { HeatmapProps } from './types';
-declare const Heatmap: (props: HeatmapProps) => import("react/jsx-runtime").JSX.Element;
+declare const Heatmap: (props: any) => import("react/jsx-runtime").JSX.Element;
 export default Heatmap;

package/dist/Charts/Line/index.d.ts

@@ -1,3 +1,2 @@
-import { LineProps } from './types';
-declare const Line: (props: LineProps) => import("react/jsx-runtime").JSX.Element;
+declare const Line: (props: any) => import("react/jsx-runtime").JSX.Element;
 export default Line;

package/dist/Charts/Pie/index.d.ts

@@ -1,3 +1,2 @@
-import { PieProps } from './types';
-declare const Pie: (props: PieProps) => import("react/jsx-runtime").JSX.Element;
+declare const Pie: (props: any) => import("react/jsx-runtime").JSX.Element;
 export default Pie;

package/dist/Charts/Radar/index.d.ts

@@ -1,3 +1,2 @@
-import { RadarProps } from './types';
-declare const Radar: (props: RadarProps) => import("react/jsx-runtime").JSX.Element;
+declare const Radar: (props: any) => import("react/jsx-runtime").JSX.Element;
 export default Radar;

package/dist/Charts/Rank/index.d.ts

@@ -1,3 +1,2 @@
-import type { RankProps } from './types';
-declare const Rank: (props: RankProps) => import("react/jsx-runtime").JSX.Element;
+declare const Rank: (props: any) => import("react/jsx-runtime").JSX.Element;
 export default Rank;

package/dist/Charts/Scatter/index.d.ts

@@ -1,3 +1,2 @@
-import { ScatterProps } from './types';
-declare const Scatter: (props: ScatterProps) => import("react/jsx-runtime").JSX.Element;
+declare const Scatter: (props: any) => import("react/jsx-runtime").JSX.Element;
 export default Scatter;

package/dist/Charts/common/cartesianCommon.d.ts

@@ -0,0 +1,34 @@
+import { Tools } from '../../Chart/ChartBase/constants';
+interface CartesianCommonOptions {
+    axesConfig: {
+        xField: string | string[];
+        yField: string;
+        seriesField?: string;
+    };
+    xField: string;
+    dataset?: any;
+    tools: Tools;
+    chartConfig?: any;
+}
+export declare function cartesianCommon(options: CartesianCommonOptions): {
+    legends: any;
+    axes: import("@visactor/vchart").ICartesianAxisSpec[];
+    tooltip: {
+        mark: {
+            updateTitle: (prev: any) => any;
+            content: {
+                key: (datum: any) => any;
+                value: (datum: any) => any;
+            };
+        };
+        dimension: {
+            updateTitle: (prev: any) => any;
+            content: {
+                key: (datum: any) => any;
+                value: (datum: any) => any;
+            };
+        };
+    };
+    label: any;
+};
+export {};

package/dist/Charts/common/createChart.d.ts

@@ -0,0 +1,7 @@
+import { Tools } from '../../Chart/ChartBase/constants';
+import { ChartConfig } from '../../ConfigProvider/hooks';
+import { Charts } from '../../types';
+import { useChartConfigTools } from './hooks';
+type SpecFactory<TConfig extends ChartConfig> = (props: TConfig, tools: Tools, chartConfig: ReturnType<typeof useChartConfigTools>) => any;
+export declare function createChart<TConfig extends ChartConfig>(chartName: Charts, ChartComponent: any, createSpec: SpecFactory<TConfig>): (props: any) => import("react/jsx-runtime").JSX.Element;
+export {};

package/dist/Charts/common/hooks/useDashLine.d.ts

@@ -12,15 +12,18 @@ import type { DashSegment } from '../types';
  *   data,
  *   xField: 'time',
  *   getFieldType,
- *   dashSegments: [{ from: '00:45' }]
+ *   dashSegments: [{ from: '00:45' }],
+ *   metrics: ['actual', 'predicted'],
  * });
  * ```
  */
-export declare const useDashLine: ({ data, xField, getFieldType, dashSegments, }: {
+export declare const useDashLine: ({ data, xField, yField, getFieldType, dashSegments, metrics, }: {
     data: any[];
-    xField?: string;
+    xField: string;
+    yField: string;
     getFieldType?: (fieldName: string, value?: any) => GenericDataType | undefined;
     dashSegments?: DashSegment[];
+    metrics?: string[];
 }) => {
     processedData: any[];
     style: any;

package/dist/Charts/common/index.d.ts

@@ -3,4 +3,7 @@
  *
  * Provides shared utilities, hooks, and configurations for all chart components
  */
+export { cartesianCommon } from './cartesianCommon';
+export { createChart } from './createChart';
 export * from './hooks';
+export { polarCommon } from './polarCommon';

package/dist/Charts/common/polarCommon.d.ts

@@ -0,0 +1,44 @@
+import { Tools } from '../../Chart/ChartBase/constants';
+interface PolarCommonOptions {
+    axesConfig: {
+        nameField: string;
+        valField: string;
+        seriesField?: string;
+    };
+    dataset?: any;
+    tools: Tools;
+    chartConfig?: any;
+    showPercent?: boolean;
+}
+export declare function polarCommon(options: PolarCommonOptions): {
+    tooltip: {
+        mark: {
+            title: {
+                value: (datum: any) => any;
+            };
+            content: {
+                key: (datum: any) => any;
+                value: (datum: any) => any;
+            };
+        };
+        dimension: {
+            title: {
+                value: (datum: any) => any;
+            };
+            content: {
+                key: (datum: any) => any;
+                value: (datum: any) => any;
+            };
+        };
+    };
+    legends: {
+        visible: boolean;
+        item: {
+            label: {
+                formatMethod: (val: any) => any;
+            };
+        };
+    };
+    label: any;
+};
+export {};

package/dist/{Chart → DataView}/DataSource/types.d.ts

@@ -1,5 +1,5 @@
+import { FilterItem } from '../../Chart/ChartControllers/Filter/types';
 import { TimeRange } from '../../components/CustomTimeRange/types';
-import { FilterItem } from '../ChartControllers/Filter/types';
 import { FieldInfoItem } from '../Dataset/types';
 export declare const DataSourceTypes: {
     METRIC: string;

package/dist/DataView/Dataset/DataView.d.ts

@@ -0,0 +1,40 @@
+/**
+ * DataView - 数据视图层（精简版）
+ *
+ * 核心类，只保留核心业务逻辑
+ * 工具函数已提取到 transforms.ts
+ */
+import { ChartJson } from '../../Chart/ChartCodeRender/type';
+import { Dataset, FieldInfoItem } from '../Dataset/types';
+/**
+ * DataView 类
+ * 核心职责：状态管理 + 流程协调
+ */
+export declare class DataView {
+    private chartJson;
+    private fieldInfo;
+    private transformResult;
+    constructor(chartJson: ChartJson);
+    /**
+     * 转换数据（核心入口）
+     * 协调所有转换步骤
+     */
+    transform(): Dataset;
+    /**
+     * 获取转换结果
+     */
+    getResult(): Dataset;
+    /**
+     * 获取字段信息
+     */
+    getFieldInfo(): FieldInfoItem[];
+}
+/**
+ * 独立导出函数（保持与旧代码兼容）
+ */
+export declare const transform2Dataset: (chartJson: ChartJson) => Dataset;
+export declare const checkUptateDataSet: (preJson: ChartJson, newJson: ChartJson, dataset: Dataset) => {
+    dataset?: Dataset;
+    isShouldUpdate: boolean;
+};
+export default DataView;

package/dist/DataView/Dataset/constants.d.ts

@@ -0,0 +1,15 @@
+/**
+ * DataView 常量
+ */
+export declare const SEPARATOR = ",";
+export declare const FOLD_KEY_NAME = "fold-key";
+export declare const MERGE_COLUMN_KEY_NAME = "megre-column-name";
+/**
+ * 生成唯一键名
+ * 每次调用都会生成新的唯一键
+ */
+export declare const getKeys: () => {
+    keyId: string;
+    FOLD_KEY: string;
+    MERGE_COLUMN_NAME: string;
+};

package/dist/DataView/Dataset/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * DataView - 数据视图层
+ *
+ * 统一导出所有模块
+ */
+export { checkUptateDataSet, DataView, transform2Dataset } from './DataView';
+export * from './transforms';
+export * from './constants';
+export { default } from './DataView';