@leankylin-sheet/core 5.2.21 → 5.2.23

package/dist/index.esm.js

@@ -31637,7 +31637,7 @@ function locale(ctx) {
 }
 
 function moveToEnd(obj) {
-  if (document.createRange) {
+  if (document.createRange && obj) {
     if (obj.innerHTML !== obj.innerText || obj.innerHTML === "") {
       obj.focus();
       var range = window.getSelection();
@@ -36595,8 +36595,9 @@ function setCaretPosition(ctx, textDom, children, pos) {
     sel === null || sel === void 0 ? void 0 : sel.addRange(range);
     el.focus();
   } catch (err) {
+    var _ctx$formulaCache, _ctx$formulaCache$ran;
     console.error(err);
-    moveToEnd(ctx.formulaCache.rangeResizeTo[0]);
+    moveToEnd((_ctx$formulaCache = ctx.formulaCache) === null || _ctx$formulaCache === void 0 ? void 0 : (_ctx$formulaCache$ran = _ctx$formulaCache.rangeResizeTo) === null || _ctx$formulaCache$ran === void 0 ? void 0 : _ctx$formulaCache$ran[0]);
   }
 }
 function functionRange(ctx, obj, v, vp) {
@@ -37310,6 +37311,10 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
     $editor = fxInput;
     $copyTo = cellInput;
   }
+  if (ctx.active_f) {
+    $editor = fxInput;
+    $copyTo = cellInput;
+  }
   var range = "";
   var rf = selected.row[0];
   var cf = selected.column[0];
@@ -37326,6 +37331,7 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
     var span = $editor.querySelector("span[rangeindex='".concat(ctx.formulaCache.rangechangeindex, "']"));
     if (span) {
       span.innerHTML = range;
+      console.log(333312);
       setCaretPosition(ctx, span, 0, range.length);
     }
   } else if (ctx.active_f) {
@@ -37339,7 +37345,7 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
     }
     ctx.formulaCache.rangechangeindex = functionHTMLIndex;
     var _span = $editor.querySelector("span[rangeindex='".concat(ctx.formulaCache.rangechangeindex, "']"));
-    setCaretPosition(ctx, _span, 0, range.length);
+    setCaretPosition(ctx, _span || $editor, 0, range.length);
     functionHTMLIndex += 1;
   } else {
     var _function_str = "<span class=\"leankylin-formula-functionrange-cell\" rangeindex=\"".concat(functionHTMLIndex, "\" dir=\"auto\" style=\"color:").concat(getHLColor(functionHTMLIndex), ";\">").concat(range, "</span>");
@@ -46583,19 +46589,39 @@ function calculateSheetFromula(ctx, id, isrefresh) {
   console.time("calcTime:".concat(id));
   var index$1 = getSheetIndex(ctx, id);
   var luckysheetfile = ctx.luckysheetfile;
-  if (!ctx.luckysheetfile[index$1].data) return;
-  for (var r = 0; r < ctx.luckysheetfile[index$1].data.length; r += 1) {
-    for (var c = 0; c < ctx.luckysheetfile[index$1].data[r].length; c += 1) {
-      var cell = ctx.luckysheetfile[index$1].data[r][c];
+  var sheetData = luckysheetfile[index$1].data;
+  if (!sheetData) return;
+  var calcChain = luckysheetfile[index$1].calcChain || [];
+  if (isrefresh && calcChain.length > 0) {
+    execFunctionGroup(ctx, null, null, null, id, sheetData, true);
+    groupValuesRefresh(ctx);
+  } else {
+    var cellsToUpdate = [];
+    for (var i = 0; i < calcChain.length; i += 1) {
+      var _calcChain$i = calcChain[i],
+        r = _calcChain$i.r,
+        c = _calcChain$i.c;
+      var cell = sheetData[r][c];
       if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
         continue;
       }
-      var result = execfunction(ctx, cell === null || cell === void 0 ? void 0 : cell.f, r, c, id, isrefresh, true);
+      var result = execfunction(ctx, cell.f, r, c, id, false, true);
       var newV = result[1];
       if (newV === cell.v) {
         continue;
       }
-      setCellValue$1(ctx, r, c, result[1], null, {
+      cellsToUpdate.push({
+        r: r,
+        c: c,
+        v: newV
+      });
+    }
+    for (var _i = 0; _i < cellsToUpdate.length; _i += 1) {
+      var _cellsToUpdate$_i = cellsToUpdate[_i],
+        _r = _cellsToUpdate$_i.r,
+        _c = _cellsToUpdate$_i.c,
+        v = _cellsToUpdate$_i.v;
+      setCellValue$1(ctx, _r, _c, v, null, {
         id: id
       });
     }
@@ -46665,9 +46691,9 @@ function calculateSheetByCells(ctx, cells) {
     for (var _index = 0; _index < calcChain.length; _index++) {
       var _parseCellReferences;
       var _calcChain$_index = calcChain[_index],
-        _r2 = _calcChain$_index.r,
-        _c2 = _calcChain$_index.c;
-      var cell = file.data[_r2][_c2];
+        _r3 = _calcChain$_index.r,
+        _c3 = _calcChain$_index.c;
+      var cell = file.data[_r3][_c3];
       if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
         continue;
       }
@@ -46679,8 +46705,8 @@ function calculateSheetByCells(ctx, cells) {
       });
       if (n) {
         needUpdateCell.push({
-          r: _r2,
-          c: _c2,
+          r: _r3,
+          c: _c3,
           id: sheetId,
           f: cell.f,
           v: cell.v
@@ -46696,17 +46722,17 @@ function calculateSheetByCells(ctx, cells) {
   });
   for (var nIndex = 0; nIndex < needUpdateCell.length; nIndex++) {
     var _needUpdateCell$nInde = needUpdateCell[nIndex],
-      _r = _needUpdateCell$nInde.r,
-      _c = _needUpdateCell$nInde.c,
+      _r2 = _needUpdateCell$nInde.r,
+      _c2 = _needUpdateCell$nInde.c,
       _id = _needUpdateCell$nInde.id,
       _f = _needUpdateCell$nInde.f,
       v = _needUpdateCell$nInde.v;
-    var result = execfunction(ctx, _f, _r, _c, _id, undefined, true);
+    var result = execfunction(ctx, _f, _r2, _c2, _id, undefined, true);
     var newV = result[1];
     if (newV === v) {
       continue;
     }
-    setCellValue$1(ctx, _r, _c, result[1], null, {
+    setCellValue$1(ctx, _r2, _c2, result[1], null, {
       id: _id
     });
   }

package/dist/index.js

@@ -31647,7 +31647,7 @@ function locale(ctx) {
 }
 
 function moveToEnd(obj) {
-  if (document.createRange) {
+  if (document.createRange && obj) {
     if (obj.innerHTML !== obj.innerText || obj.innerHTML === "") {
       obj.focus();
       var range = window.getSelection();
@@ -36605,8 +36605,9 @@ function setCaretPosition(ctx, textDom, children, pos) {
     sel === null || sel === void 0 ? void 0 : sel.addRange(range);
     el.focus();
   } catch (err) {
+    var _ctx$formulaCache, _ctx$formulaCache$ran;
     console.error(err);
-    moveToEnd(ctx.formulaCache.rangeResizeTo[0]);
+    moveToEnd((_ctx$formulaCache = ctx.formulaCache) === null || _ctx$formulaCache === void 0 ? void 0 : (_ctx$formulaCache$ran = _ctx$formulaCache.rangeResizeTo) === null || _ctx$formulaCache$ran === void 0 ? void 0 : _ctx$formulaCache$ran[0]);
   }
 }
 function functionRange(ctx, obj, v, vp) {
@@ -37320,6 +37321,10 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
     $editor = fxInput;
     $copyTo = cellInput;
   }
+  if (ctx.active_f) {
+    $editor = fxInput;
+    $copyTo = cellInput;
+  }
   var range = "";
   var rf = selected.row[0];
   var cf = selected.column[0];
@@ -37336,6 +37341,7 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
     var span = $editor.querySelector("span[rangeindex='".concat(ctx.formulaCache.rangechangeindex, "']"));
     if (span) {
       span.innerHTML = range;
+      console.log(333312);
       setCaretPosition(ctx, span, 0, range.length);
     }
   } else if (ctx.active_f) {
@@ -37349,7 +37355,7 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
     }
     ctx.formulaCache.rangechangeindex = functionHTMLIndex;
     var _span = $editor.querySelector("span[rangeindex='".concat(ctx.formulaCache.rangechangeindex, "']"));
-    setCaretPosition(ctx, _span, 0, range.length);
+    setCaretPosition(ctx, _span || $editor, 0, range.length);
     functionHTMLIndex += 1;
   } else {
     var _function_str = "<span class=\"leankylin-formula-functionrange-cell\" rangeindex=\"".concat(functionHTMLIndex, "\" dir=\"auto\" style=\"color:").concat(getHLColor(functionHTMLIndex), ";\">").concat(range, "</span>");
@@ -46593,19 +46599,39 @@ function calculateSheetFromula(ctx, id, isrefresh) {
   console.time("calcTime:".concat(id));
   var index$1 = getSheetIndex(ctx, id);
   var luckysheetfile = ctx.luckysheetfile;
-  if (!ctx.luckysheetfile[index$1].data) return;
-  for (var r = 0; r < ctx.luckysheetfile[index$1].data.length; r += 1) {
-    for (var c = 0; c < ctx.luckysheetfile[index$1].data[r].length; c += 1) {
-      var cell = ctx.luckysheetfile[index$1].data[r][c];
+  var sheetData = luckysheetfile[index$1].data;
+  if (!sheetData) return;
+  var calcChain = luckysheetfile[index$1].calcChain || [];
+  if (isrefresh && calcChain.length > 0) {
+    execFunctionGroup(ctx, null, null, null, id, sheetData, true);
+    groupValuesRefresh(ctx);
+  } else {
+    var cellsToUpdate = [];
+    for (var i = 0; i < calcChain.length; i += 1) {
+      var _calcChain$i = calcChain[i],
+        r = _calcChain$i.r,
+        c = _calcChain$i.c;
+      var cell = sheetData[r][c];
       if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
         continue;
       }
-      var result = execfunction(ctx, cell === null || cell === void 0 ? void 0 : cell.f, r, c, id, isrefresh, true);
+      var result = execfunction(ctx, cell.f, r, c, id, false, true);
       var newV = result[1];
       if (newV === cell.v) {
         continue;
       }
-      setCellValue$1(ctx, r, c, result[1], null, {
+      cellsToUpdate.push({
+        r: r,
+        c: c,
+        v: newV
+      });
+    }
+    for (var _i = 0; _i < cellsToUpdate.length; _i += 1) {
+      var _cellsToUpdate$_i = cellsToUpdate[_i],
+        _r = _cellsToUpdate$_i.r,
+        _c = _cellsToUpdate$_i.c,
+        v = _cellsToUpdate$_i.v;
+      setCellValue$1(ctx, _r, _c, v, null, {
         id: id
       });
     }
@@ -46675,9 +46701,9 @@ function calculateSheetByCells(ctx, cells) {
     for (var _index = 0; _index < calcChain.length; _index++) {
       var _parseCellReferences;
       var _calcChain$_index = calcChain[_index],
-        _r2 = _calcChain$_index.r,
-        _c2 = _calcChain$_index.c;
-      var cell = file.data[_r2][_c2];
+        _r3 = _calcChain$_index.r,
+        _c3 = _calcChain$_index.c;
+      var cell = file.data[_r3][_c3];
       if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
         continue;
       }
@@ -46689,8 +46715,8 @@ function calculateSheetByCells(ctx, cells) {
       });
       if (n) {
         needUpdateCell.push({
-          r: _r2,
-          c: _c2,
+          r: _r3,
+          c: _c3,
           id: sheetId,
           f: cell.f,
           v: cell.v
@@ -46706,17 +46732,17 @@ function calculateSheetByCells(ctx, cells) {
   });
   for (var nIndex = 0; nIndex < needUpdateCell.length; nIndex++) {
     var _needUpdateCell$nInde = needUpdateCell[nIndex],
-      _r = _needUpdateCell$nInde.r,
-      _c = _needUpdateCell$nInde.c,
+      _r2 = _needUpdateCell$nInde.r,
+      _c2 = _needUpdateCell$nInde.c,
       _id = _needUpdateCell$nInde.id,
       _f = _needUpdateCell$nInde.f,
       v = _needUpdateCell$nInde.v;
-    var result = execfunction(ctx, _f, _r, _c, _id, undefined, true);
+    var result = execfunction(ctx, _f, _r2, _c2, _id, undefined, true);
     var newV = result[1];
     if (newV === v) {
       continue;
     }
-    setCellValue$1(ctx, _r, _c, result[1], null, {
+    setCellValue$1(ctx, _r2, _c2, result[1], null, {
       id: _id
     });
   }

package/package.json

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