@visactor/vtable 1.26.2 → 1.26.3-alpha.0

package/cjs/scenegraph/component/util.d.ts

@@ -1,3 +1,4 @@
 import type { BaseTableAPI } from '../../ts-types/base-table';
+export declare function getBodyHorizontalScrollRange(table: BaseTableAPI): number;
 export declare function getColX(col: number, table: BaseTableAPI, isRightFrozen?: boolean): number;
 export declare function getRowY(row: number, table: BaseTableAPI, isBottomFrozen?: boolean): number;

package/cjs/scenegraph/component/util.js

@@ -1,5 +1,11 @@
 "use strict";
 
+function getBodyHorizontalScrollRange(table) {
+    var _a, _b, _c, _d;
+    const totalWidth = table.getAllColsWidth(), frozenColsWidth = table.getFrozenColsWidth(), rightFrozenColsWidth = table.getRightFrozenColsWidth(), frozenColsContentWidth = null !== (_b = null === (_a = table.getFrozenColsContentWidth) || void 0 === _a ? void 0 : _a.call(table)) && void 0 !== _b ? _b : frozenColsWidth, rightFrozenColsContentWidth = null !== (_d = null === (_c = table.getRightFrozenColsContentWidth) || void 0 === _c ? void 0 : _c.call(table)) && void 0 !== _d ? _d : rightFrozenColsWidth, bodyViewportWidth = table.tableNoFrameWidth - frozenColsWidth - rightFrozenColsWidth, bodyContentWidth = totalWidth - frozenColsContentWidth - rightFrozenColsContentWidth;
+    return Math.max(0, bodyContentWidth - bodyViewportWidth);
+}
+
 function getColX(col, table, isRightFrozen) {
     var _a, _b, _c, _d, _e, _f;
     if (isRightFrozen) return Math.min(table.tableNoFrameWidth, table.getAllColsWidth()) - table.getColsWidth(col, table.colCount - 1) + (null !== (_b = null === (_a = table.getRightFrozenColsScrollLeft) || void 0 === _a ? void 0 : _a.call(table)) && void 0 !== _b ? _b : 0);
@@ -17,5 +23,7 @@ function getRowY(row, table, isBottomFrozen) {
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.getRowY = exports.getColX = void 0, exports.getColX = getColX, exports.getRowY = getRowY;
+}), exports.getRowY = exports.getColX = exports.getBodyHorizontalScrollRange = void 0, 
+exports.getBodyHorizontalScrollRange = getBodyHorizontalScrollRange, exports.getColX = getColX, 
+exports.getRowY = getRowY;
 //# sourceMappingURL=util.js.map

