@visactor/vtable 0.16.2-alpha.0 → 0.16.2

package/dist/vtable.js

@@ -48997,11 +48997,11 @@
         tickData;
         scale;
         component;
-        constructor(option, width, height, padding, table) {
+        constructor(option, width, height, padding, chartSpecTheme, table) {
             this.table = table;
             this.orient = option.orient ?? 'left';
             this.type = option.type ?? 'band';
-            this.option = merge$1({}, getCommonAxis(option.__vtableChartTheme), getTableAxisTheme(this.orient, table.theme), getChartSpecAxisTheme(this.orient, this.type, option.__vtableChartTheme), option);
+            this.option = merge$1({}, getCommonAxis(chartSpecTheme), getTableAxisTheme(this.orient, table.theme), getChartSpecAxisTheme(this.orient, this.type, chartSpecTheme), option);
             if (this.orient === 'left' || this.orient === 'right') {
                 this.width = width;
                 this.height = height - padding[2];
@@ -53552,7 +53552,8 @@
             cellGroup = createCellGroup(table, value, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, customElementsGroup, renderDefault, cellTheme);
             const axisConfig = table.internalProps.layoutMap.getAxisConfigInPivotChart(col, row);
             if (axisConfig) {
-                const axis = new CartesianAxis(axisConfig, cellGroup.attribute.width, cellGroup.attribute.height, padding, table);
+                const spec = table.internalProps.layoutMap.getRawChartSpec(col, row);
+                const axis = new CartesianAxis(axisConfig, cellGroup.attribute.width, cellGroup.attribute.height, padding, spec?.theme, table);
                 cellGroup.clear();
                 cellGroup.appendChild(axis.component);
                 axis.overlap();
@@ -53656,7 +53657,25 @@
                     dx: hierarchyOffset,
                     x
                 };
+                const oldText = textMark.attribute.text;
                 textMark.setAttributes(cellTheme.text ? Object.assign({}, cellTheme.text, attribute) : attribute);
+                if (!oldText && textMark.attribute.text) {
+                    const textBaseline = cellTheme.text.textBaseline;
+                    const height = cellHeight - (padding[0] + padding[2]);
+                    let y = 0;
+                    if (textBaseline === 'middle') {
+                        y = padding[0] + (height - textMark.AABBBounds.height()) / 2;
+                    }
+                    else if (textBaseline === 'bottom') {
+                        y = padding[0] + height - textMark.AABBBounds.height();
+                    }
+                    else {
+                        y = padding[0];
+                    }
+                    textMark.setAttributes({
+                        y
+                    });
+                }
             }
             return oldCellGroup;
         }
@@ -54221,7 +54240,7 @@
                 if (!axisRange) {
                     return;
                 }
-                const { range, ticks, axisOption, isZeroAlign, theme } = axisRange;
+                const { range, ticks, axisOption, isZeroAlign } = axisRange;
                 if (isZeroAlign) {
                     const subAxisRange = getRange$1('bottom', col, row + 1, col, layout.columnHeaderLevelCount - 1, col, row, 0, layout);
                     if (subAxisRange) {
@@ -54253,8 +54272,7 @@
                     label: {
                         flush: true
                     },
-                    __ticksForVTable: ticks,
-                    __vtableChartTheme: theme
+                    __ticksForVTable: ticks
                 });
             }
             else if (row === layout.rowCount - layout.bottomFrozenRowCount &&
@@ -54272,7 +54290,7 @@
                 if (!axisRange) {
                     return;
                 }
-                const { range, ticks, axisOption, isZeroAlign, theme } = axisRange;
+                const { range, ticks, axisOption, isZeroAlign } = axisRange;
                 if (isZeroAlign) {
                     const subAxisRange = getRange$1('top', col, row - 1, col, row, col, row, 1, layout);
                     if (subAxisRange) {
@@ -54308,8 +54326,7 @@
                     label: {
                         flush: true
                     },
-                    __ticksForVTable: ticks,
-                    __vtableChartTheme: theme
+                    __ticksForVTable: ticks
                 });
             }
             else if (col === layout.rowHeaderLevelCount - 1 &&
@@ -54322,7 +54339,7 @@
                 const data = layout.dataset.collectedValues[rowDimensionKey] ?? [];
                 const rowPath = layout.getRowKeysPath(col, row);
                 const domain = data[rowPath ?? ''] ?? [];
-                const { axisOption, isPercent, theme } = getAxisOption(col + 1, row, 'left', layout);
+                const { axisOption, isPercent } = getAxisOption(col + 1, row, 'left', layout);
                 if (axisOption?.visible === false) {
                     return;
                 }
@@ -54333,8 +54350,7 @@
                     }
                 }, axisOption, {
                     orient: 'left',
-                    type: 'band',
-                    __vtableChartTheme: theme
+                    type: 'band'
                 });
             }
         }
