@visactor/vtable 0.25.0 → 0.25.1-alpha.0

package/dist/vtable.js

@@ -39873,7 +39873,7 @@
                         visible: true,
                         text: indicatorInfo?.title
                     },
-                    range: range
+                    range
                 }, axisOption, {
                     orient: 'bottom',
                     type: axisOption?.type || 'linear',
@@ -39898,14 +39898,20 @@
                 if (axisOption?.visible === false) {
                     return;
                 }
+                const spec = layout.getRawChartSpec(col + 1, row);
                 return merge({
-                    domain: chartType === 'common' ? Array.from(domain) : Array.from(domain).reverse(),
+                    domain: chartType === 'scatter'
+                        ? undefined
+                        : spec?.series?.length >= 1
+                            ? Array.from(domain)
+                            : Array.from(domain).reverse(),
+                    range: chartType === 'scatter' ? domain : undefined,
                     title: {
                         autoRotate: true
                     }
                 }, axisOption, {
                     orient: 'left',
-                    type: 'band',
+                    type: chartType === 'scatter' ? axisOption?.type ?? 'linear' : 'band',
                     __vtableChartTheme: theme
                 });
             }
@@ -40023,15 +40029,16 @@
                 const data = layout.dataset.collectedValues[columnDimensionKey] ?? [];
                 const colPath = layout.getColKeysPath(col, row);
                 const domain = data?.[colPath ?? ''] ?? [];
-                const { axisOption, isPercent, theme } = getAxisOption(col, row - 1, 'bottom', layout);
+                const { axisOption, isPercent, theme, chartType } = getAxisOption(col, row - 1, 'bottom', layout);
                 if (axisOption?.visible === false) {
                     return;
                 }
                 return merge({
-                    domain: Array.from(domain)
+                    domain: chartType === 'scatter' ? undefined : Array.from(domain),
+                    range: chartType === 'scatter' ? domain : undefined
                 }, axisOption, {
                     orient: 'bottom',
-                    type: 'band',
+                    type: chartType === 'scatter' ? axisOption?.type ?? 'linear' : 'band',
                     __vtableChartTheme: theme
                 });
             }