package/cjs/scenegraph/component/util.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/component/util.ts"],"names":[],"mappings":";;;AAEA,SAAgB,OAAO,CAAC,GAAW,EAAE,KAAmB,EAAE,aAAuB;;IAC/E,IAAI,aAAa,EAAE;QAGjB,OAAO,CACL,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,eAAe,EAAE,CAAC;YAC1D,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC;YAC3C,CAAC,MAAA,MAAA,KAAK,CAAC,4BAA4B,qDAAI,mCAAI,CAAC,CAAC,CAC9C,CAAC;KACH;IACD,MAAM,YAAY,GAAG,MAAA,MAAA,KAAK,CAAC,mBAAmB,qDAAI,mCAAI,CAAC,CAAC;IACxD,MAAM,gBAAgB,GAAG,MAAA,MAAA,KAAK,CAAC,uBAAuB,qDAAI,mCAAI,CAAC,CAAC;IAChE,IAAI,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACtC,IAAI,GAAG,IAAI,KAAK,CAAC,cAAc,EAAE;QAC/B,IAAI,IAAI,KAAK,CAAC,UAAU,GAAG,YAAY,CAAC;KACzC;SAAM;QACL,IAAI,IAAI,gBAAgB,CAAC;KAC1B;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAnBD,0BAmBC;AAED,SAAgB,OAAO,CAAC,GAAW,EAAE,KAAmB,EAAE,cAAwB;IAChF,IAAI,cAAc,EAAE;QAClB,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,gBAAgB,EAAE,CAAC,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;KACnH;IACD,IAAI,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACvC,IAAI,GAAG,IAAI,KAAK,CAAC,cAAc,EAAE;QAC/B,IAAI,IAAI,KAAK,CAAC,SAAS,CAAC;KACzB;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AATD,0BASC","file":"util.js","sourcesContent":["import type { BaseTableAPI } from '../../ts-types/base-table';\n\nexport function getColX(col: number, table: BaseTableAPI, isRightFrozen?: boolean) {\n  if (isRightFrozen) {\n    // 右冻结列的 x 位置以“表格最右侧”为基准向左累加。\n    // 当开启右冻结区域内部滚动时，需要叠加右冻结的 scrollLeft，使得列在右冻结视口内可左右移动。\n    return (\n      Math.min(table.tableNoFrameWidth, table.getAllColsWidth()) -\n      table.getColsWidth(col, table.colCount - 1) +\n      (table.getRightFrozenColsScrollLeft?.() ?? 0)\n    );\n  }\n  const frozenOffset = table.getFrozenColsOffset?.() ?? 0;\n  const frozenScrollLeft = table.getFrozenColsScrollLeft?.() ?? 0;\n  let colX = table.getColsWidth(0, col);\n  if (col >= table.frozenColCount) {\n    colX -= table.scrollLeft + frozenOffset;\n  } else {\n    colX -= frozenScrollLeft;\n  }\n  return colX;\n}\n\nexport function getRowY(row: number, table: BaseTableAPI, isBottomFrozen?: boolean) {\n  if (isBottomFrozen) {\n    return Math.min(table.tableNoFrameWidth, table.getAllRowsHeight()) - table.getRowsHeight(row, table.rowCount - 1);\n  }\n  let rowY = table.getRowsHeight(0, row);\n  if (row >= table.frozenRowCount) {\n    rowY -= table.scrollTop;\n  }\n  return rowY;\n}\n"]}
+{"version":3,"sources":["../src/scenegraph/component/util.ts"],"names":[],"mappings":";;;AAEA,SAAgB,4BAA4B,CAAC,KAAmB;;IAC9D,MAAM,UAAU,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC;IAC3C,MAAM,eAAe,GAAG,KAAK,CAAC,kBAAkB,EAAE,CAAC;IACnD,MAAM,oBAAoB,GAAG,KAAK,CAAC,uBAAuB,EAAE,CAAC;IAC7D,MAAM,sBAAsB,GAAG,MAAA,MAAA,KAAK,CAAC,yBAAyB,qDAAI,mCAAI,eAAe,CAAC;IACtF,MAAM,2BAA2B,GAAG,MAAA,MAAA,KAAK,CAAC,8BAA8B,qDAAI,mCAAI,oBAAoB,CAAC;IACrG,MAAM,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,GAAG,eAAe,GAAG,oBAAoB,CAAC;IAC3F,MAAM,gBAAgB,GAAG,UAAU,GAAG,sBAAsB,GAAG,2BAA2B,CAAC;IAE3F,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,gBAAgB,GAAG,iBAAiB,CAAC,CAAC;AAC3D,CAAC;AAVD,oEAUC;AAED,SAAgB,OAAO,CAAC,GAAW,EAAE,KAAmB,EAAE,aAAuB;;IAC/E,IAAI,aAAa,EAAE;QAGjB,OAAO,CACL,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,eAAe,EAAE,CAAC;YAC1D,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC;YAC3C,CAAC,MAAA,MAAA,KAAK,CAAC,4BAA4B,qDAAI,mCAAI,CAAC,CAAC,CAC9C,CAAC;KACH;IACD,MAAM,YAAY,GAAG,MAAA,MAAA,KAAK,CAAC,mBAAmB,qDAAI,mCAAI,CAAC,CAAC;IACxD,MAAM,gBAAgB,GAAG,MAAA,MAAA,KAAK,CAAC,uBAAuB,qDAAI,mCAAI,CAAC,CAAC;IAChE,IAAI,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACtC,IAAI,GAAG,IAAI,KAAK,CAAC,cAAc,EAAE;QAC/B,IAAI,IAAI,KAAK,CAAC,UAAU,GAAG,YAAY,CAAC;KACzC;SAAM;QACL,IAAI,IAAI,gBAAgB,CAAC;KAC1B;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAnBD,0BAmBC;AAED,SAAgB,OAAO,CAAC,GAAW,EAAE,KAAmB,EAAE,cAAwB;IAChF,IAAI,cAAc,EAAE;QAClB,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,gBAAgB,EAAE,CAAC,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;KACnH;IACD,IAAI,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACvC,IAAI,GAAG,IAAI,KAAK,CAAC,cAAc,EAAE;QAC/B,IAAI,IAAI,KAAK,CAAC,SAAS,CAAC;KACzB;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AATD,0BASC","file":"util.js","sourcesContent":["import type { BaseTableAPI } from '../../ts-types/base-table';\n\nexport function getBodyHorizontalScrollRange(table: BaseTableAPI) {\n  const totalWidth = table.getAllColsWidth();\n  const frozenColsWidth = table.getFrozenColsWidth();\n  const rightFrozenColsWidth = table.getRightFrozenColsWidth();\n  const frozenColsContentWidth = table.getFrozenColsContentWidth?.() ?? frozenColsWidth;\n  const rightFrozenColsContentWidth = table.getRightFrozenColsContentWidth?.() ?? rightFrozenColsWidth;\n  const bodyViewportWidth = table.tableNoFrameWidth - frozenColsWidth - rightFrozenColsWidth;\n  const bodyContentWidth = totalWidth - frozenColsContentWidth - rightFrozenColsContentWidth;\n\n  return Math.max(0, bodyContentWidth - bodyViewportWidth);\n}\n\nexport function getColX(col: number, table: BaseTableAPI, isRightFrozen?: boolean) {\n  if (isRightFrozen) {\n    // 右冻结列的 x 位置以“表格最右侧”为基准向左累加。\n    // 当开启右冻结区域内部滚动时，需要叠加右冻结的 scrollLeft，使得列在右冻结视口内可左右移动。\n    return (\n      Math.min(table.tableNoFrameWidth, table.getAllColsWidth()) -\n      table.getColsWidth(col, table.colCount - 1) +\n      (table.getRightFrozenColsScrollLeft?.() ?? 0)\n    );\n  }\n  const frozenOffset = table.getFrozenColsOffset?.() ?? 0;\n  const frozenScrollLeft = table.getFrozenColsScrollLeft?.() ?? 0;\n  let colX = table.getColsWidth(0, col);\n  if (col >= table.frozenColCount) {\n    colX -= table.scrollLeft + frozenOffset;\n  } else {\n    colX -= frozenScrollLeft;\n  }\n  return colX;\n}\n\nexport function getRowY(row: number, table: BaseTableAPI, isBottomFrozen?: boolean) {\n  if (isBottomFrozen) {\n    return Math.min(table.tableNoFrameWidth, table.getAllRowsHeight()) - table.getRowsHeight(row, table.rowCount - 1);\n  }\n  let rowY = table.getRowsHeight(0, row);\n  if (row >= table.frozenRowCount) {\n    rowY -= table.scrollTop;\n  }\n  return rowY;\n}\n"]}

package/cjs/scenegraph/scenegraph.js

@@ -677,7 +677,7 @@ class Scenegraph {
         let lastBodyCol = this.bodyGroup.lastChild;
         lastBodyCol && "group" !== lastBodyCol.type && (lastBodyCol = lastBodyCol._prev), 
         0 === x && firstBodyCol && firstBodyCol.col === this.table.frozenColCount && firstBodyCol.attribute.x + x < 0 ? x = -firstBodyCol.attribute.x : lastBodyCol && this.table.tableNoFrameWidth < this.table.getAllColsWidth() && lastBodyCol.col === this.table.colCount - this.table.rightFrozenColCount - 1 && lastBodyCol.attribute.x + lastBodyCol.attribute.width + x < this.table.tableNoFrameWidth - this.table.getFrozenColsWidth() - this.table.getRightFrozenColsWidth() && (x = this.table.tableNoFrameWidth - this.table.getFrozenColsWidth() - this.table.getRightFrozenColsWidth() - lastBodyCol.attribute.x - lastBodyCol.attribute.width), 
-        this.table.getFrozenColsWidth() + x !== this.bodyGroup.attribute.x && (this.bodyGroup.setAttribute("x", this.table.getFrozenColsWidth() + x), 
+        this.table.options.scrollFrozenCols && x > 0 && (x = 0), this.table.getFrozenColsWidth() + x !== this.bodyGroup.attribute.x && (this.bodyGroup.setAttribute("x", this.table.getFrozenColsWidth() + x), 
         this.colHeaderGroup.setAttribute("x", this.table.getFrozenColsWidth() + x), this.bodySelectGroup.setAttribute("x", this.bodyGroup.attribute.x), 
         this.colHeaderSelectGroup.setAttribute("x", this.colHeaderGroup.attribute.x), this.rowHeaderSelectGroup.setAttribute("x", this.rowHeaderGroup.attribute.x), 
         this.cornerHeaderSelectGroup.setAttribute("x", this.cornerHeaderGroup.attribute.x), 
@@ -740,11 +740,13 @@ class Scenegraph {
         let rowHeaderWidth = 0;
         this.rowHeaderGroup.forEachChildrenSkipChild((column => {
             rowHeaderWidth += column.attribute.width;
-        })), this.rowHeaderGroup.setAttribute("width", rowHeaderWidth);
+        })), table.options.scrollFrozenCols && (rowHeaderWidth = table.getFrozenColsWidth()), 
+        this.rowHeaderGroup.setAttribute("width", rowHeaderWidth);
         let cornerHeaderWidth = 0;
         this.cornerHeaderGroup.forEachChildrenSkipChild((column => {
             cornerHeaderWidth += column.attribute.width;
-        })), this.cornerHeaderGroup.setAttribute("width", cornerHeaderWidth), this.colHeaderGroup.setAttribute("x", this.cornerHeaderGroup.attribute.width), 
+        })), table.options.scrollFrozenCols && (cornerHeaderWidth = table.getFrozenColsWidth()), 
+        this.cornerHeaderGroup.setAttribute("width", cornerHeaderWidth), this.colHeaderGroup.setAttribute("x", this.cornerHeaderGroup.attribute.width), 
         this.rowHeaderGroup.setAttribute("y", this.cornerHeaderGroup.attribute.height), 
         this.bodyGroup.setAttributes({
             x: this.rowHeaderGroup.attribute.width,
@@ -1160,4 +1162,4 @@ class Scenegraph {
 }
 
 exports.Scenegraph = Scenegraph;
-//# sourceMappingURL=scenegraph.js.map
+//# sourceMappingURL=scenegraph.js.map