@visactor/vseed 0.2.9 → 0.3.1

package/dist/esm/types/chartType/donut/donut.d.ts

@@ -1,5 +1,5 @@
 import { type Locale } from '../../i18n';
-import type { BackgroundColor, Color, Dataset, Dimensions, Legend, MeasureTree, PieLabel, Theme, Tooltip } from '../../properties';
+import type { BackgroundColor, Color, Dataset, DonutDimension, Legend, DonutMeasure, PieLabel, Theme, Tooltip } from '../../properties';
 /**
  * @description 环形图，适用于展示单一维度数据的占比关系，中心留有空白区域可展示汇总信息
  * 适用场景:
@@ -42,17 +42,15 @@ export interface Donut {
     /**
      * 维度
      * @description 环形图的所有维度会与指标名称(存在多个指标时)合并成1个维度, 映射到饼图的角度, 并作为图例项展示.
-     * @type {Dimensions}
      * @example [{id: 'category', alias: '类别'}]
      */
-    dimensions?: Dimensions;
+    dimensions?: DonutDimension[];
     /**
      * 指标
      * @description 环形图的所有指标会自动合并为一个指标, 映射到饼图的半径, 存在多个指标时, 指标名称会与其余维度合并, 并作为图例项展示.
-     * @type {MeasureTree}
      * @example [{id: 'value', alias: '数值占比', format: 'percent'}]
      */
-    measures?: MeasureTree;
+    measures?: DonutMeasure[];
     /**
      * 图表的背景颜色
      * @default transparent 默认为透明背景

package/dist/esm/types/chartType/donut/zDonut.d.ts

@@ -40,7 +40,7 @@ export declare const zDonut: z.ZodObject<{
             row: "row";
         }>>;
     }, z.core.$strip>>>>;
-    measures: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodUnion<[z.ZodType<import("../..").MeasureGroup, unknown, z.core.$ZodTypeInternals<import("../..").MeasureGroup, unknown>>, z.ZodObject<{
+    measures: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodObject<{
         id: z.ZodString;
         alias: z.ZodOptional<z.ZodString>;
         autoFormat: z.ZodOptional<z.ZodBoolean>;
@@ -128,7 +128,16 @@ export declare const zDonut: z.ZodObject<{
             x1: "x1";
         }>>;
         parentId: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>]>>>>;
+        chartType: z.ZodOptional<z.ZodEnum<{
+            line: "line";
+            column: "column";
+            columnPercent: "columnPercent";
+            columnParallel: "columnParallel";
+            area: "area";
+            areaPercent: "areaPercent";
+            scatter: "scatter";
+        }>>;
+    }, z.core.$strip>>>>;
     backgroundColor: z.ZodOptional<z.ZodNullable<z.ZodOptional<z.ZodNullable<z.ZodDefault<z.ZodString>>>>>;
     color: z.ZodOptional<z.ZodNullable<z.ZodObject<{
         colorScheme: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString>>>;

package/dist/esm/types/chartType/donut/zDonut.js

@@ -1,12 +1,12 @@
 import { z } from "zod";
 import { zLocale } from "../../i18n/index.js";
-import { zBackgroundColor, zColor, zDataset, zDimensions, zEncoding, zLegend, zMeasureTree, zPieLabel, zTheme, zTooltip } from "../../properties/index.js";
+import { zBackgroundColor, zColor, zDataset, zDimensions, zEncoding, zLegend, zMeasures, zPieLabel, zTheme, zTooltip } from "../../properties/index.js";
 const zDonut = z.object({
     chartType: z.literal('donut'),
     dataset: zDataset.nullish(),
     encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
-    measures: zMeasureTree.nullish(),
+    measures: zMeasures.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
     color: zColor.nullish(),
     label: zPieLabel.nullish(),

package/dist/esm/types/chartType/donut/zDonut.js.map

@@ -1 +1 @@
-{"version":3,"file":"types/chartType/donut/zDonut.js","sources":["webpack://@visactor/vseed/./src/types/chartType/donut/zDonut.ts"],"sourcesContent":["import { z } from 'zod'\nimport { zLocale } from '../../i18n'\n\nimport {\n  zBackgroundColor,\n  zColor,\n  zDataset,\n  zDimensions,\n  zEncoding,\n  zLegend,\n  zMeasureTree,\n  zPieLabel,\n  zTheme,\n  zTooltip,\n} from '../../properties'\n\nexport const zDonut = z.object({\n  chartType: z.literal('donut'),\n  dataset: zDataset.nullish(),\n  encoding: zEncoding.nullish(),\n  dimensions: zDimensions.nullish(),\n  measures: zMeasureTree.nullish(),\n  backgroundColor: zBackgroundColor.nullish(),\n  color: zColor.nullish(),\n  label: zPieLabel.nullish(),\n  legend: zLegend.nullish(),\n  tooltip: zTooltip.nullish(),\n  theme: zTheme.nullish(),\n  locale: zLocale.nullish(),\n})\n"],"names":["zDonut","z","zDataset","zEncoding","zDimensions","zMeasureTree","zBackgroundColor","zColor","zPieLabel","zLegend","zTooltip","zTheme","zLocale"],"mappings":";;;AAgBO,MAAMA,SAASC,EAAE,MAAM,CAAC;IAC7B,WAAWA,EAAE,OAAO,CAAC;IACrB,SAASC,SAAS,OAAO;IACzB,UAAUC,UAAU,OAAO;IAC3B,YAAYC,YAAY,OAAO;IAC/B,UAAUC,aAAa,OAAO;IAC9B,iBAAiBC,iBAAiB,OAAO;IACzC,OAAOC,OAAO,OAAO;IACrB,OAAOC,UAAU,OAAO;IACxB,QAAQC,QAAQ,OAAO;IACvB,SAASC,SAAS,OAAO;IACzB,OAAOC,OAAO,OAAO;IACrB,QAAQC,QAAQ,OAAO;AACzB"}
+{"version":3,"file":"types/chartType/donut/zDonut.js","sources":["webpack://@visactor/vseed/./src/types/chartType/donut/zDonut.ts"],"sourcesContent":["import { z } from 'zod'\nimport { zLocale } from '../../i18n'\n\nimport {\n  zBackgroundColor,\n  zColor,\n  zDataset,\n  zDimensions,\n  zEncoding,\n  zLegend,\n  zMeasures,\n  zPieLabel,\n  zTheme,\n  zTooltip,\n} from '../../properties'\n\nexport const zDonut = z.object({\n  chartType: z.literal('donut'),\n  dataset: zDataset.nullish(),\n  encoding: zEncoding.nullish(),\n  dimensions: zDimensions.nullish(),\n  measures: zMeasures.nullish(),\n  backgroundColor: zBackgroundColor.nullish(),\n  color: zColor.nullish(),\n  label: zPieLabel.nullish(),\n  legend: zLegend.nullish(),\n  tooltip: zTooltip.nullish(),\n  theme: zTheme.nullish(),\n  locale: zLocale.nullish(),\n})\n"],"names":["zDonut","z","zDataset","zEncoding","zDimensions","zMeasures","zBackgroundColor","zColor","zPieLabel","zLegend","zTooltip","zTheme","zLocale"],"mappings":";;;AAgBO,MAAMA,SAASC,EAAE,MAAM,CAAC;IAC7B,WAAWA,EAAE,OAAO,CAAC;IACrB,SAASC,SAAS,OAAO;IACzB,UAAUC,UAAU,OAAO;IAC3B,YAAYC,YAAY,OAAO;IAC/B,UAAUC,UAAU,OAAO;IAC3B,iBAAiBC,iBAAiB,OAAO;IACzC,OAAOC,OAAO,OAAO;IACrB,OAAOC,UAAU,OAAO;IACxB,QAAQC,QAAQ,OAAO;IACvB,SAASC,SAAS,OAAO;IACzB,OAAOC,OAAO,OAAO;IACrB,QAAQC,QAAQ,OAAO;AACzB"}

package/dist/esm/types/chartType/dualAxis/dualAxis.d.ts

@@ -1,5 +1,5 @@
 import type { Locale } from '../../i18n';
-import type { AnnotationArea, AnnotationHorizontalLine, AnnotationPoint, AnnotationVerticalLine, AreaStyle, BackgroundColor, BarGapInGroup, BarMaxWidth, BarStyle, Color, CrosshairRect, Dataset, DimensionLinkage, Dimensions, DualChartType, DualMeasures, Label, Legend, LineStyle, MeasureTree, PointStyle, Sort, SortLegend, Theme, Tooltip, XBandAxis, YLinearAxis } from '../../properties';
+import type { AnnotationArea, AnnotationHorizontalLine, AnnotationPoint, AnnotationVerticalLine, AreaStyle, BackgroundColor, BarGapInGroup, BarMaxWidth, BarStyle, Color, CrosshairRect, Dataset, DimensionLinkage, DualAxisDimension, DualAxisMeasure, Label, Legend, LineStyle, PointStyle, Sort, SortLegend, Theme, Tooltip, XBandAxis, YLinearAxis } from '../../properties';
 /**
  * @description 双轴图，适用于展示两个不同量级或不同单位指标的对比关系，包含主坐标轴和次坐标轴
  * 适用场景:
@@ -43,96 +43,15 @@ export interface DualAxis {
      * @description 维度, 第一个维度会放至X轴, 其余维度会与指标名称(存在多个指标时)合并, 作为图例项展示.
      * @example [{id: 'month', alias: '月份'}]
      */
