@visactor/vseed 0.0.13 → 0.0.14

package/dist/builder/builder/builder.d.ts

@@ -19,6 +19,8 @@ export declare class Builder implements VSeedBuilder {
             };
             unfoldInfo: {
                 colorItems: string[];
+                groupId: string;
+                colorIdMap: Record<string, string>;
                 groupName: string;
             };
         }[];
@@ -5555,6 +5557,8 @@ export declare class Builder implements VSeedBuilder {
             };
             unfoldInfo: {
                 colorItems: string[];
+                groupId: string;
+                colorIdMap: Record<string, string>;
                 groupName: string;
             };
         }[];
@@ -8355,6 +8359,8 @@ export declare class Builder implements VSeedBuilder {
             };
             unfoldInfo: {
                 colorItems: string[];
+                groupId: string;
+                colorIdMap: Record<string, string>;
                 groupName: string;
             };
         }[];

package/dist/dataReshape/constant.d.ts

@@ -2,5 +2,6 @@ export declare const FoldMeasureName = "__MeaName__";
 export declare const FoldMeasureValue = "__MeaValue__";
 export declare const FoldMeasureId = "__MeaId__";
 export declare const UnfoldDimensionGroup = "__DimGroup__";
+export declare const UnfoldDimensionGroupId = "__DimGroupID__";
 export declare const Separator = "-";
 export declare const ORIGINAL_DATA = "__OriginalData__";

package/dist/dataReshape/dataReshapeFor1D1M.d.ts

