@visactor/vtable 1.26.5 → 1.26.7

package/es/scenegraph/scenegraph.js

@@ -600,79 +600,108 @@ export class Scenegraph {
         this.proxy.progress(), this.updateNextFrame();
     }
     updateTableSize() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _a, _b, _c;
         const contentWidth = Math.max(this.colHeaderGroup.attribute.width, this.bodyGroup.attribute.width, this.bottomFrozenGroup.attribute.width, 0) + Math.max(this.cornerHeaderGroup.attribute.width, this.rowHeaderGroup.attribute.width, this.leftBottomCornerGroup.attribute.width, 0) + Math.max(this.rightTopCornerGroup.attribute.width, this.rightFrozenGroup.attribute.width, this.rightBottomCornerGroup.attribute.width, 0), contentHeight = Math.max(this.colHeaderGroup.attribute.height, this.cornerHeaderGroup.attribute.height, this.rightTopCornerGroup.attribute.height, 0) + Math.max(this.rowHeaderGroup.attribute.height, this.bodyGroup.attribute.height, this.rightFrozenGroup.attribute.height, 0) + Math.max(this.leftBottomCornerGroup.attribute.height, this.bottomFrozenGroup.attribute.height, this.rightBottomCornerGroup.attribute.height, 0);
         let tableWidth = contentWidth, tableHeight = contentHeight;
