@visactor/vtable 0.13.4-alpha.0 → 0.13.4-alpha.2

package/dist/vtable.js

@@ -40385,11 +40385,21 @@
     }
 
     const DEFAULT_CONTINUOUS_TICK_COUNT = 5;
-    function getAxisDomainRangeAndLabels(min, max, axisOption, isZeroAlign, skipTick) {
+    function getAxisDomainRangeAndLabels(min, max, axisOption, isZeroAlign, axisLength, skipTick) {
         if (axisOption?.zero) {
             min = Math.min(min, 0);
             max = Math.max(max, 0);
         }
+        if (axisOption?.expand) {
+            const domainMin = min;
+            const domainMax = max;
+            if (isValid$6(axisOption.expand.min)) {
+                min = domainMin - (domainMax - domainMin) * axisOption.expand.min;
+            }
+            if (isValid$6(axisOption.expand.max)) {
+                max = domainMax + (domainMax - domainMin) * axisOption.expand.max;
+            }
+        }
         if (isNumber$6(axisOption?.min)) {
             min = axisOption.min;
         }
@@ -40411,6 +40421,14 @@
         scale.domain([min, max], !!axisOption?.nice);
         if (axisOption?.nice && !isZeroAlign) {
             let tickCount = axisOption.tick?.forceTickCount ?? axisOption.tick?.tickCount ?? 10;
+            if (isFunction$1(tickCount)) {
+                tickCount = tickCount({
+                    axisLength,
+                    labelStyle: axisOption?.label?.style ?? {
+                        fontSize: THEME_CONSTANTS.LABEL_FONT_SIZE
+                    }
+                });
+            }
             if (axisOption.niceType === 'accurateFirst') {
                 tickCount = Math.max(10, tickCount);
             }
@@ -40441,6 +40459,7 @@
         if (!layout._table.isPivotChart()) {
             return undefined;
         }
+        const table = layout._table;
         if (layout.indicatorsAsCol) {
             if (layout.hasTwoIndicatorAxes &&
                 row === layout.columnHeaderLevelCount - 1 &&
@@ -40460,7 +40479,7 @@
                     range.min = range.min < 0 ? -1 : 0;
                     range.max = range.max > 0 ? 1 : 0;
                 }
-                const { range: niceRange, ticks } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption, isZeroAlign);
+                const { range: niceRange, ticks } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption, isZeroAlign, table.getColWidth(col));
                 range.min = !isNaN(niceRange[0]) ? niceRange[0] : 0;
                 range.max = !isNaN(niceRange[1]) ? niceRange[1] : 1;
                 if (isNumber$6(axisOption?.min)) {
@@ -40510,7 +40529,7 @@
                     range.min = range.min < 0 ? -1 : 0;
                     range.max = range.max > 0 ? 1 : 0;
                 }
-                const { range: niceRange, ticks } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption, isZeroAlign);
+                const { range: niceRange, ticks } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption, isZeroAlign, table.getColWidth(col));
                 range.min = !isNaN(niceRange[0]) ? niceRange[0] : 0;
                 range.max = !isNaN(niceRange[1]) ? niceRange[1] : 1;
                 if (isNumber$6(axisOption?.min)) {
@@ -40590,7 +40609,7 @@
                     range.min = range.min < 0 ? -1 : 0;
                     range.max = range.max > 0 ? 1 : 0;
                 }
-                const { range: niceRange, ticks } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption, isZeroAlign);
+                const { range: niceRange, ticks } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption, isZeroAlign, table.getRowHeight(row));
                 range.min = !isNaN(niceRange[0]) ? niceRange[0] : 0;
                 range.max = !isNaN(niceRange[1]) ? niceRange[1] : 1;
                 if (isNumber$6(axisOption?.min)) {
@@ -40638,7 +40657,7 @@
                     range.min = range.min < 0 ? -1 : 0;
                     range.max = range.max > 0 ? 1 : 0;
                 }
-                const { range: niceRange, ticks } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption, isZeroAlign);
+                const { range: niceRange, ticks } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption, isZeroAlign, table.getRowHeight(row));
                 range.min = !isNaN(niceRange[0]) ? niceRange[0] : 0;
                 range.max = !isNaN(niceRange[1]) ? niceRange[1] : 1;
                 if (isNumber$6(axisOption?.min)) {
@@ -41412,9 +41431,6 @@
         let rowStart = 0;
         let rowEnd = 0;
         if (row < scene.table.columnHeaderLevelCount) {
-            scene.colHeaderGroup.setAttribute('height', scene.colHeaderGroup.attribute.height + detaY);
-            scene.rowHeaderGroup.setAttribute('y', scene.colHeaderGroup.attribute.y + detaY);
-            scene.bodyGroup.setAttribute('y', scene.bodyGroup.attribute.y + detaY);
             rowStart = row + 1;
             rowEnd = scene.table.columnHeaderLevelCount - 1;
         }
@@ -50159,7 +50175,7 @@
                     eventManeger.dealColumnMover(eventArgsSet);
                 }
                 else {
-                    eventManeger.dealTableSelect(eventArgsSet, true);
+                    eventManeger.dealTableSelect(eventArgsSet);
                 }
                 return;
             }
