@visactor/vtable 0.12.0-alpha.3 → 0.12.0

package/dist/vtable.js

@@ -40428,25 +40428,29 @@
         }
         if (table.heightMode === 'adaptive') {
             table._clearRowRangeHeightsMap();
-            const totalDrawHeight = table.tableNoFrameHeight - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight();
+            const columnHeaderHeight = table.getRowsHeight(0, table.columnHeaderLevelCount - 1);
+            const bottomHeaderHeight = table.isPivotChart() ? table.getBottomFrozenRowsHeight() : 0;
+            const totalDrawHeight = table.tableNoFrameHeight - columnHeaderHeight - bottomHeaderHeight;
+            const startRow = table.columnHeaderLevelCount;
+            const endRow = table.isPivotChart() ? table.rowCount - table.bottomFrozenRowCount : table.rowCount;
             let actualHeight = 0;
-            for (let row = table.frozenRowCount; row < table.rowCount - table.bottomFrozenRowCount; row++) {
+            for (let row = startRow; row < endRow; row++) {
                 actualHeight += update ? newHeights[row] : table.getRowHeight(row);
             }
             const factor = totalDrawHeight / actualHeight;
-            for (let row = table.frozenRowCount; row < table.rowCount - table.bottomFrozenRowCount; row++) {
+            for (let row = startRow; row < endRow; row++) {
                 let rowHeight;
-                if (row === table.rowCount - table.bottomFrozenRowCount - 1) {
+                if (row === endRow - 1) {
                     rowHeight =
                         totalDrawHeight -
                             (update
                                 ? newHeights.reduce((acr, cur, index) => {
-                                    if (index >= table.frozenRowCount && index < newHeights.length - table.bottomFrozenRowCount - 1) {
+                                    if (index >= startRow && index <= endRow - 2) {
                                         return acr + cur;
                                     }
                                     return acr;
                                 }, 0)
-                                : table.getRowsHeight(table.frozenRowCount, table.rowCount - table.bottomFrozenRowCount - 2));
+                                : table.getRowsHeight(startRow, endRow - 2));
                 }
                 else {
                     rowHeight = Math.round((update ? newHeights[row] : table.getRowHeight(row)) * factor);
@@ -40595,7 +40599,7 @@
         if (customRender || customLayout) {
             let spanRow = 1;
             let height = 0;
-            if (table.isHeader(col, row) || table.getBodyColumnDefine(col, row).mergeCell) {
+            if (table.isHeader(col, row) || table.getBodyColumnDefine(col, row)?.mergeCell) {
                 const cellRange = table.getCellRange(col, row);
                 spanRow = cellRange.end.row - cellRange.start.row + 1;
             }
@@ -40665,7 +40669,7 @@
         }
         let spanRow = 1;
         let endCol = col;
-        if (table.isHeader(col, row) || table.getBodyColumnDefine(col, row).mergeCell) {
+        if (table.isHeader(col, row) || table.getBodyColumnDefine(col, row)?.mergeCell) {
             const cellRange = table.getCellRange(col, row);
             spanRow = cellRange.end.row - cellRange.start.row + 1;
             col = cellRange.start.col;
@@ -43034,25 +43038,29 @@
         }
         if (table.widthMode === 'adaptive') {
             table._clearColRangeWidthsMap();
-            const totalDrawWidth = table.tableNoFrameWidth - table.getFrozenColsWidth() - table.getRightFrozenColsWidth();
+            const rowHeaderWidth = table.getColsWidth(0, table.rowHeaderLevelCount - 1);
+            const rightHeaderWidth = table.isPivotChart() ? table.getRightFrozenColsWidth() : 0;
+            const totalDrawWidth = table.tableNoFrameWidth - rowHeaderWidth - rightHeaderWidth;
+            const startCol = table.rowHeaderLevelCount;
+            const endCol = table.isPivotChart() ? table.colCount - table.rightFrozenColCount : table.colCount;
             let actualWidth = 0;
-            for (let col = table.frozenColCount; col < table.colCount - table.rightFrozenColCount; col++) {
+            for (let col = startCol; col < endCol; col++) {
                 actualWidth += update ? newWidths[col] : table.getColWidth(col);
             }
             const factor = totalDrawWidth / actualWidth;
-            for (let col = table.frozenColCount; col < table.colCount - table.rightFrozenColCount; col++) {
+            for (let col = startCol; col < endCol; col++) {
                 let colWidth;
-                if (col === table.colCount - table.rightFrozenColCount - 1) {
+                if (col === endCol - 1) {
                     colWidth =
                         totalDrawWidth -
                             (update
                                 ? newWidths.reduce((acr, cur, index) => {
-                                    if (index >= table.rowHeaderLevelCount && index < newWidths.length - table.rightFrozenColCount - 1) {
+                                    if (index >= startCol && index <= endCol - 2) {
                                         return acr + cur;
                                     }
                                     return acr;
                                 }, 0)
-                                : table.getColsWidth(table.frozenColCount, table.colCount - table.rightFrozenColCount - 2));
+                                : table.getColsWidth(startCol, endCol - 2));
                 }
                 else {
                     colWidth = Math.round((update ? newWidths[col] : table.getColWidth(col)) * factor);
@@ -43199,7 +43207,7 @@
         if (customRender || customLayout) {
             let spanCol = 1;
             let width = 0;
-            if (table.isHeader(col, row) || table.getBodyColumnDefine(col, row).mergeCell) {
+            if (table.isHeader(col, row) || table.getBodyColumnDefine(col, row)?.mergeCell) {
                 const cellRange = table.getCellRange(col, row);
                 spanCol = cellRange.end.col - cellRange.start.col + 1;
             }
@@ -43252,7 +43260,7 @@
             });
         }
         let spanCol = 1;
-        if (table.isHeader(col, row) || table.getBodyColumnDefine(col, row).mergeCell) {
+        if (table.isHeader(col, row) || table.getBodyColumnDefine(col, row)?.mergeCell) {
             const cellRange = table.getCellRange(col, row);
             spanCol = cellRange.end.col - cellRange.start.col + 1;
         }
@@ -46626,6 +46634,7 @@
             }
             this.dealWidthMode();
             this.dealHeightMode();
+            this.resetFrozen();
             this.dealFrozen();
             this.updateTableSize();
             this.updateBorderSizeAndPosition();
@@ -46771,6 +46780,7 @@
             this.updateNextFrame();
         }
         afterScenegraphCreated() {
+            this.resetFrozen();
             this.dealFrozen();
             this.createFrameBorder();
             this.updateBorderSizeAndPosition();
@@ -48897,10 +48907,6 @@
         const table = eventManeger.table;
         const stateManeger = table.stateManeger;
         document.body.addEventListener('pointermove', (e) => {
-            if (eventManeger.touchSetTimeout) {
-                clearTimeout(eventManeger.touchSetTimeout);
-                eventManeger.touchSetTimeout = undefined;
-            }
             const { x, y } = table._getMouseAbstractPoint(e, false);
             if (stateManeger.interactionState === InteractionState.scrolling) {
                 return;
@@ -49108,6 +49114,7 @@
                             stateManeger.updateInteractionState(InteractionState.grabing);
                         }
                     }, 500);
+                    eventManeger.dealTableHover(eventArgsSet);
                 }
                 else {
                     if (eventManeger.checkColumnResize(eventArgsSet, true)) {
@@ -49229,7 +49236,7 @@
                 }
             }
         });
-        table.scenegraph.tableGroup.addEventListener('click', (e) => {
+        table.scenegraph.tableGroup.addEventListener('pointertap', (e) => {
             if (table.stateManeger.columnResize.resizing || table.stateManeger.columnMove.moving) {
                 return;
             }
@@ -49238,35 +49245,45 @@
             if (!eventArgsSet?.eventArgs) {
                 return;
             }
-            const { col, row } = eventArgsSet.eventArgs;
-            if (table.hasListeners(TABLE_EVENT_TYPE.CLICK_CELL)) {
-                const cellInfo = table.getCellInfo(col, row);
-                let icon;
-                let position;
-                if (eventArgsSet.eventArgs?.target) {
-                    const iconInfo = getIconAndPositionFromTarget(eventArgsSet.eventArgs?.target);
-                    if (iconInfo) {
-                        icon = iconInfo.icon;
-                        position = iconInfo.position;
+            if (eventManeger.touchSetTimeout || e.pointerType !== 'touch') {
+                if (e.pointerType === 'touch') {
+                    const eventArgsSet = getCellEventArgsSet(e);
+                    if (eventManeger.touchSetTimeout) {
+                        clearTimeout(eventManeger.touchSetTimeout);
+                        eventManeger.dealTableSelect(eventArgsSet);
+                        eventManeger.touchSetTimeout = undefined;
                     }
                 }
-                const cellsEvent = {
-                    ...cellInfo,
-                    event: e.nativeEvent,
-                    cells: [],
-                    targetIcon: icon
-                        ? {
-                            name: icon.name,
-                            position: position,
-                            funcType: icon.attribute.funcType
+                if (table.hasListeners(TABLE_EVENT_TYPE.CLICK_CELL)) {
+                    const { col, row } = eventArgsSet.eventArgs;
+                    const cellInfo = table.getCellInfo(col, row);
+                    let icon;
+                    let position;
+                    if (eventArgsSet.eventArgs?.target) {
+                        const iconInfo = getIconAndPositionFromTarget(eventArgsSet.eventArgs?.target);
+                        if (iconInfo) {
+                            icon = iconInfo.icon;
+                            position = iconInfo.position;
                         }
-                        : undefined,
-                    target: eventArgsSet?.eventArgs?.target
-                };
-                table.fireListeners(TABLE_EVENT_TYPE.CLICK_CELL, cellsEvent);
+                    }
+                    const cellsEvent = {
+                        ...cellInfo,
+                        event: e.nativeEvent,
+                        cells: [],
+                        targetIcon: icon
+                            ? {
+                                name: icon.name,
+                                position: position,
+                                funcType: icon.attribute.funcType
+                            }
+                            : undefined,
+                        target: eventArgsSet?.eventArgs?.target
+                    };
+                    table.fireListeners(TABLE_EVENT_TYPE.CLICK_CELL, cellsEvent);
+                }
             }
         });
-        table.scenegraph.stage.addEventListener('click', (e) => {
+        table.scenegraph.stage.addEventListener('pointertap', (e) => {
             const target = e.target;
             if (target &&
                 !target.isDescendantsOf(table.scenegraph.tableGroup) &&
@@ -49853,7 +49870,9 @@
             }
             const { eventArgs } = eventArgsSet;
             if (eventArgs) {
-                if (!this.table.isPivotChart() && eventArgsSet?.eventArgs?.target.type !== 'chart') {
+                if (!this.table.isPivotChart() &&
+                    eventArgsSet?.eventArgs?.target.type !== 'chart' &&
+                    eventArgs.event.pointerType !== 'touch') {
                     this.table.stateManeger.updateHoverPos(-1, -1);
                 }
                 if (this.table.isPivotChart() &&
@@ -52757,7 +52776,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.12.0-alpha.3";
+        version = "0.12.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -54246,8 +54265,8 @@
                 row,
                 field: this.getHeaderField(col, row),
                 cellHeaderPaths: this.internalProps.layoutMap.getCellHeaderPaths(col, row),
-                title: colDef.title,
-                cellType: colDef.cellType ? (typeof colDef.cellType === 'string' ? colDef.cellType : 'progressbar') : 'text',
+                title: colDef?.title,
+                cellType: colDef?.cellType ? (typeof colDef.cellType === 'string' ? colDef.cellType : 'progressbar') : 'text',
                 originData: this.getCellOriginRecord(col, row),
                 cellRange: this.getCellRangeRelativeRect({ col, row }),
                 value: this.getCellValue(col, row),
@@ -62262,7 +62281,7 @@
         return new Tag(params ? params.attribute : {});
     }
 
-    const version = "0.12.0-alpha.3";
+    const version = "0.12.0";
     function getIcons() {
         return get$1();
     }