-        if (tableWidth = (null === (_a = this.table.containerFit) || void 0 === _a ? void 0 : _a.width) ? this.table.tableNoFrameWidth : Math.min(this.table.tableNoFrameWidth, contentWidth), 
+        tableWidth = (null === (_a = this.table.containerFit) || void 0 === _a ? void 0 : _a.width) ? this.table.tableNoFrameWidth : Math.min(this.table.tableNoFrameWidth, contentWidth), 
         tableHeight = (null === (_b = this.table.containerFit) || void 0 === _b ? void 0 : _b.height) ? this.table.tableNoFrameHeight : Math.min(this.table.tableNoFrameHeight, contentHeight), 
         this.tableGroup.setAttributes({
             x: this.table.tableX,
             y: this.table.tableY,
             width: tableWidth,
             height: tableHeight
-        }), this.tableGroup.border) {
-            const rectAttributes = null === (_c = this.tableGroup.border) || void 0 === _c ? void 0 : _c.attribute;
-            let borderTop, borderRight, borderBottom, borderLeft;
-            (null == rectAttributes ? void 0 : rectAttributes.strokeArrayWidth) ? (borderTop = rectAttributes.strokeArrayWidth ? rectAttributes.strokeArrayWidth[0] : null !== (_d = rectAttributes.lineWidth) && void 0 !== _d ? _d : 0, 
-            borderRight = rectAttributes.strokeArrayWidth ? rectAttributes.strokeArrayWidth[1] : null !== (_e = rectAttributes.lineWidth) && void 0 !== _e ? _e : 0, 
-            borderBottom = rectAttributes.strokeArrayWidth ? rectAttributes.strokeArrayWidth[2] : null !== (_f = rectAttributes.lineWidth) && void 0 !== _f ? _f : 0, 
-            borderLeft = rectAttributes.strokeArrayWidth ? rectAttributes.strokeArrayWidth[3] : null !== (_g = rectAttributes.lineWidth) && void 0 !== _g ? _g : 0) : (borderTop = null !== (_h = null == rectAttributes ? void 0 : rectAttributes.lineWidth) && void 0 !== _h ? _h : 0, 
-            borderRight = null !== (_j = null == rectAttributes ? void 0 : rectAttributes.lineWidth) && void 0 !== _j ? _j : 0, 
-            borderBottom = null !== (_k = null == rectAttributes ? void 0 : rectAttributes.lineWidth) && void 0 !== _k ? _k : 0, 
-            borderLeft = null !== (_l = null == rectAttributes ? void 0 : rectAttributes.lineWidth) && void 0 !== _l ? _l : 0), 
-            "rect" === this.tableGroup.border.type ? (null === (_m = this.table.theme.frameStyle) || void 0 === _m ? void 0 : _m.innerBorder) ? this.tableGroup.border.setAttributes({
-                x: this.table.tableX + borderLeft / 2,
-                y: this.table.tableY + borderTop / 2,
-                width: this.tableGroup.attribute.width - borderLeft / 2 - borderRight / 2,
-                height: this.tableGroup.attribute.height - borderTop / 2 - borderBottom / 2
-            }) : this.tableGroup.border.setAttributes({
-                x: this.table.tableX - borderLeft / 2,
-                y: this.table.tableY - borderTop / 2,
-                width: this.tableGroup.attribute.width + borderLeft / 2 + borderRight / 2,
-                height: this.tableGroup.attribute.height + borderTop / 2 + borderBottom / 2
-            }) : "group" === this.tableGroup.border.type && ((null === (_o = this.table.theme.frameStyle) || void 0 === _o ? void 0 : _o.innerBorder) ? (this.tableGroup.border.setAttributes({
-                x: this.table.tableX + borderLeft / 2,
-                y: this.table.tableY + borderTop / 2,
-                width: this.tableGroup.attribute.width - borderLeft / 2 - borderRight / 2,
-                height: this.tableGroup.attribute.height - borderTop / 2 - borderBottom / 2
-            }), null === (_p = this.tableGroup.border.firstChild) || void 0 === _p || _p.setAttributes({
+        });
+        const hasFrozenCols = this.table.frozenColCount > 0, hasRightFrozenCols = this.table.rightFrozenColCount > 0, hasFrozenRows = this.table.frozenRowCount > 0, hasBottomFrozenRows = this.table.bottomFrozenRowCount > 0;
+        if (hasBottomFrozenRows) {
+            const bottomFrozenRowsHeight = this.table.getBottomFrozenRowsHeight(), topFrozenBottom = Math.max(this.colHeaderGroup.attribute.y + this.colHeaderGroup.attribute.height, this.cornerHeaderGroup.attribute.y + this.cornerHeaderGroup.attribute.height, this.rightTopCornerGroup.attribute.y + this.rightTopCornerGroup.attribute.height), middleContentBottom = Math.max(this.rowHeaderGroup.attribute.y + this.rowHeaderGroup.attribute.height, this.bodyGroup.attribute.y + this.bodyGroup.attribute.height, this.rightFrozenGroup.attribute.y + this.rightFrozenGroup.attribute.height, topFrozenBottom), bottomFrozenY = Math.min(this.tableGroup.attribute.height - bottomFrozenRowsHeight, middleContentBottom);
+            this.bottomFrozenGroup.setAttribute("y", bottomFrozenY), this.leftBottomCornerGroup.setAttributes({
+                visible: hasFrozenCols,
+                y: bottomFrozenY,
+                height: bottomFrozenRowsHeight,
+                width: hasFrozenCols ? this.table.getFrozenColsWidth() : 0
+            }), this.rightBottomCornerGroup.setAttributes({
+                visible: hasRightFrozenCols,
                 x: 0,
-                y: 0,
-                width: this.tableGroup.attribute.width - borderLeft / 2 - borderRight / 2,
-                height: this.tableGroup.attribute.height - borderTop / 2 - borderBottom / 2
-            })) : (this.tableGroup.border.setAttributes({
-                x: this.table.tableX - borderLeft / 2,
-                y: this.table.tableY - borderTop / 2,
-                width: this.tableGroup.attribute.width + borderLeft / 2 + borderRight / 2,
-                height: this.tableGroup.attribute.height + borderTop / 2 + borderBottom / 2
-            }), null === (_q = this.tableGroup.border.firstChild) || void 0 === _q || _q.setAttributes({
-                x: borderLeft / 2,
-                y: borderTop / 2,
-                width: this.tableGroup.attribute.width,
-                height: this.tableGroup.attribute.height
-            })));
-        }
-        this.table.bottomFrozenRowCount > 0 && (this.bottomFrozenGroup.setAttribute("y", this.tableGroup.attribute.height - this.table.getBottomFrozenRowsHeight()), 
-        this.leftBottomCornerGroup.setAttributes({
-            visible: !0,
-            y: this.tableGroup.attribute.height - this.table.getBottomFrozenRowsHeight(),
-            height: this.table.getBottomFrozenRowsHeight(),
-            width: this.table.getFrozenColsWidth()
-        }), this.rightBottomCornerGroup.setAttributes({
-            visible: !0,
-            y: this.tableGroup.attribute.height - this.table.getBottomFrozenRowsHeight(),
-            height: this.table.getBottomFrozenRowsHeight()
-        })), this.table.rightFrozenColCount > 0 && (this.rightFrozenGroup.setAttribute("x", this.tableGroup.attribute.width - this.table.getRightFrozenColsWidth()), 
-        this.rightTopCornerGroup.setAttributes({
-            visible: !0,
-            x: this.tableGroup.attribute.width - this.table.getRightFrozenColsWidth(),
-            width: this.table.getRightFrozenColsWidth(),
-            height: this.table.getFrozenRowsHeight()
+                y: bottomFrozenY,
+                width: 0,
+                height: bottomFrozenRowsHeight
+            });
+        } else this.leftBottomCornerGroup.setAttributes({
+            visible: !1,
+            width: 0,
+            height: 0
         }), this.rightBottomCornerGroup.setAttributes({
-            visible: !0,
-            x: this.tableGroup.attribute.width - this.table.getRightFrozenColsWidth(),
-            width: this.table.getRightFrozenColsWidth()
-        })), this.updateDomContainer();
+            visible: !1,
+            width: 0,
+            height: 0
+        });
+        if (hasRightFrozenCols) {
+            const rightFrozenColsWidth = this.table.getRightFrozenColsWidth(), middleContentRight = Math.max(this.colHeaderGroup.attribute.x + this.colHeaderGroup.attribute.width, this.bodyGroup.attribute.x + this.bodyGroup.attribute.width, this.bottomFrozenGroup.attribute.x + this.bottomFrozenGroup.attribute.width), rightFrozenX = Math.min(this.tableGroup.attribute.width - rightFrozenColsWidth, middleContentRight);
+            this.rightFrozenGroup.setAttribute("x", rightFrozenX), this.rightTopCornerGroup.setAttributes({
+                visible: hasFrozenRows,
+                x: rightFrozenX,
+                width: hasFrozenRows ? rightFrozenColsWidth : 0,
+                height: hasFrozenRows ? this.table.getFrozenRowsHeight() : 0
+            }), this.rightBottomCornerGroup.setAttributes({
+                visible: hasBottomFrozenRows,
+                x: rightFrozenX,
+                width: hasBottomFrozenRows ? rightFrozenColsWidth : 0,
+                height: hasBottomFrozenRows ? this.table.getBottomFrozenRowsHeight() : 0
+            });
+        } else this.rightTopCornerGroup.setAttributes({
+            visible: !1,
+            width: 0,
+            height: 0
+        });
+        if (hasBottomFrozenRows && !(null === (_c = this.table.containerFit) || void 0 === _c ? void 0 : _c.height)) {
+            const actualContentBottom = Math.max(this.colHeaderGroup.attribute.y + this.colHeaderGroup.attribute.height, this.cornerHeaderGroup.attribute.y + this.cornerHeaderGroup.attribute.height, this.rightTopCornerGroup.attribute.y + this.rightTopCornerGroup.attribute.height, this.rowHeaderGroup.attribute.y + this.rowHeaderGroup.attribute.height, this.bodyGroup.attribute.y + this.bodyGroup.attribute.height, this.rightFrozenGroup.attribute.y + this.rightFrozenGroup.attribute.height, this.leftBottomCornerGroup.attribute.y + this.leftBottomCornerGroup.attribute.height, this.bottomFrozenGroup.attribute.y + this.bottomFrozenGroup.attribute.height, this.rightBottomCornerGroup.attribute.y + this.rightBottomCornerGroup.attribute.height);
+            actualContentBottom > 0 && actualContentBottom < this.tableGroup.attribute.height && this.tableGroup.setAttribute("height", actualContentBottom);
+        }
+        this.updateTableGroupBorder(), this.updateDomContainer();
+    }
+    updateTableGroupBorder() {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        if (!this.tableGroup.border) return;
+        const rectAttributes = null === (_a = this.tableGroup.border) || void 0 === _a ? void 0 : _a.attribute;
+        let borderTop, borderRight, borderBottom, borderLeft;
+        (null == rectAttributes ? void 0 : rectAttributes.strokeArrayWidth) ? (borderTop = rectAttributes.strokeArrayWidth ? rectAttributes.strokeArrayWidth[0] : null !== (_b = rectAttributes.lineWidth) && void 0 !== _b ? _b : 0, 
+        borderRight = rectAttributes.strokeArrayWidth ? rectAttributes.strokeArrayWidth[1] : null !== (_c = rectAttributes.lineWidth) && void 0 !== _c ? _c : 0, 
+        borderBottom = rectAttributes.strokeArrayWidth ? rectAttributes.strokeArrayWidth[2] : null !== (_d = rectAttributes.lineWidth) && void 0 !== _d ? _d : 0, 
+        borderLeft = rectAttributes.strokeArrayWidth ? rectAttributes.strokeArrayWidth[3] : null !== (_e = rectAttributes.lineWidth) && void 0 !== _e ? _e : 0) : (borderTop = null !== (_f = null == rectAttributes ? void 0 : rectAttributes.lineWidth) && void 0 !== _f ? _f : 0, 
+        borderRight = null !== (_g = null == rectAttributes ? void 0 : rectAttributes.lineWidth) && void 0 !== _g ? _g : 0, 
+        borderBottom = null !== (_h = null == rectAttributes ? void 0 : rectAttributes.lineWidth) && void 0 !== _h ? _h : 0, 
+        borderLeft = null !== (_j = null == rectAttributes ? void 0 : rectAttributes.lineWidth) && void 0 !== _j ? _j : 0), 
+        "rect" === this.tableGroup.border.type ? (null === (_k = this.table.theme.frameStyle) || void 0 === _k ? void 0 : _k.innerBorder) ? this.tableGroup.border.setAttributes({
+            x: this.table.tableX + borderLeft / 2,
+            y: this.table.tableY + borderTop / 2,
+            width: this.tableGroup.attribute.width - borderLeft / 2 - borderRight / 2,
+            height: this.tableGroup.attribute.height - borderTop / 2 - borderBottom / 2
+        }) : this.tableGroup.border.setAttributes({
+            x: this.table.tableX - borderLeft / 2,
+            y: this.table.tableY - borderTop / 2,
+            width: this.tableGroup.attribute.width + borderLeft / 2 + borderRight / 2,
+            height: this.tableGroup.attribute.height + borderTop / 2 + borderBottom / 2
+        }) : "group" === this.tableGroup.border.type && ((null === (_l = this.table.theme.frameStyle) || void 0 === _l ? void 0 : _l.innerBorder) ? (this.tableGroup.border.setAttributes({
+            x: this.table.tableX + borderLeft / 2,
+            y: this.table.tableY + borderTop / 2,
+            width: this.tableGroup.attribute.width - borderLeft / 2 - borderRight / 2,
+            height: this.tableGroup.attribute.height - borderTop / 2 - borderBottom / 2
+        }), null === (_m = this.tableGroup.border.firstChild) || void 0 === _m || _m.setAttributes({
+            x: 0,
+            y: 0,
+            width: this.tableGroup.attribute.width - borderLeft / 2 - borderRight / 2,
+            height: this.tableGroup.attribute.height - borderTop / 2 - borderBottom / 2
+        })) : (this.tableGroup.border.setAttributes({
+            x: this.table.tableX - borderLeft / 2,
+            y: this.table.tableY - borderTop / 2,
+            width: this.tableGroup.attribute.width + borderLeft / 2 + borderRight / 2,
+            height: this.tableGroup.attribute.height + borderTop / 2 + borderBottom / 2
+        }), null === (_o = this.tableGroup.border.firstChild) || void 0 === _o || _o.setAttributes({
+            x: borderLeft / 2,
+            y: borderTop / 2,
+            width: this.tableGroup.attribute.width,
+            height: this.tableGroup.attribute.height
+        })));
     }
     updateRowHeight(row, detaY, skipTableHeightMap) {
         detaY = Math.round(detaY), updateRowHeight(this, row, detaY, skipTableHeightMap), 
@@ -1025,7 +1054,7 @@ export class Scenegraph {
     updateCellContentWhileResize(col, row) {
         var _a;
         const type = (null === (_a = this.table.getCellRawRecord(col, row)) || void 0 === _a ? void 0 : _a.vtableMerge) ? "text" : this.table.getCellType(col, row), cellGroup = this.getCell(col, row);
-        "image" !== type && "video" !== type || updateImageCellContentWhileResize(cellGroup, col, row, 0, 0, this.table);
+        "image" !== type && "video" !== type && "audio" !== type || updateImageCellContentWhileResize(cellGroup, col, row, 0, 0, this.table);
     }
     createFrameBorder() {
         var _a, _b, _c, _d, _e;