@visactor/vtable 0.10.3-alpha.2 → 0.10.3-alpha.3

package/cjs/ts-types/component/axis.d.ts

@@ -8,5 +8,6 @@ export type ICellAxisOption = Omit<ICartesianAxisSpec, 'type'> & ({
         min: number;
         max: number;
     };
+    __ticksForVTable?: number[];
 });
 export type ITableAxisOption = ICartesianAxisSpec;

package/cjs/ts-types/component/axis.js.map

@@ -1 +1 @@
-{"version":3,"sources":["ts-types/component/axis.ts"],"names":[],"mappings":"","file":"axis.js","sourcesContent":["import type { ICartesianAxisSpec } from '@visactor/vchart';\n\nexport type ICellAxisOption = Omit<ICartesianAxisSpec, 'type'> &\n  (\n    | {\n        type: 'band';\n        domain: (number | string)[];\n      }\n    | {\n        type: 'linear' | 'time';\n        range: {\n          min: number;\n          max: number;\n        };\n      }\n  );\n\nexport type ITableAxisOption = ICartesianAxisSpec;\n"]}
+{"version":3,"sources":["ts-types/component/axis.ts"],"names":[],"mappings":"","file":"axis.js","sourcesContent":["import type { ICartesianAxisSpec } from '@visactor/vchart';\n\nexport type ICellAxisOption = Omit<ICartesianAxisSpec, 'type'> &\n  (\n    | {\n        type: 'band';\n        domain: (number | string)[];\n      }\n    | {\n        type: 'linear' | 'time';\n        range: {\n          min: number;\n          max: number;\n        };\n        __ticksForVTable?: number[];\n      }\n  );\n\nexport type ITableAxisOption = ICartesianAxisSpec;\n"]}

package/dist/vtable.js

@@ -40774,6 +40774,9 @@
 	        else if (isNil(this.domain?.min) && isValid(this.domain?.max)) {
 	            this.nice && this._scale.niceMin(tickCount);
 	        }
+	        else {
+	            this.nice && this._scale.nice(tickCount);
+	        }
 	    }
 	    dataToPosition(values) {
 	        return this.valueToPosition(values[0]);
@@ -40846,7 +40849,9 @@
 	            else if (isNil(this.domain?.min) && isValid(this.domain?.max)) {
 	                this._scale.niceMin(tickCount);
 	            }
-	            else ;
+	            else {
+	                this._scale.nice(tickCount);
+	            }
 	        }
 	    }
 	    includeZero(domain) {
@@ -46867,6 +46872,40 @@
 	    bind(GroupRenderContribution).toService(AdjustColorGroupAfterRenderContribution);
 	});
 
