@visactor/vtable 1.25.1-alpha.1 → 1.26.0

package/cjs/vrender.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/vrender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qEAA0D;AAC1D,kCAAgC;AAChC,yDAAwH;AACxH,yDAqBgC;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;IAGd,IAAA,6BAAc,GAAE,CAAC;IAEjB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IAIf,IAAA,2BAAY,GAAE,CAAC;IAEf,IAAA,+BAAgB,GAAE,CAAC;IACnB,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,uCAAwB,GAAE,CAAC;IAE3B,IAAA,+BAAU,GAAE,CAAC;IAEb,IAAA,uCAAwB,GAAE,CAAC;AAC7B,CAAC;AAnCD,gDAmCC;AAOD,yDAAuC;AACvC,yDAAuC;AACvC,+DAA6C;AAC7C,4DAA0C","file":"vrender.js","sourcesContent":["import { loadPoptip } from '@visactor/vrender-components';\nimport '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule, registerFlexLayoutPlugin } from '@visactor/vrender-core';\nimport {\n  loadBrowserEnv,\n  loadNodeEnv,\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.25.1-alpha.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  registerFlexLayoutPlugin();\n  // registerWrapText();\n  loadPoptip();\n\n  registerFlexLayoutPlugin();\n}\n\nexport type { Direction } from '@visactor/vrender-core';\nexport type { State } from '@visactor/vrender-components';\n// export { GroupFadeIn } from '@visactor/vrender-core';\n// export { GroupFadeOut } from '@visactor/vrender-core';\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\nexport * from '@visactor/vrender-components';\nexport * from '@visactor/vrender-animate';\n"]}
+{"version":3,"sources":["../src/vrender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qEAA0D;AAC1D,kCAAgC;AAChC,yDAAwH;AACxH,yDAqBgC;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;IAGd,IAAA,6BAAc,GAAE,CAAC;IAEjB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IAIf,IAAA,2BAAY,GAAE,CAAC;IAEf,IAAA,+BAAgB,GAAE,CAAC;IACnB,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,uCAAwB,GAAE,CAAC;IAE3B,IAAA,+BAAU,GAAE,CAAC;IAEb,IAAA,uCAAwB,GAAE,CAAC;AAC7B,CAAC;AAnCD,gDAmCC;AAOD,yDAAuC;AACvC,yDAAuC;AACvC,+DAA6C;AAC7C,4DAA0C","file":"vrender.js","sourcesContent":["import { loadPoptip } from '@visactor/vrender-components';\nimport '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule, registerFlexLayoutPlugin } from '@visactor/vrender-core';\nimport {\n  loadBrowserEnv,\n  loadNodeEnv,\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.26.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  registerFlexLayoutPlugin();\n  // registerWrapText();\n  loadPoptip();\n\n  registerFlexLayoutPlugin();\n}\n\nexport type { Direction } from '@visactor/vrender-core';\nexport type { State } from '@visactor/vrender-components';\n// export { GroupFadeIn } from '@visactor/vrender-core';\n// export { GroupFadeOut } from '@visactor/vrender-core';\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\nexport * from '@visactor/vrender-components';\nexport * from '@visactor/vrender-animate';\n"]}

package/dist/vtable.js

@@ -45727,8 +45727,7 @@
         }
         else if (type === 'checkbox') {
             const isAggregation = 'isAggregation' in table.internalProps.layoutMap && table.internalProps.layoutMap.isAggregation(col, row);
-            const isSeriesNumber = table.internalProps.layoutMap.isSeriesNumber(col, row);
-            if (isAggregation && isSeriesNumber) {
+            if (isAggregation) {
                 const createTextCellGroup = Factory.getFunction('createTextCellGroup');
                 cellGroup = createTextCellGroup(table, value, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, false, undefined, true, cellTheme, range, isAsync);
             }
@@ -45738,8 +45737,15 @@
             }
         }
         else if (type === 'radio') {
-            const createRadioCellGroup = Factory.getFunction('createRadioCellGroup');
-            cellGroup = createRadioCellGroup(null, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, table, cellTheme, define, range);
+            const isAggregation = 'isAggregation' in table.internalProps.layoutMap && table.internalProps.layoutMap.isAggregation(col, row);
+            if (isAggregation) {
+                const createTextCellGroup = Factory.getFunction('createTextCellGroup');
+                cellGroup = createTextCellGroup(table, value, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, false, undefined, true, cellTheme, range, isAsync);
+            }
+            else {
+                const createRadioCellGroup = Factory.getFunction('createRadioCellGroup');
+                cellGroup = createRadioCellGroup(null, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, table, cellTheme, define, range);
+            }
         }
         else if (type === 'switch') {
             const createSwitchCellGroup = Factory.getFunction('createSwitchCellGroup');
@@ -61176,6 +61182,10 @@
         }
         else if ((interactionState === InteractionState.grabing || table.eventManager.isDraging) &&
             !table.stateManager.isResizeCol()) {
+            if (col >= 0 && row >= 0 && isCellDisableSelect(table, col, row)) {
+                scenegraph.updateNextFrame();
+                return;
+            }
             let extendSelectRange = isValid$1(skipBodyMerge) ? !skipBodyMerge : true;
             if (cellPos.col === -1) {
                 cellPos.col = col;
@@ -62917,7 +62927,21 @@
             this.setSelectState();
             this.setFrozenState();
         }
+        endResizeIfResizing() {
+            if (this.columnResize.resizing) {
+                this.table.scenegraph.component.hideResizeCol();
+                this.columnResize.resizing = false;
+            }
+            if (this.rowResize.resizing) {
+                this.table.scenegraph.component.hideResizeRow();
+                this.rowResize.resizing = false;
+            }
+            if (this.interactionState === InteractionState.grabing) {
+                this.interactionState = InteractionState.default;
+            }
+        }
         _updateOptionSetState() {
+            this.endResizeIfResizing();
             this.interactionState = InteractionState.default;
             this.hoverIcon = {
                 col: -1,
@@ -64883,12 +64907,14 @@
                 stateManager.updateInteractionState(InteractionState.default);
                 stateManager.updateCursor();
             }
-            if ((table.theme.scrollStyle.horizontalVisible && table.theme.scrollStyle.horizontalVisible === 'focus') ||
-                (!table.theme.scrollStyle.horizontalVisible && table.theme.scrollStyle.visible === 'focus')) {
+            const scrollStyle = table.theme.scrollStyle;
+            const horizontalVisible = scrollStyle?.horizontalVisible ?? scrollStyle?.visible;
+            const verticalVisible = scrollStyle?.verticalVisible ?? scrollStyle?.visible;
+            const barToSide = scrollStyle?.barToSide ?? false;
+            if (!barToSide && horizontalVisible === 'focus') {
                 stateManager.hideHorizontalScrollBar();
             }
-            if ((table.theme.scrollStyle.verticalVisible && table.theme.scrollStyle.verticalVisible === 'focus') ||
-                (!table.theme.scrollStyle.verticalVisible && table.theme.scrollStyle.visible === 'focus')) {
+            if (!barToSide && verticalVisible === 'focus') {
                 stateManager.hideVerticalScrollBar();
             }
             if (table.hasListeners(TABLE_EVENT_TYPE.MOUSELEAVE_CELL)) {
@@ -65304,6 +65330,52 @@
                 stateManager.endSelectCells();
             }
         });
+        const scrollStyle = table.theme.scrollStyle;
+        const barToSide = scrollStyle?.barToSide ?? false;
+        const horizontalVisible = scrollStyle?.horizontalVisible ?? scrollStyle?.visible;
+        const verticalVisible = scrollStyle?.verticalVisible ?? scrollStyle?.visible;
+        const shouldShowScrollOnCanvasHover = barToSide && horizontalVisible === 'focus';
+        const shouldShowVScrollOnCanvasHover = barToSide && verticalVisible === 'focus';
+        if (shouldShowScrollOnCanvasHover || shouldShowVScrollOnCanvasHover) {
+            table.scenegraph.stage.addEventListener('pointerenter', (e) => {
+                const target = e.target;
+                const isEventFromCurrentTableCanvas = target === table.scenegraph.stage || target?.isDescendantsOf?.(table.scenegraph.stage);
+                if (!isEventFromCurrentTableCanvas) {
+                    return;
+                }
+                if (shouldShowScrollOnCanvasHover) {
+                    const relativeX = e.x - table.tableX;
+                    const target = table.options.scrollFrozenCols &&
+                        table.getFrozenColsOffset?.() > 0 &&
+                        relativeX >= 0 &&
+                        relativeX < table.getFrozenColsWidth()
+                        ? 'frozen'
+                        : table.options.scrollRightFrozenCols &&
+                            table.getRightFrozenColsOffset?.() > 0 &&
+                            relativeX > table.tableNoFrameWidth - table.getRightFrozenColsWidth()
+                            ? 'rightFrozen'
+                            : 'body';
+                    stateManager.showHorizontalScrollBar(false, target);
+                }
+                if (shouldShowVScrollOnCanvasHover) {
+                    stateManager.showVerticalScrollBar();
+                }
+            });
+            table.scenegraph.stage.addEventListener('pointerleave', (e) => {
+                const relatedTarget = e.relatedTarget;
+                const isLeavingCanvas = !relatedTarget ||
+                    (relatedTarget !== table.scenegraph.stage && !relatedTarget.isDescendantsOf?.(table.scenegraph.stage));
+                if (!isLeavingCanvas) {
+                    return;
+                }
+                if (shouldShowScrollOnCanvasHover) {
+                    stateManager.hideHorizontalScrollBar();
+                }
+                if (shouldShowVScrollOnCanvasHover) {
+                    stateManager.hideVerticalScrollBar();
+                }
+            });
+        }
         table.scenegraph.stage.addEventListener('pointermove', (e) => {
             const eventArgsSet = getCellEventArgsSetWithTable(e, table);
             const isEventFromCurrentTable = e.target?.isDescendantsOf?.(table.scenegraph.tableGroup) ?? false;
@@ -66389,6 +66461,9 @@
                         const targetCol = table.getTargetColAtConsiderRightFrozen(selectX, considerFrozenX);
                         const targetRow = table.getTargetRowAtConsiderBottomFrozen(selectY, considerFrozenY);
                         if (!table.options.select?.disableDragSelect && isValid$1(targetCol) && isValid$1(targetRow)) {
+                            if (isCellDisableSelect(table, targetCol.col, targetRow.row)) {
+                                return;
+                            }
                             table.stateManager.updateSelectPos(table.stateManager.select.selectInline === 'row' ? table.colCount - 1 : targetCol.col, table.stateManager.select.selectInline === 'col' ? table.rowCount - 1 : targetRow.row, false, false, false, false);
                         }
                     });
@@ -69627,6 +69702,8 @@
                     return TextHeaderStyle;
                 case 'checkbox':
                     return CheckboxStyle;
+                default:
+                    return TextHeaderStyle;
             }
         }
         setTableColumnsEditor() {
@@ -71857,7 +71934,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.25.1-alpha.1";
+        version = "1.26.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -74206,7 +74283,8 @@
         getCellType(col, row) {
             let cellType;
             if (this.isSeriesNumberInHeader(col, row)) {
-                return this.internalProps.layoutMap.getSeriesNumberHeader(col, row).cellType;
+                const seriesHeaderCellType = this.internalProps.layoutMap.getSeriesNumberHeader(col, row).cellType;
+                return seriesHeaderCellType === 'radio' ? 'text' : seriesHeaderCellType;
             }
             else if (this.isHeader(col, row)) {
                 cellType = this.internalProps.layoutMap.getHeader(col, row).headerType;
@@ -80507,6 +80585,7 @@
             this.setCellCheckboxState(col, row, checked);
         }
         setRecords(records, option) {
+            this.stateManager.endResizeIfResizing();
             clearChartRenderQueue();
             this.internalProps.dataSource?.release();
             this.internalProps.releaseList = this.internalProps.releaseList?.filter((item) => !item.dataSourceObj);
@@ -93921,6 +94000,7 @@
             return result;
         }
         setRecords(records) {
+            this.stateManager.endResizeIfResizing();
             clearChartRenderQueue();
             const oldHoverState = { col: this.stateManager.hover.cellPos.col, row: this.stateManager.hover.cellPos.row };
             this.options.records = this.internalProps.records = records;
@@ -95647,6 +95727,7 @@
             return undefined;
         }
         setRecords(records) {
+            this.stateManager.endResizeIfResizing();
             this.internalProps.layoutMap.release();
             clearChartRenderQueue();
             this.scenegraph.updateChartState(null, undefined);
@@ -96329,7 +96410,7 @@
     }
 
     registerForVrender();
-    const version = "1.25.1-alpha.1";
+    const version = "1.26.0";
     function getIcons() {
         return get$2();
     }