@visactor/vtable 0.17.9-alpha.8 → 0.17.9

package/dist/vtable.js

@@ -31767,6 +31767,24 @@
             }
         }
     }
+    function getCellCornerRadius(col, row, table) {
+        const tableCornerRadius = table.theme.frameStyle.cornerRadius;
+        if (tableCornerRadius) {
+            if (col === 0 && row === 0) {
+                return [tableCornerRadius, 0, 0, 0];
+            }
+            else if (col === table.colCount - 1 && row === 0) {
+                return [0, tableCornerRadius, 0, 0];
+            }
+            else if (col === 0 && row === table.rowCount - 1) {
+                return [0, 0, 0, tableCornerRadius];
+            }
+            else if (col === table.colCount - 1 && row === table.rowCount - 1) {
+                return [0, 0, tableCornerRadius, 0];
+            }
+        }
+        return 0;
+    }
 
     let Icon$1 = class Icon extends Image$2 {
         role;
@@ -32735,7 +32753,8 @@
             strokeArrayColor: cellTheme?.group?.strokeArrayColor ?? undefined,
             cursor: cellTheme?.group?.cursor ?? undefined,
             lineCap: 'square',
-            clip: true
+            clip: true,
+            cornerRadius: cellTheme.group.cornerRadius
         });
         cellGroup.role = 'cell';
         cellGroup.col = col;
@@ -33306,7 +33325,8 @@
                 strokeArrayColor: cellTheme?.group?.strokeArrayColor ?? undefined,
                 cursor: cellTheme?.group?.cursor ?? undefined,
                 lineCap: 'square',
-                clip: true
+                clip: true,
+                cornerRadius: cellTheme.group.cornerRadius
             });
             cellGroup.role = 'cell';
             cellGroup.col = col;
@@ -33684,7 +33704,8 @@
                 strokeArrayColor: cellTheme?.group?.strokeArrayColor ?? undefined,
                 cursor: cellTheme?.group?.cursor ?? undefined,
                 lineCap: 'square',
-                clip: true
+                clip: true,
+                cornerRadius: cellTheme.group.cornerRadius
             });
             cellGroup.role = 'cell';
             cellGroup.col = col;
@@ -34409,7 +34430,8 @@
             strokeArrayColor: cellTheme?.group?.strokeArrayColor ?? undefined,
             cursor: cellTheme?.group?.cursor ?? undefined,
             lineCap: 'square',
-            clip: true
+            clip: true,
+            cornerRadius: cellTheme.group.cornerRadius
         });
         cellGroup.role = 'cell';
         cellGroup.col = col;
@@ -34473,7 +34495,8 @@
             strokeArrayColor: cellTheme?.group?.strokeArrayColor ?? undefined,
             cursor: cellTheme?.group?.cursor ?? undefined,
             lineCap: 'square',
-            clip: true
+            clip: true,
+            cornerRadius: cellTheme.group.cornerRadius
         });
         cellGroup.role = 'cell';
         cellGroup.col = col;
@@ -34564,7 +34587,8 @@
                 strokeArrayColor: cellTheme?.group?.strokeArrayColor ?? undefined,
                 cursor: cellTheme?.group?.cursor ?? undefined,
                 lineCap: 'square',
-                clip: true
+                clip: true,
+                cornerRadius: cellTheme.group.cornerRadius
             });
             cellGroup.role = 'cell';
             cellGroup.col = col;
@@ -34838,6 +34862,7 @@
             isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;
         }
         let cellTheme = getStyleTheme(cellStyle, table, isMerge ? range.start.col : col, isMerge ? range.start.row : row, getProp).theme;
+        cellTheme.group.cornerRadius = getCellCornerRadius(col, row, table);
         if (!addNew && !isMerge && canUseFastUpdate(col, row, oldCellGroup, autoWrapText, table)) {
             const cellWidth = table.getColWidth(col);
             const cellHeight = table.getRowHeight(row);
@@ -34850,6 +34875,7 @@
                 strokeArrayWidth: cellTheme?.group?.strokeArrayWidth ?? undefined,
                 strokeArrayColor: cellTheme?.group?.strokeArrayColor ?? undefined,
                 cursor: cellTheme?.group?.cursor ?? undefined,
+                cornerRadius: cellTheme?.group?.cornerRadius ?? 0,
                 y: table.scenegraph.getCellGroupY(row)
             });
             const textMark = oldCellGroup.getChildByName('text');
