@visactor/vtable 0.12.0 → 0.12.1-alpha.0

package/dist/vtable.js

@@ -39797,7 +39797,7 @@
                 const data = layout.dataset.collectedValues[defaultKey + (isZeroAlign ? '_align' : '')]
                     ? layout.dataset.collectedValues[defaultKey + (isZeroAlign ? '_align' : '')]
                     : layout.dataset.collectedValues[defaultKey];
-                const colPath = layout.getColKeysPath(col);
+                const colPath = layout.getColKeysPath(col, row);
                 const range = merge$1({}, data?.[colPath ?? ''] ?? { min: 0, max: 1 });
                 if (range.positiveMax && range.positiveMax > range.max) {
                     range.max = range.positiveMax;
@@ -39852,7 +39852,7 @@
                 const data = layout.dataset.collectedValues[defaultKey + (isZeroAlign ? '_align' : '')]
                     ? layout.dataset.collectedValues[defaultKey + (isZeroAlign ? '_align' : '')]
                     : layout.dataset.collectedValues[defaultKey];
-                const colPath = layout.getColKeysPath(col);
+                const colPath = layout.getColKeysPath(col, row);
                 const range = merge$1({}, data?.[colPath ?? ''] ?? { min: 0, max: 1 });
                 if (range.positiveMax && range.positiveMax > range.max) {
                     range.max = range.positiveMax;
@@ -39914,7 +39914,7 @@
                     rowDimensionKey = rowDimensionKey[0];
                 }
                 const data = layout.dataset.collectedValues[rowDimensionKey] ?? [];
-                const rowPath = layout.getRowKeysPath(row);
+                const rowPath = layout.getRowKeysPath(col, row);
                 const domain = data[rowPath ?? ''] ?? [];
                 const { axisOption, isPercent } = getAxisOption(col + 1, row, 'left', layout);
                 if (axisOption?.visible === false) {
@@ -39944,7 +39944,7 @@
                 const data = layout.dataset.collectedValues[defaultKey + (isZeroAlign ? '_align' : '')]
                     ? layout.dataset.collectedValues[defaultKey + (isZeroAlign ? '_align' : '')]
                     : layout.dataset.collectedValues[defaultKey];
-                const rowPath = layout.getRowKeysPath(row);
+                const rowPath = layout.getRowKeysPath(col, row);
                 const range = merge$1({}, data?.[rowPath ?? ''] ?? { min: 0, max: 1 });
                 if (range.positiveMax && range.positiveMax > range.max) {
                     range.max = range.positiveMax;
@@ -40014,7 +40014,7 @@
                 const data = layout.dataset.collectedValues[defaultKey + (isZeroAlign ? '_align' : '')]
                     ? layout.dataset.collectedValues[defaultKey + (isZeroAlign ? '_align' : '')]
                     : layout.dataset.collectedValues[defaultKey];
-                const rowPath = layout.getRowKeysPath(row);
+                const rowPath = layout.getRowKeysPath(col, row);
                 const range = merge$1({}, data?.[rowPath ?? ''] ?? { min: 0, max: 1 });
                 if (range.positiveMax && range.positiveMax > range.max) {
                     range.max = range.positiveMax;
@@ -40068,7 +40068,7 @@
                     columnDimensionKey = columnDimensionKey[0];
                 }
                 const data = layout.dataset.collectedValues[columnDimensionKey] ?? [];
-                const colPath = layout.getColKeysPath(col);
+                const colPath = layout.getColKeysPath(col, row);
                 const domain = data?.[colPath ?? ''] ?? [];
                 const { axisOption, isPercent } = getAxisOption(col, row - 1, 'bottom', layout);
                 if (axisOption?.visible === false) {
@@ -52776,7 +52776,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.12.0";
+        version = "0.12.1-alpha.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -54228,6 +54228,11 @@
                 _setRecords(this, records);
             }
             this.scenegraph.createSceneGraph();
+            if (this.internalProps.title && !this.internalProps.title.isReleased) {
+                this._updateSize();
+                this.internalProps.title.resize();
+                this.scenegraph.resize();
+            }
             this.render();
         }
         setRecord(record, col, row) {
@@ -54991,7 +54996,7 @@
                 const data = layout.dataset.collectedValues[key + (isZeroAlign ? '_align' : '')]
                     ? layout.dataset.collectedValues[key + (isZeroAlign ? '_align' : '')]
                     : layout.dataset.collectedValues[key];
-                const colPath = layout.getColKeysPath(col);
+                const colPath = layout.getColKeysPath(col, row);
                 const range = merge$1({}, data?.[colPath ?? ''] ?? { min: 0, max: 1 });
                 if (range.positiveMax && range.positiveMax > range.max) {
                     range.max = range.positiveMax;
@@ -55038,7 +55043,7 @@
             const data = layout.dataset.cacheCollectedValues[rowDimensionKey] ||
                 layout.dataset.collectedValues[rowDimensionKey] ||
                 [];
-            const rowPath = layout.getRowKeysPath(row);
+            const rowPath = layout.getRowKeysPath(col, row);
             const domain = data[rowPath ?? ''];
             const { axisOption, isPercent } = getAxisOption(col, row, 'left', layout);
             axes.push(merge$1({
@@ -55056,7 +55061,7 @@
         }
         else {
             const indicatorKeys = layout.getIndicatorKeyInChartSpec(col, row);
-            const rowPath = layout.getRowKeysPath(row);
+            const rowPath = layout.getRowKeysPath(col, row);
             indicatorKeys.forEach((key, index) => {
                 if (isArray$5(key)) {
                     key = key[0];
@@ -55111,7 +55116,7 @@
             const data = layout.dataset.cacheCollectedValues[columnDimensionKey] ||
                 layout.dataset.collectedValues[columnDimensionKey] ||
                 [];
-            const colPath = layout.getColKeysPath(col);
+            const colPath = layout.getColKeysPath(col, row);
             const domain = data?.[colPath ?? ''] ?? [];
             const { axisOption, isPercent } = getAxisOption(col, row, 'bottom', layout);
             axes.push(merge$1({
@@ -55826,6 +55831,7 @@
     class Title {
         table;
         _titleOption;
+        isReleased = false;
         _titleComponent;
         _cacheAttrs;
         constructor(titleOption, table) {
@@ -55855,6 +55861,8 @@
             const padding = getQuadProps(this._titleOption.padding ?? 10);
             const realWidth = this._titleOption.width ??
                 Math.min(this.table.tableNoFrameWidth, this.table.getDrawRange().width) - padding[1] - padding[3];
+            const realHeight = this._titleOption.height ??
+                Math.min(this.table.tableNoFrameHeight, this.table.getDrawRange().height) - padding[0] - padding[2];
             this._titleComponent.setAttributes({
                 x: this._titleOption.x ?? this._titleOption.orient === 'right'
                     ? this.table.tableX + Math.min(this.table.tableNoFrameWidth, this.table.getDrawRange().width)
@@ -55862,7 +55870,12 @@
                 y: this._titleOption.y ?? this._titleOption.orient === 'bottom'
                     ? this.table.tableY + this.table.tableNoFrameHeight
                     : this.table.tableY,
-                width: realWidth,
+                width: this._titleOption.orient === 'top' || this._titleOption.orient === 'bottom'
+                    ? realWidth
+                    : this._titleOption.width,
+                height: this._titleOption.orient === 'left' || this._titleOption.orient === 'right'
+                    ? realHeight
+                    : this._titleOption.height,
                 textStyle: {
                     width: realWidth,
                     ...this._titleOption.textStyle
@@ -55906,11 +55919,14 @@
         release() {
             this._titleComponent && this.table.scenegraph.stage.defaultLayer.removeChild(this._titleComponent);
             this._titleComponent = null;
+            this.isReleased = true;
         }
         _getTitleAttrs() {
             const padding = getQuadProps(this._titleOption.padding ?? 10);
             const realWidth = this._titleOption.width ??
                 Math.min(this.table.tableNoFrameWidth, this.table.getDrawRange().width) - padding[1] - padding[3];
+            const realHeight = this._titleOption.height ??
+                Math.min(this.table.tableNoFrameHeight, this.table.getDrawRange().height) - padding[0] - padding[2];
             return {
                 text: this._titleOption.text ?? '',
                 subtext: this._titleOption.subtext ?? '',
@@ -55922,8 +55938,10 @@
                     : this.table.tableY,
                 width: this._titleOption.orient === 'top' || this._titleOption.orient === 'bottom'
                     ? realWidth
+                    : this._titleOption.width,
+                height: this._titleOption.orient === 'left' || this._titleOption.orient === 'right'
+                    ? realHeight
                     : this._titleOption.height,
-                height: this._titleOption.height,
                 minWidth: this._titleOption.minWidth,
                 maxWidth: this._titleOption.maxWidth,
                 minHeight: this._titleOption.minHeight,
@@ -56757,6 +56775,16 @@
                     this.fullRowDimensionKeys = this.fullRowDimensionKeys.concat(rowKeys);
                 });
             }
+            if (this._table.isPivotChart()) {
+                this.hasTwoIndicatorAxes = this._indicators.some(indicatorObject => {
+                    if (indicatorObject.chartSpec &&
+                        indicatorObject.chartSpec.series &&
+                        indicatorObject.chartSpec.series.length > 1) {
+                        return true;
+                    }
+                    return false;
+                });
+            }
             if (this.cornerSetting.titleOnDimension === 'column') {
                 this.cornerHeaderObjs = this._addCornerHeaders(this.columnHeaderTitle ? [''].concat(this.colDimensionKeys) : this.colDimensionKeys, this.columnsDefine);
             }
@@ -56795,14 +56823,6 @@
             }
             this.setPagination(table.options.pagination);
             if (this._table.isPivotChart()) {
-                this.hasTwoIndicatorAxes = this._indicators.some(indicatorObject => {
-                    if (indicatorObject.chartSpec &&
-                        indicatorObject.chartSpec.series &&
-                        indicatorObject.chartSpec.series.length > 1) {
-                        return true;
-                    }
-                    return false;
-                });
                 this._chartItemSpanSize = 0;
                 this._chartItemBandSize = 0;
                 this._indicators.find(indicatorObject => {
@@ -57371,6 +57391,9 @@
                 if (this.columnHeaderTitle) {
                     count += 1;
                 }
+                if (this._table.isPivotChart() && this.indicatorsAsCol && !this.hasTwoIndicatorAxes) {
+                    count -= 1;
+                }
                 return count;
             }
             return 0;
@@ -58513,18 +58536,28 @@
         get bottomAxesCount() {
             return this.bottomFrozenRowCount;
         }
-        getColKeysPath(col) {
-            const index = !this.indicatorsAsCol
-                ? col - this.rowHeaderLevelCount
-                : Math.floor((col - this.rowHeaderLevelCount) / this.indicatorKeys.length);
-            const colKey = this.dataset.colKeys[index];
+        getColKeysPath(col, row) {
+            const path = this.getCellHeaderPaths(col, row);
+            const colKey = [];
+            if (path.colHeaderPaths.length) {
+                path.colHeaderPaths.forEach(path => {
+                    if (path.dimensionKey) {
+                        colKey.push(path.value);
+                    }
+                });
+            }
             return colKey?.join(this.dataset.stringJoinChar);
         }
-        getRowKeysPath(row) {
-            const index = this.indicatorsAsCol
-                ? row - this.columnHeaderLevelCount
-                : Math.floor((row - this.columnHeaderLevelCount) / this.indicatorKeys.length);
-            const rowKey = this.dataset.rowKeys[index];
+        getRowKeysPath(col, row) {
+            const path = this.getCellHeaderPaths(col, row);
+            const rowKey = [];
+            if (path.rowHeaderPaths.length) {
+                path.rowHeaderPaths.forEach(path => {
+                    if (path.dimensionKey) {
+                        rowKey.push(path.value);
+                    }
+                });
+            }
             return rowKey?.join(this.dataset.stringJoinChar);
         }
         getIndicatorInfo(indicatorKey, indicatorValue = '') {
@@ -60772,7 +60805,7 @@
                 !options.indicatorsAsCol && !options.rows?.length && !options.rowTree ? [] : cloneDeep$1(options.rowTree);
             this.setCustomStateNameToSpec();
             internalProps.columnResizeType = options.columnResizeType ?? 'column';
-            internalProps.dataConfig = {};
+            internalProps.dataConfig = { isPivotChart: true };
             this._axes = isArray$5(options.axes) ? options.axes : [];
             if (options.rows || options.columns) {
                 const rowKeys = options.rows.reduce((keys, rowObj) => {
@@ -62281,7 +62314,7 @@
         return new Tag(params ? params.attribute : {});
     }
 
-    const version = "0.12.0";
+    const version = "0.12.1-alpha.0";
     function getIcons() {
         return get$1();
     }