@visactor/vtable 0.10.2 → 0.10.3-alpha.0

package/dist/vtable.js

@@ -46948,7 +46948,7 @@
 	        else if (col === layout.rowHeaderLevelCount - 1 &&
 	            row >= layout.columnHeaderLevelCount &&
 	            row < layout.rowCount - layout.bottomFrozenRowCount) {
-	            let rowDimensionKey = layout.getDimensionKeyInChartSpec(layout.rowHeaderLevelCount, row)[0];
+	            let rowDimensionKey = layout.getDimensionKeyInChartSpec(layout.rowHeaderLevelCount, row)?.[0];
 	            if (isArray(rowDimensionKey)) {
 	                rowDimensionKey = rowDimensionKey[0];
 	            }
@@ -46985,7 +46985,7 @@
 	                ? layout.dataset.collectedValues[defaultKey + (isZeroAlign ? '_align' : '')]
 	                : layout.dataset.collectedValues[defaultKey];
 	            const index = layout.getRecordIndexByRow(row);
-	            const range = data?.[layout.getRowKeysPath()[index][Math.max(0, layout.rowHeaderLevelCount - 1 - layout.leftAxesCount)]] ?? { min: 0, max: 1 };
+	            const range = data?.[layout.getRowKeysPath()[index]?.[Math.max(0, layout.rowHeaderLevelCount - 1 - layout.leftAxesCount)] ?? ''] ?? { min: 0, max: 1 };
 	            let indicatorInfo = null;
 	            indicatorKeys.forEach(key => {
 	                const info = layout.getIndicatorInfo(key);
@@ -47034,7 +47034,7 @@
 	                ? layout.dataset.collectedValues[defaultKey + (isZeroAlign ? '_align' : '')]
 	                : layout.dataset.collectedValues[defaultKey];
 	            const index = layout.getRecordIndexByRow(row);
-	            const range = data?.[layout.getRowKeysPath()[index][Math.max(0, layout.rowHeaderLevelCount - 1 - layout.leftAxesCount)]] ?? { min: 0, max: 1 };
+	            const range = data?.[layout.getRowKeysPath()[index]?.[Math.max(0, layout.rowHeaderLevelCount - 1 - layout.leftAxesCount)] ?? ''] ?? { min: 0, max: 1 };
 	            const axisOption = getAxisOption(col, row, 'right', layout);
 	            if (axisOption?.visible === false) {
 	                return;
@@ -47061,14 +47061,14 @@
 	        else if (row === layout.rowCount - layout.bottomFrozenRowCount &&
 	            col >= layout.rowHeaderLevelCount &&
 	            col < layout.colCount - layout.rightFrozenColCount) {
-	            let columnDimensionKey = layout.getDimensionKeyInChartSpec(col, layout.columnHeaderLevelCount)[0];
+	            let columnDimensionKey = layout.getDimensionKeyInChartSpec(col, layout.columnHeaderLevelCount)?.[0];
 	            if (isArray(columnDimensionKey)) {
 	                columnDimensionKey = columnDimensionKey[0];
 	            }
 	            const data = layout.dataset.collectedValues[columnDimensionKey] ?? [];
 	            const recordCol = layout.getRecordIndexByCol(col);
 	            const colPath = layout.getColKeysPath()[recordCol];
-	            const domain = data?.[colPath[colPath.length - 1]] ?? [];
+	            const domain = data?.[colPath?.[colPath?.length - 1]] ?? [];
 	            const axisOption = getAxisOption(col, row, 'bottom', layout);
 	            if (axisOption?.visible === false) {
 	                return;
@@ -50018,12 +50018,14 @@
 	        for (let i = 0; i < scene.table.frozenColCount - scene.table.rowHeaderLevelCount; i++) {
 	            moveColumnFromBodyToRowHeader(scene);
 	            moveColumnFromColHeaderToCornerHeader(scene);
+	            moveColumnFromBottomToLeftBottomCorner(scene);
 	        }
 	    }
 	    else if (scene.table.frozenColCount < scene.table.rowHeaderLevelCount) {
 	        for (let i = 0; i < scene.table.rowHeaderLevelCount - scene.table.frozenColCount; i++) {
 	            moveColumnFromRowHeaderToBody(scene);
 	            moveColumnFromCornerHeaderToColHeader(scene);
+	            moveColumnFromLeftBottomCornerToBottom(scene);
 	        }
 	    }
 	    scene.bodyGroup.setAttribute('x', scene.rowHeaderGroup.attribute.width);
@@ -50042,6 +50044,7 @@
 	        for (let i = 0; i < scene.frozenColCount - scene.table.rowHeaderLevelCount; i++) {
 	            moveColumnFromRowHeaderToBody(scene);
 	            moveColumnFromCornerHeaderToColHeader(scene);
+	            moveColumnFromLeftBottomCornerToBottom(scene);
 	        }
 	    }
 	    else if (scene.frozenColCount < scene.table.rowHeaderLevelCount) {
@@ -50051,6 +50054,7 @@
 	        for (let i = 0; i < scene.table.rowHeaderLevelCount - scene.frozenColCount; i++) {
 	            moveColumnFromBodyToRowHeader(scene);
 	            moveColumnFromColHeaderToCornerHeader(scene);
+	            moveColumnFromBottomToLeftBottomCorner(scene);
 	        }
 	    }
 	    scene.bodyGroup.setAttribute('x', scene.rowHeaderGroup.attribute.width);
@@ -50100,6 +50104,24 @@
 	        scene.cornerHeaderGroup.setAttribute('width', scene.cornerHeaderGroup.attribute.width - headerColumn.attribute.width);
 	    }
 	}
+	function moveColumnFromBottomToLeftBottomCorner(scene) {
+	    const column = scene.bottomFrozenGroup.firstChild instanceof Group ? scene.bottomFrozenGroup.firstChild : null;
+	    if (column) {
+	        scene.leftBottomCornerGroup.appendChild(column);
+	        scene.leftBottomCornerGroup.setAttribute('width', scene.leftBottomCornerGroup.attribute.width + column.attribute.width);
+	        scene.bottomFrozenGroup.setAttribute('width', scene.bottomFrozenGroup.attribute.width - column.attribute.width);
+	    }
+	}
+	function moveColumnFromLeftBottomCornerToBottom(scene) {
+	    const column = scene.leftBottomCornerGroup.lastChild instanceof Group
+	        ? scene.leftBottomCornerGroup.lastChild
+	        : scene.leftBottomCornerGroup.lastChild?._prev;
+	    if (column) {
+	        insertBefore(scene.bottomFrozenGroup, column, scene.bottomFrozenGroup.firstChild);
+	        scene.bottomFrozenGroup.setAttribute('width', scene.bottomFrozenGroup.attribute.width + column.attribute.width);
+	        scene.leftBottomCornerGroup.setAttribute('width', scene.leftBottomCornerGroup.attribute.width - column.attribute.width);
+	    }
+	}
 	function dealRightFrozen(distRightFrozenCol, scene) {
 	    const { table, proxy, rightTopCornerGroup, rightFrozenGroup, rightBottomCornerGroup, bottomFrozenGroup, bodyGroup, colHeaderGroup } = scene;
 	    const currentRightFrozenCol = scene.table.rightFrozenColCount;
@@ -52060,8 +52082,8 @@
 	                            { x: 0, y: max },
 	                            { x: 0, y: min }
 	                        ],
-	                        lineWidth: line.hover.strokeWidth,
-	                        stroke: line.hover.stroke
+	                        lineWidth: line.hover?.strokeWidth,
+	                        stroke: line.hover?.stroke
 	                    });
 	                    highlightLine.name = 'highlight-line';
 	                    sparkline.addChild(highlightLine);