@@ -34922,6 +34948,7 @@
                 customStyle = customMergeStyle;
                 if (customStyle) {
                     cellTheme = getStyleTheme(customStyle, table, range.start.col, range.start.row, getProp).theme;
+                    cellTheme.group.cornerRadius = getCellCornerRadius(col, row, table);
                 }
             }
         }
@@ -35059,6 +35086,7 @@
             }
             const cellStyle = customStyle || table._getCellStyle(col, row);
             const cellTheme = getStyleTheme(cellStyle, table, range ? range.start.col : col, range ? range.start.row : row, getProp).theme;
+            cellTheme.group.cornerRadius = getCellCornerRadius(col, row, table);
             cellTheme.group.width = colWidth;
             cellTheme.group.height = Array.isArray(defaultRowHeight) ? defaultRowHeight[row] : defaultRowHeight;
             if (cellTheme._vtable.padding) {
@@ -38116,6 +38144,76 @@
             });
         }
     }
+    function updateCornerRadius(table) {
+        if (!table.theme.frameStyle.cornerRadius) {
+            return;
+        }
+        const cornerRadius = table.theme.frameStyle.cornerRadius;
+        const { cornerHeaderGroup, colHeaderGroup, rowHeaderGroup, bodyGroup, rightTopCornerGroup, leftBottomCornerGroup, rightBottomCornerGroup, rightFrozenGroup, bottomFrozenGroup } = table.scenegraph;
+        cornerHeaderGroup.setAttribute('cornerRadius', 0);
+        colHeaderGroup.setAttribute('cornerRadius', 0);
+        rowHeaderGroup.setAttribute('cornerRadius', 0);
+        bodyGroup.setAttribute('cornerRadius', 0);
+        rightTopCornerGroup.setAttribute('cornerRadius', 0);
+        leftBottomCornerGroup.setAttribute('cornerRadius', 0);
+        rightBottomCornerGroup.setAttribute('cornerRadius', 0);
+        rightFrozenGroup.setAttribute('cornerRadius', 0);
+        bottomFrozenGroup.setAttribute('cornerRadius', 0);
+        if (cornerHeaderGroup.attribute.width > 0 && cornerHeaderGroup.attribute.height > 0) {
+            setCornerRadius(cornerHeaderGroup, [cornerRadius, 0, 0, 0]);
+        }
+        else if (colHeaderGroup.attribute.height > 0) {
+            setCornerRadius(colHeaderGroup, [cornerRadius, 0, 0, 0]);
+        }
+        else if (rowHeaderGroup.attribute.width > 0) {
+            setCornerRadius(rowHeaderGroup, [cornerRadius, 0, 0, 0]);
+        }
+        else {
+            setCornerRadius(bodyGroup, [cornerRadius, 0, 0, 0]);
+        }
+        if (leftBottomCornerGroup.attribute.width > 0 && leftBottomCornerGroup.attribute.height > 0) {
+            setCornerRadius(leftBottomCornerGroup, [0, 0, 0, cornerRadius]);
+        }
+        else if (bottomFrozenGroup.attribute.height > 0) {
+            setCornerRadius(bottomFrozenGroup, [0, 0, 0, cornerRadius]);
+        }
+        else if (rowHeaderGroup.attribute.width > 0) {
+            setCornerRadius(rowHeaderGroup, [0, 0, 0, cornerRadius]);
+        }
+        else {
+            setCornerRadius(bodyGroup, [0, 0, 0, cornerRadius]);
+        }
+        if (rightTopCornerGroup.attribute.width > 0 && rightTopCornerGroup.attribute.height > 0) {
+            setCornerRadius(rightTopCornerGroup, [0, cornerRadius, 0, 0]);
+        }
+        else if (colHeaderGroup.attribute.height > 0) {
+            setCornerRadius(colHeaderGroup, [0, cornerRadius, 0, 0]);
+        }
+        else if (rightFrozenGroup.attribute.width > 0) {
+            setCornerRadius(rightFrozenGroup, [0, cornerRadius, 0, 0]);
+        }
+        else {
+            setCornerRadius(bodyGroup, [0, cornerRadius, 0, 0]);
+        }
+        if (rightBottomCornerGroup.attribute.width > 0 && rightBottomCornerGroup.attribute.height > 0) {
+            setCornerRadius(rightBottomCornerGroup, [0, 0, cornerRadius, 0]);
+        }
+        else if (rightFrozenGroup.attribute.width > 0) {
+            setCornerRadius(rightFrozenGroup, [0, 0, cornerRadius, 0]);
+        }
+        else if (bottomFrozenGroup.attribute.height > 0) {
+            setCornerRadius(bottomFrozenGroup, [0, 0, cornerRadius, 0]);
+        }
+        else {
+            setCornerRadius(bodyGroup, [0, 0, cornerRadius, 0]);
+        }
+    }
+    function setCornerRadius(group, cornerRadius) {
+        group.setAttribute('cornerRadius', cornerRadius);
+        if (group.border) {
+            group.border.setAttribute('cornerRadius', cornerRadius);
+        }
+    }
 
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
@@ -38779,7 +38877,7 @@
         useStyle = true;
         order = 0;
         drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb) {
-            const { lineWidth = groupAttribute.lineWidth, stroke = groupAttribute.stroke, lineDash = groupAttribute.lineDash, strokeArrayWidth = groupAttribute.strokeArrayWidth, strokeArrayColor = groupAttribute.strokeArrayColor, notAdjustPos } = group.attribute;
+            const { lineWidth = groupAttribute.lineWidth, stroke = groupAttribute.stroke, lineDash = groupAttribute.lineDash, strokeArrayWidth = groupAttribute.strokeArrayWidth, strokeArrayColor = groupAttribute.strokeArrayColor, notAdjustPos, cornerRadius = groupAttribute.cornerRadius } = group.attribute;
             const { width = groupAttribute.width, height = groupAttribute.height } = group.attribute;
             if (notAdjustPos !== true &&
                 stroke &&
@@ -38792,7 +38890,12 @@
                 context.beginPath();
                 x = Math.floor(x) + 0.5;
                 y = Math.floor(y) + 0.5;
-                context.rect(x, y, widthFroDraw, heightFroDraw);
+                if (cornerRadius) {
+                    createRectPath(context, x, y, widthFroDraw, heightFroDraw, cornerRadius);
+                }
+                else {
+                    context.rect(x, y, widthFroDraw, heightFroDraw);
+                }
                 context.setStrokeStyle(group, group.attribute, x, y, groupAttribute);
                 context.stroke();
             }
@@ -40324,7 +40427,7 @@
                 let maxHeight = 0;
                 for (let col = this.table.colCount - this.table.rightFrozenColCount; col < this.table.colCount; col++) {
                     const colGroup = this.table.scenegraph.getColGroup(col);
-                    const cellLocation = this.table.isListTable() ? 'body' : 'rowHeader';
+                    const cellLocation = this.table.isPivotChart() ? 'rowHeader' : 'body';
                     const { height } = createComplexColumn(colGroup, col, colGroup.attribute.width, this.currentRow + 1, endRow, this.table.scenegraph.mergeMap, this.table.internalProps.defaultRowHeight, this.table, cellLocation);
                     maxHeight = Math.max(maxHeight, height);
                     this.table.scenegraph.rightFrozenGroup.setAttribute('height', maxHeight);
@@ -43892,20 +43995,20 @@
                 this.bodyGroup.appendChild(this.bodyGroup.border);
                 updateFrameBorderSize(this.bodyGroup);
                 if (this.rowHeaderGroup.attribute.width === 0) {
-                    updateFrameBorder(this.bodyGroup, this.table.theme.bodyStyle.frameStyle, [true, true, true, true]);
+                    updateFrameBorder(this.bodyGroup, this.table.theme.bodyStyle.frameStyle);
                 }
                 else {
-                    updateFrameBorder(this.bodyGroup, this.table.theme.bodyStyle.frameStyle, [true, true, true, false]);
+                    updateFrameBorder(this.bodyGroup, this.table.theme.bodyStyle.frameStyle);
                 }
             }
             if (this.colHeaderGroup.border) {
                 this.colHeaderGroup.appendChild(this.colHeaderGroup.border);
                 updateFrameBorderSize(this.colHeaderGroup);
                 if (this.cornerHeaderGroup.attribute.width === 0) {
-                    updateFrameBorder(this.colHeaderGroup, this.table.theme.headerStyle.frameStyle, [true, true, true, true]);
+                    updateFrameBorder(this.colHeaderGroup, this.table.theme.headerStyle.frameStyle);
                 }
                 else {
-                    updateFrameBorder(this.colHeaderGroup, this.table.theme.headerStyle.frameStyle, [true, true, true, false]);
+                    updateFrameBorder(this.colHeaderGroup, this.table.theme.headerStyle.frameStyle);
                 }
             }
             if (this.rowHeaderGroup.border) {
@@ -43916,6 +44019,7 @@
                 this.cornerHeaderGroup.appendChild(this.cornerHeaderGroup.border);
                 updateFrameBorderSize(this.cornerHeaderGroup);
             }
+            updateCornerRadius(this.table);
         }
         sortCell() {
             if (this.isPivot) ;
@@ -46349,7 +46453,7 @@
             if (!eventArgsSet?.eventArgs) {
                 return;
             }
-            if (eventManager.touchSetTimeout || e.pointerType !== 'touch') {
+            if (eventManager.touchSetTimeout) {
                 if (e.pointerType === 'touch') {
                     const eventArgsSet = getCellEventArgsSet(e);
                     if (eventManager.touchSetTimeout) {
@@ -46359,34 +46463,34 @@
                         eventManager.touchSetTimeout = undefined;
                     }
                 }
-                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;
-                        }
+            }
+            if (!eventManager.touchMove && 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;
                     }
-                    const cellsEvent = {
-                        ...cellInfo,
-                        event: e.nativeEvent,
-                        federatedEvent: e,
-                        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);
                 }
