@fileverse-dev/fortune-core 1.1.69 → 1.1.71

package/es/modules/cell.js

@@ -504,6 +504,9 @@ 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)) {

package/es/modules/formula.js

@@ -23,7 +23,7 @@ import _ from "lodash";
 import { getFlowdata } from "../context";
 import { columnCharToIndex, escapeScriptTag, getSheetIndex, indexToColumnChar, getSheetIdByName, escapeHTMLTag } from "../utils";
 import { getcellFormula, getRangetxt, mergeMoveMain, setCellValue } from "./cell";
-import { customErrorMessage, error, detectErrorFromValue } from "./validation";
+import { error, detectErrorFromValue } from "./validation";
 import { locale } from "../locale";
 import { colors } from "./color";
 import { colLocation, mousePosition, rowLocation } from "./location";
@@ -740,7 +740,7 @@ export function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notIns
   } else {
     clearCellError(ctx, r, c);
   }
-  return [true, !isError ? finalResult : customErrorMessage(formulaError), txt];
+  return [true, !isError ? finalResult : "#ERROR", txt];
 }
 function insertUpdateDynamicArray(ctx, dynamicArrayItem) {
   var r = dynamicArrayItem.r,

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/es/modules/validation.d.ts

@@ -11,7 +11,6 @@ export declare const error: {
 };
 export declare const errorMessagesFromValue: Record<string, string>;
 export declare function detectErrorFromValue(input: string): string;
-export declare function customErrorMessage(errorMessage: string): string;
 export declare function valueIsError(value: string): boolean;
 export declare function isRealNull(val: any): boolean;
 export declare function isHexValue(str: string): boolean;

package/es/modules/validation.js

@@ -1,7 +1,7 @@
 var _a;
 import dayjs from "dayjs";
 import _ from "lodash";
-import { error as cellErrorMessages, ERROR_NAME, ERROR_DIV_ZERO, ERROR_NULL, ERROR_NUM, ERROR_REF, ERROR_VALUE, ERROR } from "@fileverse-dev/formula-parser";
+import { ERROR_NAME, ERROR_DIV_ZERO, ERROR_NULL, ERROR_NUM, ERROR_REF, ERROR_VALUE, ERROR } from "@fileverse-dev/formula-parser";
 import { hasChinaword } from "./text";
 export var error = {
   v: "#VALUE!",
@@ -17,12 +17,6 @@ export var errorMessagesFromValue = (_a = {}, _a[ERROR_DIV_ZERO] = "Invalid calc
 export function detectErrorFromValue(input) {
   return errorMessagesFromValue[input];
 }
-export function customErrorMessage(errorMessage) {
-  if (errorMessage === cellErrorMessages(ERROR_NAME)) {
-    return "#ERROR";
-  }
-  return errorMessage;
-}
 var errorValues = Object.values(error);
 export function valueIsError(value) {
   return errorValues.includes(value);

package/lib/modules/cell.js

@@ -537,6 +537,9 @@ 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)) {

package/lib/modules/formula.js

@@ -770,7 +770,7 @@ function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notInsertFunc
   } else {
     (0, _2.clearCellError)(ctx, r, c);
   }
-  return [true, !isError ? finalResult : (0, _validation.customErrorMessage)(formulaError), txt];
+  return [true, !isError ? finalResult : "#ERROR", txt];
 }
 function insertUpdateDynamicArray(ctx, dynamicArrayItem) {
   var r = dynamicArrayItem.r,

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/lib/modules/validation.d.ts

@@ -11,7 +11,6 @@ export declare const error: {
 };
 export declare const errorMessagesFromValue: Record<string, string>;
 export declare function detectErrorFromValue(input: string): string;
-export declare function customErrorMessage(errorMessage: string): string;
 export declare function valueIsError(value: string): boolean;
 export declare function isRealNull(val: any): boolean;
 export declare function isHexValue(str: string): boolean;

package/lib/modules/validation.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.customErrorMessage = customErrorMessage;
 exports.detectErrorFromValue = detectErrorFromValue;
 exports.diff = diff;
 exports.errorMessagesFromValue = exports.error = void 0;
@@ -35,12 +34,6 @@ var errorMessagesFromValue = exports.errorMessagesFromValue = (_a = {}, _a[_form
 function detectErrorFromValue(input) {
   return errorMessagesFromValue[input];
 }
-function customErrorMessage(errorMessage) {
-  if (errorMessage === (0, _formulaParser.error)(_formulaParser.ERROR_NAME)) {
-    return "#ERROR";
-  }
-  return errorMessage;
-}
 var errorValues = Object.values(error);
 function valueIsError(value) {
   return errorValues.includes(value);

package/package.json

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