@leankylin-sheet/core 4.0.37 → 4.0.38

package/dist/index.esm.js

@@ -36171,7 +36171,6 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
   if (_.isNil(data)) {
     data = getFlowdata(ctx);
   }
-  debugger;
   if (_.isNil(ctx.formulaCache.execFunctionGlobalData)) {
     ctx.formulaCache.execFunctionGlobalData = {};
   }
@@ -59883,7 +59882,7 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
     if (copyRich) {
       for (var _offIndex = 0; _offIndex < result[index].length; _offIndex++) {
         var offNumber = result[index][_offIndex];
-        if (offNumber) {
+        if (offNumber === null || offNumber === void 0 ? void 0 : offNumber._mc) {
           cells.splice(_offIndex, 0, null);
         }
       }
@@ -59924,16 +59923,20 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
         } else {
           borderInfo.push(getCellBorder(style, index + startRow, _colIndex));
         }
-        result[index][_colIndex] = mainCell;
-        if (rowspan > 1) {
-          for (var rs_index = 1; rs_index < rowspan; rs_index += 1) {
+        result[index][offsetColIndex] = mainCell;
+        if (rowspan > 1 || colspan > 1) {
+          for (var rs_index = 0; rs_index < rowspan; rs_index += 1) {
             var nextR = index + rs_index;
             if (!result[nextR]) {
               result[nextR] = [];
             }
             for (var _cIndex = 0; _cIndex < colspan; _cIndex++) {
-              var nextC = _colIndex + _cIndex;
+              if (rs_index === 0 && _cIndex === 0) {
+                continue;
+              }
+              var nextC = offsetColIndex + _cIndex;
               result[nextR][nextC] = {
+                _mc: true,
                 mc: {
                   r: index + startRow,
                   c: _colIndex
@@ -59942,16 +59945,6 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
             }
           }
         }
-        if (colspan > 1) {
-          for (var cs_index = 1; cs_index < colspan; cs_index += 1) {
-            result[index].push({
-              mc: {
-                r: index + startRow,
-                c: _colIndex
-              }
-            });
-          }
-        }
         offsetColIndex = (colspan || 1) + offsetColIndex;
       } else {
         var item = f ? {
@@ -59964,9 +59957,15 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
       }
     }
   }
-  console.log("result", result);
   return {
-    data: result,
+    data: result === null || result === void 0 ? void 0 : result.map(function (item) {
+      return item === null || item === void 0 ? void 0 : item.map(function (cell) {
+        if (cell === null || cell === void 0 ? void 0 : cell._mc) {
+          delete cell._mc;
+        }
+        return cell;
+      });
+    }),
     borderInfo: borderInfo,
     merge: merge
   };

package/dist/index.js

@@ -36181,7 +36181,6 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
   if (___default['default'].isNil(data)) {
     data = getFlowdata(ctx);
   }
-  debugger;
   if (___default['default'].isNil(ctx.formulaCache.execFunctionGlobalData)) {
     ctx.formulaCache.execFunctionGlobalData = {};
   }
@@ -59893,7 +59892,7 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
     if (copyRich) {
       for (var _offIndex = 0; _offIndex < result[index].length; _offIndex++) {
         var offNumber = result[index][_offIndex];
-        if (offNumber) {
+        if (offNumber === null || offNumber === void 0 ? void 0 : offNumber._mc) {
           cells.splice(_offIndex, 0, null);
         }
       }
@@ -59934,16 +59933,20 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
         } else {
           borderInfo.push(getCellBorder(style, index + startRow, _colIndex));
         }
-        result[index][_colIndex] = mainCell;
-        if (rowspan > 1) {
-          for (var rs_index = 1; rs_index < rowspan; rs_index += 1) {
+        result[index][offsetColIndex] = mainCell;
+        if (rowspan > 1 || colspan > 1) {
+          for (var rs_index = 0; rs_index < rowspan; rs_index += 1) {
             var nextR = index + rs_index;
             if (!result[nextR]) {
               result[nextR] = [];
             }
             for (var _cIndex = 0; _cIndex < colspan; _cIndex++) {
-              var nextC = _colIndex + _cIndex;
+              if (rs_index === 0 && _cIndex === 0) {
+                continue;
+              }
+              var nextC = offsetColIndex + _cIndex;
               result[nextR][nextC] = {
+                _mc: true,
                 mc: {
                   r: index + startRow,
                   c: _colIndex
@@ -59952,16 +59955,6 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
             }
           }
         }
-        if (colspan > 1) {
-          for (var cs_index = 1; cs_index < colspan; cs_index += 1) {
-            result[index].push({
-              mc: {
-                r: index + startRow,
-                c: _colIndex
-              }
-            });
-          }
-        }
         offsetColIndex = (colspan || 1) + offsetColIndex;
       } else {
         var item = f ? {
@@ -59974,9 +59967,15 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
       }
     }
   }
-  console.log("result", result);
   return {
-    data: result,
+    data: result === null || result === void 0 ? void 0 : result.map(function (item) {
+      return item === null || item === void 0 ? void 0 : item.map(function (cell) {
+        if (cell === null || cell === void 0 ? void 0 : cell._mc) {
+          delete cell._mc;
+        }
+        return cell;
+      });
+    }),
     borderInfo: borderInfo,
     merge: merge
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/core",
-  "version": "4.0.37",
+  "version": "4.0.38",
   "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.37",
+    "@leankylin-sheet/formula-parser": "4.0.38",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",