@visactor/vseed 0.1.10 → 0.1.11

package/dist/esm/pipeline/utils/constant.d.ts

@@ -2,3 +2,4 @@ export declare const ANNOTATION_Z_INDEX = 1000;
 export declare const LINEAR_AXIS_INNER_OFFSET_TOP = 7;
 export declare const DUAL_AXIS_CHART_COLUMN_Z_INDEX = 1000;
 export declare const DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX = 1001;
+export declare const DEFAULT_PARENT_ID = "__DefaultParentId__";

package/dist/esm/pipeline/utils/constant.js

@@ -2,6 +2,7 @@ const ANNOTATION_Z_INDEX = 1000;
 const LINEAR_AXIS_INNER_OFFSET_TOP = 7;
 const DUAL_AXIS_CHART_COLUMN_Z_INDEX = 1000;
 const DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX = 1001;
-export { ANNOTATION_Z_INDEX, DUAL_AXIS_CHART_COLUMN_Z_INDEX, DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX, LINEAR_AXIS_INNER_OFFSET_TOP };
+const DEFAULT_PARENT_ID = '__DefaultParentId__';
+export { ANNOTATION_Z_INDEX, DEFAULT_PARENT_ID, DUAL_AXIS_CHART_COLUMN_Z_INDEX, DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX, LINEAR_AXIS_INNER_OFFSET_TOP };
 
 //# sourceMappingURL=constant.js.map

package/dist/esm/pipeline/utils/constant.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/utils/constant.js","sources":["webpack://@visactor/vseed/./src/pipeline/utils/constant.ts"],"sourcesContent":["// 标注层 z-index \nexport const ANNOTATION_Z_INDEX = 1000\n// 线性轴 顶部空隙 预留5px\nexport const LINEAR_AXIS_INNER_OFFSET_TOP = 7\n// 双轴图 柱图 ZIndex\nexport const DUAL_AXIS_CHART_COLUMN_Z_INDEX = 1000\n// 双轴图 非柱图 ZIndex\nexport const DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX = 1001\n"],"names":["ANNOTATION_Z_INDEX","LINEAR_AXIS_INNER_OFFSET_TOP","DUAL_AXIS_CHART_COLUMN_Z_INDEX","DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX"],"mappings":"AACO,MAAMA,qBAAqB;AAE3B,MAAMC,+BAA+B;AAErC,MAAMC,iCAAiC;AAEvC,MAAMC,qCAAqC"}
+{"version":3,"file":"pipeline/utils/constant.js","sources":["webpack://@visactor/vseed/./src/pipeline/utils/constant.ts"],"sourcesContent":["// 标注层 z-index\nexport const ANNOTATION_Z_INDEX = 1000\n// 线性轴 顶部空隙 预留5px\nexport const LINEAR_AXIS_INNER_OFFSET_TOP = 7\n// 双轴图 柱图 ZIndex\nexport const DUAL_AXIS_CHART_COLUMN_Z_INDEX = 1000\n// 双轴图 非柱图 ZIndex\nexport const DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX = 1001\n// 默认父级id\nexport const DEFAULT_PARENT_ID = '__DefaultParentId__'\n"],"names":["ANNOTATION_Z_INDEX","LINEAR_AXIS_INNER_OFFSET_TOP","DUAL_AXIS_CHART_COLUMN_Z_INDEX","DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX","DEFAULT_PARENT_ID"],"mappings":"AACO,MAAMA,qBAAqB;AAE3B,MAAMC,+BAA+B;AAErC,MAAMC,iCAAiC;AAEvC,MAAMC,qCAAqC;AAE3C,MAAMC,oBAAoB"}

package/dist/esm/types/properties/dimensions/dimensions.d.ts

@@ -1,3 +1,4 @@
+import type { DimensionEncoding } from "../encoding";
 /**
  * @description 维度
  */