@@ -50309,14 +50325,10 @@
                 }
             }
             else if (stateManeger.isSelecting()) {
+                table.stateManeger.endSelectCells();
                 if (table.stateManeger.select?.ranges?.length) {
                     const lastCol = table.stateManeger.select.ranges[table.stateManeger.select.ranges.length - 1].end.col;
                     const lastRow = table.stateManeger.select.ranges[table.stateManeger.select.ranges.length - 1].end.row;
-                    table.fireListeners(TABLE_EVENT_TYPE.SELECTED_CELL, {
-                        ranges: table.stateManeger.select.ranges,
-                        col: lastCol,
-                        row: lastRow
-                    });
                     if (table.hasListeners(TABLE_EVENT_TYPE.DRAG_SELECT_END)) {
                         const cellsEvent = {
                             event: e.nativeEvent,
@@ -50546,8 +50558,7 @@
             const target = e.target;
             if (target &&
                 !target.isDescendantsOf(table.scenegraph.tableGroup) &&
-                target !== table.scenegraph.tableGroup &&
-                target !== table.scenegraph.stage) {
+                target !== table.scenegraph.tableGroup) {
                 stateManeger.updateInteractionState(InteractionState.default);
                 eventManeger.dealTableHover();
                 eventManeger.dealTableSelect();
@@ -51157,7 +51168,7 @@
         }
         dealMenuHover(eventArgsSet) {
         }
-        dealTableSelect(eventArgsSet, isSelectMoving) {
+        dealTableSelect(eventArgsSet) {
             if (!eventArgsSet) {
                 this.table.stateManeger.updateSelectPos(-1, -1);
                 return false;
@@ -51168,17 +51179,10 @@
                     return false;
                 }
                 const define = this.table.getBodyColumnDefine(eventArgs.col, eventArgs.row);
-                if (this.table.isHeader(eventArgs.col, eventArgs.row) &&
-                    (define?.disableHeaderSelect || this.table.stateManeger.select?.disableHeader)) {
-                    if (!isSelectMoving) {
-                        this.table.stateManeger.updateSelectPos(-1, -1);
-                    }
+                if (this.table.isHeader(eventArgs.col, eventArgs.row) && define?.disableHeaderSelect) {
                     return false;
                 }
                 else if (!this.table.isHeader(eventArgs.col, eventArgs.row) && define?.disableSelect) {
-                    if (!isSelectMoving) {
-                        this.table.stateManeger.updateSelectPos(-1, -1);
-                    }
                     return false;
                 }
                 if (this.table.isPivotChart() &&
@@ -54092,7 +54096,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.13.4-alpha.0";
+        version = "0.13.4-alpha.2";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -56363,6 +56367,7 @@
     }
     function getChartAxes(col, row, layout) {
         const axes = [];
+        const table = layout._table;
         if (layout.indicatorsAsCol) {
             const indicatorKeys = layout.getIndicatorKeyInChartSpec(col, row);
             const colPath = layout.getColKeysPath(col, row);
@@ -56378,7 +56383,7 @@
                     range.max = Math.max(range.max, 0);
                 }
                 if (axisOption?.nice) {
-                    const { range: axisRange } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption, isZeroAlign);
+                    const { range: axisRange } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption, isZeroAlign, table.getColWidth(col));
                     range.min = axisRange[0];
                     range.max = axisRange[1];
                 }
@@ -56439,7 +56444,7 @@
                     range.max = Math.max(range.max, 0);
                 }
                 if (axisOption?.nice) {
-                    const { range: axisRange } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption, isZeroAlign);
+                    const { range: axisRange } = getAxisDomainRangeAndLabels(range.min, range.max, axisOption, isZeroAlign, table.getRowHeight(row));
                     range.min = axisRange[0];
                     range.max = axisRange[1];
                 }
@@ -63977,7 +63982,7 @@
         return new Tag(params ? params.attribute : {});
     }
 
-    const version = "0.13.4-alpha.0";
+    const version = "0.13.4-alpha.2";
     function getIcons() {
         return get$1();
     }