@@ -55283,6 +55305,9 @@
 	        if (this._table.isPivotTable() || this._table.transpose) {
 	            return null;
 	        }
+	        if (this._table.rightFrozenColCount && col >= this._table.colCount - this._table.rightFrozenColCount) {
+	            return null;
+	        }
 	        const headerC = this._table.getHeaderDefine(col, row);
 	        if (headerC.columns && headerC.columns.length > 0) {
 	            return null;
@@ -57300,7 +57325,7 @@
 	        return TABLE_EVENT_TYPE;
 	    }
 	    options;
-	    version = "0.10.2";
+	    version = "0.10.3-alpha.0";
 	    pagination;
 	    id = `VTable${Date.now()}`;
 	    headerStyleCache;
@@ -59511,7 +59536,7 @@
 	            const data = layout.dataset.collectedValues[key + (isZeroAlign ? '_align' : '')]
 	                ? layout.dataset.collectedValues[key + (isZeroAlign ? '_align' : '')]
 	                : layout.dataset.collectedValues[key];
-	            const range = data?.[layout.getRowKeysPath()[rowIndex][Math.max(0, layout.rowHeaderLevelCount - 1 - layout.leftAxesCount)]] ?? { min: 0, max: 1 };
+	            const range = data?.[layout.getRowKeysPath()[rowIndex]?.[Math.max(0, layout.rowHeaderLevelCount - 1 - layout.leftAxesCount)] ?? ''] ?? { min: 0, max: 1 };
 	            const axisOption = getAxisOption(col, row, index === 0 ? 'left' : 'right', layout);
 	            if (axisOption?.zero) {
 	                range.min = Math.min(range.min, 0);
@@ -59539,7 +59564,7 @@
 	            [];
 	        const recordCol = layout.getRecordIndexByCol(col);
 	        const colPath = layout.getColKeysPath()[recordCol];
-	        const domain = data?.[colPath[colPath.length - 1]] ?? [];
+	        const domain = data?.[colPath?.[colPath?.length - 1] ?? ''] ?? [];
 	        const axisOption = getAxisOption(col, row, 'bottom', layout);
 	        axes.push(merge$2({
 	            domain: Array.from(domain)
@@ -61047,8 +61072,8 @@
 	                if (indicatorInfo.customRender) {
 	                    hd.customRender = indicatorInfo.customRender;
 	                }
-	                if (!isValid$1(this._indicators.find(indicator => indicator.indicatorKey === indicatorInfo.indicatorKey))) {
-	                    this._indicators.push({
+	                if (!isValid$1(this._indicators?.find(indicator => indicator.indicatorKey === indicatorInfo.indicatorKey))) {
+	                    this._indicators?.push({
 	                        id: ++seqId,
 	                        indicatorKey: indicatorInfo.indicatorKey,
 	                        field: indicatorInfo.indicatorKey,
@@ -61070,8 +61095,8 @@
 	                }
 	            }
 	            else if (hd.indicatorKey) {
-	                if (!isValid$1(this._indicators.find(indicator => indicator.indicatorKey === hd.indicatorKey))) {
-	                    this._indicators.push({
+	                if (!isValid$1(this._indicators?.find(indicator => indicator.indicatorKey === hd.indicatorKey))) {
+	                    this._indicators?.push({
 	                        id: ++seqId,
 	                        indicatorKey: hd.indicatorKey,
 	                        field: hd.indicatorKey,
@@ -61274,7 +61299,7 @@
 	            let maxWidth;
 	            let minWidth;
 	            let isAuto;
-	            this._indicators.forEach((obj, index) => {
+	            this._indicators?.forEach((obj, index) => {
 	                if (typeof obj.width === 'number') {
 	                    width = Math.max(obj.width, width);
 	                }
@@ -61580,7 +61605,7 @@
 	        const paths = this.getCellHeaderPaths(_col, _row);
 	        if (this.indicatorsAsCol) {
 	            const indicatorKey = paths.colHeaderPaths.find(colPath => colPath.indicatorKey)?.indicatorKey;
-	            return (this._indicators.find(indicator => indicator.indicatorKey === indicatorKey) ??
+	            return (this._indicators?.find(indicator => indicator.indicatorKey === indicatorKey) ??
 	                this._indicators[0] ?? {
 	                id: '',
 	                field: undefined,
@@ -61590,7 +61615,7 @@
 	            });
 	        }
 	        const indicatorKey = paths.rowHeaderPaths.find(rowPath => rowPath.indicatorKey)?.indicatorKey;
-	        return (this._indicators.find(indicator => indicator.indicatorKey === indicatorKey) ??
+	        return (this._indicators?.find(indicator => indicator.indicatorKey === indicatorKey) ??
 	            this._indicators[0] ?? {
 	            id: '',
 	            field: undefined,
@@ -62158,11 +62183,11 @@
 	        let indicatorObj;
 	        if (this.indicatorsAsCol) {
 	            const indicatorKey = paths.colHeaderPaths.find(colPath => colPath.indicatorKey)?.indicatorKey;
-	            indicatorObj = this._indicators.find(indicator => indicator.indicatorKey === indicatorKey);
+	            indicatorObj = this._indicators?.find(indicator => indicator.indicatorKey === indicatorKey);
 	        }
 	        else {
 	            const indicatorKey = paths.rowHeaderPaths.find(rowPath => rowPath.indicatorKey)?.indicatorKey;
-	            indicatorObj = this._indicators.find(indicator => indicator.indicatorKey === indicatorKey);
+	            indicatorObj = this._indicators?.find(indicator => indicator.indicatorKey === indicatorKey);
 	        }
 	        indicatorObj && (indicatorObj.chartInstance = chartInstance);
 	    }
@@ -62171,11 +62196,11 @@
 	        let indicatorObj;
 	        if (this.indicatorsAsCol) {
 	            const indicatorKey = paths.colHeaderPaths.find(colPath => colPath.indicatorKey)?.indicatorKey;
-	            indicatorObj = this._indicators.find(indicator => indicator.indicatorKey === indicatorKey);
+	            indicatorObj = this._indicators?.find(indicator => indicator.indicatorKey === indicatorKey);
 	        }
 	        else {
 	            const indicatorKey = paths.rowHeaderPaths.find(rowPath => rowPath.indicatorKey)?.indicatorKey;
-	            indicatorObj = this._indicators.find(indicator => indicator.indicatorKey === indicatorKey);
+	            indicatorObj = this._indicators?.find(indicator => indicator.indicatorKey === indicatorKey);
 	        }
 	        return indicatorObj?.chartInstance;
 	    }
@@ -62205,7 +62230,7 @@
 	    release() {
 	        const activeChartInstance = this._table._getActiveChartInstance();
 	        activeChartInstance?.release();
-	        this._indicators.forEach(indicatorObject => {
+	        this._indicators?.forEach(indicatorObject => {
 	            indicatorObject.chartInstance?.release();
 	        });
 	    }
@@ -62997,7 +63022,7 @@
 	                if (this.indicatorsAsCol) {
 	                    return this.indicatorKeys[(col - this.rowHeaderLevelCount) % this.indicatorKeys.length];
 	                }
-	                return this.convertColKeys[this.convertColKeys.length - 1][Math.floor((col - this.rowHeaderLevelCount) / this.indicatorKeys.length)];
+	                return this.convertColKeys[this.convertColKeys.length - 1]?.[Math.floor((col - this.rowHeaderLevelCount) / this.indicatorKeys.length)];
 	            }
 	        }
 	        return 0;
@@ -63139,6 +63164,9 @@
 	            if (colHeaderPaths && this.showColumnHeader && row < this.columns.length - 1) {
 	                colHeaderPaths = colHeaderPaths.slice(0, row + 1);
 	            }
+	            else if (!colHeaderPaths) {
+	                colHeaderPaths = [];
+	            }
 	        }
 	        if (recordRow >= 0) {
 	            rowPath = this.rowKeysPath[recordRow];
@@ -63146,6 +63174,9 @@
 	            if (rowHeaderPaths && this.showRowHeader && col < this.rows.length - 1) {
 	                rowHeaderPaths = rowHeaderPaths.slice(0, col + 1);
 	            }
+	            else if (!rowHeaderPaths) {
+	                rowHeaderPaths = [];
+	            }
 	        }
 	        if (colHeaderPaths && this.indicatorsAsCol && col >= this.rowHeaderLevelCount) {
 	            colHeaderPaths.push(this.indicatorKeys[(col - this.rowHeaderLevelCount) % this.indicatorKeys.length]);
@@ -63551,7 +63582,7 @@
 	                colKey.push(record[colAttr]);
 	            }
 	        }
-	        this.dataConfig.indicators.forEach((indicatorKey) => {
+	        this.dataConfig.indicators?.forEach((indicatorKey) => {
 	            const recordValue = record[indicatorKey];
 	            if (recordValue !== undefined) {
 	                if (this.dataConfig.indicatorsAsCol) {
@@ -64204,6 +64235,9 @@
 	            const dimensionIndex = this.columns.indexOf(dimension);
 	            this.colsIsTotal[dimensionIndex] = true;
 	        }
+	        this.rowKeysPath = [];
+	        this.rowKeysPath_FULL = [];
+	        this.colKeysPath = [];
 	        if (records) {
 	            this.records = records;
 	            const t0 = typeof window !== 'undefined' ? window.performance.now() : 0;
@@ -64411,17 +64445,17 @@
 	                }
 	                else if (aggRule?.field) {
 	                    if (typeof aggRule?.field === 'string') {
-	                        isValid$1(record[aggRule?.field]) && this.tree[flatRowKey]?.[flatColKey]?.[i].push(record);
+	                        aggRule?.field in record && this.tree[flatRowKey]?.[flatColKey]?.[i].push(record);
 	                    }
 	                    else {
 	                        const isPush = aggRule?.field.find((field) => {
-	                            return record[field];
+	                            return field in record;
 	                        });
 	                        isPush && this.tree[flatRowKey]?.[flatColKey]?.[i].push(record);
 	                    }
 	                }
 	                else {
-	                    isValid$1(record[this.indicatorKeys[i]]) && this.tree[flatRowKey]?.[flatColKey]?.[i].push(record);
+	                    this.indicatorKeys[i] in record && this.tree[flatRowKey]?.[flatColKey]?.[i].push(record);
 	                }
 	            }
 	        }
@@ -64923,8 +64957,8 @@
 	        this.internalProps.columnResizeType = options.columnResizeType ?? 'column';
 	        this.internalProps.dataConfig = options.dataConfig;
 	        this.internalProps.enableDataAnalysis = options.enableDataAnalysis;
-	        if (this.internalProps.enableDataAnalysis && (options.rows || options.columns)) {
-	            const rowKeys = options.rows.reduce((keys, rowObj) => {
+	        if (this.internalProps.enableDataAnalysis) {
+	            const rowKeys = options.rows?.reduce((keys, rowObj) => {
 	                if (typeof rowObj === 'string') {
 	                    keys.push(rowObj);
 	                }
@@ -64932,8 +64966,8 @@
 	                    keys.push(rowObj.dimensionKey);
 	                }
 	                return keys;
-	            }, []);
-	            const columnKeys = options.columns.reduce((keys, columnObj) => {
+	            }, []) ?? [];
+	            const columnKeys = options.columns?.reduce((keys, columnObj) => {
 	                if (typeof columnObj === 'string') {
 	                    keys.push(columnObj);
 	                }
@@ -64941,7 +64975,7 @@
 	                    keys.push(columnObj.dimensionKey);
 	                }
 	                return keys;
-	            }, []);
+	            }, []) ?? [];
 	            const indicatorKeys = options.indicators?.reduce((keys, indicatorObj) => {
 	                if (typeof indicatorObj === 'string') {
 	                    keys.push(indicatorObj);
@@ -65026,7 +65060,7 @@
 	                }
 	                return keys;
 	            }, []);
-	            const indicatorKeys = options.indicators.reduce((keys, indicatorObj) => {
+	            const indicatorKeys = options.indicators?.reduce((keys, indicatorObj) => {
 	                if (typeof indicatorObj === 'string') {
 	                    keys.push(indicatorObj);
 	                }
@@ -65391,39 +65425,37 @@
 	        this.internalProps.columnResizeType = options.columnResizeType ?? 'column';
 	        this.internalProps.dataConfig = { isPivotChart: true };
 	        this._axes = isArray(options.axes) ? options.axes : [];
-	        if (options.rows || options.columns) {
-	            const rowKeys = options.rows.reduce((keys, rowObj) => {
-	                if (typeof rowObj === 'string') {
-	                    keys.push(rowObj);
-	                }
-	                else {
-	                    keys.push(rowObj.dimensionKey);
-	                }
-	                return keys;
-	            }, []);
-	            const columnKeys = options.columns.reduce((keys, columnObj) => {
-	                if (typeof columnObj === 'string') {
-	                    keys.push(columnObj);
-	                }
-	                else {
-	                    keys.push(columnObj.dimensionKey);
-	                }
-	                return keys;
-	            }, []);
-	            const indicatorKeys = options.indicators?.reduce((keys, indicatorObj) => {
-	                if (typeof indicatorObj === 'string') {
-	                    keys.push(indicatorObj);
-	                }
-	                else {
-	                    keys.push(indicatorObj.indicatorKey);
-	                }
-	                return keys;
-	            }, []) ?? [];
-	            this.internalProps.dataConfig.collectValuesBy = this._generateCollectValuesConfig(columnKeys, rowKeys);
-	            this.internalProps.dataConfig.aggregationRules = this._generateAggregationRules();
-	            this.internalProps.dataConfig.dimensionSortArray = this._getDimensionSortArray();
-	            this.dataset = new Dataset(this.internalProps.dataConfig, null, rowKeys, columnKeys, indicatorKeys, options.records, options.columnTree, options.rowTree);
-	        }
+	        const rowKeys = options.rows?.reduce((keys, rowObj) => {
+	            if (typeof rowObj === 'string') {
+	                keys.push(rowObj);
+	            }
+	            else {
+	                keys.push(rowObj.dimensionKey);
+	            }
+	            return keys;
+	        }, []) ?? [];
+	        const columnKeys = options.columns?.reduce((keys, columnObj) => {
+	            if (typeof columnObj === 'string') {
+	                keys.push(columnObj);
+	            }
+	            else {
+	                keys.push(columnObj.dimensionKey);
+	            }
+	            return keys;
+	        }, []) ?? [];
+	        const indicatorKeys = options.indicators?.reduce((keys, indicatorObj) => {
+	            if (typeof indicatorObj === 'string') {
+	                keys.push(indicatorObj);
+	            }
+	            else {
+	                keys.push(indicatorObj.indicatorKey);
+	            }
+	            return keys;
+	        }, []) ?? [];
+	        this.internalProps.dataConfig.collectValuesBy = this._generateCollectValuesConfig(columnKeys, rowKeys);
+	        this.internalProps.dataConfig.aggregationRules = this._generateAggregationRules();
+	        this.internalProps.dataConfig.dimensionSortArray = this._getDimensionSortArray();
+	        this.dataset = new Dataset(this.internalProps.dataConfig, null, rowKeys, columnKeys, indicatorKeys, options.records, options.columnTree, options.rowTree);
 	        this.refreshHeader();
 	        if (options.dataSource) {
 	            _setDataSource(this, options.dataSource);
@@ -65488,7 +65520,7 @@
 	                }
 	                return keys;
 	            }, []);
-	            const indicatorKeys = options.indicators.reduce((keys, indicatorObj) => {
+	            const indicatorKeys = options.indicators?.reduce((keys, indicatorObj) => {
 	                if (typeof indicatorObj === 'string') {
 	                    keys.push(indicatorObj);
 	                }
@@ -65763,7 +65795,7 @@
 	    _generateCollectValuesConfig(columnKeys, rowKeys) {
 	        const option = this.options;
 	        const collectValuesBy = {};
-	        for (let i = 0, len = option.indicators.length; i < len; i++) {
+	        for (let i = 0, len = option.indicators?.length; i < len; i++) {
 	            if (typeof option.indicators[i] !== 'string' && option.indicators[i].chartSpec) {
 	                if (option.indicatorsAsCol === false) {
 	                    const indicatorDefine = option.indicators[i];
@@ -65881,7 +65913,7 @@
 	    }
 	    _generateAggregationRules() {
 	        const aggregationRules = [];
-	        this.options.indicators.forEach((indicator) => {
+	        this.options.indicators?.forEach((indicator) => {
 	            if (typeof indicator === 'string') {
 	                aggregationRules.push({
 	                    indicatorKey: indicator,
@@ -65945,7 +65977,7 @@
 	                delete spec.area.state.selected_reverse;
 	            }
 	        };
-	        this.options.indicators.forEach((indicator) => {
+	        this.options.indicators?.forEach((indicator) => {
 	            if (indicator.chartSpec) {
 	                const spec = indicator.chartSpec;
 	                if (spec.series) {
@@ -66660,7 +66692,7 @@
 		percentCalc: percentCalc
 	});
 
-	const version = "0.10.2";
+	const version = "0.10.3-alpha.0";
 	function getIcons() {
 	    return get$1();
 	}