@visactor/vtable-calendar 1.14.4-alpha.0 → 1.14.4-alpha.1

package/dist/vtable-calendar.js

@@ -36015,7 +36015,7 @@
       return isHandlingChartQueue;
     }
     function renderChart(chart) {
-      var _a, _b, _c, _d, _e, _f, _g;
+      var _a, _b, _c, _d, _e, _f;
       const {
         axes: axes,
         dataId: dataId,
@@ -36062,10 +36062,10 @@
       } = chart.getRootNode();
       let updateSpec = !1;
       if (table.options.specFormat) {
-        const formatResult = table.options.specFormat(chart.attribute.spec, chartInstance, chart);
+        const formatResult = table.options.specFormat(chart.attribute.spec);
         if (formatResult.needFormatSpec && formatResult.spec) {
           const spec = formatResult.spec;
-          chartInstance.updateSpecSync(spec), updateSpec = null === (_a = formatResult.updateSpec) || void 0 === _a || _a;
+          chartInstance.updateSpecSync(spec), updateSpec = !0;
         }
       }
       if (!updateSpec) if (null == axes || axes.forEach((axis, index) => {
@@ -36085,7 +36085,7 @@
             tickMode: null === (_e = axis.tick) || void 0 === _e ? void 0 : _e.tickMode
           }
         }, !0);
-      }), null === (_c = null === (_b = table.internalProps.layoutMap) || void 0 === _b ? void 0 : _b.updateDataStateToActiveChartInstance) || void 0 === _c || _c.call(_b, chartInstance), "string" == typeof dataId) chartInstance.updateDataSync(dataId, null != data ? data : []);else {
+      }), null === (_b = null === (_a = table.internalProps.layoutMap) || void 0 === _a ? void 0 : _a.updateDataStateToActiveChartInstance) || void 0 === _b || _b.call(_a, chartInstance), "string" == typeof dataId) chartInstance.updateDataSync(dataId, null != data ? data : []);else {
         const dataBatch = [];
         for (const dataIdStr in dataId) {
           const dataIdAndField = dataId[dataIdStr],
@@ -36095,11 +36095,11 @@
             });
           dataBatch.push({
             id: dataIdStr,
-            values: dataIdAndField ? null !== (_d = null == data ? void 0 : data.filter(item => item.hasOwnProperty(dataIdAndField))) && void 0 !== _d ? _d : [] : null != data ? data : [],
-            fields: null === (_e = null == series ? void 0 : series.data) || void 0 === _e ? void 0 : _e.fields
-          }), chartInstance.updateFullDataSync || chartInstance.updateDataSync(dataIdStr, dataIdAndField ? null !== (_f = null == data ? void 0 : data.filter(item => item.hasOwnProperty(dataIdAndField))) && void 0 !== _f ? _f : [] : null != data ? data : []);
+            values: dataIdAndField ? null !== (_c = null == data ? void 0 : data.filter(item => item.hasOwnProperty(dataIdAndField))) && void 0 !== _c ? _c : [] : null != data ? data : [],
+            fields: null === (_d = null == series ? void 0 : series.data) || void 0 === _d ? void 0 : _d.fields
+          }), chartInstance.updateFullDataSync || chartInstance.updateDataSync(dataIdStr, dataIdAndField ? null !== (_e = null == data ? void 0 : data.filter(item => item.hasOwnProperty(dataIdAndField))) && void 0 !== _e ? _e : [] : null != data ? data : []);
         }
-        null === (_g = chartInstance.updateFullDataSync) || void 0 === _g || _g.call(chartInstance, dataBatch);
+        null === (_f = chartInstance.updateFullDataSync) || void 0 === _f || _f.call(chartInstance, dataBatch);
       }
       cacheStageCanvas(chartInstance.getStage(), chart);
     }