+                const cellsEvent = {
+                    ...cellInfo,
+                    event: e.nativeEvent,
+                    federatedEvent: e,
+                    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('pointerdown', (e) => {
@@ -49068,11 +49172,6 @@
                     return;
                 }
                 const { col, row } = e;
-                if (e.related) {
-                    if (this._isBindCell(col, row)) {
-                        return;
-                    }
-                }
                 let tooltipOption;
                 const headerDescription = table.getHeaderDescription(col, row);
                 if (headerDescription) {
@@ -49129,11 +49228,6 @@
                 }
             });
             table.on(TABLE_EVENT_TYPE.MOUSELEAVE_CELL, e => {
-                if (e.related) {
-                    if (this._isBindCell(e.related.col, e.related.row)) {
-                        return;
-                    }
-                }
                 this._unbindFromCell();
             });
             table.on(TABLE_EVENT_TYPE.SELECTED_CELL, e => {
@@ -50206,7 +50300,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.17.9-alpha.8";
+        version = "0.17.9";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -56879,11 +56973,12 @@
                         const rowDimension = rowHeaderPaths[i];
                         for (let j = 0; j < rowArr.length; j++) {
                             const dimension = rowArr[j];
-                            if (((!isValid$1(rowDimension.indicatorKey) &&
+                            if ((!isValid$1(rowDimension.indicatorKey) &&
                                 dimension.dimensionKey === rowDimension.dimensionKey &&
                                 dimension.value === rowDimension.value) ||
-                                (isValid$1(rowDimension.indicatorKey) && dimension.indicatorKey === rowDimension.indicatorKey)) &&
-                                dimension.value === rowDimension.value) {
+                                (isValid$1(rowDimension.indicatorKey) &&
+                                    dimension.indicatorKey === rowDimension.indicatorKey &&
+                                    (!rowDimension.value || dimension.value === rowDimension.value))) {
                                 rowArr = dimension.children;
                                 if (needLowestLevel && !rowArr) {
                                     rowDimensionFinded = dimension;
@@ -57966,15 +58061,19 @@
             this.needSplitPositiveAndNegative = needSplitPositiveAndNegative ?? false;
             this.rowsIsTotal = new Array(this.rows?.length ?? 0).fill(false);
             this.colsIsTotal = new Array(this.columns?.length ?? 0).fill(false);
-            for (let i = 0, len = this.totals?.row?.subTotalsDimensions?.length; i < len; i++) {
-                const dimension = this.totals.row.subTotalsDimensions[i];
-                const dimensionIndex = this.rows.indexOf(dimension);
-                this.rowsIsTotal[dimensionIndex] = true;
+            if (this.totals?.row?.showSubTotals) {
+                for (let i = 0, len = this.totals?.row?.subTotalsDimensions?.length; i < len; i++) {
+                    const dimension = this.totals.row.subTotalsDimensions[i];
+                    const dimensionIndex = this.rows.indexOf(dimension);
+                    this.rowsIsTotal[dimensionIndex] = true;
+                }
             }
-            for (let i = 0, len = this.totals?.column?.subTotalsDimensions?.length; i < len; i++) {
-                const dimension = this.totals.column.subTotalsDimensions[i];
-                const dimensionIndex = this.columns.indexOf(dimension);
-                this.colsIsTotal[dimensionIndex] = true;
+            if (this.totals?.column?.showSubTotals) {
+                for (let i = 0, len = this.totals?.column?.subTotalsDimensions?.length; i < len; i++) {
+                    const dimension = this.totals.column.subTotalsDimensions[i];
+                    const dimensionIndex = this.columns.indexOf(dimension);
+                    this.colsIsTotal[dimensionIndex] = true;
+                }
             }
             this.setRecords(records);
         }
@@ -60493,6 +60592,55 @@
             }
             return null;
         }
+        getCellAddressByRecord(record) {
+            const rowHeaderPaths = [];
+            const colHeaderPaths = [];
+            const recordKeyMapToIndicatorKeys = {};
+            const indicatorRecordKeys = [];
+            this.dataset.dataConfig.aggregationRules.forEach(aggregationRule => {
+                if (typeof aggregationRule.field === 'string') {
+                    recordKeyMapToIndicatorKeys[aggregationRule.field] = aggregationRule.indicatorKey;
+                    indicatorRecordKeys.push(aggregationRule.field);
+                }
+                else {
+                    for (let i = 0; i < aggregationRule.field.length; i++) {
+                        recordKeyMapToIndicatorKeys[aggregationRule.field[i]] = aggregationRule.indicatorKey;
+                        indicatorRecordKeys.push(aggregationRule.field[i]);
+                    }
+                }
+            });
+            for (const key in record) {
+                if (this.dataset.rows.indexOf(key) >= 0) {
+                    rowHeaderPaths.push({
+                        dimensionKey: key,
+                        value: record[key]
+                    });
+                }
+                if (this.dataset.columns.indexOf(key) >= 0) {
+                    colHeaderPaths.push({
+                        dimensionKey: key,
+                        value: record[key]
+                    });
+                }
+                if (indicatorRecordKeys.indexOf(key) >= 0) {
+                    if (this.dataset.indicatorsAsCol) {
+                        colHeaderPaths.push({
+                            indicatorKey: recordKeyMapToIndicatorKeys[key]
+                        });
+                    }
+                    else {
+                        rowHeaderPaths.push({
+                            indicatorKey: recordKeyMapToIndicatorKeys[key]
+                        });
+                    }
+                }
+            }
+            return this.getCellAddressByHeaderPaths({
+                rowHeaderPaths,
+                colHeaderPaths,
+                cellLocation: 'body'
+            });
+        }
         getChartInstance(cellHeaderPaths) {
             const cellAddr = this.getCellAddressByHeaderPaths(cellHeaderPaths);
             if (cellAddr) {
@@ -61125,7 +61273,7 @@
         return new Tag$1(params ? params.attribute : {});
     }
 
-    const version = "0.17.9-alpha.8";
+    const version = "0.17.9";
     function getIcons() {
         return get$2();
     }