@visactor/vseed 0.0.38 → 0.0.39

package/dist/index.js

@@ -2357,7 +2357,7 @@ const pointStyle_pointStyle = (spec, context)=>{
         pointStyle
     ];
     const customMap = pointStyles.reduce((result, style, index)=>{
-        const { pointBorderColor, pointBorderStyle, pointBorderWidth = 1, pointColor, pointColorOpacity, pointSize } = style;
+        const { pointBorderColor, pointBorderStyle, pointBorderWidth = 1, pointColor, pointColorOpacity, pointSize, pointVisible = true } = style;
         const lineDash = 'dashed' === pointBorderStyle ? [
             5,
             2
@@ -2377,6 +2377,7 @@ const pointStyle_pointStyle = (spec, context)=>{
                     return false;
                 },
                 style: {
+                    visible: pointVisible,
                     size: pointSize,
                     fill: pointColor,
                     fillOpacity: pointColorOpacity,
@@ -2461,9 +2462,9 @@ const lineStyle_lineStyle = (spec, context)=>{
     const group = encoding[0]?.group?.[0];
     const lineGroups = groupBy(dataset, (d)=>d[group ?? '']);
     const customMap = lineStyles.reduce((result, style, index)=>{
-        const { lineColor, lineColorOpacity, lineSmooth, lineStyle, lineWidth } = style;
-        const dashSegment = (lineWidth ?? 2) * 2;
-        const dashGap = lineWidth ?? 2;
+        const { lineColor, lineColorOpacity, lineSmooth, lineStyle, lineWidth = 2, lineVisible = true } = style;
+        const dashSegment = 2 * lineWidth;
+        const dashGap = lineWidth;
         const lineDash = 'dashed' === lineStyle ? [
             dashSegment,
             dashSegment
@@ -2485,6 +2486,7 @@ const lineStyle_lineStyle = (spec, context)=>{
                     return false;
                 },
                 style: {
+                    visible: lineVisible,
                     curveType: curveType,
                     strokeOpacity: lineColorOpacity,
                     stroke: lineColor,
@@ -3032,13 +3034,14 @@ const pivotIndicators_pivotIndicators = (chartPipeline)=>(spec, context)=>{
             ...spec
         };
         const { advancedVSeed } = context;
-        const { measures, datasetReshapeInfo, encoding } = advancedVSeed;
+        const { measures, datasetReshapeInfo, encoding, dataset } = advancedVSeed;
         const colorItems = unique(datasetReshapeInfo.flatMap((d)=>d.unfoldInfo.colorItems));
         const indicators = datasetReshapeInfo.map((reshapeInfo, index)=>{
             const measure = measures?.find((d)=>d.id === reshapeInfo.id);
             const newEncoding = [
                 encoding[index]
             ];
+            const newDataset = dataset[index];
             const newDatasetReshapeInfo = [
                 {
                     ...reshapeInfo,
@@ -3053,6 +3056,7 @@ const pivotIndicators_pivotIndicators = (chartPipeline)=>(spec, context)=>{
                 advancedVSeed: {
                     ...advancedVSeed,
                     datasetReshapeInfo: newDatasetReshapeInfo,
+                    dataset: newDataset,
                     encoding: newEncoding
                 }
             };
@@ -3161,7 +3165,8 @@ const pivotDiscreteLegend = (spec, context)=>{
             ...cur.unfoldInfo.colorIdMap
         }), {});
     const { legend, color } = baseConfig;
-    const { colorScheme } = color;
+    const { colorScheme, colorMapping } = color;
+    const colorSpecified = createSpecifiedForColorMapping(colorMapping, colorIdMap, colorItems);
     const { enable, position = 'bottom', labelFontColor, labelFontSize = 12, labelFontWeight = 400, maxSize = 1, border, shapeType = 'rectRound' } = legend || {};
     const orient = [
         'bottom',
@@ -3208,17 +3213,20 @@ const pivotDiscreteLegend = (spec, context)=>{
         position: legendPosition,
         maxCol: Math.max(1, maxSize),
         maxRow: Math.max(1, maxSize),
-        data: colorItems.map((d, index)=>({
+        data: colorItems.map((d, index)=>{
+            const color = colorSpecified?.[d] ?? colorScheme?.[index % colorScheme.length];
+            return {
                 label: d,
                 shape: {
                     outerBorder: border ? {
-                        stroke: colorScheme?.[index % colorScheme.length],
+                        stroke: color,
                         distance: 3,
                         lineWidth: 1
                     } : void 0,
-                    fill: colorScheme?.[index % colorScheme.length]
+                    fill: color
                 }
-            })),
+            };
+        }),
         item: {
             focus: true,
             maxWidth: '30%',
@@ -3568,7 +3576,7 @@ const barStyle_barStyle = (spec, context)=>{
         barStyle
     ];
     const customMap = barStyles.reduce((result, style, index)=>{
-        const { barBorderColor, barBorderStyle, barBorderWidth = 1, barColor, barColorOpacity, barRadius } = style;
+        const { barBorderColor, barBorderStyle, barBorderWidth = 1, barColor, barColorOpacity, barRadius, barVisible = true } = style;
         const lineDash = 'dashed' === barBorderStyle ? [
             5,
             2
@@ -3588,6 +3596,7 @@ const barStyle_barStyle = (spec, context)=>{
                     return false;
                 },
                 style: {
+                    visible: barVisible,
                     fill: barColor,
                     fillOpacity: barColorOpacity,
                     cornerRadius: barRadius,
@@ -4566,7 +4575,12 @@ const areaStyle_areaStyle = (spec, context)=>{
     const { advancedVSeed } = context;
     const { markStyle, encoding, dataset } = advancedVSeed;
     const { areaStyle } = markStyle;
-    if (!areaStyle) return spec;
+    if (!areaStyle) return {
+        ...spec,
+        area: {
+            visible: true
+        }
+    };
     const result = {
         ...spec
     };
@@ -4574,19 +4588,20 @@ const areaStyle_areaStyle = (spec, context)=>{
         areaStyle
     ];
     const group = encoding[0]?.group?.[0];
-    const lineGroups = groupBy(dataset, (d)=>d[group ?? '']);
+    const areaGroups = groupBy(dataset, (d)=>d[group ?? '']);
     const customMap = areaStyles.reduce((result, style, index)=>{
-        const { areaColor, areaColorOpacity } = style;
+        const { areaColor, areaColorOpacity, areaVisible = true } = style;
         return {
             ...result,
             [`custom${index + 1}`]: {
                 level: index + 1,
                 filter: (datum)=>{
-                    const lineData = lineGroups[datum[group ?? '']];
+                    const lineData = areaGroups[datum[group ?? '']];
                     for (const d of lineData)if (selector_selector(d, style.selector)) return true;
                     return false;
                 },
                 style: {
+                    visible: areaVisible,
                     fill: areaColor,
                     fillOpacity: areaColorOpacity
                 }
@@ -4596,6 +4611,7 @@ const areaStyle_areaStyle = (spec, context)=>{
     return {
         ...result,
         area: {
+            visible: true,
             state: {
                 ...customMap
             }
@@ -6524,7 +6540,7 @@ const pivotDualAxis = [
     pivotIndicators_pivotIndicatorsAsRow,
     datasetPivot,
     pivotIndicators_pivotIndicators([
-        seriesDualAxis([
+        series([
             initDualAxisPrimary,
             dualChartTypePrimary,
             datasetPrimary,
@@ -9060,6 +9076,7 @@ const zBarStyle = z.object({
         zSelector,
         zSelectors
     ]).nullish(),
+    barVisible: z.boolean().nullish(),
     barColor: z.string().nullish(),
     barColorOpacity: z.number().nullish(),
     barBorderColor: z.string().nullish(),
@@ -9079,6 +9096,7 @@ const zPointStyle = z.object({
         zSelector,
         zSelectors
     ]).nullish(),
+    pointVisible: z.boolean().nullish(),
     pointSize: z.number().nullish(),
     pointColor: z.string().nullish(),
     pointColorOpacity: z.number().nullish(),
@@ -9097,6 +9115,7 @@ const zLineStyle = z.object({
         zSelector,
         zSelectors
     ]).nullish(),
+    lineVisible: z.boolean().nullish(),
     lineSmooth: z.boolean().nullish(),
     lineColor: z.string().nullish(),
     lineColorOpacity: z.number().nullish(),
@@ -9114,6 +9133,7 @@ const zAreaStyle = z.object({
         zSelector,
         zSelectors
     ]).nullish(),
+    areaVisible: z.boolean().nullish(),
     areaColor: z.string().nullish(),
     areaColorOpacity: z.number().nullish()
 });