@@ -16,7 +17,7 @@ export type Dimension = {
      * - row: 支持将多个维度映射到行通道, 支持所有图表类型
      * - column: 支持将多个维度映射到列通道, 支持所有图表类型
      */
-    encoding?: 'xAxis' | 'yAxis' | 'angle' | 'color' | 'detail' | 'tooltip' | 'label' | 'row' | 'column';
+    encoding?: DimensionEncoding;
 };
 /**
  * @description 维度组

package/dist/esm/types/properties/encoding/dimensionEncoding.d.ts

@@ -0,0 +1,13 @@
+/**
+ * @description 维度映射的通道
+ * - x: 支持将多个维度映射到x轴, 支持柱状图、折线图、面积图等
+ * - y: 支持将多个维度映射到y轴, 支持柱状图、折线图、面积图等
+ * - angle: 支持将多个维度映射到角度通道, 支持玫瑰图、雷达图等
+ * - color: 支持将多个维度映射到颜色通道, 支持所有图表类型
+ * - detail: 支持将多个维度映射到详情通道, 支持所有图表类型
+ * - tooltip: 支持将多个维度映射到提示通道, 支持所有图表类型
+ * - label: 支持将多个维度映射到标签通道, 支持所有图表类型
+ * - row: 支持将多个维度映射到行通道, 支持所有图表类型
+ * - column: 支持将多个维度映射到列通道, 支持所有图表类型
+ */
+export type DimensionEncoding = 'xAxis' | 'yAxis' | 'angle' | 'color' | 'detail' | 'tooltip' | 'label' | 'row' | 'column';

package/dist/esm/types/properties/encoding/index.d.ts

@@ -1,2 +1,6 @@
 export type { Encoding } from './encoding';
+export type { DimensionEncoding } from './dimensionEncoding';
+export type { MeasureEncoding } from './measureEncoding';
 export { zEncoding } from './zEncoding';
+export { zDimensionEncoding } from './zDimensionEncoding';
+export { zMeasureEncoding } from './zMeasureEncoding';

package/dist/esm/types/properties/encoding/index.js

@@ -1,2 +1,4 @@
 import { zEncoding } from "./zEncoding.js";
-export { zEncoding };
+import { zDimensionEncoding } from "./zDimensionEncoding.js";
+import { zMeasureEncoding } from "./zMeasureEncoding.js";
+export { zDimensionEncoding, zEncoding, zMeasureEncoding };

package/dist/esm/types/properties/encoding/measureEncoding.d.ts

@@ -0,0 +1 @@
+export type MeasureEncoding = 'primaryYAxis' | 'secondaryYAxis' | 'xAxis' | 'yAxis' | 'angle' | 'radius' | 'size' | 'color' | 'detail' | 'column' | 'label' | 'tooltip';

package/dist/esm/types/properties/encoding/zDimensionEncoding.d.ts

@@ -0,0 +1,12 @@
+import { z } from 'zod';
+export declare const zDimensionEncoding: z.ZodEnum<{
+    column: "column";
+    xAxis: "xAxis";
+    yAxis: "yAxis";
+    angle: "angle";
+    color: "color";
+    detail: "detail";
+    tooltip: "tooltip";
+    label: "label";
+    row: "row";
+}>;

package/dist/esm/types/properties/encoding/zDimensionEncoding.js

@@ -0,0 +1,15 @@
+import { z } from "zod";
+const zDimensionEncoding = z["enum"]([
+    'xAxis',
+    'yAxis',
+    'angle',
+    'color',
+    'detail',
+    'tooltip',
+    'label',
+    'row',
+    'column'
+]);
+export { zDimensionEncoding };
+
+//# sourceMappingURL=zDimensionEncoding.js.map

package/dist/esm/types/properties/encoding/zDimensionEncoding.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types/properties/encoding/zDimensionEncoding.js","sources":["webpack://@visactor/vseed/./src/types/properties/encoding/zDimensionEncoding.ts"],"sourcesContent":["import { z } from 'zod'\n\nexport const zDimensionEncoding = z.enum([\n  'xAxis',\n  'yAxis',\n  'angle',\n  'color',\n  'detail',\n  'tooltip',\n  'label',\n  'row',\n  'column',\n])\n"],"names":["zDimensionEncoding","z"],"mappings":";AAEO,MAAMA,qBAAqBC,CAAC,CAADA,OAAM,CAAC;IACvC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;CACD"}

package/dist/esm/types/properties/encoding/zMeasureEncoding.d.ts

@@ -0,0 +1,15 @@
+import { z } from 'zod';
+export declare const zMeasureEncoding: z.ZodEnum<{
+    column: "column";
+    xAxis: "xAxis";
+    yAxis: "yAxis";
+    angle: "angle";
+    color: "color";
+    detail: "detail";
+    tooltip: "tooltip";
+    label: "label";
+    primaryYAxis: "primaryYAxis";
+    secondaryYAxis: "secondaryYAxis";
+    radius: "radius";
+    size: "size";
+}>;