@@ -40040,15 +40047,31 @@
     }
     function getAxisOption(col, row, orient, layout) {
         const spec = layout.getRawChartSpec(col, row);
-        if (spec && isArray$3(spec.axes)) {
-            const axisOption = spec.axes.find((axis) => {
+        const axes = spec.axes ?? [];
+        layout._table.pivotChartAxes.forEach(axis => {
+            const index = axes.findIndex((a) => {
+                return axis.orient === a.orient;
+            });
+            if (index === -1) {
+                axes.push(axis);
+            }
+        });
+        if (spec && isArray$3(axes)) {
+            const axisOption = axes.find((axis) => {
                 return axis.orient === orient;
             });
             if (axisOption) {
                 const { seriesIndex, seriesId } = axisOption;
                 let seriesIndice;
+                let seriesSpec;
                 if (isValid$3(seriesId) && isArray$3(spec.series)) {
-                    seriesIndice = (isArray$3(seriesId) ? seriesId : [seriesId]).map(id => spec.series.findIndex((s) => s.id === id));
+                    seriesIndice = (isArray$3(seriesId) ? seriesId : [seriesId]).map(id => {
+                        const index = spec.series.findIndex((s) => s.id === id);
+                        if (index >= 0) {
+                            seriesSpec = spec.series[index];
+                        }
+                        return index;
+                    });
                 }
                 else if (isValid$3(seriesIndex) && isArray$3(spec.series)) {
                     seriesIndice = seriesIndex;
@@ -40059,7 +40082,7 @@
                     isZeroAlign: checkZeroAlign(spec, orient, layout),
                     seriesIndice,
                     theme: spec.theme,
-                    chartType: spec.type
+                    chartType: seriesSpec?.type ?? spec.type
                 };
             }
         }
@@ -58017,7 +58040,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.25.0";
+        version = "0.25.1-alpha.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -60869,7 +60892,10 @@
         for (let i = 0; i < layout.indicatorsDefine.length; i++) {
             const columnObj = layout.indicatorsDefine[i];
             if (columnObj.chartSpec) {
-                if (columnObj.chartSpec.type !== 'pie' &&
+                if (columnObj.chartSpec.type !== 'wordCloud' &&
+                    columnObj.chartSpec.type !== 'radar' &&
+                    columnObj.chartSpec.type !== 'gauge' &&
+                    columnObj.chartSpec.type !== 'pie' &&
                     columnObj.chartSpec.type !== 'funnel' &&
                     columnObj.chartSpec.type !== 'rose') {
                     isHasCartesianChart = true;
@@ -60883,7 +60909,12 @@
         let isHasCartesianChart = true;
         const chartSpec = layout.getRawChartSpec(col, row);
         if (chartSpec) {
-            if (chartSpec.type === 'pie' || chartSpec.type === 'funnel' || chartSpec.type === 'rose') {
+            if (chartSpec.type === 'pie' ||
+                chartSpec.type === 'radar' ||
+                chartSpec.type === 'gauge' ||
+                chartSpec.type === 'wordCloud' ||
+                chartSpec.type === 'funnel' ||
+                chartSpec.type === 'rose') {
                 isHasCartesianChart = false;
             }
         }
@@ -60899,6 +60930,9 @@
                 const columnObj = layout.indicatorsDefine[i];
                 if (columnObj.chartSpec) {
                     if (columnObj.chartSpec.type !== 'pie' &&
+                        columnObj.chartSpec.type !== 'wordCloud' &&
+                        columnObj.chartSpec.type !== 'radar' &&
+                        columnObj.chartSpec.type !== 'gauge' &&
                         columnObj.chartSpec.type !== 'funnel' &&
                         columnObj.chartSpec.type !== 'rose') {
                         isHasCartesianChart = true;
@@ -60910,7 +60944,12 @@
         else {
             const chartSpec = layout.getRawChartSpec(col, row);
             if (chartSpec) {
-                if (chartSpec.type !== 'pie' && chartSpec.type !== 'funnel' && chartSpec.type !== 'rose') {
+                if (chartSpec.type !== 'pie' &&
+                    chartSpec.type !== 'radar' &&
+                    chartSpec.type !== 'gauge' &&
+                    chartSpec.type !== 'wordCloud' &&
+                    chartSpec.type !== 'funnel' &&
+                    chartSpec.type !== 'rose') {
                     isHasCartesianChart = true;
                 }
             }
@@ -60931,7 +60970,9 @@
                         serie.sortDataByAxis = true;
                     });
                 }
-                chartSpec.axes = layout.getChartAxes(col, row);
+                if (chartSpec.type !== 'gauge' && chartSpec.type !== 'rose' && chartSpec.type !== 'radar') {
+                    chartSpec.axes = layout.getChartAxes(col, row);
+                }
                 chartSpec.padding = 0;
                 chartSpec.dataZoom = [];
                 return chartSpec;
@@ -60985,11 +61026,12 @@
                 [];
             const rowPath = layout.getRowKeysPath(col, row);
             const domain = data[rowPath ?? ''];
-            const { axisOption, isPercent } = getAxisOption(col, row, 'left', layout);
+            const { axisOption, isPercent, chartType } = getAxisOption(col, row, 'left', layout);
             axes.push(merge({
-                domain: Array.from(domain ?? [])
+                domain: chartType === 'scatter' ? undefined : Array.from(domain ?? []),
+                range: chartType === 'scatter' ? domain : undefined
             }, axisOption, {
-                type: 'band',
+                type: chartType === 'scatter' ? axisOption?.type ?? 'linear' : 'band',
                 orient: 'left',
                 label: { visible: false },
                 domainLine: { visible: false },
@@ -61041,11 +61083,12 @@
                 [];
             const colPath = layout.getColKeysPath(col, row);
             const domain = data?.[colPath ?? ''] ?? [];
-            const { axisOption, isPercent } = getAxisOption(col, row, 'bottom', layout);
+            const { axisOption, isPercent, chartType } = getAxisOption(col, row, 'bottom', layout);
             axes.push(merge({
-                domain: Array.from(domain)
+                domain: chartType === 'scatter' ? undefined : Array.from(domain ?? []),
+                range: chartType === 'scatter' ? domain : undefined
             }, axisOption, {
-                type: 'band',
+                type: chartType === 'scatter' ? axisOption?.type ?? 'linear' : 'band',
                 orient: 'bottom',
                 visible: true,
                 label: { visible: false },
@@ -67395,7 +67438,7 @@
                 record[derivedFieldRule.fieldName] = derivedFieldRule.derivedFunc(record);
             });
             for (const field in this.collectValuesBy) {
-                if (record[field]) {
+                if (isValid$3(record[field])) {
                     if (!this.collectedValues[field]) {
                         this.collectedValues[field] = {};
                     }
@@ -69738,7 +69781,11 @@
             const collectValuesBy = {};
             for (let i = 0, len = indicators?.length; i < len; i++) {
                 if (typeof indicators[i] !== 'string' && indicators[i].chartSpec) {
-                    if (indicators[i].chartSpec?.type === 'pie') {
+                    if (indicators[i].chartSpec?.type === 'pie' ||
+                        indicators[i].chartSpec?.type === 'rose' ||
+                        indicators[i].chartSpec?.type === 'radar' ||
+                        indicators[i].chartSpec?.type === 'gauge' ||
+                        indicators[i].chartSpec?.type === 'wordCloud') {
                         continue;
                     }
                     const indicatorDefine = indicators[i];
@@ -69758,7 +69805,7 @@
                                 collectValuesBy[xField] = {
                                     by: columnKeys,
                                     type: chartSeries.direction !== 'horizontal' ? 'xField' : undefined,
-                                    range: chartSeries.direction === 'horizontal',
+                                    range: chartSeries.type === 'scatter' ? true : chartSeries.direction === 'horizontal',
                                     sortBy: chartSeries.direction !== 'horizontal'
                                         ? chartSeries?.data?.fields?.[xField]?.domain ?? indicatorSpec?.data?.fields?.[xField]?.domain
                                         : undefined
@@ -69769,7 +69816,7 @@
                                     (chartSeries.stack = true);
                                 collectValuesBy[yField] = {
                                     by: rowKeys,
-                                    range: chartSeries.direction !== 'horizontal',
+                                    range: chartSeries.type === 'scatter' ? true : chartSeries.direction !== 'horizontal',
                                     sumBy: chartSeries.stack && columnKeys.concat(chartSeries?.xField),
                                     sortBy: chartSeries.direction === 'horizontal'
                                         ? chartSeries?.data?.fields?.[yField]?.domain ?? indicatorSpec?.data?.fields?.[yField]?.domain
@@ -69783,7 +69830,7 @@
                             collectValuesBy[xField] = {
                                 by: columnKeys,
                                 type: indicatorSpec.direction !== 'horizontal' ? 'xField' : undefined,
-                                range: indicatorSpec.direction === 'horizontal',
+                                range: indicatorSpec.type === 'scatter' ? true : indicatorSpec.direction === 'horizontal',
                                 sortBy: indicatorSpec.direction !== 'horizontal' ? indicatorSpec?.data?.fields?.[xField]?.domain : undefined
                             };
                             indicatorSpec?.stack !== false &&
@@ -69815,7 +69862,7 @@
                                 collectValuesBy[yField] = {
                                     by: rowKeys,
                                     type: chartSeries.direction === 'horizontal' ? 'yField' : undefined,
-                                    range: chartSeries.direction !== 'horizontal',
+                                    range: chartSeries.type === 'scatter' ? true : chartSeries.direction !== 'horizontal',
                                     sortBy: chartSeries.direction === 'horizontal'
                                         ? chartSeries?.data?.fields?.[yField]?.domain ?? indicatorSpec?.data?.fields?.[yField]?.domain
                                         : undefined
@@ -69826,7 +69873,7 @@
                                     (chartSeries.stack = true);
                                 collectValuesBy[xField] = {
                                     by: columnKeys,
-                                    range: chartSeries.direction === 'horizontal',
+                                    range: chartSeries.type === 'scatter' ? true : chartSeries.direction === 'horizontal',
                                     sumBy: chartSeries.stack && rowKeys.concat(chartSeries?.yField),
                                     sortBy: chartSeries.direction !== 'horizontal'
                                         ? chartSeries?.data?.fields?.[xField]?.domain ?? indicatorSpec?.data?.fields?.[xField]?.domain
@@ -69840,7 +69887,7 @@
                             collectValuesBy[yField] = {
                                 by: rowKeys,
                                 type: indicatorSpec.direction === 'horizontal' ? 'yField' : undefined,
-                                range: indicatorSpec.direction !== 'horizontal',
+                                range: indicatorSpec.type === 'scatter' ? true : indicatorSpec.direction !== 'horizontal',
                                 sortBy: indicatorSpec.direction === 'horizontal' ? indicatorSpec?.data?.fields?.[yField]?.domain : undefined
                             };
                             indicatorSpec?.stack !== false &&
@@ -69849,7 +69896,7 @@
                             const xField = indicatorSpec.xField;
                             collectValuesBy[xField] = {
                                 by: columnKeys,
-                                range: indicatorSpec.direction === 'horizontal',
+                                range: indicatorSpec.type === 'scatter' ? true : indicatorSpec.direction === 'horizontal',
                                 sumBy: indicatorSpec.stack && rowKeys.concat(indicatorSpec?.yField),
                                 sortBy: indicatorSpec.direction !== 'horizontal' ? indicatorSpec?.data?.fields?.[xField]?.domain : undefined,
                                 extendRange: parseMarkLineGetExtendRange(indicatorSpec.markLine)
@@ -70653,7 +70700,7 @@
     }
 
     registerForVrender();
-    const version = "0.25.0";
+    const version = "0.25.1-alpha.0";
     function getIcons() {
         return get$2();
     }