+	function getAxisDomainRangeAndLabels(min, max, axisOption, skipTick) {
+	    if (axisOption?.zero) {
+	        min = Math.min(min, 0);
+	        max = Math.max(max, 0);
+	    }
+	    const scale = new LinearScale();
+	    scale.domain([min, max], !!axisOption?.nice);
+	    if (axisOption?.nice) {
+	        let tickCount = axisOption.tick?.forceTickCount ?? axisOption.tick?.tickCount ?? 10;
+	        if (axisOption.niceType === 'accurateFirst') {
+	            tickCount = Math.max(10, tickCount);
+	        }
+	        if (isNil(axisOption.min) && isNil(axisOption.max)) {
+	            scale.nice(tickCount);
+	        }
+	        else if (isValid(axisOption.min) && isNil(axisOption.max)) {
+	            scale.niceMax(tickCount);
+	        }
+	        else if (isNil(axisOption.min) && isValid(axisOption.max)) {
+	            scale.niceMin(tickCount);
+	        }
+	    }
+	    let scaleTicks;
+	    if (!skipTick) {
+	        scaleTicks = scale.ticks(axisOption?.tickCount ?? DEFAULT_CONTINUOUS_TICK_COUNT, {
+	            noDecimals: axisOption?.tick?.noDecimals
+	        });
+	    }
+	    return {
+	        range: scale.domain(),
+	        ticks: scaleTicks
+	    };
+	}
+
 	function getAxisConfigInPivotChart(col, row, layout) {
 	    if (!layout._table.isPivotChart()) {
 	        return undefined;
@@ -46884,7 +46923,7 @@
 	            if (!defaultKey) {
 	                return undefined;
 	            }
-	            const isZeroAlign = checkZeroAlign(col, row, 'top', layout);
+	            const { axisOption, isPercent, isZeroAlign } = getAxisOption(col, row + 1, 'top', layout);
 	            const data = layout.dataset.collectedValues[defaultKey + (isZeroAlign ? '_align' : '')]
 	                ? layout.dataset.collectedValues[defaultKey + (isZeroAlign ? '_align' : '')]
 	                : layout.dataset.collectedValues[defaultKey];
@@ -46892,7 +46931,6 @@
 	            const range = data
 	                ? data[layout.getColKeysPath()[index][Math.max(0, layout.columnHeaderLevelCount - 1 - layout.topAxesCount)]]
 	                : { max: 1, min: 0 };
-	            const { axisOption, isPercent } = getAxisOption(col, row + 1, 'top', layout);
 	            if (range.min === range.max) {
 	                if (range.min > 0) {
 	                    range.min = 0;
@@ -46908,6 +46946,9 @@
 	                range.min = range.min < 0 ? -1 : 0;
 	                range.max = range.max > 0 ? 1 : 0;
 	            }
+	            const { range: niceRange, ticks } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption);
+	            range.min = !isNaN(niceRange[0]) ? niceRange[0] : 0;
+	            range.max = !isNaN(niceRange[1]) ? niceRange[1] : 1;
 	            if (isNumber$1(axisOption?.min)) {
 	                range.min = axisOption.min;
 	            }
@@ -46921,7 +46962,8 @@
 	                type: 'linear',
 	                label: {
 	                    flush: true
-	                }
+	                },
+	                __ticksForVTable: ticks
 	            });
 	        }
 	        else if (row === layout.rowCount - layout.bottomFrozenRowCount &&
@@ -46932,12 +46974,12 @@
 	            if (isArray(defaultKey)) {
 	                defaultKey = defaultKey[0];
 	            }
-	            const isZeroAlign = checkZeroAlign(col, row, 'bottom', layout);
+	            const { axisOption, isPercent, isZeroAlign } = getAxisOption(col, row - 1, 'bottom', layout);
 	            const data = layout.dataset.collectedValues[defaultKey + (isZeroAlign ? '_align' : '')]
 	                ? layout.dataset.collectedValues[defaultKey + (isZeroAlign ? '_align' : '')]
 	                : layout.dataset.collectedValues[defaultKey];
 	            const index = layout.getRecordIndexByCol(col);
-	            const range = merge$2({}, data?.[layout.getColKeysPath()?.[index]?.[Math.max(0, layout.columnHeaderLevelCount - 1 - layout.topAxesCount)]] ?? { min: 0, max: 1 });
+	            const range = merge$2({}, data?.[layout.getColKeysPath()?.[index]?.[Math.max(0, layout.columnHeaderLevelCount - 1 - layout.topAxesCount)] ?? ''] ?? { min: 0, max: 1 });
 	            if (range.min === range.max) {
 	                if (range.min > 0) {
 	                    range.min = 0;
@@ -46953,7 +46995,6 @@
 	                    indicatorInfo = info;
 	                }
 	            });
-	            const { axisOption, isPercent } = getAxisOption(col, row - 1, 'bottom', layout);
 	            if (axisOption?.visible === false) {
 	                return;
 	            }
@@ -46961,6 +47002,9 @@
 	                range.min = range.min < 0 ? -1 : 0;
 	                range.max = range.max > 0 ? 1 : 0;
 	            }