@@ -54354,7 +54370,7 @@
                 if (!axisRange) {
                     return;
                 }
-                const { range, ticks, axisOption, isZeroAlign, theme } = axisRange;
+                const { range, ticks, axisOption, isZeroAlign } = axisRange;
                 if (isZeroAlign) {
                     const subAxisRange = getRange$1('right', col + 1, row, col, row, col, row, 1, layout);
                     if (subAxisRange) {
@@ -54391,8 +54407,7 @@
                     label: {
                         flush: true
                     },
-                    __ticksForVTable: ticks,
-                    __vtableChartTheme: theme
+                    __ticksForVTable: ticks
                 });
             }
             else if (col === layout.colCount - layout.rightFrozenColCount &&
@@ -54402,7 +54417,7 @@
                 if (!axisRange) {
                     return;
                 }
-                const { range, ticks, axisOption, isZeroAlign, theme } = axisRange;
+                const { range, ticks, axisOption, isZeroAlign } = axisRange;
                 if (isZeroAlign) {
                     const subAxisRange = getRange$1('left', col - 1, row, layout.rowHeaderLevelCount - 1, row, col, row, 0, layout);
                     if (subAxisRange) {
@@ -54437,8 +54452,7 @@
                     label: {
                         flush: true
                     },
-                    __ticksForVTable: ticks,
-                    __vtableChartTheme: theme
+                    __ticksForVTable: ticks
                 });
             }
             else if (row === layout.rowCount - layout.bottomFrozenRowCount &&
@@ -54451,7 +54465,7 @@
                 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 } = getAxisOption(col, row - 1, 'bottom', layout);
                 if (axisOption?.visible === false) {
                     return;
                 }
@@ -54459,8 +54473,7 @@
                     domain: Array.from(domain)
                 }, axisOption, {
                     orient: 'bottom',
-                    type: 'band',
-                    __vtableChartTheme: theme
+                    type: 'band'
                 });
             }
         }
@@ -54485,8 +54498,7 @@
                     axisOption,
                     isPercent: spec.percent,
                     isZeroAlign: checkZeroAlign(spec, orient, layout),
-                    seriesIndice,
-                    theme: spec.theme
+                    seriesIndice
                 };
             }
         }
@@ -54496,8 +54508,7 @@
         return {
             axisOption,
             isPercent: false,
-            isZeroAlign: checkZeroAlign(spec, orient, layout),
-            theme: spec.theme
+            isZeroAlign: checkZeroAlign(spec, orient, layout)
         };
     }
     function checkZeroAlign(spec, orient, layout) {
@@ -54577,7 +54588,7 @@
         return range;
     }
     function getRange$1(position, colForAxisOption, rowForAxisOption, colForIndicatorKey, rowForIndicatorKey, col, row, defaultSeriesIndice, layout) {
-        const { axisOption, isPercent, isZeroAlign, seriesIndice, theme } = getAxisOption(colForAxisOption, rowForAxisOption, position, layout);
+        const { axisOption, isPercent, isZeroAlign, seriesIndice } = getAxisOption(colForAxisOption, rowForAxisOption, position, layout);
         if (axisOption?.visible === false) {
             return undefined;
         }
@@ -54616,8 +54627,7 @@
             axisOption,
             isZeroAlign,
             range,
-            ticks,
-            theme
+            ticks
         };
     }
     function isTopOrBottomAxis(col, row, layout) {
@@ -55696,7 +55706,8 @@
             const cellStyle = scene.table._getCellStyle(col, row);
             const padding = getQuadProps(getProp('padding', cellStyle, col, row, scene.table));
             if (axisConfig) {
-                const axis = new CartesianAxis(axisConfig, cellGroup.attribute.width, cellGroup.attribute.height, padding, scene.table);
+                const spec = scene.table.internalProps.layoutMap.getRawChartSpec(col, row);
+                const axis = new CartesianAxis(axisConfig, cellGroup.attribute.width, cellGroup.attribute.height, padding, spec?.theme, scene.table);
                 cellGroup.clear();
                 cellGroup.appendChild(axis.component);
                 axis.overlap();
@@ -59093,7 +59104,6 @@
         return getCellByCache(cacheCellGroup._next, row);
     }
 
-    new Group$3({});
     function moveHeaderPosition(colSource, rowSource, colTarget, rowTarget, table) {
         const scene = table.scenegraph;
         const cellLocation = table.getCellLocation(colTarget, rowTarget);
@@ -59179,11 +59189,42 @@
             }
         }
         scene.updateContainer();