@@ -36221,10 +36221,10 @@
           context.drawImage(canvas, x, y, width, height);
         }) : context.drawImage(cacheCanvas, x, y, width, height);else if (activeChartInstance) {
           if (table.options.specFormat) {
-            const formatResult = table.options.specFormat(chart.attribute.spec, activeChartInstance, chart);
+            const formatResult = table.options.specFormat(chart.attribute.spec);
             if (formatResult.needFormatSpec && formatResult.spec) {
               const spec = formatResult.spec;
-              activeChartInstance.updateSpecSync(spec);
+              return void activeChartInstance.updateSpecSync(spec);
             }
           }
           const viewBox = chart.getViewBox();
@@ -46622,6 +46622,10 @@
       }
     }
 
+    function getCustomMergeCellFunc(customMergeCell) {
+      return isFunction$1(customMergeCell) ? customMergeCell : isArray$1(customMergeCell) ? (col, row) => customMergeCell.find(item => item.range.start.col <= col && item.range.end.col >= col && item.range.start.row <= row && item.range.end.row >= row) : void 0;
+    }
+
     const {
         toBoxArray: toBoxArray
       } = style,
@@ -46637,7 +46641,7 @@
       constructor(container) {
         let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.14.4-alpha.0", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
+        if (super(), this.showFrozenIcon = !0, this.version = "1.14.4-alpha.1", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
         const {
           frozenColCount = 0,
           frozenRowCount: frozenRowCount,
@@ -46721,7 +46725,7 @@
         }
         this.headerStyleCache = new Map(), this.bodyStyleCache = new Map(), this.bodyMergeTitleCache = new Map(), this.bodyBottomStyleCache = new Map(), internalProps.stick = {
           changedCells: new Map()
-        }, internalProps.customMergeCell = options.customMergeCell;
+        }, internalProps.customMergeCell = getCustomMergeCellFunc(options.customMergeCell);
         const CustomCellStylePlugin = Factory.getComponent("customCellStylePlugin");
         CustomCellStylePlugin && (this.customCellStylePlugin = new CustomCellStylePlugin(this, null !== (_j = options.customCellStyle) && void 0 !== _j ? _j : [], null !== (_k = options.customCellStyleArrangement) && void 0 !== _k ? _k : []));
       }
@@ -47474,7 +47478,7 @@
           const MenuHandler = Factory.getComponent("menuHandler");
           internalProps.menuHandler = new MenuHandler(this);
         }
-        this.clearCellStyleCache(), this.clearColWidthCache(), this.clearRowHeightCache(), internalProps.customMergeCell = options.customMergeCell, null === (_l = this.customCellStylePlugin) || void 0 === _l || _l.updateCustomCell(null !== (_m = options.customCellStyle) && void 0 !== _m ? _m : [], null !== (_o = options.customCellStyleArrangement) && void 0 !== _o ? _o : []);
+        this.clearCellStyleCache(), this.clearColWidthCache(), this.clearRowHeightCache(), internalProps.customMergeCell = getCustomMergeCellFunc(options.customMergeCell), null === (_l = this.customCellStylePlugin) || void 0 === _l || _l.updateCustomCell(null !== (_m = options.customCellStyle) && void 0 !== _m ? _m : [], null !== (_o = options.customCellStyleArrangement) && void 0 !== _o ? _o : []);
       }
       renderWithRecreateCells() {
         const oldHoverState = {
@@ -54113,7 +54117,7 @@
           canvas: null !== (_0 = table.canvas) && void 0 !== _0 ? _0 : table.scenegraph.stage.window.getContext().canvas,
           mode: table.options.mode,
           modeParams: table.options.modeParams,
-          spec: table.options.specTransformInCell ? table.options.specTransformInCell(chartSpec, col, row) : chartSpec,
+          spec: chartSpec,
           ClassType: ClassType,
           width: width - padding[3] - padding[1],
           height: height - padding[2] - padding[0],
@@ -54123,9 +54127,7 @@
           cellPadding: padding,
           dpr: table.internalProps.pixelRatio,
           axes: table.isPivotChart() ? table.internalProps.layoutMap.getChartAxes(col, row) : [],
-          tableChartOption: table.options.chartOption,
-          col: col,
-          row: row
+          tableChartOption: table.options.chartOption
         });
         cellGroup.appendChild(chartGroup), table.internalProps.layoutMap.setChartInstance(col, row, chartGroup.chartInstance);
       }