-    dimensions?: Dimensions;
+    dimensions?: DualAxisDimension[];
     /**
      * @description 双轴图指标
-     * measures可以使用2个指标组, 代表普通双轴图的主轴和次轴指标, 每个指标组内的指标会自动合并为一个指标.
-     * measures可以使用1个指标组, 再嵌套2个指标组, 绘制组合双轴图. 最外层的每一个组, 代表一个双轴图, 它们会纵向排列.
-     * @example
-     * 普通双轴图
-     * [
-     *   {
-     *     id: "primaryAxis",
-     *     alias: '主轴',
-     *     children: [{id: 'profit', alias: '利润'}, {id: 'sales', alias: '销售额'}]
-     *   },
-     *   {
-     *     id: "secondaryAxis",
-     *     alias: '次轴',
-     *     children: [{id: 'growth', alias: '增长率'}, {id: 'returnRatio', alias: '回报率'}]
-     *   }
-     * ]
-     * 组合双轴图
-     * [
-     *   {
-     *     id: "first",
-     *     alias: "第一个双轴图",
-     *     children: [
-     *      {
-     *        id: "primaryAxis",
-     *        alias: '主轴',
-     *        children: [{id: 'profit', alias: '利润'}, {id: 'sales', alias: '销售额'}]
-     *      },
-     *      {
-     *        id: "secondaryAxis",
-     *        alias: '次轴',
-     *        children: [{id: 'growth', alias: '增长率'}, {id: 'returnRatio', alias: '回报率'}]
-     *      },
-     *     ]
-     *   },
-     *   {
-     *     id: "second",
-     *     alias: "第二个双轴图",
-     *     children: [
-     *      {
-     *        id: "primaryAxis2",
-     *        alias: '主轴',
-     *        children: [{id: 'profit2', alias: '利润'}, {id: 'sales2', alias: '销售额'}]
-     *      },
-     *      {
-     *        id: "secondaryAxis2",
-     *        alias: '次轴',
-     *        children: [{id: 'growth2', alias: '增长率'}, {id: 'returnRatio2', alias: '回报率'}]
-     *      },
-     *     ]
-     *   },
-     * ]
-     */
-    measures?: MeasureTree;
-    /**
-     * @description 双轴图指标, 是measures的简化形式
-     * 组合的双轴图指标配置, 每个对象都代表一个双轴图, 双轴图之间纵向排列, 必须是数组.
-     * 每个配置对象内, primaryMeasures代表所有的主轴指标, secondaryMeasures代表所有的次轴指标, primaryMeasures和secondaryMeasures可配置为数组或一个对象
-     * primaryMeasures 如果是多个指标, 则会自动合并
-     * secondaryMeasures 如果是多个指标, 则会自动合并
-     * @example
-     * 如下示例配置了一个双轴图, 主轴有1个value指标, 次轴有1个growth指标
-     * [
-     *   {
-     *     primaryMeasures:   {id: 'value', alias: '数值'}
-     *     secondaryMeasures: {id: 'growth', alias: '增长率'}
-     *   }
-     * ]
-     * 如下示例配置了2个纵向排列的双轴图, 第一个双轴图, 主轴有1个value指标, 次轴有一个growth指标, 第二个双轴图, 主轴有2个指标: profit与sales, 次轴有一个returnRatio指标
-     * [
-     *   {
-     *     primaryMeasures:  {id: 'value', alias: '数值'}
-     *     secondaryMeasures: {id: 'growth', alias: '增长率'}
-     *   },
-     *   {
-     *     primaryMeasures:   [{id: 'profit', alias: '利润'}, {id: 'sales', alias: '销售额'}],
-     *     secondaryMeasures: [{id: 'returnRatio', alias: '回报率'}]
-     *   }
-     * ]
-     */
-    dualMeasures?: DualMeasures;
-    /**
-     * @description 双轴图的主次轴的图表类型, 用于定义双轴图的类型, 包括折线图, 柱状图, 面积图等, 当measures有多组时, dualChartType可以配置为数组, 每项对应一个双轴图的子图表类型.
-     * @example
-     * {primary: 'line', secondary: 'bar'}
-     * [{primary: 'line', secondary: 'bar'}, {primary: 'column', secondary: 'area'}]
+     * 对于encoding中映射到primaryYAxis和secondaryYAxis的指标,
+     * 可以通过设置`parentId`属性, 将指标进行分组，不同分组的指标会显示到不同子图中，
+     * 也可以设置`chartType`属性，来指定不同指标组的图表类型。
+     * @example [{ id: 'value', encoding: 'primaryYAxis' }, { id: 'growth', encoding: 'secondaryYAxis' }]
      */
