@leankylin-sheet/core 4.0.36 → 4.0.37

package/dist/index.esm.js

@@ -36171,6 +36171,7 @@ 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 = {};
   }
@@ -51484,7 +51485,6 @@ function updateDropCell(ctx) {
           if ((cell === null || cell === void 0 ? void 0 : cell.f) != null) {
             var f = "=".concat(functionCopy(ctx, cell.f, "down", j - apply_str_r + 1));
             var v = execfunction(ctx, f, j, i);
-            execFunctionGroup(ctx, j, i, v[1], undefined, d);
             var _v = _slicedToArray(v, 3);
             cell.v = _v[1];
             cell.f = _v[2];
@@ -51566,7 +51566,6 @@ function updateDropCell(ctx) {
           if ((_cell === null || _cell === void 0 ? void 0 : _cell.f) != null) {
             var _f = "=".concat(functionCopy(ctx, _cell.f, "up", apply_end_r - _j + 1));
             var _v2 = execfunction(ctx, _f, _j, i);
-            execFunctionGroup(ctx, _j, i, _v2[1], undefined, d);
             var _v3 = _slicedToArray(_v2, 3);
             _cell.v = _v3[1];
             _cell.f = _v3[2];
@@ -51647,7 +51646,6 @@ function updateDropCell(ctx) {
           if ((_cell2 === null || _cell2 === void 0 ? void 0 : _cell2.f) != null) {
             var _f2 = "=".concat(functionCopy(ctx, _cell2.f, "right", _j2 - apply_str_c + 1));
             var _v4 = execfunction(ctx, _f2, _i23, _j2);
-            execFunctionGroup(ctx, _j2, _i23, _v4[1], undefined, d);
             var _v5 = _slicedToArray(_v4, 3);
             _cell2.v = _v5[1];
             _cell2.f = _v5[2];
@@ -51722,7 +51720,6 @@ function updateDropCell(ctx) {
           if ((_cell3 === null || _cell3 === void 0 ? void 0 : _cell3.f) != null) {
             var _f3 = "=".concat(functionCopy(ctx, _cell3.f, "left", apply_end_c - _j3 + 1));
             var _v6 = execfunction(ctx, _f3, _i23, _j3);
-            execFunctionGroup(ctx, _j3, _i23, _v6[1], undefined, d);
             var _v7 = _slicedToArray(_v6, 3);
             _cell3.v = _v7[1];
             _cell3.f = _v7[2];
@@ -51793,28 +51790,6 @@ function updateDropCell(ctx) {
       }
     }
   }
-  var cdformat = file.luckysheet_conditionformat_save;
-  if (cdformat != null && cdformat.length > 0) {
-    for (var _i24 = 0; _i24 < cdformat.length; _i24 += 1) {
-      var cdformat_cellrange = cdformat[_i24].cellrange;
-      var emptyRange = [];
-      for (var _j4 = 0; _j4 < cdformat_cellrange.length; _j4 += 1) {
-        var range = CFSplitRange(cdformat_cellrange[_j4], {
-          row: copyRange.row,
-          column: copyRange.column
-        }, {
-          row: applyRange.row,
-          column: applyRange.column
-        }, "operatePart");
-        if (range.length > 0) {
-          emptyRange = emptyRange.concat(range);
-        }
-      }
-      if (emptyRange.length > 0) {
-        cdformat[_i24].cellrange.push(applyRange);
-      }
-    }
-  }
   jfrefreshgrid(ctx, d, ctx.luckysheet_select_save);
 }
 function onDropCellSelectEnd(ctx, e, container) {
@@ -59899,18 +59874,28 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
   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];
-    var isFirstNoRs = false;
     var cells = Array.from(row.querySelectorAll("td")).slice(0, currentColLen);
     if (!result[index]) {
       result[index] = [];
     }
+    if (copyRich) {
+      for (var _offIndex = 0; _offIndex < result[index].length; _offIndex++) {
+        var offNumber = result[index][_offIndex];
+        if (offNumber) {
+          cells.splice(_offIndex, 0, null);
+        }
+      }
+    }
     var offsetColIndex = 0;
     for (var cIndex = 0; cIndex < cells.length; cIndex += 1) {
-      var _colIndex = startCol + offsetColIndex + (startOffColIndexMap[index] || 0);
+      var _colIndex = startCol + offsetColIndex;
       var cell = cells[cIndex];
+      if (cell === null) {
+        offsetColIndex++;
+        continue;
+      }
       var m = cell === null || cell === void 0 ? void 0 : cell.textContent;
       var v = cell.getAttribute("x:num");
       var f = cell.getAttribute("f");
@@ -59937,26 +59922,23 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
           merge["".concat(index + startRow, "_").concat(_colIndex)] = mainCell.mc;
           borderInfo.push.apply(borderInfo, _toConsumableArray(getCellMcBorder(ctx, style, index + startRow, _colIndex, mainCell.mc)));
         } else {
-          isFirstNoRs = true;
           borderInfo.push(getCellBorder(style, index + startRow, _colIndex));
         }
-        result[index].push(mainCell);
+        result[index][_colIndex] = mainCell;
         if (rowspan > 1) {
           for (var rs_index = 1; rs_index < rowspan; rs_index += 1) {
-            if (!result[index + rs_index]) {
-              result[index + rs_index] = [];
+            var nextR = index + rs_index;
+            if (!result[nextR]) {
+              result[nextR] = [];
             }
-            result[index + rs_index].push({
-              mc: {
-                r: index + startRow,
-                c: _colIndex
-              }
-            });
-            if (!isFirstNoRs) {
-              if (!startOffColIndexMap[index + rs_index]) {
-                startOffColIndexMap[index + rs_index] = 0;
-              }
-              startOffColIndexMap[index + rs_index] += colspan || 1;
+            for (var _cIndex = 0; _cIndex < colspan; _cIndex++) {
+              var nextC = _colIndex + _cIndex;
+              result[nextR][nextC] = {
+                mc: {
+                  r: index + startRow,
+                  c: _colIndex
+                }
+              };
             }
           }
         }
@@ -59970,7 +59952,7 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
             });
           }
         }
-        offsetColIndex += colspan || 1;
+        offsetColIndex = (colspan || 1) + offsetColIndex;
       } else {
         var item = f ? {
           f: f
@@ -59982,6 +59964,7 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
       }
     }
   }
+  console.log("result", result);
   return {
     data: result,
     borderInfo: borderInfo,

package/dist/index.js

@@ -36181,6 +36181,7 @@ 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 = {};
   }
@@ -51494,7 +51495,6 @@ function updateDropCell(ctx) {
           if ((cell === null || cell === void 0 ? void 0 : cell.f) != null) {
             var f = "=".concat(functionCopy(ctx, cell.f, "down", j - apply_str_r + 1));
             var v = execfunction(ctx, f, j, i);
-            execFunctionGroup(ctx, j, i, v[1], undefined, d);
             var _v = _slicedToArray(v, 3);
             cell.v = _v[1];
             cell.f = _v[2];
@@ -51576,7 +51576,6 @@ function updateDropCell(ctx) {
           if ((_cell === null || _cell === void 0 ? void 0 : _cell.f) != null) {
             var _f = "=".concat(functionCopy(ctx, _cell.f, "up", apply_end_r - _j + 1));
             var _v2 = execfunction(ctx, _f, _j, i);
-            execFunctionGroup(ctx, _j, i, _v2[1], undefined, d);
             var _v3 = _slicedToArray(_v2, 3);
             _cell.v = _v3[1];
             _cell.f = _v3[2];
@@ -51657,7 +51656,6 @@ function updateDropCell(ctx) {
           if ((_cell2 === null || _cell2 === void 0 ? void 0 : _cell2.f) != null) {
             var _f2 = "=".concat(functionCopy(ctx, _cell2.f, "right", _j2 - apply_str_c + 1));
             var _v4 = execfunction(ctx, _f2, _i23, _j2);
-            execFunctionGroup(ctx, _j2, _i23, _v4[1], undefined, d);
             var _v5 = _slicedToArray(_v4, 3);
             _cell2.v = _v5[1];
             _cell2.f = _v5[2];
@@ -51732,7 +51730,6 @@ function updateDropCell(ctx) {
           if ((_cell3 === null || _cell3 === void 0 ? void 0 : _cell3.f) != null) {
             var _f3 = "=".concat(functionCopy(ctx, _cell3.f, "left", apply_end_c - _j3 + 1));
             var _v6 = execfunction(ctx, _f3, _i23, _j3);
-            execFunctionGroup(ctx, _j3, _i23, _v6[1], undefined, d);
             var _v7 = _slicedToArray(_v6, 3);
             _cell3.v = _v7[1];
             _cell3.f = _v7[2];
@@ -51803,28 +51800,6 @@ function updateDropCell(ctx) {
       }
     }
   }
-  var cdformat = file.luckysheet_conditionformat_save;
-  if (cdformat != null && cdformat.length > 0) {
-    for (var _i24 = 0; _i24 < cdformat.length; _i24 += 1) {
-      var cdformat_cellrange = cdformat[_i24].cellrange;
-      var emptyRange = [];
-      for (var _j4 = 0; _j4 < cdformat_cellrange.length; _j4 += 1) {
-        var range = CFSplitRange(cdformat_cellrange[_j4], {
-          row: copyRange.row,
-          column: copyRange.column
-        }, {
-          row: applyRange.row,
-          column: applyRange.column
-        }, "operatePart");
-        if (range.length > 0) {
-          emptyRange = emptyRange.concat(range);
-        }
-      }
-      if (emptyRange.length > 0) {
-        cdformat[_i24].cellrange.push(applyRange);
-      }
-    }
-  }
   jfrefreshgrid(ctx, d, ctx.luckysheet_select_save);
 }
 function onDropCellSelectEnd(ctx, e, container) {
@@ -59909,18 +59884,28 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
   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];
-    var isFirstNoRs = false;
     var cells = Array.from(row.querySelectorAll("td")).slice(0, currentColLen);
     if (!result[index]) {
       result[index] = [];
     }
+    if (copyRich) {
+      for (var _offIndex = 0; _offIndex < result[index].length; _offIndex++) {
+        var offNumber = result[index][_offIndex];
+        if (offNumber) {
+          cells.splice(_offIndex, 0, null);
+        }
+      }
+    }
     var offsetColIndex = 0;
     for (var cIndex = 0; cIndex < cells.length; cIndex += 1) {
-      var _colIndex = startCol + offsetColIndex + (startOffColIndexMap[index] || 0);
+      var _colIndex = startCol + offsetColIndex;
       var cell = cells[cIndex];
+      if (cell === null) {
+        offsetColIndex++;
+        continue;
+      }
       var m = cell === null || cell === void 0 ? void 0 : cell.textContent;
       var v = cell.getAttribute("x:num");
       var f = cell.getAttribute("f");
@@ -59947,26 +59932,23 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
           merge["".concat(index + startRow, "_").concat(_colIndex)] = mainCell.mc;
           borderInfo.push.apply(borderInfo, _toConsumableArray(getCellMcBorder(ctx, style, index + startRow, _colIndex, mainCell.mc)));
         } else {
-          isFirstNoRs = true;
           borderInfo.push(getCellBorder(style, index + startRow, _colIndex));
         }
-        result[index].push(mainCell);
+        result[index][_colIndex] = mainCell;
         if (rowspan > 1) {
           for (var rs_index = 1; rs_index < rowspan; rs_index += 1) {
-            if (!result[index + rs_index]) {
-              result[index + rs_index] = [];
+            var nextR = index + rs_index;
+            if (!result[nextR]) {
+              result[nextR] = [];
             }
-            result[index + rs_index].push({
-              mc: {
-                r: index + startRow,
-                c: _colIndex
-              }
-            });
-            if (!isFirstNoRs) {
-              if (!startOffColIndexMap[index + rs_index]) {
-                startOffColIndexMap[index + rs_index] = 0;
-              }
-              startOffColIndexMap[index + rs_index] += colspan || 1;
+            for (var _cIndex = 0; _cIndex < colspan; _cIndex++) {
+              var nextC = _colIndex + _cIndex;
+              result[nextR][nextC] = {
+                mc: {
+                  r: index + startRow,
+                  c: _colIndex
+                }
+              };
             }
           }
         }
@@ -59980,7 +59962,7 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
             });
           }
         }
-        offsetColIndex += colspan || 1;
+        offsetColIndex = (colspan || 1) + offsetColIndex;
       } else {
         var item = f ? {
           f: f
@@ -59992,6 +59974,7 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
       }
     }
   }
+  console.log("result", result);
   return {
     data: result,
     borderInfo: borderInfo,

package/package.json

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