@visactor/vtable 1.0.0 → 1.0.1

package/cjs/vrender.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/vrender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAA8F;AAC9F,yDAAqE;AACrE,yDAmBgC;AAIhC,IAAI,QAAQ,GAAG,KAAK,CAAC;AACrB,SAAgB,kBAAkB;IAChC,IAAI,QAAQ,EAAE;QACZ,OAAO;KACR;IACD,QAAQ,GAAG,IAAI,CAAC;IAEhB,IAAA,+BAAgB,GAAE,CAAC;IAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;QAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;KAC3B;SAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;QACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;KACxB;IACD,IAAA,0BAAW,GAAE,CAAC;IACd,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,8BAAe,GAAE,CAAC;IAClB,IAAA,gCAAiB,GAAE,CAAC;IACpB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,+BAAgB,GAAE,CAAC;IACnB,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,+BAAgB,GAAE,CAAC;AACrB,CAAC;AA/BD,gDA+BC;AAED,yDAAuC;AACvC,yDAAuC","file":"vrender.js","sourcesContent":["import '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule } from '@visactor/vrender-core';\nimport { loadBrowserEnv, loadNodeEnv } from '@visactor/vrender-kits';\nimport {\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\n// export const version = \"1.0.0\";\n\nlet registed = false;\nexport function registerForVrender() {\n  if (registed) {\n    return;\n  }\n  registed = true;\n  // 注册内置组件\n  preLoadAllModule();\n\n  if (isBrowserEnv()) {\n    loadBrowserEnv(container);\n  } else if (isNodeEnv()) {\n    loadNodeEnv(container);\n  }\n  registerArc();\n  registerArc3d();\n  registerArea();\n  registerCircle();\n  registerGlyph();\n  registerGroup();\n  registerImage();\n  registerLine();\n  registerPath();\n  registerPolygon();\n  registerPyramid3d();\n  registerRect();\n  registerRect3d();\n  registerRichtext();\n  registerShadowRoot();\n  registerSymbol();\n  registerText();\n  registerWrapText();\n}\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}
+{"version":3,"sources":["../src/vrender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAA8F;AAC9F,yDAAqE;AACrE,yDAmBgC;AAIhC,IAAI,QAAQ,GAAG,KAAK,CAAC;AACrB,SAAgB,kBAAkB;IAChC,IAAI,QAAQ,EAAE;QACZ,OAAO;KACR;IACD,QAAQ,GAAG,IAAI,CAAC;IAEhB,IAAA,+BAAgB,GAAE,CAAC;IAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;QAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;KAC3B;SAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;QACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;KACxB;IACD,IAAA,0BAAW,GAAE,CAAC;IACd,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,8BAAe,GAAE,CAAC;IAClB,IAAA,gCAAiB,GAAE,CAAC;IACpB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,+BAAgB,GAAE,CAAC;IACnB,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,+BAAgB,GAAE,CAAC;AACrB,CAAC;AA/BD,gDA+BC;AAED,yDAAuC;AACvC,yDAAuC","file":"vrender.js","sourcesContent":["import '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule } from '@visactor/vrender-core';\nimport { loadBrowserEnv, loadNodeEnv } from '@visactor/vrender-kits';\nimport {\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\n// export const version = \"1.0.1\";\n\nlet registed = false;\nexport function registerForVrender() {\n  if (registed) {\n    return;\n  }\n  registed = true;\n  // 注册内置组件\n  preLoadAllModule();\n\n  if (isBrowserEnv()) {\n    loadBrowserEnv(container);\n  } else if (isNodeEnv()) {\n    loadNodeEnv(container);\n  }\n  registerArc();\n  registerArc3d();\n  registerArea();\n  registerCircle();\n  registerGlyph();\n  registerGroup();\n  registerImage();\n  registerLine();\n  registerPath();\n  registerPolygon();\n  registerPyramid3d();\n  registerRect();\n  registerRect3d();\n  registerRichtext();\n  registerShadowRoot();\n  registerSymbol();\n  registerText();\n  registerWrapText();\n}\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}

package/dist/vtable.js

@@ -38291,8 +38291,7 @@
                     lineClamp,
                     wordBreak: 'break-word',
                     whiteSpace: text.length === 1 && !autoWrapText ? 'no-wrap' : 'normal',
-                    dx: (textAlign === 'left' ? (!contentLeftIcons.length && !contentRightIcons.length ? hierarchyOffset : 0) : 0) +
-                        _contentOffset
+                    dx: (textAlign === 'left' ? (!contentLeftIcons.length ? hierarchyOffset : 0) : 0) + _contentOffset
                 };
                 const wrapText = new Text$1(cellTheme.text ? Object.assign({}, cellTheme.text, attribute) : attribute);
                 wrapText.name = 'text';
@@ -38339,14 +38338,17 @@
                     align: textAlign,
                     baseline: textBaseline
                 });
