@leankylin-sheet/core 5.2.46 → 5.2.48

package/dist/api/range.d.ts

@@ -18,6 +18,15 @@ export declare function getSelectionCoordinates(ctx: Context): string[];
 export declare function getCellsByRange(ctx: Context, range: Selection, options?: CommonOptions): (Cell | null)[][];
 export declare function getHtmlByRange(ctx: Context, range: Range, options?: CommonOptions): string | null;
 export declare function setSelection(ctx: Context, range: Range, options: CommonOptions): void;
+export declare function registerExecFunctionExist(ctx: Context, sheet: {
+    id?: string;
+}, formulaCells: Array<{
+    r: number;
+    c: number;
+}>, modified: Array<{
+    r: number;
+    c: number;
+}>): void;
 export declare function setCellValuesByRange(ctx: Context, data: any[][], range: SingleRange, cellInput: HTMLDivElement | null, options?: CommonOptions, setMerge?: boolean): void;
 export declare function setCellValues(ctx: Context, data: any[], cellInput: HTMLDivElement | null): void;
 export declare function setCellFormatByRange(ctx: Context, attr: keyof Cell, value: any, range: Range | SingleRange, options?: CommonOptions): void;

package/dist/index.esm.js

@@ -42667,6 +42667,7 @@ function deepClear(ctx) {
   if (allowEdit === false) {
     return "allowEdit";
   }
+  var hasVChange = false;
   var selection = ctx.luckysheet_select_save;
   if (selection && !_.isEmpty(selection)) {
     var d = getFlowdata(ctx);
@@ -42678,8 +42679,11 @@ function deepClear(ctx) {
       var c2 = selection[s].column[1];
       for (var r = r1; r <= r2; r += 1) {
         for (var c = c1; c <= c2; c += 1) {
-          var _d$r2;
+          var _d$r2, _d$r3, _d$r3$c, _d$r4, _d$r4$c;
           var cell = d === null || d === void 0 ? void 0 : (_d$r2 = d[r]) === null || _d$r2 === void 0 ? void 0 : _d$r2[c];
+          if ((d === null || d === void 0 ? void 0 : (_d$r3 = d[r]) === null || _d$r3 === void 0 ? void 0 : (_d$r3$c = _d$r3[c]) === null || _d$r3$c === void 0 ? void 0 : _d$r3$c.v) !== undefined || (d === null || d === void 0 ? void 0 : (_d$r4 = d[r]) === null || _d$r4 === void 0 ? void 0 : (_d$r4$c = _d$r4[c]) === null || _d$r4$c === void 0 ? void 0 : _d$r4$c.f) !== undefined) {
+            hasVChange = true;
+          }
           d[r][c] = null;
           if ((cell === null || cell === void 0 ? void 0 : cell.f) != null) ;
           if (hyperlinkMap && hyperlinkMap["".concat(r, "_").concat(c)]) {
@@ -42689,6 +42693,9 @@ function deepClear(ctx) {
       }
     }
   }
+  if (!hasVChange) {
+    return "success-no-v-change";
+  }
   return "success";
 }
 function deleteSelectedCellText(ctx, deep) {
@@ -42699,6 +42706,7 @@ function deleteSelectedCellText(ctx, deep) {
   if (allowEdit === false) {
     return "allowEdit";
   }
+  var hasVChange = false;
   var selection = ctx.luckysheet_select_save;
   if (selection && !_.isEmpty(selection)) {
     var d = getFlowdata(ctx);
@@ -42725,6 +42733,10 @@ function deleteSelectedCellText(ctx, deep) {
       var _c4 = selection[_s].column[1];
       for (var r = _r3; r <= _r4; r += 1) {
         for (var c = _c3; c <= _c4; c += 1) {
+          var _d$r5, _d$r5$c, _d$r6, _d$r6$c;
+          if ((d === null || d === void 0 ? void 0 : (_d$r5 = d[r]) === null || _d$r5 === void 0 ? void 0 : (_d$r5$c = _d$r5[c]) === null || _d$r5$c === void 0 ? void 0 : _d$r5$c.v) !== undefined || (d === null || d === void 0 ? void 0 : (_d$r6 = d[r]) === null || _d$r6 === void 0 ? void 0 : (_d$r6$c = _d$r6[c]) === null || _d$r6$c === void 0 ? void 0 : _d$r6$c.f) !== undefined) {
+            hasVChange = true;
+          }
           if (_.isPlainObject(d[r][c])) {
             var cell = d[r][c];
             delete cell.m;
@@ -42746,6 +42758,9 @@ function deleteSelectedCellText(ctx, deep) {
       }
     }
   }
+  if (!hasVChange) {
+    return "success-no-v-change";
+  }
   return "success";
 }
 function selectIsOverlap(ctx, range) {
@@ -56197,6 +56212,7 @@ function setCellValueInBatch(ctx, sheet, row, column, value, cellInput, formulaC
       data[row][column] = {};
     }
     var cell = data[row][column];
+    var oldF = cell.f;
     if (value.f != null && value.v == null) {
       curv.f = value.f;
       if (value.ct != null) {
@@ -56204,19 +56220,20 @@ function setCellValueInBatch(ctx, sheet, row, column, value, cellInput, formulaC
       }
       Object.assign(cell, curv);
       if (_.isString(value.f)) {
-        formulaCells.push({
-          r: row,
-          c: column,
-          f: value.f,
-          ct: value.ct
-        });
+        if (value.f !== oldF) {
+          formulaCells.push({
+            r: row,
+            c: column,
+            f: value.f,
+            ct: value.ct
+          });
+        }
       } else {
         updateCell(ctx, row, column, cellInput, curv);
       }
     } else {
       var needupdateFdev = false;
       var needUpdateM = false;
-      var oldF = cell.f;
       var nf = value.f;
       var oldV = cell.v;
       var nv = value.v;
@@ -56319,12 +56336,15 @@ function setCellValueInBatch(ctx, sheet, row, column, value, cellInput, formulaC
         data[row][column] = {};
       }
       var _cell = data[row][column];
+      var _oldF = _cell.f;
       _cell.f = text;
-      formulaCells.push({
-        r: row,
-        c: column,
-        f: text
-      });
+      if (_oldF !== text) {
+        formulaCells.push({
+          r: row,
+          c: column,
+          f: text
+        });
+      }
     } else if (text.substr(0, 5) === "<span") {
       updateCell(ctx, row, column, cellInput, value);
     } else {
@@ -56650,6 +56670,54 @@ function setSelection(ctx, range, options) {
     ctx.luckysheet_select_save = sheet.luckysheet_select_save;
   }
 }
+function registerExecFunctionExist(ctx, sheet, formulaCells, modified) {
+  var seen = new Set();
+  var exist = [];
+  var pushUnique = function pushUnique(r, c) {
+    var key = "".concat(r, "_").concat(c);
+    if (seen.has(key)) return;
+    seen.add(key);
+    exist.push({
+      r: r,
+      c: c,
+      i: sheet.id
+    });
+  };
+  for (var i = 0; i < formulaCells.length; i += 1) {
+    pushUnique(formulaCells[i].r, formulaCells[i].c);
+  }
+  for (var _i = 0; _i < modified.length; _i += 1) {
+    pushUnique(modified[_i].r, modified[_i].c);
+  }
+  ctx.formulaCache.execFunctionExist = exist;
+}
+function isCellValueUnchanged(sheet, r, c, v) {
+  var _sheet$data, _sheet$data$r;
+  if (_typeof(v) === 'object' && !('f' in v) && !('v' in v)) {
+    return true;
+  }
+  var oldCell = (_sheet$data = sheet.data) === null || _sheet$data === void 0 ? void 0 : (_sheet$data$r = _sheet$data[r]) === null || _sheet$data$r === void 0 ? void 0 : _sheet$data$r[c];
+  if (oldCell == null) return false;
+  if (v == null || v.toString().length === 0) return false;
+  var newF;
+  var newV;
+  if (v instanceof Object) {
+    newF = v.f;
+    newV = v.v;
+  } else if (typeof v === "string" && v[0] === "=") {
+    newF = v;
+  } else {
+    newV = v;
+  }
+  var oldF = oldCell.f;
+  if (newF != null || oldF != null) {
+    if (newF !== oldF) return false;
+    if (newV == null) return true;
+    return String(newV) === String(oldCell.v);
+  }
+  if (newV == null) return false;
+  return String(newV) === String(oldCell.v);
+}
 function setCellValuesByRange(ctx, data, range, cellInput) {
   var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
   var setMerge = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
@@ -56722,18 +56790,9 @@ function setCellValuesByRange(ctx, data, range, cellInput) {
     sheet.config = cfg;
   }
   if (modifiedCells.length > 0) {
-    ctx.formulaCache.execFunctionExist = formulaCells.map(function (fc) {
-      return {
-        r: fc.r,
-        c: fc.c,
-        i: sheet.id
-      };
-    });
-    for (var k = 0; k < modifiedCells.length; k += 1) {
-      ctx.formulaCache.execFunctionExist.push(modifiedCells[k]);
-    }
-    for (var _k = 0; _k < formulaCells.length; _k += 1) {
-      var fc = formulaCells[_k];
+    registerExecFunctionExist(ctx, sheet, formulaCells, modifiedCells);
+    for (var k = 0; k < formulaCells.length; k += 1) {
+      var fc = formulaCells[k];
       var v = execfunction(ctx, fc.f, fc.r, fc.c, sheet.id, false, true);
       setCellValue(ctx, fc.r, fc.c, flowdata, {
         v: v[1],
@@ -56781,27 +56840,21 @@ function setCellValues(ctx, data, cellInput) {
     throw SHEET_NOT_FOUND;
   }
   var formulaCells = [];
+  var changedData = [];
   for (var _j = 0; _j < data.length; _j += 1) {
     var _data$_j = data[_j],
       _r = _data$_j.r,
       _c = _data$_j.c,
       _v = _data$_j.v;
+    if (!isCellValueUnchanged(sheet, _r, _c, _v)) {
+      changedData.push(data[_j]);
+    }
     setCellValueInBatch(ctx, sheet, _r, _c, _v, cellInput, formulaCells);
   }
-  ctx.formulaCache.execFunctionExist = formulaCells.map(function (fc) {
-    return {
-      r: fc.r,
-      c: fc.c,
-      i: sheet.id
-    };
-  });
-  for (var _j2 = 0; _j2 < data.length; _j2 += 1) {
-    ctx.formulaCache.execFunctionExist.push({
-      r: data[_j2].r,
-      c: data[_j2].c,
-      i: sheet.id
-    });
+  if (formulaCells.length === 0 && changedData.length === 0) {
+    return;
   }
+  registerExecFunctionExist(ctx, sheet, formulaCells, changedData);
   for (var k = 0; k < formulaCells.length; k += 1) {
     var fc = formulaCells[k];
     var val = execfunction(ctx, fc.f, fc.r, fc.c, sheet.id, false, true);
@@ -56940,6 +56993,7 @@ var index = /*#__PURE__*/Object.freeze({
   getCellsByRange: getCellsByRange,
   getHtmlByRange: getHtmlByRange,
   setSelection: setSelection,
+  registerExecFunctionExist: registerExecFunctionExist,
   setCellValuesByRange: setCellValuesByRange,
   setCellValues: setCellValues,
   setCellFormatByRange: setCellFormatByRange,
@@ -57322,9 +57376,11 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
       if (ctx.activeImg != null) {
         removeActiveImage(ctx);
       } else {
-        deleteSelectedCellText(ctx);
+        var flag = deleteSelectedCellText(ctx);
+        if (flag === "success") {
+          jfrefreshgrid(ctx, null, undefined);
+        }
       }
-      jfrefreshgrid(ctx, null, undefined);
       e.preventDefault();
     } else if (kstr === "ArrowUp" || kstr === "ArrowDown" || kstr === "ArrowLeft" || kstr === "ArrowRight") {
       handleArrowKey(ctx, e);

package/dist/index.js

@@ -42677,6 +42677,7 @@ function deepClear(ctx) {
   if (allowEdit === false) {
     return "allowEdit";
   }
+  var hasVChange = false;
   var selection = ctx.luckysheet_select_save;
   if (selection && !___default['default'].isEmpty(selection)) {
     var d = getFlowdata(ctx);
@@ -42688,8 +42689,11 @@ function deepClear(ctx) {
       var c2 = selection[s].column[1];
       for (var r = r1; r <= r2; r += 1) {
         for (var c = c1; c <= c2; c += 1) {
-          var _d$r2;
+          var _d$r2, _d$r3, _d$r3$c, _d$r4, _d$r4$c;
           var cell = d === null || d === void 0 ? void 0 : (_d$r2 = d[r]) === null || _d$r2 === void 0 ? void 0 : _d$r2[c];
+          if ((d === null || d === void 0 ? void 0 : (_d$r3 = d[r]) === null || _d$r3 === void 0 ? void 0 : (_d$r3$c = _d$r3[c]) === null || _d$r3$c === void 0 ? void 0 : _d$r3$c.v) !== undefined || (d === null || d === void 0 ? void 0 : (_d$r4 = d[r]) === null || _d$r4 === void 0 ? void 0 : (_d$r4$c = _d$r4[c]) === null || _d$r4$c === void 0 ? void 0 : _d$r4$c.f) !== undefined) {
+            hasVChange = true;
+          }
           d[r][c] = null;
           if ((cell === null || cell === void 0 ? void 0 : cell.f) != null) ;
           if (hyperlinkMap && hyperlinkMap["".concat(r, "_").concat(c)]) {
@@ -42699,6 +42703,9 @@ function deepClear(ctx) {
       }
     }
   }
+  if (!hasVChange) {
+    return "success-no-v-change";
+  }
   return "success";
 }
 function deleteSelectedCellText(ctx, deep) {
@@ -42709,6 +42716,7 @@ function deleteSelectedCellText(ctx, deep) {
   if (allowEdit === false) {
     return "allowEdit";
   }
+  var hasVChange = false;
   var selection = ctx.luckysheet_select_save;
   if (selection && !___default['default'].isEmpty(selection)) {
     var d = getFlowdata(ctx);
@@ -42735,6 +42743,10 @@ function deleteSelectedCellText(ctx, deep) {
       var _c4 = selection[_s].column[1];
       for (var r = _r3; r <= _r4; r += 1) {
         for (var c = _c3; c <= _c4; c += 1) {
+          var _d$r5, _d$r5$c, _d$r6, _d$r6$c;
+          if ((d === null || d === void 0 ? void 0 : (_d$r5 = d[r]) === null || _d$r5 === void 0 ? void 0 : (_d$r5$c = _d$r5[c]) === null || _d$r5$c === void 0 ? void 0 : _d$r5$c.v) !== undefined || (d === null || d === void 0 ? void 0 : (_d$r6 = d[r]) === null || _d$r6 === void 0 ? void 0 : (_d$r6$c = _d$r6[c]) === null || _d$r6$c === void 0 ? void 0 : _d$r6$c.f) !== undefined) {
+            hasVChange = true;
+          }
           if (___default['default'].isPlainObject(d[r][c])) {
             var cell = d[r][c];
             delete cell.m;
@@ -42756,6 +42768,9 @@ function deleteSelectedCellText(ctx, deep) {
       }
     }
   }
+  if (!hasVChange) {
+    return "success-no-v-change";
+  }
   return "success";
 }
 function selectIsOverlap(ctx, range) {
@@ -56207,6 +56222,7 @@ function setCellValueInBatch(ctx, sheet, row, column, value, cellInput, formulaC
       data[row][column] = {};
     }
     var cell = data[row][column];
+    var oldF = cell.f;
     if (value.f != null && value.v == null) {
       curv.f = value.f;
       if (value.ct != null) {
@@ -56214,19 +56230,20 @@ function setCellValueInBatch(ctx, sheet, row, column, value, cellInput, formulaC
       }
       Object.assign(cell, curv);
       if (___default['default'].isString(value.f)) {
-        formulaCells.push({
-          r: row,
-          c: column,
-          f: value.f,
-          ct: value.ct
-        });
+        if (value.f !== oldF) {
+          formulaCells.push({
+            r: row,
+            c: column,
+            f: value.f,
+            ct: value.ct
+          });
+        }
       } else {
         updateCell(ctx, row, column, cellInput, curv);
       }
     } else {
       var needupdateFdev = false;
       var needUpdateM = false;
-      var oldF = cell.f;
       var nf = value.f;
       var oldV = cell.v;
       var nv = value.v;
@@ -56329,12 +56346,15 @@ function setCellValueInBatch(ctx, sheet, row, column, value, cellInput, formulaC
         data[row][column] = {};
       }
       var _cell = data[row][column];
+      var _oldF = _cell.f;
       _cell.f = text;
-      formulaCells.push({
-        r: row,
-        c: column,
-        f: text
-      });
+      if (_oldF !== text) {
+        formulaCells.push({
+          r: row,
+          c: column,
+          f: text
+        });
+      }
     } else if (text.substr(0, 5) === "<span") {
       updateCell(ctx, row, column, cellInput, value);
     } else {
@@ -56660,6 +56680,54 @@ function setSelection(ctx, range, options) {
     ctx.luckysheet_select_save = sheet.luckysheet_select_save;
   }
 }
+function registerExecFunctionExist(ctx, sheet, formulaCells, modified) {
+  var seen = new Set();
+  var exist = [];
+  var pushUnique = function pushUnique(r, c) {
+    var key = "".concat(r, "_").concat(c);
+    if (seen.has(key)) return;
+    seen.add(key);
+    exist.push({
+      r: r,
+      c: c,
+      i: sheet.id
+    });
+  };
+  for (var i = 0; i < formulaCells.length; i += 1) {
+    pushUnique(formulaCells[i].r, formulaCells[i].c);
+  }
+  for (var _i = 0; _i < modified.length; _i += 1) {
+    pushUnique(modified[_i].r, modified[_i].c);
+  }
+  ctx.formulaCache.execFunctionExist = exist;
+}
+function isCellValueUnchanged(sheet, r, c, v) {
+  var _sheet$data, _sheet$data$r;
+  if (_typeof(v) === 'object' && !('f' in v) && !('v' in v)) {
+    return true;
+  }
+  var oldCell = (_sheet$data = sheet.data) === null || _sheet$data === void 0 ? void 0 : (_sheet$data$r = _sheet$data[r]) === null || _sheet$data$r === void 0 ? void 0 : _sheet$data$r[c];
+  if (oldCell == null) return false;
+  if (v == null || v.toString().length === 0) return false;
+  var newF;
+  var newV;
+  if (v instanceof Object) {
+    newF = v.f;
+    newV = v.v;
+  } else if (typeof v === "string" && v[0] === "=") {
+    newF = v;
+  } else {
+    newV = v;
+  }
+  var oldF = oldCell.f;
+  if (newF != null || oldF != null) {
+    if (newF !== oldF) return false;
+    if (newV == null) return true;
+    return String(newV) === String(oldCell.v);
+  }
+  if (newV == null) return false;
+  return String(newV) === String(oldCell.v);
+}
 function setCellValuesByRange(ctx, data, range, cellInput) {
   var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
   var setMerge = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
@@ -56732,18 +56800,9 @@ function setCellValuesByRange(ctx, data, range, cellInput) {
     sheet.config = cfg;
   }
   if (modifiedCells.length > 0) {
-    ctx.formulaCache.execFunctionExist = formulaCells.map(function (fc) {
-      return {
-        r: fc.r,
-        c: fc.c,
-        i: sheet.id
-      };
-    });
-    for (var k = 0; k < modifiedCells.length; k += 1) {
-      ctx.formulaCache.execFunctionExist.push(modifiedCells[k]);
-    }
-    for (var _k = 0; _k < formulaCells.length; _k += 1) {
-      var fc = formulaCells[_k];
+    registerExecFunctionExist(ctx, sheet, formulaCells, modifiedCells);
+    for (var k = 0; k < formulaCells.length; k += 1) {
+      var fc = formulaCells[k];
       var v = execfunction(ctx, fc.f, fc.r, fc.c, sheet.id, false, true);
       setCellValue(ctx, fc.r, fc.c, flowdata, {
         v: v[1],
@@ -56791,27 +56850,21 @@ function setCellValues(ctx, data, cellInput) {
     throw SHEET_NOT_FOUND;
   }
   var formulaCells = [];
+  var changedData = [];
   for (var _j = 0; _j < data.length; _j += 1) {
     var _data$_j = data[_j],
       _r = _data$_j.r,
       _c = _data$_j.c,
       _v = _data$_j.v;
+    if (!isCellValueUnchanged(sheet, _r, _c, _v)) {
+      changedData.push(data[_j]);
+    }
     setCellValueInBatch(ctx, sheet, _r, _c, _v, cellInput, formulaCells);
   }
-  ctx.formulaCache.execFunctionExist = formulaCells.map(function (fc) {
-    return {
-      r: fc.r,
-      c: fc.c,
-      i: sheet.id
-    };
-  });
-  for (var _j2 = 0; _j2 < data.length; _j2 += 1) {
-    ctx.formulaCache.execFunctionExist.push({
-      r: data[_j2].r,
-      c: data[_j2].c,
-      i: sheet.id
-    });
+  if (formulaCells.length === 0 && changedData.length === 0) {
+    return;
   }
+  registerExecFunctionExist(ctx, sheet, formulaCells, changedData);
   for (var k = 0; k < formulaCells.length; k += 1) {
     var fc = formulaCells[k];
     var val = execfunction(ctx, fc.f, fc.r, fc.c, sheet.id, false, true);
@@ -56950,6 +57003,7 @@ var index = /*#__PURE__*/Object.freeze({
   getCellsByRange: getCellsByRange,
   getHtmlByRange: getHtmlByRange,
   setSelection: setSelection,
+  registerExecFunctionExist: registerExecFunctionExist,
   setCellValuesByRange: setCellValuesByRange,
   setCellValues: setCellValues,
   setCellFormatByRange: setCellFormatByRange,
@@ -57332,9 +57386,11 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
       if (ctx.activeImg != null) {
         removeActiveImage(ctx);
       } else {
-        deleteSelectedCellText(ctx);
+        var flag = deleteSelectedCellText(ctx);
+        if (flag === "success") {
+          jfrefreshgrid(ctx, null, undefined);
+        }
       }
-      jfrefreshgrid(ctx, null, undefined);
       e.preventDefault();
     } else if (kstr === "ArrowUp" || kstr === "ArrowDown" || kstr === "ArrowLeft" || kstr === "ArrowRight") {
       handleArrowKey(ctx, e);

package/package.json

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