package/dist/esm/types/properties/encoding/zMeasureEncoding.js

@@ -0,0 +1,18 @@
+import { z } from "zod";
+const zMeasureEncoding = z["enum"]([
+    'primaryYAxis',
+    'secondaryYAxis',
+    'xAxis',
+    'yAxis',
+    'angle',
+    'radius',
+    'size',
+    'color',
+    'detail',
+    'column',
+    'label',
+    'tooltip'
+]);
+export { zMeasureEncoding };
+
+//# sourceMappingURL=zMeasureEncoding.js.map

package/dist/esm/types/properties/encoding/zMeasureEncoding.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types/properties/encoding/zMeasureEncoding.js","sources":["webpack://@visactor/vseed/./src/types/properties/encoding/zMeasureEncoding.ts"],"sourcesContent":["import { z } from 'zod'\n\nexport const zMeasureEncoding = z.enum([\n  'primaryYAxis',\n  'secondaryYAxis',\n  'xAxis',\n  'yAxis',\n  'angle',\n  'radius',\n  'size',\n  'color',\n  'detail',\n  'column',\n  'label',\n  'tooltip',\n])\n"],"names":["zMeasureEncoding","z"],"mappings":";AAEO,MAAMA,mBAAmBC,CAAC,CAADA,OAAM,CAAC;IACrC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;CACD"}

package/dist/esm/types/properties/measures/measures.d.ts

@@ -1,3 +1,4 @@
+import type { MeasureEncoding } from '../encoding';
 import type { NumFormat } from './format/numFormat';
 /**
  * @description 指标
@@ -41,7 +42,7 @@ export type Measure = {
      * - label: 指标映射的标签, 适用于所有图表
      * - tooltip: 指标映射的提示, 适用于所有图表
      */
