@visactor/vseed 0.1.0 → 0.1.1

package/dist/index.js

@@ -1241,17 +1241,23 @@ const encodingForColumn = (advancedVSeed, context)=>{
     if (!dimensions) return advancedVSeed;
     const encoding = vseed.encoding;
     if (encoding) {
-        const x = encoding.x || [];
+        const x = encoding.x || [
+            dimensions[0].id
+        ];
+        const color = encoding.color || [
+            (dimensions[1] || dimensions[0]).id
+        ];
         const detail = encoding.detail || [];
-        const color = encoding.color || [];
-        const mergedDetail = [
-            ...color.filter((d)=>!x.includes(d)),
+        const mergedDetail = unique([
+            ...color,
             ...detail
-        ];
+        ]);
         return {
             ...advancedVSeed,
             encoding: {
                 ...encoding,
+                x,
+                color,
                 detail: mergedDetail
             }
         };
@@ -1259,7 +1265,7 @@ const encodingForColumn = (advancedVSeed, context)=>{
     const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
     const mergedEncoding = {
         x: dimensions.slice(0, 1).map((item)=>item.id),
-        color: dimensions.slice(1).map((item)=>item.id),
+        color: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
         detail: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
         tooltip: dimensions.map((item)=>item.id),
         label: [],
@@ -3834,17 +3840,23 @@ const encodingForBar = (advancedVSeed, context)=>{
     if (!dimensions) return advancedVSeed;
     const encoding = vseed.encoding;
     if (encoding) {
-        const y = encoding.y || [];
+        const y = encoding.y || [
+            dimensions[0].id
+        ];
+        const color = encoding.color || [
+            (dimensions[1] || dimensions[0]).id
+        ];
         const detail = encoding.detail || [];
-        const color = encoding.color || [];
-        const mergedDetail = [
-            ...color.filter((d)=>!y.includes(d)),
+        const mergedDetail = unique([
+            ...color,
             ...detail
-        ];
+        ]);
         return {
             ...advancedVSeed,
             encoding: {
                 ...encoding,
+                y,
+                color,
                 detail: mergedDetail
             }
         };
@@ -3852,7 +3864,7 @@ const encodingForBar = (advancedVSeed, context)=>{
     const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
     const mergedEncoding = {
         y: dimensions.slice(0, 1).map((item)=>item.id),
-        color: dimensions.slice(1).map((item)=>item.id),
+        color: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
         detail: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
         tooltip: dimensions.map((item)=>item.id),
         label: [],
@@ -4717,7 +4729,9 @@ const encodingForScatter = (advancedVSeed, context)=>{
     const encoding = vseed.encoding;
     if (encoding) {
         const detail = encoding.detail || [];
-        const color = encoding.color || [];
+        const color = encoding.color || [
+            (dimensions[1] || dimensions[0]).id
+        ];
         const mergedDetail = unique([
             ...color,
             ...detail
@@ -4726,6 +4740,7 @@ const encodingForScatter = (advancedVSeed, context)=>{
             ...advancedVSeed,
             encoding: {
                 ...encoding,
+                color,
                 detail: mergedDetail
             }
         };
@@ -5112,17 +5127,23 @@ const encodingForDualAxis = (advancedVSeed, context)=>{
     if (!dimensions) return advancedVSeed;
     const encoding = vseed.encoding;
     if (encoding) {
-        const x = encoding.x || [];
+        const x = encoding.x || [
+            dimensions[0].id
+        ];
+        const color = encoding.color || [
+            (dimensions[1] || dimensions[0]).id
+        ];
         const detail = encoding.detail || [];
-        const color = encoding.color || [];
-        const mergedDetail = [
-            ...color.filter((d)=>!x.includes(d)),
+        const mergedDetail = unique([
+            ...color,
             ...detail
-        ];
+        ]);
         return {
             ...advancedVSeed,
             encoding: {
                 ...encoding,
+                x,
+                color,
                 detail: mergedDetail
             }
         };
@@ -6102,7 +6123,6 @@ const encodingForPie = (advancedVSeed, context)=>{
         }
     };
     const mergedEncoding = {
-        angle: dimensions.slice(0, 1).map((item)=>item.id),
         color: dimensions.slice(0).map((item)=>item.id),
         detail: dimensions.slice(0).map((item)=>item.id),
         tooltip: dimensions.map((item)=>item.id),
@@ -6141,8 +6161,7 @@ const initPie = (spec, context)=>{
     result.outerRadius = 0.8;
     result.innerRadius = 0;
     result.valueField = foldInfo.measureValue;
-    result.categoryField = unfoldInfo.encodingAngle;
-    result.seriesField = unfoldInfo.encodingColorId;
+    result.categoryField = unfoldInfo.encodingColorId;
     result.padding = 0;
     result.region = [
         {
@@ -6233,8 +6252,7 @@ const initDonut = (spec, context)=>{
     result.outerRadius = 0.8;
     result.innerRadius = 0.8 * result.outerRadius;
     result.valueField = foldInfo.measureValue;
-    result.categoryField = unfoldInfo.encodingDetail;
-    result.seriesField = unfoldInfo.encodingColorId;
+    result.categoryField = unfoldInfo.encodingColorId;
     result.padding = 0;
     result.region = [
         {
@@ -6304,17 +6322,23 @@ const encodingForRose = (advancedVSeed, context)=>{
     if (!dimensions) return advancedVSeed;
     const encoding = vseed.encoding;
     if (encoding) {
-        const angle = encoding.angle || [];
+        const angle = encoding.angle || [
+            dimensions[0].id
+        ];
+        const color = encoding.color || [
+            (dimensions[1] || dimensions[0]).id
+        ];
         const detail = encoding.detail || [];
-        const color = encoding.color || [];
-        const mergedDetail = [
-            ...color.filter((d)=>!angle.includes(d)),
+        const mergedDetail = unique([
+            ...color,
             ...detail
-        ];
+        ]);
         return {
             ...advancedVSeed,
             encoding: {
                 ...encoding,
+                angle,
+                color,
                 detail: mergedDetail
             }
         };
@@ -6322,7 +6346,7 @@ const encodingForRose = (advancedVSeed, context)=>{
     const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
     const mergedEncoding = {
         angle: dimensions.slice(0, 1).map((item)=>item.id),
-        color: dimensions.slice(1).map((item)=>item.id),
+        color: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
         detail: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
         tooltip: dimensions.map((item)=>item.id),
         label: [],
@@ -6357,7 +6381,7 @@ const initRose = (spec, context)=>{
     const { dataset, datasetReshapeInfo } = advancedVSeed;
     const { foldInfo, unfoldInfo } = datasetReshapeInfo[0];
     result.type = 'rose';
-    result.categoryField = unfoldInfo.encodingAngle;
+    result.angleField = unfoldInfo.encodingAngle;
     result.seriesField = unfoldInfo.encodingColorId;
     result.valueField = foldInfo.measureValue;
     result.padding = 0;
@@ -6527,7 +6551,7 @@ const initRoseParallel = (spec, context)=>{
     const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
     const sameDimensionsMode = dimensions.length > 1 && dimensions.every((dim)=>dim.id === dimensions[0].id);
     result.type = 'rose';
-    result.categoryField = sameDimensionsMode ? [
+    result.angleField = sameDimensionsMode ? [
         unfoldInfo.encodingAngle
     ] : [
         unfoldInfo.encodingAngle,
@@ -6617,17 +6641,23 @@ const encodingForRadar = (advancedVSeed, context)=>{
     if (!dimensions) return advancedVSeed;
     const encoding = vseed.encoding;
     if (encoding) {
-        const angle = encoding.angle || [];
+        const angle = encoding.angle || [
+            dimensions[0].id
+        ];
+        const color = encoding.color || [
+            (dimensions[1] || dimensions[0]).id
+        ];
         const detail = encoding.detail || [];
-        const color = encoding.color || [];
-        const mergedDetail = [
-            ...color.filter((d)=>!angle.includes(d)),
+        const mergedDetail = unique([
+            ...color,
             ...detail
-        ];
+        ]);
         return {
             ...advancedVSeed,
             encoding: {
                 ...encoding,
+                angle,
+                color,
                 detail: mergedDetail
             }
         };
@@ -6831,8 +6861,7 @@ const initFunnel = (spec, context)=>{
     const { foldInfo, unfoldInfo } = datasetReshapeInfo[0];
     result.type = 'funnel';
     result.valueField = foldInfo.measureValue;
-    result.categoryField = unfoldInfo.encodingDetail;
-    result.seriesField = unfoldInfo.encodingColorId;
+    result.categoryField = unfoldInfo.encodingColorId;
     result.padding = 0;
     result.isTransform = true;
     result.shape = 'rect';
@@ -6867,6 +6896,7 @@ const funnel = [
     initFunnel,
     background_backgroundColor,
     datasetXY,
+    color_color,
     label_label,
     tooltip_tooltip,
     discreteLegend,
@@ -6884,6 +6914,7 @@ const pivotFunnel = [
         initFunnel,
         background_backgroundColor,
         datasetXY,
+        color_color,
         label_label,
         tooltip_tooltip,
         discreteLegend,
@@ -6907,12 +6938,22 @@ const encodingForHeatmap = (advancedVSeed, context)=>{
     const { dimensions } = advancedVSeed;
     if (!dimensions) return advancedVSeed;
     const encoding = vseed.encoding;
-    if (encoding) return {
-        ...advancedVSeed,
-        encoding: {
-            ...encoding
-        }
-    };
+    if (encoding) {
+        const x = encoding.x || [
+            dimensions[0].id
+        ];
+        const y = encoding.y || [
+            (dimensions[1] || dimensions[0]).id
+        ];
+        return {
+            ...advancedVSeed,
+            encoding: {
+                x,
+                y,
+                ...encoding
+            }
+        };
+    }
     const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
     const mergedEncoding = {
         x: dimensions.slice(0, 1).map((item)=>item.id),
@@ -6999,6 +7040,7 @@ const heatmap = [
     initHeatmap,
     background_backgroundColor,
     datasetXY,
+    color_color,
     label_label,
     labelColorInversion,
     discreteLegend,
@@ -7020,6 +7062,7 @@ const pivotHeatmap = [
         initHeatmap,
         background_backgroundColor,
         datasetXY,
+        color_color,
         label_label,
         labelColorInversion,
         discreteLegend,