-        for (let col = updateColStart; col <= updateColEnd; col++) {
-            const columnGroup = table.scenegraph.getColGroup(col);
-            columnGroup?.setAttribute('chartInstance', undefined);
-            for (let row = updateRowStart; row <= updateRowEnd; row++) {
-                scene.updateCellContent(col, row);
+        if (direction === 'column') {
+            for (let col = updateColStart; col <= updateColEnd; col++) {
+                const columnGroup = table.scenegraph.getColGroup(col);
+                columnGroup?.setAttribute('chartInstance', undefined);
+                for (let row = 0; row <= table.frozenRowCount - 1; row++) {
+                    scene.updateCellContent(col, row);
+                }
+                for (let row = scene.bodyRowStart; row <= scene.bodyRowEnd; row++) {
+                    scene.updateCellContent(col, row);
+                }
+                for (let row = table.rowCount - table.bottomFrozenRowCount; row <= table.rowCount - 1; row++) {
+                    scene.updateCellContent(col, row);
+                }
+            }
+        }
+        else {
+            for (let col = 0; col <= table.frozenColCount - 1; col++) {
+                const columnGroup = table.scenegraph.getColGroup(col);
+                columnGroup?.setAttribute('chartInstance', undefined);
+                for (let row = updateRowStart; row <= updateRowEnd; row++) {
+                    scene.updateCellContent(col, row);
+                }
+            }
+            for (let col = scene.bodyColStart; col <= scene.bodyColEnd; col++) {
+                const columnGroup = table.scenegraph.getColGroup(col);
+                columnGroup?.setAttribute('chartInstance', undefined);
+                for (let row = updateRowStart; row <= updateRowEnd; row++) {
+                    scene.updateCellContent(col, row);
+                }
+            }
+            for (let col = table.colCount - table.rightFrozenColCount; col <= table.colCount - 1; col++) {
+                const columnGroup = table.scenegraph.getColGroup(col);
+                columnGroup?.setAttribute('chartInstance', undefined);
+                for (let row = updateRowStart; row <= updateRowEnd; row++) {
+                    scene.updateCellContent(col, row);
+                }
             }
         }
     }
@@ -60529,7 +60570,8 @@
                             const axisConfig = table.internalProps.layoutMap.getAxisConfigInPivotChart(cell.col, cell.row);
                             const cellStyle = table._getCellStyle(cell.col, cell.row);
                             const padding = getQuadProps(getProp('padding', cellStyle, cell.col, cell.row, table));
-                            const axis = new CartesianAxis(axisConfig, cell.attribute.width, cell.attribute.height, padding, table);
+                            const spec = table.internalProps.layoutMap.getRawChartSpec(cell.col, cell.row);
+                            const axis = new CartesianAxis(axisConfig, cell.attribute.width, cell.attribute.height, padding, spec?.theme, table);
                             cell.clear();
                             cell.appendChild(axis.component);
                             axis.overlap();
@@ -64574,6 +64616,9 @@
                     }
                 }
             }
+            if (table.editorManager) {
+                table.editorManager.completeEdit();
+            }
             stateManager.updateInteractionState(InteractionState.default);
             eventManager.dealTableHover();
         });
@@ -68426,7 +68471,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.16.2-alpha.0";
+        version = "0.16.2";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -76288,6 +76333,21 @@
                         }
                     };
                 }
+                return {
+                    value() {
+                        return changeValue;
+                    },
+                    className: '',
+                    push() {
+                    },
+                    formatValue() {
+                        return changeValue;
+                    },
+                    clearCacheValue() {
+                    },
+                    reset() {
+                    }
+                };
             }
             return agg
                 ? agg
