@visactor/vseed 0.0.13 → 0.0.14

package/dist/index.js

@@ -266,30 +266,40 @@ const FoldMeasureName = '__MeaName__';
 const FoldMeasureValue = '__MeaValue__';
 const FoldMeasureId = '__MeaId__';
 const UnfoldDimensionGroup = '__DimGroup__';
+const UnfoldDimensionGroupId = '__DimGroupID__';
 const Separator = '-';
 const ORIGINAL_DATA = '__OriginalData__';
-const unfoldDimensions = (dataset, dimensions, measures, unfoldStartIndex = 0, foldGroupName = UnfoldDimensionGroup, dimensionsSeparator = Separator)=>{
+const unfoldDimensions = (dataset, dimensions, measures, unfoldStartIndex = 0, unfoldGroupName = UnfoldDimensionGroup, unfoldGroupId = UnfoldDimensionGroupId, foldMeasureId = FoldMeasureId, dimensionsSeparator = Separator)=>{
     if (unfoldStartIndex < 0 || unfoldStartIndex >= dimensions.length) throw new Error('unfoldStartIndex is out of range');
     const dimensionsToBeUnfolded = dimensions.slice(unfoldStartIndex);
     const unfoldInfo = {
-        groupName: foldGroupName,
-        colorItems: []
+        groupName: unfoldGroupName,
+        groupId: unfoldGroupId,
+        colorItems: [],
+        colorIdMap: {}
     };
     if (0 === dimensions.length || 0 === measures.length) return {
         dataset,
         unfoldInfo: {
-            groupName: foldGroupName,
-            colorItems: []
+            groupName: unfoldGroupName,
+            groupId: unfoldGroupId,
+            colorItems: [],
+            colorIdMap: {}
         }
     };
     const colorItems = [];
+    const colorMap = {};
     for(let i = 0; i < dataset.length; i++){
         const datum = dataset[i];
-        const colorItem = generateDimGroupName(dimensionsToBeUnfolded, datum, dimensionsSeparator);
-        datum[foldGroupName] = colorItem;
-        colorItems.push(colorItem);
+        const colorName = generateDimGroupName(dimensionsToBeUnfolded, datum, dimensionsSeparator);
+        const colorId = colorName + (datum[foldMeasureId] || '');
+        datum[unfoldGroupName] = colorName;
+        datum[unfoldGroupId] = colorId;
+        colorItems.push(colorId);
+        colorMap[colorId] = colorName;
     }
     unfoldInfo.colorItems = unique(colorItems);
+    unfoldInfo.colorIdMap = colorMap;
     return {
         dataset,
         unfoldInfo
@@ -315,7 +325,7 @@ const foldMeasures = (dataset, measures, measureId = FoldMeasureId, measureName
         const { id, alias } = measure;
         datum[id] = dataset[i][id];
         datum[measureId] = id;
-        datum[measureName] = alias;
+        datum[measureName] = alias || id;
         datum[measureValue] = dataset[i][id];
         foldInfo.foldMap[id] = alias;
         result[index++] = datum;
@@ -334,12 +344,14 @@ const emptyReshapeResult = {
         measureValue: ''
     },
     unfoldInfo: {
+        groupName: '',
+        groupId: '',
         colorItems: [],
-        groupName: ''
+        colorIdMap: {}
     }
 };
 const dataReshapeFor2D1M = (dataset, dimensions, measures, options)=>{
-    const { foldMeasureId = FoldMeasureId, foldMeasureName = FoldMeasureName, foldMeasureValue = FoldMeasureValue, unfoldDimensionGroup = UnfoldDimensionGroup } = options || {};
+    const { foldMeasureId = FoldMeasureId, foldMeasureName = FoldMeasureName, foldMeasureValue = FoldMeasureValue, unfoldDimensionGroup = UnfoldDimensionGroup, unfoldDimensionGroupId = UnfoldDimensionGroupId } = options || {};
     if (0 === dimensions.length && 0 === measures.length) return emptyReshapeResult;
     const { dataset: foldedDataset, foldInfo } = foldMeasures(dataset, measures, foldMeasureId, foldMeasureName, foldMeasureValue);
     if (0 === dimensions.length) {
@@ -359,7 +371,7 @@ const dataReshapeFor2D1M = (dataset, dimensions, measures, options)=>{
                 id: foldMeasureValue,
                 alias: i18n`指标值`
             }
-        ], 1, unfoldDimensionGroup);
+        ], 1, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
         return {
             dataset: finalDataset,
             foldInfo,
@@ -379,7 +391,7 @@ const dataReshapeFor2D1M = (dataset, dimensions, measures, options)=>{
                 id: foldMeasureValue,
                 alias: i18n`指标值`
             }
-        ], 1, unfoldDimensionGroup);
+        ], 1, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
         return {
             dataset: finalDataset,
             foldInfo,
@@ -397,11 +409,13 @@ const dataReshapeFor1D1M_emptyReshapeResult = {
     },
     unfoldInfo: {
         groupName: '',
-        colorItems: []
+        groupId: '',
+        colorItems: [],
+        colorIdMap: {}
     }
 };
 const dataReshapeFor1D1M = (dataset, dimensions, measures, options)=>{
-    const { foldMeasureId = FoldMeasureId, foldMeasureName = FoldMeasureName, foldMeasureValue = FoldMeasureValue, unfoldDimensionGroup = UnfoldDimensionGroup } = options || {};
+    const { foldMeasureId = FoldMeasureId, foldMeasureName = FoldMeasureName, foldMeasureValue = FoldMeasureValue, unfoldDimensionGroup = UnfoldDimensionGroup, unfoldDimensionGroupId = UnfoldDimensionGroupId } = options || {};
     if (0 === dimensions.length && 0 === measures.length) return dataReshapeFor1D1M_emptyReshapeResult;
     const { dataset: foldedDataset, foldInfo } = foldMeasures(dataset, measures, foldMeasureId, foldMeasureName, foldMeasureValue);
     if (0 === dimensions.length) {
@@ -416,7 +430,7 @@ const dataReshapeFor1D1M = (dataset, dimensions, measures, options)=>{
                 id: foldMeasureValue,
                 alias: i18n`指标值`
             }
-        ], 0, unfoldDimensionGroup);
+        ], 0, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
         return {
             dataset: finalDataset,
             foldInfo,
@@ -436,7 +450,7 @@ const dataReshapeFor1D1M = (dataset, dimensions, measures, options)=>{
                 id: foldMeasureValue,
                 alias: i18n`指标值`
             }
-        ], 0, unfoldDimensionGroup);
+        ], 0, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
         return {
             dataset: finalDataset,
             foldInfo,
@@ -576,7 +590,6 @@ const encodingXY = (advancedVSeed)=>{
     if (!datasetReshapeInfo || !dimensions) return result;
     const encoding = datasetReshapeInfo.reduce((prev, cur)=>{
         const { foldInfo, unfoldInfo } = cur;
-        const isSingleDimension = 1 === dimensions.length;
         const isZeroDimension = 0 === dimensions.length;
         const x = [
             isZeroDimension ? foldInfo.measureName : dimensions[0].id
@@ -585,7 +598,7 @@ const encodingXY = (advancedVSeed)=>{
             foldInfo.measureValue
         ];
         const group = [
-            isSingleDimension || isZeroDimension ? foldInfo.measureName : unfoldInfo.groupName
+            unfoldInfo.groupId
         ];
         const color = [
             foldInfo.measureName
@@ -614,7 +627,6 @@ const encodingYX = (advancedVSeed)=>{
     const encoding = datasetReshapeInfo.reduce((prev, cur)=>{
         const { foldInfo, unfoldInfo } = cur;
         const isZeroDimension = 0 === dimensions.length;
-        const isSingleDimension = 1 === dimensions.length;
         const y = [
             isZeroDimension ? foldInfo.measureName : dimensions[0].id
         ];
@@ -622,7 +634,7 @@ const encodingYX = (advancedVSeed)=>{
             foldInfo.measureValue
         ];
         const group = [
-            isSingleDimension || isZeroDimension ? foldInfo.measureName : unfoldInfo.groupName
+            unfoldInfo.groupId
         ];
         const color = [
             foldInfo.measureName
@@ -654,13 +666,13 @@ const encodingPolar = (advancedVSeed)=>{
             foldInfo.measureValue
         ];
         const angle = [
-            unfoldInfo.groupName
+            unfoldInfo.groupId
         ];
         const group = [
-            unfoldInfo.groupName
+            unfoldInfo.groupId
         ];
         const color = [
-            unfoldInfo.groupName
+            unfoldInfo.groupId
         ];
         return [
             ...prev,
@@ -1645,22 +1657,27 @@ const label_label = (spec, context)=>{
     const { measures, datasetReshapeInfo, locale } = advancedVSeed;
     const baseConfig = advancedVSeed.baseConfig.vchart;
     if (!baseConfig || !baseConfig.label) return result;
-    const { measureId } = datasetReshapeInfo[0].foldInfo;
+    const { measureId, measureValue } = datasetReshapeInfo[0].foldInfo;
     const { label } = baseConfig;
     const { enable } = label;
     result.label = {
         visible: enable,
         formatMethod: (value, datum)=>{
-            const id = datum[measureId];
-            const measure = findMeasureById(measures, id);
-            if (!measure) return value;
-            const { format = {}, autoFormat = true } = measure;
-            if (!isEmpty(format)) {
-                const formatter = createFormatter(format);
-                return formatter(value);
-            }
-            if (autoFormat) return autoFormatter(value, locale);
-            return String(value);
+            const result = [];
+            const formatValue = (value)=>{
+                const id = datum[measureId];
+                const measure = findMeasureById(measures, id);
+                if (!measure) return value;
+                const { format = {}, autoFormat = true } = measure;
+                if (!isEmpty(format)) {
+                    const formatter = createFormatter(format);
+                    return formatter(value);
+                }
+                if (autoFormat) return autoFormatter(value, locale);
+                return String(value);
+            };
+            result.push(formatValue(datum[measureValue]));
+            return result.join(' ');
         }
     };
     return result;
@@ -1670,6 +1687,8 @@ const discreteLegend = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
+    const { datasetReshapeInfo } = advancedVSeed;
+    const { unfoldInfo } = datasetReshapeInfo[0];
     const baseConfig = advancedVSeed.baseConfig.vchart;
     if (!baseConfig || !baseConfig.legend) return result;
     const { legend } = baseConfig;
@@ -1743,6 +1762,7 @@ const discreteLegend = (spec, context)=>{
                 }
             },
             label: {
+                formatMethod: (value)=>unfoldInfo.colorIdMap[String(value)] ?? value,
                 style: {
                     fontSize: labelFontSize,
                     fill: labelFontColor,
@@ -1770,6 +1790,10 @@ const pivotDiscreteLegend = (spec, context)=>{
     if (!baseConfig || !baseConfig.legend) return result;
     const { datasetReshapeInfo } = advancedVSeed;
     const colorItems = unique(datasetReshapeInfo.flatMap((d)=>d.unfoldInfo.colorItems));
+    const colorIdMap = datasetReshapeInfo.reduce((prev, cur)=>({
+            ...prev,
+            ...cur.unfoldInfo.colorIdMap
+        }), {});
     const { legend, color } = baseConfig;
     const { colorScheme } = color;
     const { enable, position = 'bottom', labelFontColor, labelFontSize = 12, labelFontWeight, maxSize, border, shapeType = 'rectRound' } = legend || {};
@@ -1844,6 +1868,7 @@ const pivotDiscreteLegend = (spec, context)=>{
                 }
             },
             label: {
+                formatMethod: (value)=>colorIdMap[String(value)] ?? value,
                 style: {
                     fontSize: labelFontSize,
                     fill: labelFontColor,
@@ -1876,11 +1901,19 @@ const color_color = (spec, context)=>{
     if (!baseConfig || !baseConfig.color) return result;
     const { color } = baseConfig;
     const { colorScheme, colorMapping } = color;
+    const mappingList = [];
+    if (colorMapping) Object.entries(colorMapping).forEach(([key, value])=>{
+        const idMap = Object.entries(unfoldInfo.colorIdMap).filter(([_, v])=>key === v);
+        for (const [colorId] of idMap)mappingList.push([
+            colorId,
+            value
+        ]);
+    });
     result.color = {
         type: 'ordinal',
         domain: unfoldInfo.colorItems,
         range: colorScheme,
-        specified: colorMapping
+        specified: Object.fromEntries(mappingList)
     };
     return result;
 };
@@ -2361,8 +2394,7 @@ const lineStyle_lineStyle = (spec, context)=>{
                 },
                 style: {
                     curveType: curveType,
-                    fill: lineColor,
-                    fillOpacity: lineColorOpacity,
+                    strokeOpacity: lineColorOpacity,
                     stroke: lineColor,
                     lineWidth: lineWidth,
                     lineDash: lineDash
@@ -2697,7 +2729,7 @@ const annotationArea_annotationArea = (spec, context)=>{
         right: 'insideRight'
     };
     const markArea = annotationAreaList.flatMap((annotationArea)=>{
-        const { selector: selectorPoint, text = '', textPosition = 'top', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'center', textBaseline = 'top', backgroundBorderColor, backgroundBorderRadius = 4, backgroundBorderWidth = 1, backgroundColor = '#191d24', backgroundPadding = 4, backgroundVisible = true, outerPadding = 0, areaColor = '#888888', areaColorOpacity = 0.15, areaBorderColor, areaBorderRadius, areaBorderWidth } = annotationArea;
+        const { selector: selectorPoint, text = '', textPosition = 'top', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'center', textBaseline = 'top', backgroundBorderColor, backgroundBorderRadius = 4, backgroundBorderWidth = 1, backgroundColor = '#191d24', backgroundPadding = 10, backgroundVisible = true, outerPadding = 4, areaColor = '#888888', areaColorOpacity = 0.15, areaBorderColor, areaBorderRadius, areaBorderWidth } = annotationArea;
         const dataset = advancedVSeed.dataset.flat();
         const selectedData = dataset.filter((datum)=>selector_selector(datum, selectorPoint));
         return {
@@ -4188,6 +4220,8 @@ const zFoldInfo = z.object({
 });
 const zUnfoldInfo = z.object({
     colorItems: z.array(z.string()),
+    groupId: z.string(),
+    colorIdMap: z.record(z.string(), z.string()),
     groupName: z.string()
 });
 const zDatasetReshapeInfo = z.array(z.object({
@@ -4804,6 +4838,6 @@ const zCustomThemeConfig = z.object({
 });
 const zCustomTheme = z.record(z.string(), zCustomThemeConfig).optional();
 const zTheme = z.string();
-export { Builder, FoldMeasureId, FoldMeasureName, FoldMeasureValue, ORIGINAL_DATA, Separator, UnfoldDimensionGroup, areaAdvancedPipeline, areaPercentAdvancedPipeline, areaPercentSpecPipeline, areaSpecPipeline, autoFormatter, autoNumFormatter, barAdvancedPipeline, barParallelAdvancedPipeline, barParallelSpecPipeline, barPercentAdvancedPipeline, barPercentSpecPipeline, barSpecPipeline, columnAdvancedPipeline, columnParallelAdvancedPipeline, columnParallelSpecPipeline, columnPercentAdvancedPipeline, columnPercentSpecPipeline, columnSpecPipeline, createFormatter, createNumFormatter, darkTheme, dataReshapeFor1D1M, dataReshapeFor2D1M, execPipeline, findMeasureById, foldMeasures, i18n, intl, isPivotChart, isVChart, isVTable, lightTheme, lineAdvancedPipeline, lineSpecPipeline, pieAdvancedPipeline, pieSpecPipeline, all_registerAll as registerAll, registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerColumn, registerColumnParallel, registerColumnPercent, registerCustomTheme, registerDarkTheme, registerLightTheme, registerLine, unfoldDimensions, zAnnotation, zAnnotationArea, zAnnotationHorizontalLine, zAnnotationPoint, zAnnotationVerticalLine, zAreaStyle, zAxis, zBackgroundColor, zBarStyle, zBaseConfig, zChartType, zColor, zConfig, zCrosshairLine, zCrosshairRect, zCustomTheme, zCustomThemeConfig, zDataset, zDatasetReshapeInfo, zDatum, zDimension, zDimensions, zEncoding, zFoldInfo, zLabel, zLegend, zLineStyle, zMarkStyle, zMeasure, zMeasureGroup, zMeasures, zNumFormat, zPointStyle, zStackCornerRadius, zTheme, zTooltip, zUnfoldInfo, zXBandAxis, zXLinearAxis, zYBandAxis, zYLinearAxis };
+export { Builder, FoldMeasureId, FoldMeasureName, FoldMeasureValue, ORIGINAL_DATA, Separator, UnfoldDimensionGroup, UnfoldDimensionGroupId, areaAdvancedPipeline, areaPercentAdvancedPipeline, areaPercentSpecPipeline, areaSpecPipeline, autoFormatter, autoNumFormatter, barAdvancedPipeline, barParallelAdvancedPipeline, barParallelSpecPipeline, barPercentAdvancedPipeline, barPercentSpecPipeline, barSpecPipeline, columnAdvancedPipeline, columnParallelAdvancedPipeline, columnParallelSpecPipeline, columnPercentAdvancedPipeline, columnPercentSpecPipeline, columnSpecPipeline, createFormatter, createNumFormatter, darkTheme, dataReshapeFor1D1M, dataReshapeFor2D1M, execPipeline, findMeasureById, foldMeasures, i18n, intl, isPivotChart, isVChart, isVTable, lightTheme, lineAdvancedPipeline, lineSpecPipeline, pieAdvancedPipeline, pieSpecPipeline, all_registerAll as registerAll, registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerColumn, registerColumnParallel, registerColumnPercent, registerCustomTheme, registerDarkTheme, registerLightTheme, registerLine, unfoldDimensions, zAnnotation, zAnnotationArea, zAnnotationHorizontalLine, zAnnotationPoint, zAnnotationVerticalLine, zAreaStyle, zAxis, zBackgroundColor, zBarStyle, zBaseConfig, zChartType, zColor, zConfig, zCrosshairLine, zCrosshairRect, zCustomTheme, zCustomThemeConfig, zDataset, zDatasetReshapeInfo, zDatum, zDimension, zDimensions, zEncoding, zFoldInfo, zLabel, zLegend, zLineStyle, zMarkStyle, zMeasure, zMeasureGroup, zMeasures, zNumFormat, zPointStyle, zStackCornerRadius, zTheme, zTooltip, zUnfoldInfo, zXBandAxis, zXLinearAxis, zYBandAxis, zYLinearAxis };
 
 //# sourceMappingURL=index.js.map