+	            const { range: niceRange, ticks } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption);
+	            range.min = !isNaN(niceRange[0]) ? niceRange[0] : 0;
+	            range.max = !isNaN(niceRange[1]) ? niceRange[1] : 1;
 	            if (isNumber$1(axisOption?.min)) {
 	                range.min = axisOption.min;
 	            }
@@ -46978,7 +47022,8 @@
 	                type: 'linear',
 	                label: {
 	                    flush: true
-	                }
+	                },
+	                __ticksForVTable: ticks
 	            });
 	        }
 	        else if (col === layout.rowHeaderLevelCount - 1 &&
@@ -47016,7 +47061,7 @@
 	            if (isArray(defaultKey)) {
 	                defaultKey = defaultKey[0];
 	            }
-	            const isZeroAlign = checkZeroAlign(col, row, 'left', layout);
+	            const { axisOption, isPercent, isZeroAlign } = getAxisOption(col + 1, row, 'left', layout);
 	            const data = layout.dataset.collectedValues[defaultKey + (isZeroAlign ? '_align' : '')]
 	                ? layout.dataset.collectedValues[defaultKey + (isZeroAlign ? '_align' : '')]
 	                : layout.dataset.collectedValues[defaultKey];
@@ -47037,7 +47082,6 @@
 	                    indicatorInfo = info;
 	                }
 	            });
-	            const { axisOption, isPercent } = getAxisOption(col + 1, row, 'left', layout);
 	            if (axisOption?.visible === false) {
 	                return;
 	            }
@@ -47045,6 +47089,9 @@
 	                range.min = range.min < 0 ? -1 : 0;
 	                range.max = range.max > 0 ? 1 : 0;
 	            }
+	            const { range: niceRange, ticks } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption);
+	            range.min = !isNaN(niceRange[0]) ? niceRange[0] : 0;
+	            range.max = !isNaN(niceRange[1]) ? niceRange[1] : 1;
 	            if (isNumber$1(axisOption?.min)) {
 	                range.min = axisOption.min;
 	            }
@@ -47063,7 +47110,8 @@
 	                type: 'linear',
 	                label: {
 	                    flush: true
-	                }
+	                },
+	                __ticksForVTable: ticks
 	            });
 	        }
 	        else if (col === layout.colCount - layout.rightFrozenColCount &&
@@ -47077,13 +47125,12 @@
 	            if (!defaultKey) {
 	                return undefined;
 	            }
-	            const isZeroAlign = checkZeroAlign(col, row, 'right', layout);
+	            const { axisOption, isPercent, isZeroAlign } = getAxisOption(col - 1, row, 'right', layout);
 	            const data = layout.dataset.collectedValues[defaultKey + (isZeroAlign ? '_align' : '')]
 	                ? layout.dataset.collectedValues[defaultKey + (isZeroAlign ? '_align' : '')]
 	                : layout.dataset.collectedValues[defaultKey];
 	            const index = layout.getRecordIndexByRow(row);
 	            const range = merge$2({}, data?.[layout.getRowKeysPath()[index]?.[Math.max(0, layout.rowHeaderLevelCount - 1 - layout.leftAxesCount)] ?? ''] ?? { min: 0, max: 1 });
-	            const { axisOption, isPercent } = getAxisOption(col - 1, row, 'right', layout);
 	            if (range.min === range.max) {
 	                if (range.min > 0) {
 	                    range.min = 0;
@@ -47099,6 +47146,9 @@
 	                range.min = range.min < 0 ? -1 : 0;
 	                range.max = range.max > 0 ? 1 : 0;
 	            }
+	            const { range: niceRange, ticks } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption);
+	            range.min = !isNaN(niceRange[0]) ? niceRange[0] : 0;
+	            range.max = !isNaN(niceRange[1]) ? niceRange[1] : 1;
 	            if (isNumber$1(axisOption?.min)) {
 	                range.min = axisOption.min;
 	            }
@@ -47115,7 +47165,8 @@
 	                type: 'linear',
 	                label: {
 	                    flush: true
-	                }
+	                },
+	                __ticksForVTable: ticks
 	            });
 	        }
 	        else if (row === layout.rowCount - layout.bottomFrozenRowCount &&
@@ -47152,7 +47203,8 @@
 	        if (axisOption) {
 	            return {
 	                axisOption,
-	                isPercent: spec.percent
+	                isPercent: spec.percent,
+	                isZeroAlign: checkZeroAlign(spec, orient, layout)
 	            };
 	        }
 	    }
