@leankylin-sheet/core 4.0.3 → 4.0.4

package/dist/index.esm.js

@@ -56416,7 +56416,6 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
 function handleGlobalWheel(ctx, e, cache, scrollbarX, scrollbarY) {
   var _cache$searchDialog;
   if (((_cache$searchDialog = cache.searchDialog) === null || _cache$searchDialog === void 0 ? void 0 : _cache$searchDialog.mouseEnter) && ctx.showSearch && ctx.showReplace) return;
-  if (ctx.filterContextMenu != null) return;
   var scrollLeft = scrollbarX.scrollLeft;
   var scrollTop = scrollbarY.scrollTop;
   if (e.deltaY !== 0) {
@@ -56935,8 +56934,6 @@ function handleCellAreaMouseMove(ctx, globalCache, e, container) {
   if (!afterCellMouseMove) {
     return;
   }
-  ctx.contextMenu = {};
-  ctx.filterContextMenu = undefined;
   var flowdata = getFlowdata(ctx);
   if (!flowdata) return;
   var rect = container.getBoundingClientRect();
@@ -59751,11 +59748,14 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
   var rows = htmlDoc.querySelectorAll("tbody tr");
   if (!rows || rows.length < 1) {
     return {
-      data: [[clipboardData.getData("text")]]
+      data: [[clipboardData.getData("text")]],
+      borderInfo: [],
+      merge: {}
     };
   }
   var result = [];
   var borderInfo = [];
+  var merge = {};
   var startOffColIndexMap = {};
   for (var index = 0; index < (rows === null || rows === void 0 ? void 0 : rows.length); index += 1) {
     var row = rows[index];
@@ -59787,6 +59787,7 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
             r: index + startRow,
             c: _colIndex
           };
+          merge["".concat(index + startRow, "_").concat(_colIndex)] = mainCell.mc;
           borderInfo.push.apply(borderInfo, _toConsumableArray(getCellMcBorder(ctx, style, index + startRow, _colIndex, mainCell.mc)));
         } else {
           isFirstNoRs = true;
@@ -59833,7 +59834,8 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
   }
   return {
     data: result,
-    borderInfo: borderInfo
+    borderInfo: borderInfo,
+    merge: merge
   };
 }
 function handlePasteByLeanklin(_x2, _x3, _x4) {
@@ -59842,7 +59844,7 @@ function handlePasteByLeanklin(_x2, _x3, _x4) {
 function _handlePasteByLeanklin() {
   _handlePasteByLeanklin = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(ctx, e, copyRich) {
     var _ctx$luckysheet_selec8, _data$0$;
-    var allowEdit, selectRange, rows, columns, _getClipboardData, copyData, borderInfo, _ctx$config$borderInf, index, data, copyOne, pasteData, r, rIndex, c, row, column, range;
+    var allowEdit, selectRange, rows, columns, _getClipboardData, copyData, borderInfo, merge, _ctx$config$borderInf, index, data, copyOne, pasteData, r, rIndex, c, row, column, range;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -59862,13 +59864,19 @@ function _handlePasteByLeanklin() {
         case 6:
           rows = selectRange.row;
           columns = selectRange.column;
-          _getClipboardData = getClipboardData(ctx, e, copyRich, rows[0], columns[0]), copyData = _getClipboardData.data, borderInfo = _getClipboardData.borderInfo;
+          _getClipboardData = getClipboardData(ctx, e, copyRich, rows[0], columns[0]), copyData = _getClipboardData.data, borderInfo = _getClipboardData.borderInfo, merge = _getClipboardData.merge;
           if (!ctx.config.borderInfo) {
             ctx.config.borderInfo = [];
           }
           if (copyRich) {
             (_ctx$config$borderInf = ctx.config.borderInfo).push.apply(_ctx$config$borderInf, _toConsumableArray(borderInfo));
           }
+          if (!ctx.config.merge) {
+            ctx.config.merge = {};
+          }
+          if (copyRich) {
+            ctx.config.merge = Object.assign(ctx.config.merge, merge);
+          }
           index = getSheetIndex(ctx, ctx.currentSheetId);
           ctx.luckysheetfile[index].config = ctx.config;
           data = copyData;
@@ -59890,14 +59898,14 @@ function _handlePasteByLeanklin() {
             column: column
           };
           if (isAllowEdit(ctx, [range])) {
-            _context2.next = 22;
+            _context2.next = 24;
             break;
           }
           return _context2.abrupt("return");
-        case 22:
+        case 24:
           setCellValuesByRange(ctx, pasteData, range, null);
           ctx.luckysheet_select_save = [range];
-        case 24:
+        case 26:
         case "end":
           return _context2.stop();
       }

package/dist/index.js

@@ -56426,7 +56426,6 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
 function handleGlobalWheel(ctx, e, cache, scrollbarX, scrollbarY) {
   var _cache$searchDialog;
   if (((_cache$searchDialog = cache.searchDialog) === null || _cache$searchDialog === void 0 ? void 0 : _cache$searchDialog.mouseEnter) && ctx.showSearch && ctx.showReplace) return;
-  if (ctx.filterContextMenu != null) return;
   var scrollLeft = scrollbarX.scrollLeft;
   var scrollTop = scrollbarY.scrollTop;
   if (e.deltaY !== 0) {
@@ -56945,8 +56944,6 @@ function handleCellAreaMouseMove(ctx, globalCache, e, container) {
   if (!afterCellMouseMove) {
     return;
   }
-  ctx.contextMenu = {};
-  ctx.filterContextMenu = undefined;
   var flowdata = getFlowdata(ctx);
   if (!flowdata) return;
   var rect = container.getBoundingClientRect();
@@ -59761,11 +59758,14 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
   var rows = htmlDoc.querySelectorAll("tbody tr");
   if (!rows || rows.length < 1) {
     return {
-      data: [[clipboardData.getData("text")]]
+      data: [[clipboardData.getData("text")]],
+      borderInfo: [],
+      merge: {}
     };
   }
   var result = [];
   var borderInfo = [];
+  var merge = {};
   var startOffColIndexMap = {};
   for (var index = 0; index < (rows === null || rows === void 0 ? void 0 : rows.length); index += 1) {
     var row = rows[index];
@@ -59797,6 +59797,7 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
             r: index + startRow,
             c: _colIndex
           };
+          merge["".concat(index + startRow, "_").concat(_colIndex)] = mainCell.mc;
           borderInfo.push.apply(borderInfo, _toConsumableArray(getCellMcBorder(ctx, style, index + startRow, _colIndex, mainCell.mc)));
         } else {
           isFirstNoRs = true;
@@ -59843,7 +59844,8 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
   }
   return {
     data: result,
-    borderInfo: borderInfo
+    borderInfo: borderInfo,
+    merge: merge
   };
 }
 function handlePasteByLeanklin(_x2, _x3, _x4) {
@@ -59852,7 +59854,7 @@ function handlePasteByLeanklin(_x2, _x3, _x4) {
 function _handlePasteByLeanklin() {
   _handlePasteByLeanklin = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(ctx, e, copyRich) {
     var _ctx$luckysheet_selec8, _data$0$;
-    var allowEdit, selectRange, rows, columns, _getClipboardData, copyData, borderInfo, _ctx$config$borderInf, index, data, copyOne, pasteData, r, rIndex, c, row, column, range;
+    var allowEdit, selectRange, rows, columns, _getClipboardData, copyData, borderInfo, merge, _ctx$config$borderInf, index, data, copyOne, pasteData, r, rIndex, c, row, column, range;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -59872,13 +59874,19 @@ function _handlePasteByLeanklin() {
         case 6:
           rows = selectRange.row;
           columns = selectRange.column;
-          _getClipboardData = getClipboardData(ctx, e, copyRich, rows[0], columns[0]), copyData = _getClipboardData.data, borderInfo = _getClipboardData.borderInfo;
+          _getClipboardData = getClipboardData(ctx, e, copyRich, rows[0], columns[0]), copyData = _getClipboardData.data, borderInfo = _getClipboardData.borderInfo, merge = _getClipboardData.merge;
           if (!ctx.config.borderInfo) {
             ctx.config.borderInfo = [];
           }
           if (copyRich) {
             (_ctx$config$borderInf = ctx.config.borderInfo).push.apply(_ctx$config$borderInf, _toConsumableArray(borderInfo));
           }
+          if (!ctx.config.merge) {
+            ctx.config.merge = {};
+          }
+          if (copyRich) {
+            ctx.config.merge = Object.assign(ctx.config.merge, merge);
+          }
           index = getSheetIndex(ctx, ctx.currentSheetId);
           ctx.luckysheetfile[index].config = ctx.config;
           data = copyData;
@@ -59900,14 +59908,14 @@ function _handlePasteByLeanklin() {
             column: column
           };
           if (isAllowEdit(ctx, [range])) {
-            _context2.next = 22;
+            _context2.next = 24;
             break;
           }
           return _context2.abrupt("return");
-        case 22:
+        case 24:
           setCellValuesByRange(ctx, pasteData, range, null);
           ctx.luckysheet_select_save = [range];
-        case 24:
+        case 26:
         case "end":
           return _context2.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/core",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",
@@ -13,7 +13,7 @@
     "build": "father-build"
   },
   "dependencies": {
-    "@leankylin-sheet/formula-parser": "4.0.3",
+    "@leankylin-sheet/formula-parser": "4.0.4",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",