@visactor/vtable-calendar 1.19.3-alpha.0 → 1.19.4-alpha.0

package/dist/vtable-calendar.js

@@ -45224,13 +45224,20 @@
         const pos = _getUpdateRowIndex(addRows[0] - 1, addRows[addRows.length - 1] + 1, scene);
         rowUpdatePos = isValid$3(rowUpdatePos) ? isValid$3(pos) ? Math.min(rowUpdatePos, pos) : rowUpdatePos : pos;
       }
+      const batchMergePos = new Set();
       for (let col = 0; col < table.colCount; col++) updateRows.forEach(row => {
         if (row < table.frozenRowCount) {
           const mergeInfo = getCellMergeInfo(scene.table, col, row);
-          if (mergeInfo) for (let col = mergeInfo.start.col; col <= mergeInfo.end.col; col++) for (let row = mergeInfo.start.row; row <= mergeInfo.end.row; row++) updateCell$1(col, row, scene.table, !1);else updateCell$1(col, row, scene.table, !1);
+          if (mergeInfo) for (let col = mergeInfo.start.col; col <= mergeInfo.end.col; col++) for (let row = mergeInfo.start.row; row <= mergeInfo.end.row; row++) {
+            const key = `${col}-${row}`;
+            batchMergePos.has(key) || (updateCell$1(col, row, scene.table, !1), batchMergePos.add(key));
+          } else updateCell$1(col, row, scene.table, !1);
         } else if (row > table.rowCount - 1 || row < scene.table.rowCount - scene.table.bottomFrozenRowCount && (row < scene.proxy.rowStart || row > scene.proxy.rowEnd)) removeCellGroup(row, scene);else {
           const mergeInfo = getCellMergeInfo(scene.table, col, row);
-          if (mergeInfo) for (let col = mergeInfo.start.col; col <= mergeInfo.end.col; col++) for (let row = mergeInfo.start.row; row <= mergeInfo.end.row; row++) updateCell$1(col, row, scene.table, !1);else updateCell$1(col, row, scene.table, !1);
+          if (mergeInfo) for (let col = mergeInfo.start.col; col <= mergeInfo.end.col; col++) for (let row = mergeInfo.start.row; row <= mergeInfo.end.row; row++) {
+            const key = `${col}-${row}`;
+            batchMergePos.has(key) || (updateCell$1(col, row, scene.table, !1), batchMergePos.add(key));
+          } else updateCell$1(col, row, scene.table, !1);
         }
       });
       if (updateRows.length) {
@@ -46207,15 +46214,20 @@
       });
       const colWidthsMap = table.colWidthsMap;
       let updateAfter;
