@visactor/vtable 1.16.2-alpha.2 → 1.16.2

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;AAGD,uDAAqD;AAA5C,2GAAA,WAAW,OAAA;AACpB,uDAAsD;AAA7C,4GAAA,YAAY,OAAA;AAErB,yDAAuC;AACvC,yDAAuC;AACvC,+DAA6C","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.16.2-alpha.2\";\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, Timeline } from '@visactor/vrender-core';\nexport { GroupFadeIn } from '@visactor/vrender-core';\nexport { GroupFadeOut } from '@visactor/vrender-core';\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\nexport * from '@visactor/vrender-components';\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;AAGD,uDAAqD;AAA5C,2GAAA,WAAW,OAAA;AACpB,uDAAsD;AAA7C,4GAAA,YAAY,OAAA;AAErB,yDAAuC;AACvC,yDAAuC;AACvC,+DAA6C","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.16.2\";\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, Timeline } from '@visactor/vrender-core';\nexport { GroupFadeIn } from '@visactor/vrender-core';\nexport { GroupFadeOut } from '@visactor/vrender-core';\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\nexport * from '@visactor/vrender-components';\n"]}

package/dist/vtable.js

@@ -30704,7 +30704,7 @@
             return record.then((r) => getField(r, field, col, row, table, promiseCallBack));
         }
         const fieldGet = isFieldAssessor(field) ? field.get : field;