-    dualChartType?: DualChartType | DualChartType[];
+    measures?: DualAxisMeasure[];
     /**
      * @description 用于定义双轴图的两根轴的刻度是否对齐, 当measures有多组时, alignTicks可以配置为数组, 每项对应一个双轴图的刻度是否对齐.
      * @example {"chartType":"dualAxis","dataset":[{"date":"2019","profit":10,"sales":100},{"date":"2020","profit":30,"sales":200},{"date":"2021","profit":30,"sales":300},{"date":"2022","profit":50,"sales":500}],"alignTicks":[false,true],"dualMeasures":[{"primaryMeasures":[{"id":"profit"}],"secondaryMeasures":[{"id":"sales"}]},{"primaryMeasures":[{"id":"profit"}],"secondaryMeasures":[{"id":"sales"}]}]}

package/dist/esm/types/chartType/dualAxis/zDualAxis.d.ts

@@ -17,7 +17,7 @@ export declare const zDualAxis: z.ZodObject<{
             row: "row";
         }>>;
     }, z.core.$strip>>>>;
-    measures: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodUnion<[z.ZodType<import("../../properties").MeasureGroup, unknown, z.core.$ZodTypeInternals<import("../../properties").MeasureGroup, unknown>>, z.ZodObject<{
+    measures: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodObject<{
         id: z.ZodString;
         alias: z.ZodOptional<z.ZodString>;
         autoFormat: z.ZodOptional<z.ZodBoolean>;
@@ -81,371 +81,22 @@ export declare const zDualAxis: z.ZodObject<{
                 halfEven: "halfEven";
             }>>>;
         }, z.core.$strip>>>;
-        encoding: z.ZodOptional<z.ZodEnum<{
-            column: "column";
-            value: "value";
-            xAxis: "xAxis";
-            yAxis: "yAxis";
-            angle: "angle";
-            color: "color";
-            detail: "detail";
-            tooltip: "tooltip";
-            label: "label";
-            primaryYAxis: "primaryYAxis";
-            secondaryYAxis: "secondaryYAxis";
-            radius: "radius";
-            size: "size";
-            q1: "q1";
-            median: "median";
-            q3: "q3";
-            min: "min";
-            max: "max";
-            outliers: "outliers";
-            x0: "x0";
-            x1: "x1";
-        }>>;
         parentId: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>]>>>>;
-    dualMeasures: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodObject<{
-        id: z.ZodString;
-        primaryMeasures: z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodObject<{
-            format: z.ZodOptional<z.ZodOptional<z.ZodObject<{
-                type: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    number: "number";
-                    percent: "percent";
-                    permille: "permille";
-                    scientific: "scientific";
-                }>>>;
-                ratio: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                symbol: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                thousandSeparator: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
-                prefix: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                suffix: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                fractionDigits: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                significantDigits: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                roundingPriority: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    morePrecision: "morePrecision";
-                    lessPrecision: "lessPrecision";
-                }>>>;
-                roundingMode: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    floor: "floor";
-                    ceil: "ceil";
-                    expand: "expand";
-                    trunc: "trunc";
-                    halfCeil: "halfCeil";
-                    halfFloor: "halfFloor";
-                    halfExpand: "halfExpand";
-                    halfTrunc: "halfTrunc";
-                    halfEven: "halfEven";
-                }>>>;
-            }, z.core.$strip>>>;
-            id: z.ZodString;
-            alias: z.ZodOptional<z.ZodString>;
-            autoFormat: z.ZodOptional<z.ZodBoolean>;
-            numFormat: z.ZodOptional<z.ZodOptional<z.ZodObject<{
-                type: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    number: "number";
-                    percent: "percent";
-                    permille: "permille";
-                    scientific: "scientific";
-                }>>>;
-                ratio: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                symbol: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                thousandSeparator: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
-                prefix: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                suffix: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                fractionDigits: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                significantDigits: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                roundingPriority: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    morePrecision: "morePrecision";
-                    lessPrecision: "lessPrecision";
-                }>>>;
-                roundingMode: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    floor: "floor";
-                    ceil: "ceil";
-                    expand: "expand";
-                    trunc: "trunc";
-                    halfCeil: "halfCeil";
-                    halfFloor: "halfFloor";
-                    halfExpand: "halfExpand";
-                    halfTrunc: "halfTrunc";
-                    halfEven: "halfEven";
-                }>>>;
-            }, z.core.$strip>>>;
-        }, z.core.$strip>>, z.ZodObject<{
-            format: z.ZodOptional<z.ZodOptional<z.ZodObject<{
-                type: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    number: "number";
-                    percent: "percent";
-                    permille: "permille";
-                    scientific: "scientific";
-                }>>>;
-                ratio: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                symbol: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                thousandSeparator: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
-                prefix: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                suffix: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                fractionDigits: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                significantDigits: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                roundingPriority: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    morePrecision: "morePrecision";
-                    lessPrecision: "lessPrecision";
-                }>>>;
-                roundingMode: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    floor: "floor";
-                    ceil: "ceil";
-                    expand: "expand";
-                    trunc: "trunc";
-                    halfCeil: "halfCeil";
-                    halfFloor: "halfFloor";
-                    halfExpand: "halfExpand";
-                    halfTrunc: "halfTrunc";
-                    halfEven: "halfEven";
-                }>>>;
-            }, z.core.$strip>>>;
-            id: z.ZodString;
-            alias: z.ZodOptional<z.ZodString>;
-            autoFormat: z.ZodOptional<z.ZodBoolean>;
-            numFormat: z.ZodOptional<z.ZodOptional<z.ZodObject<{
-                type: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    number: "number";
-                    percent: "percent";
-                    permille: "permille";
-                    scientific: "scientific";
-                }>>>;
-                ratio: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                symbol: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                thousandSeparator: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
-                prefix: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                suffix: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                fractionDigits: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                significantDigits: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                roundingPriority: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    morePrecision: "morePrecision";
-                    lessPrecision: "lessPrecision";
-                }>>>;
-                roundingMode: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    floor: "floor";
-                    ceil: "ceil";
-                    expand: "expand";
-                    trunc: "trunc";
-                    halfCeil: "halfCeil";
-                    halfFloor: "halfFloor";
-                    halfExpand: "halfExpand";
-                    halfTrunc: "halfTrunc";
-                    halfEven: "halfEven";
-                }>>>;
-            }, z.core.$strip>>>;
-        }, z.core.$strip>]>>;
-        secondaryMeasures: z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodObject<{
-            id: z.ZodString;
-            alias: z.ZodOptional<z.ZodString>;
-            autoFormat: z.ZodOptional<z.ZodBoolean>;
-            numFormat: z.ZodOptional<z.ZodOptional<z.ZodObject<{
-                type: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    number: "number";
-                    percent: "percent";
-                    permille: "permille";
-                    scientific: "scientific";
-                }>>>;
-                ratio: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                symbol: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                thousandSeparator: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
-                prefix: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                suffix: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                fractionDigits: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                significantDigits: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                roundingPriority: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    morePrecision: "morePrecision";
-                    lessPrecision: "lessPrecision";
-                }>>>;
-                roundingMode: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    floor: "floor";
-                    ceil: "ceil";
-                    expand: "expand";
-                    trunc: "trunc";
-                    halfCeil: "halfCeil";
-                    halfFloor: "halfFloor";
-                    halfExpand: "halfExpand";
-                    halfTrunc: "halfTrunc";
-                    halfEven: "halfEven";
-                }>>>;
-            }, z.core.$strip>>>;
-            format: z.ZodOptional<z.ZodOptional<z.ZodObject<{
-                type: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    number: "number";
-                    percent: "percent";
-                    permille: "permille";
-                    scientific: "scientific";
-                }>>>;
-                ratio: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                symbol: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                thousandSeparator: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
-                prefix: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                suffix: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                fractionDigits: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                significantDigits: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                roundingPriority: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    morePrecision: "morePrecision";
-                    lessPrecision: "lessPrecision";
-                }>>>;
-                roundingMode: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    floor: "floor";
-                    ceil: "ceil";
-                    expand: "expand";
-                    trunc: "trunc";
-                    halfCeil: "halfCeil";
-                    halfFloor: "halfFloor";
-                    halfExpand: "halfExpand";
-                    halfTrunc: "halfTrunc";
-                    halfEven: "halfEven";
-                }>>>;
-            }, z.core.$strip>>>;
-            encoding: z.ZodOptional<z.ZodEnum<{
-                column: "column";
-                value: "value";
-                xAxis: "xAxis";
-                yAxis: "yAxis";
-                angle: "angle";
-                color: "color";
-                detail: "detail";
-                tooltip: "tooltip";
-                label: "label";
-                primaryYAxis: "primaryYAxis";
-                secondaryYAxis: "secondaryYAxis";
-                radius: "radius";
-                size: "size";
-                q1: "q1";
-                median: "median";
-                q3: "q3";
-                min: "min";
-                max: "max";
-                outliers: "outliers";
-                x0: "x0";
-                x1: "x1";
-            }>>;
-            parentId: z.ZodOptional<z.ZodString>;
-        }, z.core.$strip>>, z.ZodObject<{
-            id: z.ZodString;
-            alias: z.ZodOptional<z.ZodString>;
-            autoFormat: z.ZodOptional<z.ZodBoolean>;
-            numFormat: z.ZodOptional<z.ZodOptional<z.ZodObject<{
-                type: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    number: "number";
-                    percent: "percent";
-                    permille: "permille";
-                    scientific: "scientific";
-                }>>>;
-                ratio: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                symbol: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                thousandSeparator: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
-                prefix: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                suffix: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                fractionDigits: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                significantDigits: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                roundingPriority: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    morePrecision: "morePrecision";
-                    lessPrecision: "lessPrecision";
-                }>>>;
-                roundingMode: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    floor: "floor";
-                    ceil: "ceil";
-                    expand: "expand";
-                    trunc: "trunc";
-                    halfCeil: "halfCeil";
-                    halfFloor: "halfFloor";
-                    halfExpand: "halfExpand";
-                    halfTrunc: "halfTrunc";
-                    halfEven: "halfEven";
-                }>>>;
-            }, z.core.$strip>>>;
-            format: z.ZodOptional<z.ZodOptional<z.ZodObject<{
-                type: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    number: "number";
-                    percent: "percent";
-                    permille: "permille";
-                    scientific: "scientific";
-                }>>>;
-                ratio: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                symbol: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                thousandSeparator: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
-                prefix: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                suffix: z.ZodOptional<z.ZodDefault<z.ZodString>>;
-                fractionDigits: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                significantDigits: z.ZodOptional<z.ZodDefault<z.ZodNumber>>;
-                roundingPriority: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    morePrecision: "morePrecision";
-                    lessPrecision: "lessPrecision";
-                }>>>;
-                roundingMode: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-                    floor: "floor";
-                    ceil: "ceil";
-                    expand: "expand";
-                    trunc: "trunc";
-                    halfCeil: "halfCeil";
-                    halfFloor: "halfFloor";
-                    halfExpand: "halfExpand";
-                    halfTrunc: "halfTrunc";
-                    halfEven: "halfEven";
-                }>>>;
-            }, z.core.$strip>>>;
-            encoding: z.ZodOptional<z.ZodEnum<{
-                column: "column";
-                value: "value";
-                xAxis: "xAxis";
-                yAxis: "yAxis";
-                angle: "angle";
-                color: "color";
-                detail: "detail";
-                tooltip: "tooltip";
-                label: "label";
-                primaryYAxis: "primaryYAxis";
-                secondaryYAxis: "secondaryYAxis";
-                radius: "radius";
-                size: "size";
-                q1: "q1";
-                median: "median";
-                q3: "q3";
-                min: "min";
-                max: "max";
-                outliers: "outliers";
-                x0: "x0";
-                x1: "x1";
-            }>>;
-            parentId: z.ZodOptional<z.ZodString>;
-        }, z.core.$strip>]>>;
-    }, z.core.$strip>>>>;
-    dualChartType: z.ZodOptional<z.ZodNullable<z.ZodUnion<[z.ZodArray<z.ZodObject<{
-        primary: z.ZodDefault<z.ZodEnum<{
-            line: "line";
-            column: "column";
-            columnParallel: "columnParallel";
-            area: "area";
-            scatter: "scatter";
-        }>>;
-        secondary: z.ZodDefault<z.ZodEnum<{
+        chartType: z.ZodOptional<z.ZodEnum<{
             line: "line";
             column: "column";
             columnParallel: "columnParallel";
             area: "area";
             scatter: "scatter";
         }>>;
-    }, z.core.$strip>>, z.ZodObject<{
-        primary: z.ZodDefault<z.ZodEnum<{
-            line: "line";
-            column: "column";
-            columnParallel: "columnParallel";
-            area: "area";
-            scatter: "scatter";
-        }>>;
-        secondary: z.ZodDefault<z.ZodEnum<{
-            line: "line";
-            column: "column";
-            columnParallel: "columnParallel";
-            area: "area";
-            scatter: "scatter";
+        encoding: z.ZodOptional<z.ZodEnum<{
+            color: "color";
+            tooltip: "tooltip";
+            label: "label";
+            primaryYAxis: "primaryYAxis";
+            secondaryYAxis: "secondaryYAxis";
         }>>;
-    }, z.core.$strip>]>>>;
+    }, z.core.$strip>>>>;
     alignTicks: z.ZodOptional<z.ZodNullable<z.ZodUnion<[z.ZodArray<z.ZodBoolean>, z.ZodBoolean]>>>;
     primaryYAxis: z.ZodOptional<z.ZodNullable<z.ZodUnion<[z.ZodArray<z.ZodObject<{
         visible: z.ZodOptional<z.ZodNullable<z.ZodDefault<z.ZodBoolean>>>;

package/dist/esm/types/chartType/dualAxis/zDualAxis.js

@@ -1,13 +1,11 @@
 import { z } from "zod";
 import { zLocale } from "../../i18n/index.js";
-import { zAnnotationArea, zAnnotationHorizontalLine, zAnnotationPoint, zAnnotationVerticalLine, zAreaStyle, zBackgroundColor, zBarGapInGroup, zBarMaxWidth, zBarStyle, zColor, zCrosshairRect, zDataset, zDimensionLinkage, zDimensions, zDualChartType, zDualMeasures, zLabel, zLegend, zLineStyle, zMeasureTree, zPointStyle, zSort, zSortLegend, zTheme, zTooltip, zXBandAxis, zYLinearAxis } from "../../properties/index.js";
+import { zAnnotationArea, zAnnotationHorizontalLine, zAnnotationPoint, zAnnotationVerticalLine, zAreaStyle, zBackgroundColor, zBarGapInGroup, zBarMaxWidth, zBarStyle, zColor, zCrosshairRect, zDataset, zDimensionLinkage, zDimensions, zDualMeasures, zLabel, zLegend, zLineStyle, zPointStyle, zSort, zSortLegend, zTheme, zTooltip, zXBandAxis, zYLinearAxis } from "../../properties/index.js";
 const zDualAxis = z.object({
     chartType: z.literal('dualAxis'),
     dataset: zDataset.nullish(),
     dimensions: zDimensions.nullish(),
-    measures: zMeasureTree.nullish(),
-    dualMeasures: zDualMeasures.nullish(),
-    dualChartType: z.array(zDualChartType).or(zDualChartType).nullish(),
+    measures: zDualMeasures.nullish(),
     alignTicks: z.array(z.boolean()).or(z.boolean()).nullish(),
     primaryYAxis: z.array(zYLinearAxis).or(zYLinearAxis).nullish(),
     secondaryYAxis: z.array(zYLinearAxis).or(zYLinearAxis).nullish(),

package/dist/esm/types/chartType/dualAxis/zDualAxis.js.map

@@ -1 +1 @@
-{"version":3,"file":"types/chartType/dualAxis/zDualAxis.js","sources":["webpack://@visactor/vseed/./src/types/chartType/dualAxis/zDualAxis.ts"],"sourcesContent":["import { z } from 'zod'\nimport { zLocale } from 'src/types/i18n'\nimport {\n  zAnnotationArea,\n  zAnnotationHorizontalLine,\n  zAnnotationPoint,\n  zAnnotationVerticalLine,\n  zAreaStyle,\n  zBackgroundColor,\n  zBarGapInGroup,\n  zBarMaxWidth,\n  zBarStyle,\n  zColor,\n  zCrosshairRect,\n  zDataset,\n  zDimensionLinkage,\n  zDimensions,\n  zDualChartType,\n  zDualMeasures,\n  zLabel,\n  zLegend,\n  zLineStyle,\n  zMeasureTree,\n  zPointStyle,\n  zSort,\n  zSortLegend,\n  zTheme,\n  zTooltip,\n  zXBandAxis,\n  zYLinearAxis,\n} from 'src/types/properties'\n\nexport const zDualAxis = z.object({\n  chartType: z.literal('dualAxis'),\n\n  dataset: zDataset.nullish(),\n  dimensions: zDimensions.nullish(),\n  measures: zMeasureTree.nullish(),\n  dualMeasures: zDualMeasures.nullish(),\n\n  dualChartType: z.array(zDualChartType).or(zDualChartType).nullish(),\n  alignTicks: z.array(z.boolean()).or(z.boolean()).nullish(),\n\n  primaryYAxis: z.array(zYLinearAxis).or(zYLinearAxis).nullish(),\n  secondaryYAxis: z.array(zYLinearAxis).or(zYLinearAxis).nullish(),\n  xAxis: zXBandAxis.nullish(),\n\n  backgroundColor: zBackgroundColor.nullish(),\n  color: zColor.nullish(),\n  label: zLabel.nullish(),\n  legend: zLegend.nullish(),\n  tooltip: zTooltip.nullish(),\n\n  crosshairRect: zCrosshairRect.nullish(),\n  sort: zSort.nullish(),\n  sortLegend: zSortLegend.nullish(),\n  theme: zTheme.nullish(),\n  barMaxWidth: zBarMaxWidth.nullish(),\n  barGapInGroup: zBarGapInGroup.nullish(),\n\n  barStyle: z.array(zBarStyle).or(zBarStyle).nullish(),\n  pointStyle: z.array(zPointStyle).or(zPointStyle).nullish(),\n  lineStyle: z.array(zLineStyle).or(zLineStyle).nullish(),\n  areaStyle: z.array(zAreaStyle).or(zAreaStyle).nullish(),\n\n  annotationPoint: z.array(zAnnotationPoint).or(zAnnotationPoint).nullish(),\n  annotationVerticalLine: z.array(zAnnotationVerticalLine).or(zAnnotationVerticalLine).nullish(),\n  annotationHorizontalLine: z.array(zAnnotationHorizontalLine).or(zAnnotationHorizontalLine).nullish(),\n  annotationArea: z.array(zAnnotationArea).or(zAnnotationArea).nullish(),\n  dimensionLinkage: zDimensionLinkage.nullish(),\n\n  locale: zLocale.nullish(),\n})\n"],"names":["zDualAxis","z","zDataset","zDimensions","zMeasureTree","zDualMeasures","zDualChartType","zYLinearAxis","zXBandAxis","zBackgroundColor","zColor","zLabel","zLegend","zTooltip","zCrosshairRect","zSort","zSortLegend","zTheme","zBarMaxWidth","zBarGapInGroup","zBarStyle","zPointStyle","zLineStyle","zAreaStyle","zAnnotationPoint","zAnnotationVerticalLine","zAnnotationHorizontalLine","zAnnotationArea","zDimensionLinkage","zLocale"],"mappings":";;;AAgCO,MAAMA,YAAYC,EAAE,MAAM,CAAC;IAChC,WAAWA,EAAE,OAAO,CAAC;IAErB,SAASC,SAAS,OAAO;IACzB,YAAYC,YAAY,OAAO;IAC/B,UAAUC,aAAa,OAAO;IAC9B,cAAcC,cAAc,OAAO;IAEnC,eAAeJ,EAAE,KAAK,CAACK,gBAAgB,EAAE,CAACA,gBAAgB,OAAO;IACjE,YAAYL,EAAE,KAAK,CAACA,EAAE,OAAO,IAAI,EAAE,CAACA,EAAE,OAAO,IAAI,OAAO;IAExD,cAAcA,EAAE,KAAK,CAACM,cAAc,EAAE,CAACA,cAAc,OAAO;IAC5D,gBAAgBN,EAAE,KAAK,CAACM,cAAc,EAAE,CAACA,cAAc,OAAO;IAC9D,OAAOC,WAAW,OAAO;IAEzB,iBAAiBC,iBAAiB,OAAO;IACzC,OAAOC,OAAO,OAAO;IACrB,OAAOC,OAAO,OAAO;IACrB,QAAQC,QAAQ,OAAO;IACvB,SAASC,SAAS,OAAO;IAEzB,eAAeC,eAAe,OAAO;IACrC,MAAMC,MAAM,OAAO;IACnB,YAAYC,YAAY,OAAO;IAC/B,OAAOC,OAAO,OAAO;IACrB,aAAaC,aAAa,OAAO;IACjC,eAAeC,eAAe,OAAO;IAErC,UAAUlB,EAAE,KAAK,CAACmB,WAAW,EAAE,CAACA,WAAW,OAAO;IAClD,YAAYnB,EAAE,KAAK,CAACoB,aAAa,EAAE,CAACA,aAAa,OAAO;IACxD,WAAWpB,EAAE,KAAK,CAACqB,YAAY,EAAE,CAACA,YAAY,OAAO;IACrD,WAAWrB,EAAE,KAAK,CAACsB,YAAY,EAAE,CAACA,YAAY,OAAO;IAErD,iBAAiBtB,EAAE,KAAK,CAACuB,kBAAkB,EAAE,CAACA,kBAAkB,OAAO;IACvE,wBAAwBvB,EAAE,KAAK,CAACwB,yBAAyB,EAAE,CAACA,yBAAyB,OAAO;IAC5F,0BAA0BxB,EAAE,KAAK,CAACyB,2BAA2B,EAAE,CAACA,2BAA2B,OAAO;IAClG,gBAAgBzB,EAAE,KAAK,CAAC0B,iBAAiB,EAAE,CAACA,iBAAiB,OAAO;IACpE,kBAAkBC,kBAAkB,OAAO;IAE3C,QAAQC,QAAQ,OAAO;AACzB"}
+{"version":3,"file":"types/chartType/dualAxis/zDualAxis.js","sources":["webpack://@visactor/vseed/./src/types/chartType/dualAxis/zDualAxis.ts"],"sourcesContent":["import { z } from 'zod'\nimport { zLocale } from 'src/types/i18n'\nimport {\n  zAnnotationArea,\n  zAnnotationHorizontalLine,\n  zAnnotationPoint,\n  zAnnotationVerticalLine,\n  zAreaStyle,\n  zBackgroundColor,\n  zBarGapInGroup,\n  zBarMaxWidth,\n  zBarStyle,\n  zColor,\n  zCrosshairRect,\n  zDataset,\n  zDimensionLinkage,\n  zDimensions,\n  zDualMeasures,\n  zLabel,\n  zLegend,\n  zLineStyle,\n  zPointStyle,\n  zSort,\n  zSortLegend,\n  zTheme,\n  zTooltip,\n  zXBandAxis,\n  zYLinearAxis,\n} from 'src/types/properties'\n\nexport const zDualAxis = z.object({\n  chartType: z.literal('dualAxis'),\n\n  dataset: zDataset.nullish(),\n  dimensions: zDimensions.nullish(),\n  measures: zDualMeasures.nullish(),\n\n  alignTicks: z.array(z.boolean()).or(z.boolean()).nullish(),\n\n  primaryYAxis: z.array(zYLinearAxis).or(zYLinearAxis).nullish(),\n  secondaryYAxis: z.array(zYLinearAxis).or(zYLinearAxis).nullish(),\n  xAxis: zXBandAxis.nullish(),\n\n  backgroundColor: zBackgroundColor.nullish(),\n  color: zColor.nullish(),\n  label: zLabel.nullish(),\n  legend: zLegend.nullish(),\n  tooltip: zTooltip.nullish(),\n\n  crosshairRect: zCrosshairRect.nullish(),\n  sort: zSort.nullish(),\n  sortLegend: zSortLegend.nullish(),\n  theme: zTheme.nullish(),\n  barMaxWidth: zBarMaxWidth.nullish(),\n  barGapInGroup: zBarGapInGroup.nullish(),\n\n  barStyle: z.array(zBarStyle).or(zBarStyle).nullish(),\n  pointStyle: z.array(zPointStyle).or(zPointStyle).nullish(),\n  lineStyle: z.array(zLineStyle).or(zLineStyle).nullish(),\n  areaStyle: z.array(zAreaStyle).or(zAreaStyle).nullish(),\n\n  annotationPoint: z.array(zAnnotationPoint).or(zAnnotationPoint).nullish(),\n  annotationVerticalLine: z.array(zAnnotationVerticalLine).or(zAnnotationVerticalLine).nullish(),\n  annotationHorizontalLine: z.array(zAnnotationHorizontalLine).or(zAnnotationHorizontalLine).nullish(),\n  annotationArea: z.array(zAnnotationArea).or(zAnnotationArea).nullish(),\n  dimensionLinkage: zDimensionLinkage.nullish(),\n\n  locale: zLocale.nullish(),\n})\n"],"names":["zDualAxis","z","zDataset","zDimensions","zDualMeasures","zYLinearAxis","zXBandAxis","zBackgroundColor","zColor","zLabel","zLegend","zTooltip","zCrosshairRect","zSort","zSortLegend","zTheme","zBarMaxWidth","zBarGapInGroup","zBarStyle","zPointStyle","zLineStyle","zAreaStyle","zAnnotationPoint","zAnnotationVerticalLine","zAnnotationHorizontalLine","zAnnotationArea","zDimensionLinkage","zLocale"],"mappings":";;;AA8BO,MAAMA,YAAYC,EAAE,MAAM,CAAC;IAChC,WAAWA,EAAE,OAAO,CAAC;IAErB,SAASC,SAAS,OAAO;IACzB,YAAYC,YAAY,OAAO;IAC/B,UAAUC,cAAc,OAAO;IAE/B,YAAYH,EAAE,KAAK,CAACA,EAAE,OAAO,IAAI,EAAE,CAACA,EAAE,OAAO,IAAI,OAAO;IAExD,cAAcA,EAAE,KAAK,CAACI,cAAc,EAAE,CAACA,cAAc,OAAO;IAC5D,gBAAgBJ,EAAE,KAAK,CAACI,cAAc,EAAE,CAACA,cAAc,OAAO;IAC9D,OAAOC,WAAW,OAAO;IAEzB,iBAAiBC,iBAAiB,OAAO;IACzC,OAAOC,OAAO,OAAO;IACrB,OAAOC,OAAO,OAAO;IACrB,QAAQC,QAAQ,OAAO;IACvB,SAASC,SAAS,OAAO;IAEzB,eAAeC,eAAe,OAAO;IACrC,MAAMC,MAAM,OAAO;IACnB,YAAYC,YAAY,OAAO;IAC/B,OAAOC,OAAO,OAAO;IACrB,aAAaC,aAAa,OAAO;IACjC,eAAeC,eAAe,OAAO;IAErC,UAAUhB,EAAE,KAAK,CAACiB,WAAW,EAAE,CAACA,WAAW,OAAO;IAClD,YAAYjB,EAAE,KAAK,CAACkB,aAAa,EAAE,CAACA,aAAa,OAAO;IACxD,WAAWlB,EAAE,KAAK,CAACmB,YAAY,EAAE,CAACA,YAAY,OAAO;IACrD,WAAWnB,EAAE,KAAK,CAACoB,YAAY,EAAE,CAACA,YAAY,OAAO;IAErD,iBAAiBpB,EAAE,KAAK,CAACqB,kBAAkB,EAAE,CAACA,kBAAkB,OAAO;IACvE,wBAAwBrB,EAAE,KAAK,CAACsB,yBAAyB,EAAE,CAACA,yBAAyB,OAAO;IAC5F,0BAA0BtB,EAAE,KAAK,CAACuB,2BAA2B,EAAE,CAACA,2BAA2B,OAAO;IAClG,gBAAgBvB,EAAE,KAAK,CAACwB,iBAAiB,EAAE,CAACA,iBAAiB,OAAO;IACpE,kBAAkBC,kBAAkB,OAAO;IAE3C,QAAQC,QAAQ,OAAO;AACzB"}

package/dist/esm/types/chartType/funnel/funnel.d.ts

@@ -1,5 +1,5 @@
 import type { Locale } from '../../i18n';
-import type { BackgroundColor, Color, ColorLegend, Dataset, Dimensions, Label, MeasureTree, Theme, Tooltip } from '../../properties';
+import type { BackgroundColor, Color, ColorLegend, Dataset, Label, FunnelDimension, FunnelMeasure, Theme, Tooltip } from '../../properties';
 /**
  * @description 漏斗图，用于展示单一维度数据的占比关系
  * 适用场景:
@@ -41,17 +41,15 @@ export interface Funnel {
     /**
      * 维度
      * @description 漏斗图的所有维度会与指标名称(存在多个指标时)合并成一个维度,并作为图例项展示
-     * @type {Dimensions}
      * @example [{id: 'category', alias: '类别'}]
      */
-    dimensions?: Dimensions;
+    dimensions?: FunnelDimension[];
     /**
      * 指标
      * @description 漏斗图的所有指标会自动合并为一个指标, 存在多个指标时, 指标名称会与其余维度合并, 作为图例项展示.
-     * @type {MeasureTree}
      * @example [{id: 'value', alias: '数值占比', format: 'percent'}]
      */
-    measures?: MeasureTree;
+    measures?: FunnelMeasure[];
     /**
      * 图表的背景颜色
      * @default transparent 默认为透明背景