-      if (removeCols.forEach(col => {
+      removeCols.forEach(col => {
         colWidthsMap.delAndReorder(col);
       }), removeCols.length && resetColNumber(scene), scene.table._clearColRangeWidthsMap(), addCols.forEach(col => {
         const needUpdateAfter = addCol(col, scene);
         resetColNumber(scene), updateAfter = null != updateAfter ? updateAfter : needUpdateAfter, colWidthsMap.addAndReorder(col);
-      }), resetColNumberAndX(scene), updateCols.forEach(col => {
+      }), resetColNumberAndX(scene);
+      const batchMergePos = new Set();
+      if (updateCols.forEach(col => {
         for (let row = 0; row < table.rowCount; row++) {
           const mergeInfo = getCellMergeInfo(scene.table, col, row);
-          if (mergeInfo) for (let col = mergeInfo.start.col; col <= mergeInfo.end.col; col++) for (let col = mergeInfo.start.col; col <= mergeInfo.end.col; col++) updateCell$1(col, row, scene.table, !1);else updateCell$1(col, row, scene.table, !1);
+          if (mergeInfo) for (let col = mergeInfo.start.col; col <= mergeInfo.end.col; col++) for (let col = mergeInfo.start.col; col <= mergeInfo.end.col; col++) {
+            const key = `${col}-${row}`;
+            batchMergePos.has(key) || (updateCell$1(col, row, scene.table, !1), batchMergePos.add(key));
+          } else updateCell$1(col, row, scene.table, !1);
         }
       }), isNumber$4(updateAfter)) {
         for (let col = updateAfter; col < Math.max(table.colCount, null !== (_a = table.internalProps._oldColCount) && void 0 !== _a ? _a : table.colCount); col++) for (let row = 0; row < Math.max(table.rowCount, null !== (_b = table.internalProps._oldRowCount) && void 0 !== _b ? _b : table.rowCount); row++) {
@@ -49585,7 +49597,7 @@
           }
         });
       }), table.scenegraph.tableGroup.addEventListener("pointerup", e => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (0 === e.button) {
           if ("grabing" === stateManager.interactionState) {
             if (stateManager.updateInteractionState(InteractionState.default), stateManager.isResizeCol()) endResizeCol(table);else if (stateManager.isResizeRow()) endResizeRow(table);else if (stateManager.isMoveCol()) {
@@ -49608,14 +49620,42 @@
               }
             }
           } else stateManager.interactionState === InteractionState.scrolling && stateManager.updateInteractionState(InteractionState.default);
+          if (!table.eventManager.isDraging) {
+            const eventArgsSet = getCellEventArgsSet(e);
+            if (!eventManager.isTouchMove && 0 === e.button && eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE.CLICK_CELL)) {
+              const {
+                  col: col,
+                  row: row
+                } = eventArgsSet.eventArgs,
+                cellInfo = table.getCellInfo(col, row);
+              let icon, position;
+              if (null === (_c = eventArgsSet.eventArgs) || void 0 === _c ? void 0 : _c.target) {
+                const iconInfo = getIconAndPositionFromTarget(null === (_d = eventArgsSet.eventArgs) || void 0 === _d ? void 0 : _d.target);
+                iconInfo && (icon = iconInfo.icon, position = iconInfo.position);
+              }
+              const cellsEvent = Object.assign(Object.assign({}, cellInfo), {
+                event: e.nativeEvent,
+                federatedEvent: e,
+                cells: [],
+                targetIcon: icon ? {
+                  name: icon.name,
+                  position: position,
+                  funcType: icon.attribute.funcType
+                } : void 0,
+                target: null === (_e = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _e ? void 0 : _e.target,
+                mergeCellInfo: null === (_f = eventArgsSet.eventArgs) || void 0 === _f ? void 0 : _f.mergeInfo
+              });
+              table.fireListeners(TABLE_EVENT_TYPE.CLICK_CELL, cellsEvent);
+            }
+          }
           if (table.hasListeners(TABLE_EVENT_TYPE.MOUSEUP_CELL)) {
             const eventArgsSet = getCellEventArgsSet(e);
             eventArgsSet.eventArgs && table.fireListeners(TABLE_EVENT_TYPE.MOUSEUP_CELL, {
               col: eventArgsSet.eventArgs.col,
               row: eventArgsSet.eventArgs.row,
               event: e.nativeEvent,
-              target: null === (_c = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _c ? void 0 : _c.target,
-              mergeCellInfo: null === (_d = eventArgsSet.eventArgs) || void 0 === _d ? void 0 : _d.mergeInfo
+              target: null === (_g = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _g ? void 0 : _g.target,
+              mergeCellInfo: null === (_h = eventArgsSet.eventArgs) || void 0 === _h ? void 0 : _h.mergeInfo
             });
           }
           setTimeout(() => {
@@ -49653,39 +49693,14 @@
           }
         }
       }), table.scenegraph.tableGroup.addEventListener("pointertap", e => {
-        var _a, _b, _c, _d, _e;
+        var _a;
         if (table.stateManager.columnResize.resizing) return;
         const eventArgsSet = getCellEventArgsSet(e);
-        if (!eventManager.isTouchMove && 0 === e.button && eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE.CLICK_CELL)) {
-          const {
-              col: col,
-              row: row
-            } = eventArgsSet.eventArgs,
-            cellInfo = table.getCellInfo(col, row);
-          let icon, position;
-          if (null === (_a = eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.target) {
-            const iconInfo = getIconAndPositionFromTarget(null === (_b = eventArgsSet.eventArgs) || void 0 === _b ? void 0 : _b.target);
-            iconInfo && (icon = iconInfo.icon, position = iconInfo.position);
-          }
-          const cellsEvent = Object.assign(Object.assign({}, cellInfo), {
-            event: e.nativeEvent,
-            federatedEvent: e,
-            cells: [],
-            targetIcon: icon ? {
-              name: icon.name,
-              position: position,
-              funcType: icon.attribute.funcType
-            } : void 0,
-            target: null === (_c = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _c ? void 0 : _c.target,
-            mergeCellInfo: null === (_d = eventArgsSet.eventArgs) || void 0 === _d ? void 0 : _d.mergeInfo
-          });
-          table.fireListeners(TABLE_EVENT_TYPE.CLICK_CELL, cellsEvent);
-        }
         if (!table.stateManager.columnResize.resizing && !table.stateManager.columnMove.moving && (eventManager.dealIconClick(e, eventArgsSet), (null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) && eventManager.touchSetTimeout && "touch" === e.pointerType)) {
           const eventArgsSet = getCellEventArgsSet(e);
           if (eventManager.touchSetTimeout) {
             clearTimeout(eventManager.touchSetTimeout);
-            const isHasSelected = !!(null === (_e = stateManager.select.ranges) || void 0 === _e ? void 0 : _e.length);
+            const isHasSelected = !!(null === (_a = stateManager.select.ranges) || void 0 === _a ? void 0 : _a.length);
             eventManager.dealTableSelect(eventArgsSet), stateManager.endSelectCells(!0, isHasSelected), eventManager.touchSetTimeout = void 0;
           }
         }
@@ -53616,7 +53631,7 @@
       }
       constructor(container, options = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.19.3-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");
+        if (super(), this.showFrozenIcon = !0, this.version = "1.19.4-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