+                const dealWithIconComputeVar = {
+                    addedHierarchyOffset: 0
+                };
                 contentLeftIcons.forEach(icon => {
-                    const iconMark = dealWithIcon(icon, undefined, cellGroup.col, cellGroup.row, range, table);
+                    const iconMark = dealWithIcon(icon, undefined, cellGroup.col, cellGroup.row, range, table, dealWithIconComputeVar);
                     iconMark.role = 'icon-content-left';
                     iconMark.name = icon.name;
                     cellContent.addLeftOccupyingIcon(iconMark);
                 });
                 contentRightIcons.forEach(icon => {
-                    const iconMark = dealWithIcon(icon, undefined, cellGroup.col, cellGroup.row, range, table);
+                    const iconMark = dealWithIcon(icon, undefined, cellGroup.col, cellGroup.row, range, table, dealWithIconComputeVar);
                     iconMark.role = 'icon-content-right';
                     iconMark.name = icon.name;
                     cellContent.addRightOccupyingIcon(iconMark);
@@ -38410,7 +38412,7 @@
             height: height + padding[0] + padding[2]
         });
     }
-    function dealWithIcon(icon, mark, col, row, range, table) {
+    function dealWithIcon(icon, mark, col, row, range, table, dealWithIconComputeVar) {
         const iconAttribute = {};
         if (icon.type === 'image') {
             iconAttribute.image = icon.src;
@@ -38424,13 +38426,20 @@
         iconAttribute.funcType = icon.funcType;
         iconAttribute.interactive = icon.interactive;
         let hierarchyOffset = 0;
-        if (isNumber$4(col) &&
+        if ((!dealWithIconComputeVar || dealWithIconComputeVar?.addedHierarchyOffset === 0) &&
+            isNumber$4(col) &&
             isNumber$4(row) &&
             table &&
-            (icon.funcType === IconFuncTypeEnum.collapse || icon.funcType === IconFuncTypeEnum.expand)) {
+            (icon.funcType === IconFuncTypeEnum.collapse ||
+                icon.funcType === IconFuncTypeEnum.expand ||
+                icon.positionType === IconPosition.contentLeft ||
+                icon.positionType === IconPosition.contentRight)) {
             hierarchyOffset = range
                 ? getHierarchyOffset(range.start.col, range.start.row, table)
                 : getHierarchyOffset(col, row, table);
+            if (dealWithIconComputeVar) {
+                dealWithIconComputeVar.addedHierarchyOffset = 1;
+            }
         }
         iconAttribute.marginLeft = (icon.marginLeft ?? 0) + hierarchyOffset;
         iconAttribute.marginRight = icon.marginRight ?? 0;
@@ -44903,6 +44912,10 @@
                 if (hd?.hierarchyLevel) {
                     cellHierarchyIndent =
                         (hd.hierarchyLevel ?? 0) * (layoutMap.rowHierarchyIndent ?? 0);
+                    if (layoutMap.rowHierarchyTextStartAlignment &&
+                        !table.internalProps.headerHelper.getHierarchyIcon(col, row)) {
+                        cellHierarchyIndent += table.internalProps.headerHelper.getHierarchyIconWidth();
+                    }
                 }
             }
             else {
@@ -44914,6 +44927,10 @@
                         Array.isArray(indexArr) && table.getHierarchyState(col, row) !== HierarchyState.none
                             ? (indexArr.length - 1) * (layoutMap.hierarchyIndent ?? 0)
                             : 0;
+                    if (layoutMap.hierarchyTextStartAlignment &&
+                        !table.internalProps.bodyHelper.getHierarchyIcon(col, row)) {
+                        cellHierarchyIndent += table.internalProps.headerHelper.getHierarchyIconWidth();
+                    }
                 }
             }
             const textWidth = computeTextWidth(col, row, cellType, table);
@@ -50680,7 +50697,7 @@
         return table._getLayoutCellId(col, row) === table._getLayoutCellId(range1Col, range1Row);
     }
 
-    function updateSelectPosition(state, col, row, isShift, isCtrl, isSelectAll, isSelectMoving = false) {
+    function updateSelectPosition(state, col, row, isShift, isCtrl, isSelectAll, isSelectMoving = false, skipBodyMerge = false) {
         const { table, interactionState } = state;
         const { scenegraph } = table;
         const { highlightScope, disableHeader, cellPos } = state.select;
@@ -50892,6 +50909,9 @@
                             col,
                             row
                         };
+                        if (skipBodyMerge) {
+                            currentRange.skipBodyMerge = true;
+                        }
                     }
                 }
                 scenegraph.updateCellSelectBorder(currentRange, extendSelectRange);