@@ -47161,10 +47213,11 @@
 	    });
 	    return {
 	        axisOption,
-	        isPercent: false
+	        isPercent: false,
+	        isZeroAlign: checkZeroAlign(spec, orient, layout)
 	    };
 	}
-	function checkZeroAlign(col, row, orient, layout) {
+	function checkZeroAlign(spec, orient, layout) {
 	    const orients = [];
 	    if (orient === 'left' || orient === 'right') {
 	        orients.push('left', 'right');
@@ -47172,7 +47225,6 @@
 	    else if (orient === 'top' || orient === 'bottom') {
 	        orients.push('top', 'bottom');
 	    }
-	    const spec = layout.getRawChartSpec(col, row);
 	    let axesSpec;
 	    if (spec && isArray(spec.axes)) {
 	        axesSpec = spec.axes;
@@ -47226,12 +47278,19 @@
 	            });
 	        }
 	        else {
-	            const range = attribute.range;
-	            const minNumber = Math.abs(range.min) > 1 ? Math.round(range.min) : range.min;
-	            const maxNumber = Math.abs(range.max) > 1 ? Math.round(range.max) : range.max;
-	            const minString = formatDecimal(minNumber);
-	            const maxString = formatDecimal(maxNumber);
-	            [minString, maxString].forEach(text => {
+	            let ticks;
+	            if (isArray(config.__ticksForVTable)) {
+	                ticks = config.__ticksForVTable;
+	            }
+	            else {
+	                const range = attribute.range;
+	                const minNumber = Math.abs(range.min) > 1 ? Math.round(range.min) : range.min;
+	                const maxNumber = Math.abs(range.max) > 1 ? Math.round(range.max) : range.max;
+	                const minString = formatDecimal(minNumber);
+	                const maxString = formatDecimal(maxNumber);
+	                ticks = [minString, maxString];
+	            }
+	            ticks.forEach(text => {
 	                if (attribute.label.formatMethod) {
 	                    text = attribute.label.formatMethod(text);
 	                }
@@ -47289,12 +47348,19 @@
 	            });
 	        }
 	        else {
-	            const range = attribute.range;
-	            const minNumber = Math.abs(range.min) > 1 ? Math.round(range.min) : range.min;
-	            const maxNumber = Math.abs(range.max) > 1 ? Math.round(range.max) : range.max;
-	            const minString = formatDecimal(minNumber);
-	            const maxString = formatDecimal(maxNumber);
-	            [minString, maxString].forEach(text => {
+	            let ticks;
+	            if (isArray(config.__ticksForVTable)) {
+	                ticks = config.__ticksForVTable;
+	            }
+	            else {
+	                const range = attribute.range;
+	                const minNumber = Math.abs(range.min) > 1 ? Math.round(range.min) : range.min;
+	                const maxNumber = Math.abs(range.max) > 1 ? Math.round(range.max) : range.max;
+	                const minString = formatDecimal(minNumber);
+	                const maxString = formatDecimal(maxNumber);
+	                ticks = [minString, maxString];
+	            }
+	            ticks.forEach(text => {
 	                if (attribute.label.formatMethod) {
 	                    text = attribute.label.formatMethod(text);
 	                }
@@ -57391,7 +57457,7 @@
 	        return TABLE_EVENT_TYPE;
 	    }
 	    options;
-	    version = "0.10.3-alpha.2";
+	    version = "0.10.3-alpha.3";
 	    pagination;
 	    id = `VTable${Date.now()}`;
 	    headerStyleCache;
@@ -59548,12 +59614,12 @@
 	            if (isArray(key)) {
 	                key = key[0];
 	            }
-	            const isZeroAlign = checkZeroAlign(col, row, index === 0 ? 'bottom' : 'top', layout);
+	            const { axisOption, isPercent, isZeroAlign } = getAxisOption(col, row, index === 0 ? 'bottom' : 'top', layout);
 	            const data = layout.dataset.collectedValues[key + (isZeroAlign ? '_align' : '')]
 	                ? layout.dataset.collectedValues[key + (isZeroAlign ? '_align' : '')]
 	                : layout.dataset.collectedValues[key];
-	            const range = merge$2({}, data?.[layout.getColKeysPath()?.[colIndex]?.[Math.max(0, layout.columnHeaderLevelCount - 1 - layout.topAxesCount)]] ?? { min: 0, max: 1 });
-	            const { axisOption, isPercent } = getAxisOption(col, row, index === 0 ? 'bottom' : 'top', layout);
+	            const range = merge$2({}, data?.[layout.getColKeysPath()?.[colIndex]?.[Math.max(0, layout.columnHeaderLevelCount - 1 - layout.topAxesCount)] ??
+	                ''] ?? { min: 0, max: 1 });
 	            if (isPercent) {
 	                range.min = range.min < 0 ? -1 : 0;
 	                range.max = range.max > 0 ? 1 : 0;
@@ -59562,6 +59628,17 @@
 	                range.min = Math.min(range.min, 0);
 	                range.max = Math.max(range.max, 0);
 	            }
+	            if (axisOption?.nice) {
+	                const { ticks } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption);
+	                range.min = ticks[0];
+	                range.max = ticks[ticks.length - 1];
+	            }
+	            if (isNumber$1(axisOption?.min)) {
+	                range.min = axisOption.min;
+	            }
+	            if (isNumber$1(axisOption?.max)) {
+	                range.max = axisOption.max;
+	            }
 	            axes.push(merge$2({
 	                range
 	            }, axisOption, {
@@ -59606,12 +59683,11 @@
 	            if (isArray(key)) {
 	                key = key[0];
 	            }
-	            const isZeroAlign = checkZeroAlign(col, row, index === 0 ? 'left' : 'right', layout);
+	            const { axisOption, isPercent, isZeroAlign } = getAxisOption(col, row, index === 0 ? 'left' : 'right', layout);
 	            const data = layout.dataset.collectedValues[key + (isZeroAlign ? '_align' : '')]
 	                ? layout.dataset.collectedValues[key + (isZeroAlign ? '_align' : '')]
 	                : layout.dataset.collectedValues[key];
 	            const range = merge$2({}, data?.[layout.getRowKeysPath()[rowIndex]?.[Math.max(0, layout.rowHeaderLevelCount - 1 - layout.leftAxesCount)] ?? ''] ?? { min: 0, max: 1 });
-	            const { axisOption, isPercent } = getAxisOption(col, row, index === 0 ? 'left' : 'right', layout);
 	            if (isPercent) {
 	                range.min = range.min < 0 ? -1 : 0;
 	                range.max = range.max > 0 ? 1 : 0;
@@ -59620,6 +59696,17 @@
 	                range.min = Math.min(range.min, 0);
 	                range.max = Math.max(range.max, 0);
 	            }
+	            if (axisOption?.nice) {
+	                const { ticks } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption);
+	                range.min = ticks[0];
+	                range.max = ticks[ticks.length - 1];
+	            }
+	            if (isNumber$1(axisOption?.min)) {
+	                range.min = axisOption.min;
+	            }
+	            if (isNumber$1(axisOption?.max)) {
+	                range.max = axisOption.max;
+	            }
 	            axes.push(merge$2({
 	                range
 	            }, axisOption, {
@@ -66778,7 +66865,7 @@
 		percentCalc: percentCalc
 	});
 
-	const version = "0.10.3-alpha.2";
+	const version = "0.10.3-alpha.3";
 	function getIcons() {
 	    return get$1();
 	}