-    encoding?: 'primaryYAxis' | 'secondaryYAxis' | 'xAxis' | 'yAxis' | 'angle' | 'radius' | 'size' | 'color' | 'detail' | 'column' | 'label' | 'tooltip';
+    encoding?: MeasureEncoding;
     /**
      * @description 以扁平的指标配置形式, 构建树形指标组, parentId指向父级指标组的id, 用于构建指标树
      * @tip 指标树的配置存在两种形式, 方式一是直接配置带children的指标树, 方式二是配置parentId的扁平指标列表, 两种方式不能同时配置

package/dist/umd/index.js

@@ -67,6 +67,7 @@
         var __webpack_exports__ = {};
         __webpack_require__.r(__webpack_exports__);
         __webpack_require__.d(__webpack_exports__, {
+            zScatterConfig: ()=>zScatterConfig,
             zTooltip: ()=>zTooltip,
             funnelAdvancedPipeline: ()=>funnelAdvancedPipeline,
             zHeatmapConfig: ()=>zHeatmapConfig,
@@ -133,8 +134,9 @@
             registerAreaPercent: ()=>registerAreaPercent,
             zBarPercent: ()=>zBarPercent,
             zHeatmap: ()=>zHeatmap,
-            zScatterMeasure: ()=>zScatterMeasure,
+            zMeasureEncoding: ()=>zMeasureEncoding,
             zDatum: ()=>zDatum,
+            zScatterMeasure: ()=>zScatterMeasure,
             zTheme: ()=>zTheme,
             barAdvancedPipeline: ()=>barAdvancedPipeline,
             zCustomThemeConfig: ()=>zCustomThemeConfig,
@@ -258,9 +260,9 @@
             registerPie: ()=>registerPie,
             foldMeasures: ()=>foldMeasures,
             isPivotTable: ()=>isPivotTable,
+            zDimensionEncoding: ()=>zDimensionEncoding,
             zFunnel: ()=>zFunnel,
             zScatter: ()=>zScatter,
-            zScatterConfig: ()=>zScatterConfig,
             zBarParallelConfig: ()=>zBarParallelConfig,
             barParallelAdvancedPipeline: ()=>barParallelAdvancedPipeline,
             FoldMeasureValue: ()=>FoldMeasureValue,
@@ -1791,6 +1793,7 @@
             });
             return depth;
         };
+        const DEFAULT_PARENT_ID = '__DefaultParentId__';
         const isTable = (vseed)=>'table' === vseed.chartType;
         const isPivotTable = (vseed)=>'pivotTable' === vseed.chartType;
         const isVTable = (vseed)=>[
@@ -1801,7 +1804,7 @@
         const isPivotChart = (vseed)=>{
             if (isVTable(vseed)) return false;
             if (isMeasureTreeWithParentId(vseed.measures)) {
-                const parentIds = vseed.measures?.map((measure)=>measure.parentId);
+                const parentIds = vseed.measures?.map((measure)=>measure.parentId || DEFAULT_PARENT_ID);
                 return parentIds && chunk_QJLMYOTX_i(parentIds).length > 1;
             }
             if ('dualAxis' === vseed.chartType || 'scatter' === vseed.chartType) {
@@ -1845,17 +1848,22 @@
         const generateMeasuresByParentId = (measures)=>{
             const measureTree = [];
             measures.forEach((measure)=>{
-                if (!measure.parentId) return;
                 const parent = measureTree.find((item)=>item.id === measure.parentId);
                 if (parent && 'children' in parent) {
                     parent.children = parent.children || [];
                     parent.children.push(measure);
-                } else measureTree.push({
+                } else if (measure.parentId) measureTree.push({
                     id: measure.parentId,
                     children: [
                         measure
                     ]
                 });
+                else measureTree.push({
+                    id: DEFAULT_PARENT_ID,
+                    children: [
+                        measure
+                    ]
+                });
             });
             return measureTree;
         };
@@ -2989,7 +2997,7 @@
                     style: {}
                 }
             };
-            if (!pointStyle) return result;
+            if (chunk_JK3VNB42_n(pointStyle) || chunk_VCYTMP4D_n(pointStyle)) return result;
             const pointStyles = Array.isArray(pointStyle) ? pointStyle : [
                 pointStyle
             ];
@@ -3127,7 +3135,7 @@
                     style: {}
                 }
             };
-            if (!lineStyle) return result;
+            if (chunk_JK3VNB42_n(lineStyle) || chunk_VCYTMP4D_n(lineStyle)) return result;
             const lineStyles = Array.isArray(lineStyle) ? lineStyle : [
                 lineStyle
             ];
@@ -3272,8 +3280,8 @@
             ];
         };
         const createMarkContent = (tooltip, dimensions, measures, locale, foldInfo, unfoldInfo)=>{
-            const dims = T(dimensions.filter((item)=>tooltip.includes(item.id)), (item)=>item.id);
-            const meas = T(measures.filter((item)=>tooltip.includes(item.id)), (item)=>item.id);
+            const dims = C(dimensions.filter((item)=>tooltip.includes(item.id)), T((item)=>item.id), T((item)=>item.alias));
+            const meas = C(measures.filter((item)=>tooltip.includes(item.id)), T((item)=>item.id), T((item)=>item.alias));
             const dimContent = dims.map((item)=>({
                     visible: true,
                     hasShape: true,
@@ -4457,7 +4465,7 @@
                     }
                 }
             };
-            if (!barStyle) return result;
+            if (chunk_JK3VNB42_n(barStyle) || chunk_VCYTMP4D_n(barStyle)) return result;
             const barStyles = Array.isArray(barStyle) ? barStyle : [
                 barStyle
             ];
@@ -5580,7 +5588,7 @@
                     style: {}
                 }
             };
-            if (!areaStyle) return result;
+            if (chunk_JK3VNB42_n(areaStyle) || chunk_VCYTMP4D_n(areaStyle)) return result;
             const areaStyles = Array.isArray(areaStyle) ? areaStyle : [
                 areaStyle
             ];
@@ -5900,17 +5908,17 @@
         const buildMeasuresForScatter_generateMeasuresByParentId = (measures)=>{
             const scatterMeasures = [];
             measures.forEach((item)=>{
-                if (!item.parentId) return;
-                if (!scatterMeasures.find((d)=>d.id === item.parentId)) scatterMeasures.push({
-                    id: item.parentId,
+                const id = item.parentId || DEFAULT_PARENT_ID;
+                if (!scatterMeasures.find((d)=>d.id === id)) scatterMeasures.push({
+                    id,
                     yMeasures: [],
                     xMeasures: []
                 });
-                const scatterChart = scatterMeasures.find((d)=>d.id === item.parentId);
+                const scatterChart = scatterMeasures.find((d)=>d.id === id);
                 if (!scatterChart || !Array.isArray(scatterChart.yMeasures) || !Array.isArray(scatterChart.xMeasures)) return;
                 const encoding = Array.isArray(item.encoding) ? item.encoding : [
                     item.encoding
-                ];
+                ].filter(Boolean);
                 const isX = encoding.includes('xAxis');
                 const isY = encoding.includes('yAxis');
                 const isEmpty = !encoding.length;
@@ -6448,17 +6456,17 @@
         const buildMeasuresForDualAxis_generateMeasuresByParentId = (measures)=>{
             const dualMeasures = [];
             measures.forEach((item)=>{
-                if (!item.parentId) return;
-                if (!dualMeasures.find((d)=>d.id === item.parentId)) dualMeasures.push({
-                    id: item.parentId,
+                const id = item.parentId || DEFAULT_PARENT_ID;
+                if (!dualMeasures.find((d)=>d.id === id)) dualMeasures.push({
+                    id,
                     primaryMeasures: [],
                     secondaryMeasures: []
                 });
-                const dualChart = dualMeasures.find((d)=>d.id === item.parentId);
+                const dualChart = dualMeasures.find((d)=>d.id === id);
                 if (!dualChart || !Array.isArray(dualChart.primaryMeasures) || !Array.isArray(dualChart.secondaryMeasures)) return;
                 const encoding = Array.isArray(item.encoding) ? item.encoding : [
                     item.encoding
-                ];
+                ].filter(Boolean);
                 const isPrimary = encoding.includes('primaryYAxis');
                 const isSecondary = encoding.includes('secondaryYAxis');
                 const isEmpty = !item.encoding;
@@ -6486,7 +6494,7 @@
             const secondaryMeasures = measures[1] || [];
             const hasEncoding = (vseed.dimensions || []).some((item)=>item.encoding);
             if (primaryMeasures && primaryMeasures.children) {
-                const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, primaryMeasures.children, encoding, {
+                const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(primaryMeasures.children, (item)=>item.id), encoding, {
                     colorItemAsId: hasEncoding,
                     foldMeasureValue: FoldPrimaryMeasureValue,
                     colorMeasureId: getColorMeasureId(advancedVSeed)
@@ -6496,7 +6504,7 @@
                 unfoldInfoList.push(unfoldInfo);
             }
             if (secondaryMeasures && secondaryMeasures.children) {
-                const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, secondaryMeasures.children, encoding, {
+                const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(secondaryMeasures.children, (item)=>item.id), encoding, {
                     foldMeasureValue: FoldSecondaryMeasureValue,
                     colorMeasureId: getColorMeasureId(advancedVSeed)
                 });
@@ -6552,7 +6560,7 @@
                 const primaryMeasures = measures[0];
                 const secondaryMeasures = measures[1] || [];
                 if (primaryMeasures && primaryMeasures.children) {
-                    const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, primaryMeasures.children, encoding, {
+                    const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(primaryMeasures.children, (item)=>item.id), encoding, {
                         colorItemAsId: hasEncoding,
                         foldMeasureValue: `${FoldPrimaryMeasureValue}${index}`,
                         colorMeasureId: getColorMeasureId(advancedVSeed)
@@ -6562,7 +6570,7 @@
                     unfoldInfoList.push(unfoldInfo);
                 }
                 if (secondaryMeasures && secondaryMeasures.children) {
-                    const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, secondaryMeasures.children, encoding, {
+                    const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(secondaryMeasures.children, (item)=>item.id), encoding, {
                         foldMeasureValue: `${FoldSecondaryMeasureValue}${index}`,
                         colorMeasureId: getColorMeasureId(advancedVSeed)
                     });
@@ -12880,6 +12888,31 @@
             column: schemas_array(schemas_string()).nullish(),
             group: schemas_array(schemas_string()).nullish().describe("\u5DF2\u5F03\u7528, \u8BF7\u4F7F\u7528\u989C\u8272\u66FF\u4EE3")
         });
+        const zDimensionEncoding = schemas_enum([
+            'xAxis',
+            'yAxis',
+            'angle',
+            'color',
+            'detail',
+            'tooltip',
+            'label',
+            'row',
+            'column'
+        ]);
+        const zMeasureEncoding = schemas_enum([
+            'primaryYAxis',
+            'secondaryYAxis',
+            'xAxis',
+            'yAxis',
+            'angle',
+            'radius',
+            'size',
+            'color',
+            'detail',
+            'column',
+            'label',
+            'tooltip'
+        ]);
         const zXBandAxis = schemas_object({
             visible: schemas_boolean().default(true).nullish(),
             labelAutoHide: schemas_boolean().default(true).nullish(),