@fileverse-dev/fortune-core 1.1.70 → 1.1.72-hotfix-1

package/es/api/sheet.js

@@ -2,7 +2,7 @@ import _ from "lodash";
 import { v4 as uuidv4 } from "uuid";
 import { dataToCelldata, getSheet } from "./common";
 import { getSheetIndex } from "../utils";
-import { api, execfunction, insertUpdateFunctionGroup, locale } from "..";
+import { api, execfunction, getFlowdata, insertUpdateFunctionGroup, locale, spillSortResult } from "..";
 export function getAllSheets(ctx) {
   return ctx.luckysheetfile;
 }
@@ -121,7 +121,16 @@ export function calculateSheetFromula(ctx, id) {
         continue;
       }
       var result = execfunction(ctx, (_c = ctx.luckysheetfile[index].data[r][c]) === null || _c === void 0 ? void 0 : _c.f, r, c, id);
-      api.setCellValue(ctx, r, c, result[1], null);
+      var isValueArray = Array.isArray(result[1]);
+      if (isValueArray) {
+        var value = {
+          f: result[2],
+          v: result[1]
+        };
+        spillSortResult(ctx, r, c, value, getFlowdata(ctx));
+      } else {
+        api.setCellValue(ctx, r, c, result[1], null);
+      }
       insertUpdateFunctionGroup(ctx, r, c, id);
     }
   }

package/es/modules/cell.js

@@ -504,9 +504,6 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
   var inputHtml = $input === null || $input === void 0 ? void 0 : $input.innerHTML;
   var flowdata = getFlowdata(ctx);
   if (!flowdata) return;
-  if (!(value === null || value === void 0 ? void 0 : value.toString())) {
-    clearCellError(ctx, r, c);
-  }
   var index = getSheetIndex(ctx, ctx.currentSheetId);
   var dataVerification = ctx.luckysheetfile[index].dataVerification;
   if (!_.isNil(dataVerification)) {
@@ -563,6 +560,10 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
     }
   }
   value = value || ($input === null || $input === void 0 ? void 0 : $input.innerText);
+  var shouldClearError = (oldValue === null || oldValue === void 0 ? void 0 : oldValue.f) ? oldValue.f !== value : (oldValue === null || oldValue === void 0 ? void 0 : oldValue.v) !== value;
+  if (shouldClearError) {
+    clearCellError(ctx, r, c);
+  }
   if (((_b = (_a = ctx.hooks).beforeUpdateCell) === null || _b === void 0 ? void 0 : _b.call(_a, r, c, value)) === false) {
     cancelNormalSelected(ctx);
     return;

package/es/modules/selection.js

@@ -20,6 +20,7 @@ import { hasPartMC } from "./validation";
 import { update } from "./format";
 import SSF from "./ssf";
 import { CFSplitRange } from "./ConditionFormat";
+import { clearCellError } from "./error-state-helpers";
 export var selectionCache = {
   isPasteAction: false
 };
@@ -1536,6 +1537,7 @@ export function deleteSelectedCellText(ctx) {
               cell === null || cell === void 0 ? true : delete cell.baseValue;
               cell === null || cell === void 0 ? true : delete cell.baseCurrency;
             }
+            clearCellError(ctx, r, c);
           } else {
             d[r][c] = null;
           }

package/lib/api/sheet.js

@@ -138,7 +138,16 @@ function calculateSheetFromula(ctx, id) {
         continue;
       }
       var result = (0, _2.execfunction)(ctx, (_c = ctx.luckysheetfile[index].data[r][c]) === null || _c === void 0 ? void 0 : _c.f, r, c, id);
-      _2.api.setCellValue(ctx, r, c, result[1], null);
+      var isValueArray = Array.isArray(result[1]);
+      if (isValueArray) {
+        var value = {
+          f: result[2],
+          v: result[1]
+        };
+        (0, _2.spillSortResult)(ctx, r, c, value, (0, _2.getFlowdata)(ctx));
+      } else {
+        _2.api.setCellValue(ctx, r, c, result[1], null);
+      }
       (0, _2.insertUpdateFunctionGroup)(ctx, r, c, id);
     }
   }

package/lib/modules/cell.js

@@ -537,9 +537,6 @@ function updateCell(ctx, r, c, $input, value, canvas) {
   var inputHtml = $input === null || $input === void 0 ? void 0 : $input.innerHTML;
   var flowdata = (0, _context.getFlowdata)(ctx);
   if (!flowdata) return;
-  if (!(value === null || value === void 0 ? void 0 : value.toString())) {
-    (0, _api.clearCellError)(ctx, r, c);
-  }
   var index = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
   var dataVerification = ctx.luckysheetfile[index].dataVerification;
   if (!_lodash.default.isNil(dataVerification)) {
@@ -596,6 +593,10 @@ function updateCell(ctx, r, c, $input, value, canvas) {
     }
   }
   value = value || ($input === null || $input === void 0 ? void 0 : $input.innerText);
+  var shouldClearError = (oldValue === null || oldValue === void 0 ? void 0 : oldValue.f) ? oldValue.f !== value : (oldValue === null || oldValue === void 0 ? void 0 : oldValue.v) !== value;
+  if (shouldClearError) {
+    (0, _api.clearCellError)(ctx, r, c);
+  }
   if (((_b = (_a = ctx.hooks).beforeUpdateCell) === null || _b === void 0 ? void 0 : _b.call(_a, r, c, value)) === false) {
     cancelNormalSelected(ctx);
     return;

package/lib/modules/selection.js

@@ -42,6 +42,7 @@ var _validation = require("./validation");
 var _format = require("./format");
 var _ssf = _interopRequireDefault(require("./ssf"));
 var _ConditionFormat = require("./ConditionFormat");
+var _errorStateHelpers = require("./error-state-helpers");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -1571,6 +1572,7 @@ function deleteSelectedCellText(ctx) {
               cell === null || cell === void 0 ? true : delete cell.baseValue;
               cell === null || cell === void 0 ? true : delete cell.baseCurrency;
             }
+            (0, _errorStateHelpers.clearCellError)(ctx, r, c);
           } else {
             d[r][c] = null;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.1.70",
+  "version": "1.1.72-hotfix-1",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",