@leankylin-sheet/core 4.0.24 → 4.0.26

package/dist/index.esm.js

@@ -36282,14 +36282,14 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
         }
       }
       for (var _j2 = 0; _j2 < formulaTextArray.length; _j2 += 1) {
-        var t = formulaTextArray[_j2];
+        var t = _.trim(formulaTextArray[_j2]);
         if (t.length <= 1) {
           continue;
         }
         if (t.substring(0, 1) === '"' && t.substring(t.length - 1, 1) === '"' || !iscelldata(t)) {
           continue;
         }
-        var range = getcellrange(ctx, _.trim(t), formulaCell.id);
+        var range = getcellrange(ctx, t, formulaCell.id);
         if (_.isNil(range)) {
           continue;
         }
@@ -55876,13 +55876,32 @@ function setCellValuesByRange(ctx, data, range, cellInput) {
   if (data.length !== rowCount || data[0].length !== columnCount) {
     throw new Error("data size does not match range");
   }
+  var sheet = getSheet(ctx, options);
+  var cfg = sheet.config || {};
+  if (cfg.merge == null) {
+    cfg.merge = {};
+  }
   for (var i = 0; i < rowCount; i += 1) {
     for (var j = 0; j < columnCount; j += 1) {
+      var _data$i$j, _data$i$j$mc, _data$i$j2, _data$i$j2$mc, _data$i$j3, _data$i$j3$mc, _data$i$j4, _data$i$j4$mc;
       var row = range.row[0] + i;
       var column = range.column[0] + j;
       setCellValue$1(ctx, row, column, data[i][j], cellInput, options);
+      var r1 = (_data$i$j = data[i][j]) === null || _data$i$j === void 0 ? void 0 : (_data$i$j$mc = _data$i$j.mc) === null || _data$i$j$mc === void 0 ? void 0 : _data$i$j$mc.r;
+      var c1 = (_data$i$j2 = data[i][j]) === null || _data$i$j2 === void 0 ? void 0 : (_data$i$j2$mc = _data$i$j2.mc) === null || _data$i$j2$mc === void 0 ? void 0 : _data$i$j2$mc.c;
+      var rs = (_data$i$j3 = data[i][j]) === null || _data$i$j3 === void 0 ? void 0 : (_data$i$j3$mc = _data$i$j3.mc) === null || _data$i$j3$mc === void 0 ? void 0 : _data$i$j3$mc.rs;
+      var cs = (_data$i$j4 = data[i][j]) === null || _data$i$j4 === void 0 ? void 0 : (_data$i$j4$mc = _data$i$j4.mc) === null || _data$i$j4$mc === void 0 ? void 0 : _data$i$j4$mc.cs;
+      if (rs > 1 || cs > 1) {
+        cfg.merge["".concat(r1, "_").concat(c1)] = {
+          r: r1,
+          c: c1,
+          rs: rs,
+          cs: cs
+        };
+      }
     }
   }
+  sheet.config = cfg;
 }
 function setCellValues(ctx, data, cellInput) {
   if (data == null) {
@@ -59829,7 +59848,8 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
       } else {
         result[index].push({
           m: m,
-          v: v
+          v: v,
+          f: f || undefined
         });
       }
     }

package/dist/index.js

@@ -36292,14 +36292,14 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
         }
       }
       for (var _j2 = 0; _j2 < formulaTextArray.length; _j2 += 1) {
-        var t = formulaTextArray[_j2];
+        var t = ___default['default'].trim(formulaTextArray[_j2]);
         if (t.length <= 1) {
           continue;
         }
         if (t.substring(0, 1) === '"' && t.substring(t.length - 1, 1) === '"' || !iscelldata(t)) {
           continue;
         }
-        var range = getcellrange(ctx, ___default['default'].trim(t), formulaCell.id);
+        var range = getcellrange(ctx, t, formulaCell.id);
         if (___default['default'].isNil(range)) {
           continue;
         }
@@ -55886,13 +55886,32 @@ function setCellValuesByRange(ctx, data, range, cellInput) {
   if (data.length !== rowCount || data[0].length !== columnCount) {
     throw new Error("data size does not match range");
   }
+  var sheet = getSheet(ctx, options);
+  var cfg = sheet.config || {};
+  if (cfg.merge == null) {
+    cfg.merge = {};
+  }
   for (var i = 0; i < rowCount; i += 1) {
     for (var j = 0; j < columnCount; j += 1) {
+      var _data$i$j, _data$i$j$mc, _data$i$j2, _data$i$j2$mc, _data$i$j3, _data$i$j3$mc, _data$i$j4, _data$i$j4$mc;
       var row = range.row[0] + i;
       var column = range.column[0] + j;
       setCellValue$1(ctx, row, column, data[i][j], cellInput, options);
+      var r1 = (_data$i$j = data[i][j]) === null || _data$i$j === void 0 ? void 0 : (_data$i$j$mc = _data$i$j.mc) === null || _data$i$j$mc === void 0 ? void 0 : _data$i$j$mc.r;
+      var c1 = (_data$i$j2 = data[i][j]) === null || _data$i$j2 === void 0 ? void 0 : (_data$i$j2$mc = _data$i$j2.mc) === null || _data$i$j2$mc === void 0 ? void 0 : _data$i$j2$mc.c;
+      var rs = (_data$i$j3 = data[i][j]) === null || _data$i$j3 === void 0 ? void 0 : (_data$i$j3$mc = _data$i$j3.mc) === null || _data$i$j3$mc === void 0 ? void 0 : _data$i$j3$mc.rs;
+      var cs = (_data$i$j4 = data[i][j]) === null || _data$i$j4 === void 0 ? void 0 : (_data$i$j4$mc = _data$i$j4.mc) === null || _data$i$j4$mc === void 0 ? void 0 : _data$i$j4$mc.cs;
+      if (rs > 1 || cs > 1) {
+        cfg.merge["".concat(r1, "_").concat(c1)] = {
+          r: r1,
+          c: c1,
+          rs: rs,
+          cs: cs
+        };
+      }
     }
   }
+  sheet.config = cfg;
 }
 function setCellValues(ctx, data, cellInput) {
   if (data == null) {
@@ -59839,7 +59858,8 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
       } else {
         result[index].push({
           m: m,
-          v: v
+          v: v,
+          f: f || undefined
         });
       }
     }

package/package.json

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