-        if (fieldGet in record) {
+        if (isObject$7(record) && fieldGet in record) {
             const fieldResult = record[fieldGet];
             return getValue$2(fieldResult, promiseCallBack);
         }
@@ -47938,16 +47938,16 @@
             setPoptipTheme(this.table.theme.textPopTipStyle);
             let width;
             let height;
-            if (Env.mode === 'node') {
-                vglobal.setEnv('node', table.options.modeParams);
-                width = table.canvasWidth;
-                height = table.canvasHeight;
-            }
-            else if (table.options.canvas && table.options.viewBox) {
+            if (table.options.canvas && table.options.viewBox) {
                 vglobal.setEnv('browser');
                 width = table.options.viewBox.x2 - table.options.viewBox.x1;
                 height = table.options.viewBox.y2 - table.options.viewBox.y1;
             }
+            else if (Env.mode === 'node') {
+                vglobal.setEnv('node', table.options.modeParams);
+                width = table.canvasWidth;
+                height = table.canvasHeight;
+            }
             else {
                 vglobal.setEnv('browser');
                 width = table.canvas.width;
@@ -57183,6 +57183,7 @@
             value: '',
             children: [],
             level: -1,
+            afterSpanLevel: -1,
             levelSpan: 1,
             startIndex: 0,
             size: 0,
@@ -57231,10 +57232,11 @@
             }
             let size = node.dimensionKey ? (this.sizeIncludeParent ? 1 : 0) : 0;
             const children = node.children || node.columns;
-            if (this.hierarchyType === 'grid') {
+            if (this.hierarchyType === 'grid' || this.hierarchyType === null) {
                 if (children?.length >= 1) {
                     children.forEach((n) => {
                         n.level = (node.level ?? 0) + 1;
+                        this.hierarchyType === 'grid' && (n.afterSpanLevel = (node.afterSpanLevel ?? 0) + (node.levelSpan ?? 1));
                         this.totalLevel = Math.max(this.totalLevel, n.level + 1);
                         size += this.setTreeNode(n, size, node);
                     });
@@ -58207,7 +58209,6 @@
         if (absoluteX === 0) {
             return { left: 0, col: 0, right: 0, width: 0 };
         }
-        absoluteX = absoluteX - _this.tableX;
         if (isConsider &&
             absoluteX > _this.tableNoFrameWidth - _this.getRightFrozenColsWidth() &&
             absoluteX < _this.tableNoFrameWidth &&
@@ -58296,8 +58297,8 @@
             x <= _this.getAllColsWidth()) {
             rightFrozen = true;
         }
-        const colInfo = getTargetColAtConsiderRightFrozen((leftFrozen || rightFrozen ? x : x + _this.scrollLeft) + _this.tableX, rightFrozen, _this);
-        const rowInfo = getTargetRowAtConsiderBottomFrozen((topFrozen || bottomFrozen ? y : y + _this.scrollTop) + _this.tableY, bottomFrozen, _this);
+        const colInfo = getTargetColAtConsiderRightFrozen(leftFrozen || rightFrozen ? x : x + _this.scrollLeft, rightFrozen, _this);
+        const rowInfo = getTargetRowAtConsiderBottomFrozen(topFrozen || bottomFrozen ? y : y + _this.scrollTop, bottomFrozen, _this);
         if (colInfo && rowInfo) {
             const { row, top, bottom, height } = rowInfo;
             const { col, left, right, width } = colInfo;
@@ -59600,7 +59601,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.16.2-alpha.2";
+        version = "1.16.2";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -59661,10 +59662,8 @@
                 this.showFrozenIcon = false;
             }
             if (this.options.canvas) {
-                if (Env.mode !== 'node') {
-                    internalProps.element = this.options.canvas.parentElement;
-                    internalProps.element.style.position = 'relative';
-                }
+                internalProps.element = this.options.canvas.parentElement;
+                internalProps.element.style.position = 'relative';
                 internalProps.focusControl = new FocusInput(this, internalProps.element);
                 internalProps.canvas = this.options.canvas;
                 internalProps.context = internalProps.canvas.getContext('2d');
@@ -64404,7 +64403,7 @@
             this._headerCellIds = [];
             this.hierarchyIndent = hierarchyIndent ?? 20;
             this.hierarchyTextStartAlignment = table.options.hierarchyTextStartAlignment;
-            this.columnTree = new DimensionTree(columns, { seqId: 0 });
+            this.columnTree = new DimensionTree(columns, { seqId: 0 }, null);
             this._headerObjectsIncludeHided = this._addHeaders(0, columns, []);
             this._headerObjects = this._headerObjectsIncludeHided.filter(col => {
                 return col.define.hide !== true;
@@ -65634,6 +65633,7 @@
                     },
                     referencePosition,
                     container: this.table.getElement(),
+                    table: this.table,
                     col,
                     row
                 });
@@ -67240,7 +67240,7 @@
                 this.stateManager.initLeftRecordsCheckState(this.records);
             }
             if (isValid$3(field)) {
-                const keys = Array.from(this.stateManager.checkedState.keys()).sort();
+                const keys = Array.from(this.stateManager.checkedState.keys()).sort((a, b) => Number(a) - Number(b));
                 let stateArr = keys.map(key => this.stateManager.checkedState.get(key));
                 if (this.options.groupBy) {
                     stateArr = getGroupCheckboxState(this);
@@ -69221,7 +69221,7 @@
             }
             titleWidth += attribute.title.space ?? 4;
         }
-        return tickWidth + labelWidth + titleWidth + 1;
+        return Math.ceil(tickWidth + labelWidth + titleWidth + 1);
     }
     function computeAxisComponentHeight(config, table) {
         const attribute = merge$1({}, commonAxis, config);
@@ -73322,7 +73322,7 @@
         };
     }
 
-    const defaultDimension = { startInTotal: 0, level: 0 };
+    const defaultDimension = { startInTotal: 0, afterSpanLevel: 0 };
     class PivotHeaderLayoutMap {
         sharedVar;
         colIndex = 0;
@@ -75293,10 +75293,10 @@
             let row = 0;
             if (rowDimension) {
                 row = this.columnHeaderLevelCount;
-                const { startInTotal, level } = rowDimension;
+                const { startInTotal, afterSpanLevel } = rowDimension;
                 row += startInTotal;
                 if (this.rowHierarchyType === 'grid') {
-                    col = (this.rowHeaderTitle ? level + 1 : level) + this.leftRowSeriesNumberColumnCount;
+                    col = (this.rowHeaderTitle ? afterSpanLevel + 1 : afterSpanLevel) + this.leftRowSeriesNumberColumnCount;
                 }
                 else {
                     col = 0 + this.leftRowSeriesNumberColumnCount;
@@ -75305,9 +75305,9 @@
             }
             else if (colDimension) {
                 col = this.rowHeaderLevelCount + this.leftRowSeriesNumberColumnCount;
-                const { startInTotal, level } = colDimension;
+                const { startInTotal, afterSpanLevel } = colDimension;
                 col += startInTotal;
-                row = this.columnHeaderTitle ? level + 1 : level;
+                row = this.columnHeaderTitle ? afterSpanLevel + 1 : afterSpanLevel;
                 return { col, row };
             }
             return undefined;
@@ -75687,10 +75687,10 @@
             }
             if (rowDimensionFinded || forceBody) {
                 row = this.columnHeaderLevelCount;
-                const { startInTotal, level } = rowDimensionFinded ?? defaultDimension;
+                const { startInTotal, afterSpanLevel } = rowDimensionFinded ?? defaultDimension;
                 row += startInTotal ?? 0;
                 if (this.rowHierarchyType === 'grid') {
-                    defaultCol = (this.rowHeaderTitle ? level + 1 : level) + this.leftRowSeriesNumberColumnCount;
+                    defaultCol = (this.rowHeaderTitle ? afterSpanLevel + 1 : afterSpanLevel) + this.leftRowSeriesNumberColumnCount;
                 }
                 else {
                     defaultCol = 0;
@@ -75698,9 +75698,9 @@
             }
             if (colDimensionFinded || forceBody) {
                 col = this.rowHeaderLevelCount + this.leftRowSeriesNumberColumnCount;
-                const { startInTotal, level } = colDimensionFinded ?? defaultDimension;
+                const { startInTotal, afterSpanLevel } = colDimensionFinded ?? defaultDimension;
                 col += startInTotal ?? 0;
-                defaultRow = this.columnHeaderTitle ? level + 1 : level;
+                defaultRow = this.columnHeaderTitle ? afterSpanLevel + 1 : afterSpanLevel;
             }
             if (isValid$3(col) || isValid$3(row)) {
                 return { col: col ?? defaultCol, row: row ?? defaultRow };
@@ -80872,11 +80872,17 @@
                         }
                     });
                     chartInstance.updateViewBox({
-                        x1: viewBox.x1 - chartNode.getRootNode().table.scrollLeft,
-                        x2: viewBox.x2 - chartNode.getRootNode().table.scrollLeft,
-                        y1: viewBox.y1 - chartNode.getRootNode().table.scrollTop,
-                        y2: viewBox.y2 - chartNode.getRootNode().table.scrollTop
+                        x1: 0,
+                        x2: viewBox.x2 - viewBox.x1,
+                        y1: 0,
+                        y2: viewBox.y2 - viewBox.y1
                     }, false, false);
+                    const chartStage = chartInstance.getStage();
+                    const matrix = chartNode.globalTransMatrix.clone();
+                    const stageMatrix = chartNode.stage.window.getViewBoxTransform();
+                    matrix.multiply(stageMatrix.a, stageMatrix.b, stageMatrix.c, stageMatrix.d, stageMatrix.e, stageMatrix.f);
+                    chartStage.window.setViewBoxTransform &&
+                        chartStage.window.setViewBoxTransform(matrix.a, matrix.b, matrix.c, matrix.d, matrix.e, matrix.f);
                     if (typeof dataId === 'string') {
                         chartInstance.updateDataSync(dataId, data ?? []);
                     }
@@ -80904,7 +80910,7 @@
                         }
                         chartInstance.updateFullDataSync?.(dataBatch);
                     }
-                    this.renderAsync();
+                    this.render();
                 }
                 return {
                     chartInstance,
@@ -81575,7 +81581,7 @@
     }
 
     registerForVrender();
-    const version = "1.16.2-alpha.2";
+    const version = "1.16.2";
     function getIcons() {
         return get$2();
     }