@@ -52205,11 +52225,11 @@
         updateHoverPos(col, row) {
             updateHoverPosition(this, col, row);
         }
-        updateSelectPos(col, row, isShift = false, isCtrl = false, isSelectAll = false, isSelectMoving = false) {
+        updateSelectPos(col, row, isShift = false, isCtrl = false, isSelectAll = false, isSelectMoving = false, skipBodyMerge = false) {
             if (row !== -1 && row !== -1) {
                 this.select.selecting = true;
             }
-            updateSelectPosition(this, col, row, isShift, isCtrl, isSelectAll, isSelectMoving);
+            updateSelectPosition(this, col, row, isShift, isCtrl, isSelectAll, isSelectMoving, skipBodyMerge);
         }
         checkCellRangeInSelect(cellPosStart, cellPosEnd) {
             return checkMultiCellInSelect(cellPosStart, cellPosEnd, this.select.ranges, this.select.highlightScope);
@@ -55367,6 +55387,10 @@
         }
         getIcons(col, row, cellValue, dataValue, context) {
             const iconArr = [];
+            const hierarchyIcon = this.getHierarchyIcon(col, row);
+            if (hierarchyIcon) {
+                iconArr.push(hierarchyIcon);
+            }
             const { icon: iconDefine } = this._table.getBodyColumnDefine(col, row);
             if (iconDefine) {
                 let iconResults;
@@ -55405,10 +55429,6 @@
                     addIcon(iconResults);
                 }
             }
-            const hierarchyIcon = this.getHierarchyIcon(col, row);
-            if (hierarchyIcon) {
-                iconArr.push(hierarchyIcon);
-            }
             context &&
                 iconArr.forEach((i, index) => {
                     if (i.content || i.src) {
@@ -58441,7 +58461,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.0.0";
+        version = "1.0.1";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -59015,6 +59035,10 @@
                 this._clearRowRangeHeightsMap(row);
             }
         }
+        setRowHeight(row, height) {
+            this.scenegraph.setRowHeight(row, height);
+            this.internalProps._heightResizedRowMap.add(row);
+        }
         getRowsHeight(startRow, endRow) {
             if (startRow > endRow || this.rowCount === 0) {
                 return 0;
@@ -59108,6 +59132,10 @@
                 this.stateManager.checkFrozen();
             }
         }
+        setColWidth(col, width) {
+            this.scenegraph.setColWidth(col, width);
+            this.internalProps._widthResizedColMap.add(col);
+        }
         _clearColRangeWidthsMap(col) {
             if (typeof col !== 'number') {
                 this._colRangeWidthsMap.clear();
@@ -59999,12 +60027,12 @@
             const { scrollLeft, scrollTop } = this;
             cellRanges.forEach((cellRange, index) => {
                 if (cellRange.start.col === cellRange.end.col && cellRange.start.row === cellRange.end.row) {
-                    this.stateManager.updateSelectPos(cellRange.start.col, cellRange.start.row, false, index >= 1);
+                    this.stateManager.updateSelectPos(cellRange.start.col, cellRange.start.row, false, index >= 1, false, false, true);
                 }
                 else {
                     this.stateManager.updateSelectPos(cellRange.start.col, cellRange.start.row, false, index >= 1);
                     this.stateManager.updateInteractionState(InteractionState.grabing);
-                    this.stateManager.updateSelectPos(cellRange.end.col, cellRange.end.row, false, index >= 1);
+                    this.stateManager.updateSelectPos(cellRange.end.col, cellRange.end.row, false, index >= 1, false, false, true);
                 }
                 this.stateManager.endSelectCells(false);
                 this.stateManager.updateInteractionState(InteractionState.default);
@@ -71647,7 +71675,7 @@
     }
 
     registerForVrender();
-    const version = "1.0.0";
+    const version = "1.0.1";
     function getIcons() {
         return get$2();
     }