@visactor/vtable-calendar 1.22.8 → 1.22.9-alpha.0

package/dist/vtable-calendar.js

@@ -44112,10 +44112,10 @@
     function getAxisConfigInPivotChart(col, row, layout) {
       var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
       if (layout._table.isPivotChart()) if (layout.indicatorsAsCol) {
-        if (layout.hasTwoIndicatorAxes && row === layout.columnHeaderLevelCount - 1 && col >= layout.rowHeaderLevelCount && col < layout.colCount - layout.rightFrozenColCount) {
+        if (layout.hasTopIndicatorAxis && row === layout.columnHeaderLevelCount - 1 && col >= layout.rowHeaderLevelCount && col < layout.colCount - layout.rightFrozenColCount) {
           const indicatorKey = layout.getIndicatorKey(col, row),
             indicatorInfo = layout.getIndicatorInfo(indicatorKey);
-          if (!(null == indicatorInfo ? void 0 : indicatorInfo.hasTwoIndicatorAxes)) return;
+          if (!(null == indicatorInfo ? void 0 : indicatorInfo.hasTopIndicatorAxis)) return;
           const axisRange = getRange("top", col, row + 1, col, layout.columnHeaderLevelCount - 1, col, row, 1, layout);
           if (!axisRange) return;
           const chartCellStyle = layout._table._getCellStyle(col, row + 1),
@@ -44286,7 +44286,7 @@
         if (col === layout.colCount - layout.rightFrozenColCount && row >= layout.columnHeaderLevelCount && row < layout.rowCount - layout.bottomFrozenRowCount) {
           const indicatorKey = layout.getIndicatorKey(col, row),
             indicatorInfo = layout.getIndicatorInfo(indicatorKey);
-          if (!(null == indicatorInfo ? void 0 : indicatorInfo.hasTwoIndicatorAxes)) return;
+          if (!(null == indicatorInfo ? void 0 : indicatorInfo.hasRightIndicatorAxis)) return;
           const {
               axisOption: axisOption,
               chartType: chartType
@@ -44456,7 +44456,7 @@
     function isTopOrBottomAxis(col, row, layout) {
       if (!layout._table.isPivotChart()) return !1;
       if (layout.indicatorsAsCol) {
-        if (layout.hasTwoIndicatorAxes && row === layout.columnHeaderLevelCount - 1 && col >= layout.rowHeaderLevelCount && col < layout.colCount - layout.rightFrozenColCount) return !0;
+        if (layout.hasTopIndicatorAxis && row === layout.columnHeaderLevelCount - 1 && col >= layout.rowHeaderLevelCount && col < layout.colCount - layout.rightFrozenColCount) return !0;
         if (row === layout.rowCount - layout.bottomFrozenRowCount && col >= layout.rowHeaderLevelCount && col < layout.colCount - layout.rightFrozenColCount) return !0;
       } else if (row === layout.rowCount - layout.bottomFrozenRowCount && col >= layout.rowHeaderLevelCount && col < layout.colCount - layout.rightFrozenColCount) return !0;
       return !1;
@@ -44483,7 +44483,7 @@
       Direction.vertical = "vertical", Direction.horizontal = "horizontal";
     }(Direction || (Direction = {}));
     function getRange(position, colForAxisOption, rowForAxisOption, colForIndicatorKey, rowForIndicatorKey, col, row, defaultSeriesIndice, layout) {
-      const indicatorKeys = layout.getIndicatorKeyInChartSpec(colForIndicatorKey, rowForIndicatorKey);
+      const indicatorKeys = layout.getIndicatorKeyInChartSpec(colForIndicatorKey >= 0 ? colForIndicatorKey : col, rowForIndicatorKey >= 0 ? rowForIndicatorKey : row);
       let path;
       path = "top" === position || "bottom" === position ? layout.getColKeysPath(col, row) : layout.getRowKeysPath(col, row);
       const rangeConfig = getChartAxisRange(colForAxisOption, rowForAxisOption, defaultSeriesIndice, position, indicatorKeys, path, layout);
@@ -45882,7 +45882,7 @@
               maxWidth = Math.max(axisWidth, maxWidth);
               continue;
             }
-          } else if (layout.isLeftBottomCorner(col, row) || layout.isRightTopCorner(col, row) || layout.isRightBottomCorner(col, row)) continue;
+          } else if (layout.isLeftBottomCorner(col, row) || layout.isRightTopCorner(col, row) || layout.isRightBottomCorner(col, row) || layout.isAxisCell(col, row)) continue;
         }
         const customWidth = computeCustomRenderWidth(col, row, table);
         if (customWidth && (maxWidth = Math.max(customWidth.width, maxWidth), !customWidth.renderDefault)) continue;
@@ -53184,7 +53184,7 @@
     }
     function getAxisPosition(col, row, layout) {
       if (layout.indicatorsAsCol) {
-        if (layout.hasTwoIndicatorAxes && row === layout.columnHeaderLevelCount - 1 && col >= layout.rowHeaderLevelCount && col < layout.colCount - layout.rightFrozenColCount) return "top";
+        if (layout.hasTopIndicatorAxis && row === layout.columnHeaderLevelCount - 1 && col >= layout.rowHeaderLevelCount && col < layout.colCount - layout.rightFrozenColCount) return "top";
         if (row === layout.rowCount - layout.bottomFrozenRowCount && col >= layout.rowHeaderLevelCount && col < layout.colCount - layout.rightFrozenColCount) return "bottom";
         if (col === layout.rowHeaderLevelCount - 1 && row >= layout.rowHeaderLevelCount && row < layout.rowCount - layout.bottomFrozenRowCount) return "left";
       } else {
@@ -56083,7 +56083,7 @@
       }
       constructor(container, options = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.22.8", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "node" === Env.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, container = container.container ? container.container : null), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
+        if (super(), this.showFrozenIcon = !0, this.version = "1.22.9-alpha.0", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "node" === Env.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, container = container.container ? container.container : null), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
         this.pluginManager = new PluginManager(this, options), this.fireListeners(TABLE_EVENT_TYPE.BEFORE_INIT, {
           options: options,
           container: container