@@ -11,6 +11,7 @@ export declare const dataReshapeFor1D1M: (dataset: Dataset, dimensions: Dimensio
     foldMeasureName?: string;
     foldMeasureValue?: string;
     unfoldDimensionGroup?: string;
+    unfoldDimensionGroupId?: string;
 }) => {
     dataset: Dataset;
     foldInfo: FoldInfo;

package/dist/dataReshape/dataReshapeFor2D1M.d.ts

@@ -11,6 +11,7 @@ export declare const dataReshapeFor2D1M: (dataset: Dataset, dimensions: Dimensio
     foldMeasureName?: string;
     foldMeasureValue?: string;
     unfoldDimensionGroup?: string;
+    unfoldDimensionGroupId?: string;
 }) => {
     dataset: Dataset;
     foldInfo: FoldInfo;

package/dist/dataReshape/unfoldDimensions.d.ts

@@ -5,7 +5,7 @@ import type { UnfoldInfo } from '../types';
  * 展开指定的维度
  * @description 第一步: 根据指定的维度, 将多个维度展开为N个指标(取决于维值去重后的数量), 随后合并成一个维度.
  */
-export declare const unfoldDimensions: (dataset: Dataset, dimensions: Dimension[], measures: Measure[], unfoldStartIndex?: number, foldGroupName?: string, dimensionsSeparator?: string) => {
+export declare const unfoldDimensions: (dataset: Dataset, dimensions: Dimension[], measures: Measure[], unfoldStartIndex?: number, unfoldGroupName?: string, unfoldGroupId?: string, foldMeasureId?: string, dimensionsSeparator?: string) => {
     dataset: Dataset;
     unfoldInfo: UnfoldInfo;
 };

package/dist/index.cjs

@@ -77,6 +77,7 @@ __webpack_require__.d(__webpack_exports__, {
     registerArea: ()=>registerArea,
     findMeasureById: ()=>findMeasureById,
     zDataset: ()=>zDataset,
+    UnfoldDimensionGroupId: ()=>UnfoldDimensionGroupId,
     zNumFormat: ()=>zNumFormat,
     barPercentAdvancedPipeline: ()=>barPercentAdvancedPipeline,
     areaPercentAdvancedPipeline: ()=>areaPercentAdvancedPipeline,
@@ -390,30 +391,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 = (0, external_remeda_namespaceObject.unique)(colorItems);
+    unfoldInfo.colorIdMap = colorMap;
     return {
         dataset,
         unfoldInfo
@@ -439,7 +450,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;
@@ -458,12 +469,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) {
@@ -483,7 +496,7 @@ const dataReshapeFor2D1M = (dataset, dimensions, measures, options)=>{
                 id: foldMeasureValue,
                 alias: i18n`指标值`
             }
-        ], 1, unfoldDimensionGroup);
+        ], 1, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
         return {
             dataset: finalDataset,
             foldInfo,
@@ -503,7 +516,7 @@ const dataReshapeFor2D1M = (dataset, dimensions, measures, options)=>{
                 id: foldMeasureValue,
                 alias: i18n`指标值`
             }
-        ], 1, unfoldDimensionGroup);
+        ], 1, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
         return {
             dataset: finalDataset,
             foldInfo,
@@ -521,11 +534,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) {
@@ -540,7 +555,7 @@ const dataReshapeFor1D1M = (dataset, dimensions, measures, options)=>{
                 id: foldMeasureValue,
                 alias: i18n`指标值`
             }
-        ], 0, unfoldDimensionGroup);
+        ], 0, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
         return {
             dataset: finalDataset,
             foldInfo,
@@ -560,7 +575,7 @@ const dataReshapeFor1D1M = (dataset, dimensions, measures, options)=>{
                 id: foldMeasureValue,
                 alias: i18n`指标值`
             }
-        ], 0, unfoldDimensionGroup);
+        ], 0, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
         return {
             dataset: finalDataset,
             foldInfo,
@@ -700,7 +715,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
@@ -709,7 +723,7 @@ const encodingXY = (advancedVSeed)=>{
             foldInfo.measureValue
         ];
         const group = [
-            isSingleDimension || isZeroDimension ? foldInfo.measureName : unfoldInfo.groupName
+            unfoldInfo.groupId
         ];
         const color = [
             foldInfo.measureName
@@ -738,7 +752,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
         ];
@@ -746,7 +759,7 @@ const encodingYX = (advancedVSeed)=>{
             foldInfo.measureValue
         ];
         const group = [
-            isSingleDimension || isZeroDimension ? foldInfo.measureName : unfoldInfo.groupName
+            unfoldInfo.groupId
         ];
         const color = [
             foldInfo.measureName
@@ -778,13 +791,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,
@@ -1769,22 +1782,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 (!(0, external_remeda_namespaceObject.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 (!(0, external_remeda_namespaceObject.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;
@@ -1794,6 +1812,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;
@@ -1867,6 +1887,7 @@ const discreteLegend = (spec, context)=>{
                 }
             },
             label: {
+                formatMethod: (value)=>unfoldInfo.colorIdMap[String(value)] ?? value,
                 style: {
                     fontSize: labelFontSize,
                     fill: labelFontColor,
@@ -1894,6 +1915,10 @@ const pivotDiscreteLegend = (spec, context)=>{
     if (!baseConfig || !baseConfig.legend) return result;
     const { datasetReshapeInfo } = advancedVSeed;
     const colorItems = (0, external_remeda_namespaceObject.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 || {};
@@ -1968,6 +1993,7 @@ const pivotDiscreteLegend = (spec, context)=>{
                 }
             },
             label: {
+                formatMethod: (value)=>colorIdMap[String(value)] ?? value,
                 style: {
                     fontSize: labelFontSize,
                     fill: labelFontColor,
@@ -2000,11 +2026,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;
 };
@@ -2485,8 +2519,7 @@ const lineStyle_lineStyle = (spec, context)=>{
                 },
                 style: {
                     curveType: curveType,
-                    fill: lineColor,
-                    fillOpacity: lineColorOpacity,
+                    strokeOpacity: lineColorOpacity,
                     stroke: lineColor,
                     lineWidth: lineWidth,
                     lineDash: lineDash
@@ -2821,7 +2854,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 {
@@ -4313,6 +4346,8 @@ const zFoldInfo = external_zod_namespaceObject.z.object({
 });
 const zUnfoldInfo = external_zod_namespaceObject.z.object({
     colorItems: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()),
+    groupId: external_zod_namespaceObject.z.string(),
+    colorIdMap: external_zod_namespaceObject.z.record(external_zod_namespaceObject.z.string(), external_zod_namespaceObject.z.string()),
     groupName: external_zod_namespaceObject.z.string()
 });
 const zDatasetReshapeInfo = external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.object({
@@ -4936,6 +4971,7 @@ exports.FoldMeasureValue = __webpack_exports__.FoldMeasureValue;
 exports.ORIGINAL_DATA = __webpack_exports__.ORIGINAL_DATA;
 exports.Separator = __webpack_exports__.Separator;
 exports.UnfoldDimensionGroup = __webpack_exports__.UnfoldDimensionGroup;
+exports.UnfoldDimensionGroupId = __webpack_exports__.UnfoldDimensionGroupId;
 exports.areaAdvancedPipeline = __webpack_exports__.areaAdvancedPipeline;
 exports.areaPercentAdvancedPipeline = __webpack_exports__.areaPercentAdvancedPipeline;
 exports.areaPercentSpecPipeline = __webpack_exports__.areaPercentSpecPipeline;
@@ -5035,6 +5071,7 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "ORIGINAL_DATA",
     "Separator",
     "UnfoldDimensionGroup",
+    "UnfoldDimensionGroupId",
     "areaAdvancedPipeline",
     "areaPercentAdvancedPipeline",
     "areaPercentSpecPipeline",