@@ -76846,6 +76906,9 @@
             this.internalProps.columnResizeType = options.columnResizeType ?? 'column';
             this.internalProps.dataConfig = cloneDeep$1(options.dataConfig);
             this.internalProps.enableDataAnalysis = options.enableDataAnalysis;
+            if (!options.rowTree && !options.columnTree) {
+                this.internalProps.enableDataAnalysis = true;
+            }
             const records = this.internalProps.records;
             if (this.internalProps.enableDataAnalysis && (options.rows || options.columns)) {
                 const rowKeys = options.rows?.reduce((keys, rowObj) => {
@@ -76956,6 +77019,9 @@
             internalProps.columnResizeType = options.columnResizeType ?? 'column';
             internalProps.dataConfig = cloneDeep$1(options.dataConfig);
             internalProps.enableDataAnalysis = options.enableDataAnalysis;
+            if (!options.rowTree && !options.columnTree) {
+                internalProps.enableDataAnalysis = true;
+            }
             if (options?.rowHierarchyType === 'tree' &&
                 this.internalProps.layoutMap.rowHierarchyType === 'tree' &&
                 this.internalProps.layoutMap.rowExpandLevel === options?.rowExpandLevel) {
@@ -77139,7 +77205,7 @@
             }
             if (this.internalProps.layoutMap.isHeader(col, row)) {
                 const { title, fieldFormat } = this.internalProps.layoutMap.getHeader(col, row);
-                return typeof fieldFormat === 'function' ? fieldFormat(title) : title;
+                return typeof fieldFormat === 'function' ? fieldFormat(title, col, row, this) : title;
             }
             if (this.dataset) {
                 const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
@@ -77163,16 +77229,15 @@
                 const valueNode = this.flatDataToObjects.getTreeNode(rowKeys, colKeys, this.internalProps.layoutMap.getBody(col, row).indicatorKey);
                 const { fieldFormat } = this.internalProps.layoutMap.getBody(col, row);
                 return typeof fieldFormat === 'function'
-                    ? fieldFormat(valueNode?.record, col, row, this)
+                    ? fieldFormat(valueNode?.value, col, row, this)
                     : valueNode?.value ?? '';
             }
             const { fieldFormat } = this.internalProps.layoutMap.getBody(col, row);
             const rowIndex = this.getBodyIndexByRow(row);
             const colIndex = this.getBodyIndexByCol(col);
             const dataValue = this.records[rowIndex]?.[colIndex];
-            const cellHeaderPaths = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
             if (typeof fieldFormat === 'function') {
-                const fieldResult = fieldFormat({ dataValue, ...cellHeaderPaths }, col, row, this);
+                const fieldResult = fieldFormat(dataValue, col, row, this);
                 return fieldResult;
             }
             return dataValue;
@@ -77446,6 +77511,9 @@
             }
             this.eventManager.updateEventBinder();
         }
+        completeEditCell() {
+            this.editorManager.completeEdit();
+        }
         getEditor(col, row) {
             const define = this.getBodyColumnDefine(col, row);
             let editorDefine = define?.editor ?? this.options.editor;
@@ -77772,7 +77840,7 @@
             }
             if (this.internalProps.layoutMap.isHeader(col, row)) {
                 const { title, fieldFormat } = this.internalProps.layoutMap.getHeader(col, row);
-                return typeof fieldFormat === 'function' ? fieldFormat(title) : title;
+                return typeof fieldFormat === 'function' ? fieldFormat(title, col, row, this) : title;
             }
             if (this.dataset) {
                 const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
@@ -77789,9 +77857,8 @@
             const rowIndex = this.getBodyIndexByRow(row);
             const colIndex = this.getBodyIndexByCol(col);
             const dataValue = this.records[rowIndex]?.[colIndex];
-            const cellHeaderPaths = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
             if (typeof fieldFormat === 'function') {
-                const fieldResult = fieldFormat({ dataValue, ...cellHeaderPaths }, col, row, this);
+                const fieldResult = fieldFormat(dataValue, col, row, this);
                 return fieldResult;
             }
             return dataValue;
@@ -78847,7 +78914,7 @@
         return new Tag$1(params ? params.attribute : {});
     }
 
-    const version = "0.16.2-alpha.0";
+    const version = "0.16.2";
     function getIcons() {
         return get$2();
     }