@fileverse-dev/fortune-core 1.1.66-error-3 → 1.1.66
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/api/index.d.ts +0 -1
- package/es/api/index.js +1 -2
- package/es/canvas.js +0 -25
- package/es/context.d.ts +1 -3
- package/es/events/mouse.js +1 -2
- package/es/modules/cell.js +1 -5
- package/es/modules/formula.js +4 -15
- package/es/modules/index.d.ts +0 -1
- package/es/modules/index.js +1 -2
- package/es/modules/validation.d.ts +0 -3
- package/es/modules/validation.js +0 -12
- package/es/types.d.ts +0 -8
- package/lib/api/index.d.ts +0 -1
- package/lib/api/index.js +0 -12
- package/lib/canvas.js +0 -25
- package/lib/context.d.ts +1 -3
- package/lib/events/mouse.js +0 -1
- package/lib/modules/cell.js +0 -4
- package/lib/modules/formula.js +2 -13
- package/lib/modules/index.d.ts +0 -1
- package/lib/modules/index.js +0 -11
- package/lib/modules/validation.d.ts +0 -3
- package/lib/modules/validation.js +1 -15
- package/lib/types.d.ts +0 -8
- package/package.json +1 -1
- package/es/modules/error-state-helpers.d.ts +0 -5
- package/es/modules/error-state-helpers.js +0 -82
- package/lib/modules/error-state-helpers.d.ts +0 -5
- package/lib/modules/error-state-helpers.js +0 -91
package/es/api/index.d.ts
CHANGED
package/es/api/index.js
CHANGED
package/es/canvas.js
CHANGED
|
@@ -1121,31 +1121,6 @@ var Canvas = function () {
|
|
|
1121
1121
|
endX: cellsize[2] + cellsize[0],
|
|
1122
1122
|
endY: cellsize[3] + cellsize[1]
|
|
1123
1123
|
}, renderCtx);
|
|
1124
|
-
if (cell === null || cell === void 0 ? void 0 : cell.error) {
|
|
1125
|
-
var errorBorderColor = "#FB3449";
|
|
1126
|
-
var borderThicknessInPixels = 1;
|
|
1127
|
-
var leftCellBoundary = Math.round(startX + offsetLeft - 3 + bodrder05);
|
|
1128
|
-
var topCellBoundary = Math.round(startY + offsetTop - 3 + bodrder05);
|
|
1129
|
-
var rightCellBoundary = Math.round(endX + offsetLeft - 3 + bodrder05);
|
|
1130
|
-
var bottomCellBoundary = Math.round(endY + offsetTop - 3 + bodrder05);
|
|
1131
|
-
var innerCellWidth = rightCellBoundary - leftCellBoundary;
|
|
1132
|
-
var innerCellHeight = bottomCellBoundary - topCellBoundary;
|
|
1133
|
-
var renderingContext = renderCtx;
|
|
1134
|
-
renderingContext.save();
|
|
1135
|
-
renderingContext.fillStyle = errorBorderColor;
|
|
1136
|
-
renderingContext.fillRect(leftCellBoundary, topCellBoundary, innerCellWidth, borderThicknessInPixels);
|
|
1137
|
-
renderingContext.fillRect(leftCellBoundary, bottomCellBoundary - borderThicknessInPixels, innerCellWidth, borderThicknessInPixels);
|
|
1138
|
-
renderingContext.fillRect(leftCellBoundary, topCellBoundary, borderThicknessInPixels, innerCellHeight);
|
|
1139
|
-
renderingContext.fillRect(rightCellBoundary - borderThicknessInPixels, topCellBoundary, borderThicknessInPixels, innerCellHeight);
|
|
1140
|
-
var errorRibbonSize = 8 * this.sheetCtx.zoomRatio;
|
|
1141
|
-
renderingContext.beginPath();
|
|
1142
|
-
renderingContext.moveTo(leftCellBoundary + borderThicknessInPixels, topCellBoundary + borderThicknessInPixels);
|
|
1143
|
-
renderingContext.lineTo(leftCellBoundary + borderThicknessInPixels + errorRibbonSize, topCellBoundary + borderThicknessInPixels);
|
|
1144
|
-
renderingContext.lineTo(leftCellBoundary + borderThicknessInPixels, topCellBoundary + borderThicknessInPixels + errorRibbonSize);
|
|
1145
|
-
renderingContext.closePath();
|
|
1146
|
-
renderingContext.fill();
|
|
1147
|
-
renderingContext.restore();
|
|
1148
|
-
}
|
|
1149
1124
|
};
|
|
1150
1125
|
Canvas.prototype.cellOverflowRender = function (r, c, stc, edc, renderCtx, scrollHeight, scrollWidth, offsetLeft, offsetTop, afCompute, cfCompute) {
|
|
1151
1126
|
var startY;
|
package/es/context.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { SheetConfig } from ".";
|
|
2
2
|
import { FormulaCache } from "./modules";
|
|
3
3
|
import { Hooks } from "./settings";
|
|
4
|
-
import { Sheet, Selection, Cell, CommentBox, Rect, Image, Presence, LinkCardProps, FilterOptions, RangeDialogProps, DataRegulationProps, ConditionRulesProps, GlobalCache
|
|
4
|
+
import { Sheet, Selection, Cell, CommentBox, Rect, Image, Presence, LinkCardProps, FilterOptions, RangeDialogProps, DataRegulationProps, ConditionRulesProps, GlobalCache } from "./types";
|
|
5
5
|
interface MutableRefObject<T> {
|
|
6
6
|
current: T;
|
|
7
7
|
}
|
|
@@ -21,10 +21,8 @@ export type Context = {
|
|
|
21
21
|
fullscreenmode: boolean;
|
|
22
22
|
devicePixelRatio: number;
|
|
23
23
|
commentBoxes?: CommentBox[];
|
|
24
|
-
errorBoxes?: CellError[];
|
|
25
24
|
editingCommentBox?: CommentBox;
|
|
26
25
|
hoveredCommentBox?: CommentBox;
|
|
27
|
-
hoverErrorBox?: CellError;
|
|
28
26
|
insertedImgs?: Image[];
|
|
29
27
|
editingInsertedImgs?: Image;
|
|
30
28
|
activeImg?: string;
|
package/es/events/mouse.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _ from "lodash";
|
|
2
2
|
import { getFlowdata } from "../context";
|
|
3
|
-
import { cancelActiveImgItem, cancelPaintModel, functionHTMLGenerate, israngeseleciton, rangeHightlightselected, rangeSetValue, onCommentBoxMove, onCommentBoxMoveEnd, onCommentBoxResize, onCommentBoxResizeEnd, onImageMove, onImageMoveEnd, onImageResize, onImageResizeEnd, removeEditingComment, overShowComment, removeOverShowComment, rangeDrag, onFormulaRangeDragEnd, createFormulaRangeSelect, createRangeHightlight, onCellsMoveEnd, onCellsMove, cellFocus, editComment, onIframeMoveEnd, onIframeResizeEnd
|
|
3
|
+
import { cancelActiveImgItem, cancelPaintModel, functionHTMLGenerate, israngeseleciton, rangeHightlightselected, rangeSetValue, onCommentBoxMove, onCommentBoxMoveEnd, onCommentBoxResize, onCommentBoxResizeEnd, onImageMove, onImageMoveEnd, onImageResize, onImageResizeEnd, removeEditingComment, overShowComment, removeOverShowComment, rangeDrag, onFormulaRangeDragEnd, createFormulaRangeSelect, createRangeHightlight, onCellsMoveEnd, onCellsMove, cellFocus, editComment, onIframeMoveEnd, onIframeResizeEnd } from "../modules";
|
|
4
4
|
import { getFrozenHandleLeft, getFrozenHandleTop, scrollToFrozenRowCol } from "../modules/freeze";
|
|
5
5
|
import { cancelFunctionrangeSelected, mergeBorder, mergeMoveMain, updateCell, luckysheetUpdateCell } from "../modules/cell";
|
|
6
6
|
import { colLocation, colLocationByIndex, rowLocation, rowLocationByIndex } from "../modules/location";
|
|
@@ -899,7 +899,6 @@ export function handleOverlayMouseMove(ctx, globalCache, e, cellInput, scrollX,
|
|
|
899
899
|
if (onImageResize(ctx, globalCache, e)) return;
|
|
900
900
|
onCellsMove(ctx, globalCache, e, scrollX, scrollY, container);
|
|
901
901
|
overShowComment(ctx, e, scrollX, scrollY, container);
|
|
902
|
-
overShowError(ctx, e, scrollX, scrollY, container);
|
|
903
902
|
onSearchDialogMove(globalCache, e);
|
|
904
903
|
onRangeSelectionModalMove(globalCache, e);
|
|
905
904
|
if (!!ctx.luckysheet_scroll_status || !!ctx.luckysheet_select_status || !!ctx.luckysheet_rows_selected_status || !!ctx.luckysheet_cols_selected_status || !!ctx.luckysheet_cell_selected_move || !!ctx.luckysheet_cell_selected_extend || !!ctx.luckysheet_cols_change_size || !!ctx.luckysheet_rows_change_size) {
|
package/es/modules/cell.js
CHANGED
|
@@ -5,7 +5,7 @@ import { getSheetIndex, indexToColumnChar, rgbToHex, processArray, getContentInP
|
|
|
5
5
|
import { checkCF, getComputeMap } from "./ConditionFormat";
|
|
6
6
|
import { getFailureText, validateCellData } from "./dataVerification";
|
|
7
7
|
import { genarate, update } from "./format";
|
|
8
|
-
import {
|
|
8
|
+
import { getRowHeight } from "../api";
|
|
9
9
|
import { delFunctionGroup, execfunction, execFunctionGroup, functionHTMLGenerate, getcellrange, iscelldata } from "./formula";
|
|
10
10
|
import { attrToCssName, convertSpanToShareString, isInlineStringCell, isInlineStringCT } from "./inline-string";
|
|
11
11
|
import { isRealNull, isRealNum, valueIsError } from "./validation";
|
|
@@ -633,10 +633,8 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
|
|
|
633
633
|
Object.keys(value).forEach(function (attr) {
|
|
634
634
|
curv[attr] = value[attr];
|
|
635
635
|
});
|
|
636
|
-
clearCellError(ctx, r, c);
|
|
637
636
|
}
|
|
638
637
|
} else {
|
|
639
|
-
clearCellError(ctx, r, c);
|
|
640
638
|
delFunctionGroup(ctx, r, c);
|
|
641
639
|
curv = _.cloneDeep(((_e = d === null || d === void 0 ? void 0 : d[r]) === null || _e === void 0 ? void 0 : _e[c]) || {});
|
|
642
640
|
curv.v = value;
|
|
@@ -710,14 +708,12 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
|
|
|
710
708
|
dynamicArrayItem = v[3].data;
|
|
711
709
|
}
|
|
712
710
|
} else {
|
|
713
|
-
clearCellError(ctx, r, c);
|
|
714
711
|
var v = curv;
|
|
715
712
|
if (_.isNil(value.v)) {
|
|
716
713
|
value.v = v;
|
|
717
714
|
}
|
|
718
715
|
}
|
|
719
716
|
} else {
|
|
720
|
-
clearCellError(ctx, r, c);
|
|
721
717
|
delFunctionGroup(ctx, r, c);
|
|
722
718
|
execFunctionGroup(ctx, r, c, value);
|
|
723
719
|
isRunExecFunction = false;
|
package/es/modules/formula.js
CHANGED
|
@@ -18,16 +18,16 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
|
|
|
18
18
|
}
|
|
19
19
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
20
20
|
};
|
|
21
|
-
import { Parser, ERROR_REF } from "@fileverse-dev/formula-parser";
|
|
22
21
|
import _ from "lodash";
|
|
22
|
+
import { Parser, ERROR_REF } from "@fileverse-dev/formula-parser";
|
|
23
23
|
import { getFlowdata } from "../context";
|
|
24
24
|
import { columnCharToIndex, escapeScriptTag, getSheetIndex, indexToColumnChar, getSheetIdByName, escapeHTMLTag } from "../utils";
|
|
25
25
|
import { getcellFormula, getRangetxt, mergeMoveMain, setCellValue } from "./cell";
|
|
26
|
-
import {
|
|
26
|
+
import { error } from "./validation";
|
|
27
27
|
import { locale } from "../locale";
|
|
28
28
|
import { colors } from "./color";
|
|
29
29
|
import { colLocation, mousePosition, rowLocation } from "./location";
|
|
30
|
-
import { cancelFunctionrangeSelected,
|
|
30
|
+
import { cancelFunctionrangeSelected, seletedHighlistByindex, spillSortResult } from ".";
|
|
31
31
|
import { isLetterNumberPattern, removeLastSpan } from "../utils/index";
|
|
32
32
|
var functionHTMLIndex = 0;
|
|
33
33
|
var rangeIndexes = [];
|
|
@@ -729,18 +729,7 @@ export function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notIns
|
|
|
729
729
|
var resultStr = Number(result).toFixed(ctx.formulaCache.parser.cryptoDecimals).toLowerCase();
|
|
730
730
|
finalResult = "".concat(resultStr, " ").concat(ctx.formulaCache.parser.cryptoDenomination);
|
|
731
731
|
}
|
|
732
|
-
|
|
733
|
-
var detectedErrorFromValue = detectErrorFromValue(finalResult === null || finalResult === void 0 ? void 0 : finalResult.toString());
|
|
734
|
-
if (isError || detectedErrorFromValue) {
|
|
735
|
-
setCellError(ctx, r, c, {
|
|
736
|
-
row_column: "".concat(r, "_").concat(c),
|
|
737
|
-
title: "Error",
|
|
738
|
-
message: (formulaError === null || formulaError === void 0 ? void 0 : formulaError.toString()) || detectedErrorFromValue || "Unknown Error"
|
|
739
|
-
});
|
|
740
|
-
} else {
|
|
741
|
-
clearCellError(ctx, r, c);
|
|
742
|
-
}
|
|
743
|
-
return [true, !isError ? finalResult : customErrorMessage(formulaError), txt];
|
|
732
|
+
return [true, _.isNil(formulaError) ? finalResult : formulaError, txt];
|
|
744
733
|
}
|
|
745
734
|
function insertUpdateDynamicArray(ctx, dynamicArrayItem) {
|
|
746
735
|
var r = dynamicArrayItem.r,
|
package/es/modules/index.d.ts
CHANGED
package/es/modules/index.js
CHANGED
|
@@ -9,9 +9,6 @@ export declare const error: {
|
|
|
9
9
|
nl: string;
|
|
10
10
|
sp: string;
|
|
11
11
|
};
|
|
12
|
-
export declare const errorMessagesFromValue: Record<string, string>;
|
|
13
|
-
export declare function detectErrorFromValue(input: string): string;
|
|
14
|
-
export declare function customErrorMessage(errorMessage: string): string;
|
|
15
12
|
export declare function valueIsError(value: string): boolean;
|
|
16
13
|
export declare function isRealNull(val: any): boolean;
|
|
17
14
|
export declare function isHexValue(str: string): boolean;
|
package/es/modules/validation.js
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
var _a;
|
|
2
1
|
import dayjs from "dayjs";
|
|
3
2
|
import _ from "lodash";
|
|
4
|
-
import { error as cellErrorMessages, ERROR_NAME, ERROR_DIV_ZERO, ERROR_NA, ERROR_NULL, ERROR_NUM, ERROR_REF, ERROR_VALUE, ERROR } from "@fileverse-dev/formula-parser";
|
|
5
3
|
import { hasChinaword } from "./text";
|
|
6
4
|
export var error = {
|
|
7
5
|
v: "#VALUE!",
|
|
@@ -13,16 +11,6 @@ export var error = {
|
|
|
13
11
|
nl: "#NULL!",
|
|
14
12
|
sp: "#SPILL!"
|
|
15
13
|
};
|
|
16
|
-
export var errorMessagesFromValue = (_a = {}, _a[ERROR_DIV_ZERO] = "Invalid calculation: the divisor (second value) cannot be zero", _a[ERROR_NAME] = "Wrong function name or parameter", _a[ERROR_NA] = "Empty value", _a[ERROR_NULL] = "Formula returned null", _a[ERROR_NUM] = "Invalid number", _a[ERROR_REF] = "Invalid reference", _a[ERROR_VALUE] = "Invalid value", _a[ERROR] = "Unknown error", _a);
|
|
17
|
-
export function detectErrorFromValue(input) {
|
|
18
|
-
return errorMessagesFromValue[input];
|
|
19
|
-
}
|
|
20
|
-
export function customErrorMessage(errorMessage) {
|
|
21
|
-
if (errorMessage === cellErrorMessages(ERROR_NAME)) {
|
|
22
|
-
return "#ERROR";
|
|
23
|
-
}
|
|
24
|
-
return errorMessage;
|
|
25
|
-
}
|
|
26
14
|
var errorValues = Object.values(error);
|
|
27
15
|
export function valueIsError(value) {
|
|
28
16
|
return errorValues.includes(value);
|
package/es/types.d.ts
CHANGED
|
@@ -25,13 +25,6 @@ export type CellStyle = {
|
|
|
25
25
|
un?: number;
|
|
26
26
|
tr?: string;
|
|
27
27
|
};
|
|
28
|
-
export type CellError = {
|
|
29
|
-
title: string;
|
|
30
|
-
message: string;
|
|
31
|
-
left?: number;
|
|
32
|
-
top?: number;
|
|
33
|
-
row_column?: string;
|
|
34
|
-
};
|
|
35
28
|
export type Cell = {
|
|
36
29
|
v?: string | number | boolean;
|
|
37
30
|
m?: string | number;
|
|
@@ -69,7 +62,6 @@ export type Cell = {
|
|
|
69
62
|
c: number;
|
|
70
63
|
id: string;
|
|
71
64
|
};
|
|
72
|
-
error?: CellError;
|
|
73
65
|
} & CellStyle;
|
|
74
66
|
export type CellWithRowAndCol = {
|
|
75
67
|
r: number;
|
package/lib/api/index.d.ts
CHANGED
package/lib/api/index.js
CHANGED
|
@@ -98,16 +98,4 @@ Object.keys(_workbook).forEach(function (key) {
|
|
|
98
98
|
return _workbook[key];
|
|
99
99
|
}
|
|
100
100
|
});
|
|
101
|
-
});
|
|
102
|
-
var _errorStateHelpers = require("../modules/error-state-helpers");
|
|
103
|
-
Object.keys(_errorStateHelpers).forEach(function (key) {
|
|
104
|
-
if (key === "default" || key === "__esModule") return;
|
|
105
|
-
if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
|
|
106
|
-
if (key in exports && exports[key] === _errorStateHelpers[key]) return;
|
|
107
|
-
Object.defineProperty(exports, key, {
|
|
108
|
-
enumerable: true,
|
|
109
|
-
get: function get() {
|
|
110
|
-
return _errorStateHelpers[key];
|
|
111
|
-
}
|
|
112
|
-
});
|
|
113
101
|
});
|
package/lib/canvas.js
CHANGED
|
@@ -1128,31 +1128,6 @@ var Canvas = exports.Canvas = function () {
|
|
|
1128
1128
|
endX: cellsize[2] + cellsize[0],
|
|
1129
1129
|
endY: cellsize[3] + cellsize[1]
|
|
1130
1130
|
}, renderCtx);
|
|
1131
|
-
if (cell === null || cell === void 0 ? void 0 : cell.error) {
|
|
1132
|
-
var errorBorderColor = "#FB3449";
|
|
1133
|
-
var borderThicknessInPixels = 1;
|
|
1134
|
-
var leftCellBoundary = Math.round(startX + offsetLeft - 3 + bodrder05);
|
|
1135
|
-
var topCellBoundary = Math.round(startY + offsetTop - 3 + bodrder05);
|
|
1136
|
-
var rightCellBoundary = Math.round(endX + offsetLeft - 3 + bodrder05);
|
|
1137
|
-
var bottomCellBoundary = Math.round(endY + offsetTop - 3 + bodrder05);
|
|
1138
|
-
var innerCellWidth = rightCellBoundary - leftCellBoundary;
|
|
1139
|
-
var innerCellHeight = bottomCellBoundary - topCellBoundary;
|
|
1140
|
-
var renderingContext = renderCtx;
|
|
1141
|
-
renderingContext.save();
|
|
1142
|
-
renderingContext.fillStyle = errorBorderColor;
|
|
1143
|
-
renderingContext.fillRect(leftCellBoundary, topCellBoundary, innerCellWidth, borderThicknessInPixels);
|
|
1144
|
-
renderingContext.fillRect(leftCellBoundary, bottomCellBoundary - borderThicknessInPixels, innerCellWidth, borderThicknessInPixels);
|
|
1145
|
-
renderingContext.fillRect(leftCellBoundary, topCellBoundary, borderThicknessInPixels, innerCellHeight);
|
|
1146
|
-
renderingContext.fillRect(rightCellBoundary - borderThicknessInPixels, topCellBoundary, borderThicknessInPixels, innerCellHeight);
|
|
1147
|
-
var errorRibbonSize = 8 * this.sheetCtx.zoomRatio;
|
|
1148
|
-
renderingContext.beginPath();
|
|
1149
|
-
renderingContext.moveTo(leftCellBoundary + borderThicknessInPixels, topCellBoundary + borderThicknessInPixels);
|
|
1150
|
-
renderingContext.lineTo(leftCellBoundary + borderThicknessInPixels + errorRibbonSize, topCellBoundary + borderThicknessInPixels);
|
|
1151
|
-
renderingContext.lineTo(leftCellBoundary + borderThicknessInPixels, topCellBoundary + borderThicknessInPixels + errorRibbonSize);
|
|
1152
|
-
renderingContext.closePath();
|
|
1153
|
-
renderingContext.fill();
|
|
1154
|
-
renderingContext.restore();
|
|
1155
|
-
}
|
|
1156
1131
|
};
|
|
1157
1132
|
Canvas.prototype.cellOverflowRender = function (r, c, stc, edc, renderCtx, scrollHeight, scrollWidth, offsetLeft, offsetTop, afCompute, cfCompute) {
|
|
1158
1133
|
var startY;
|
package/lib/context.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { SheetConfig } from ".";
|
|
2
2
|
import { FormulaCache } from "./modules";
|
|
3
3
|
import { Hooks } from "./settings";
|
|
4
|
-
import { Sheet, Selection, Cell, CommentBox, Rect, Image, Presence, LinkCardProps, FilterOptions, RangeDialogProps, DataRegulationProps, ConditionRulesProps, GlobalCache
|
|
4
|
+
import { Sheet, Selection, Cell, CommentBox, Rect, Image, Presence, LinkCardProps, FilterOptions, RangeDialogProps, DataRegulationProps, ConditionRulesProps, GlobalCache } from "./types";
|
|
5
5
|
interface MutableRefObject<T> {
|
|
6
6
|
current: T;
|
|
7
7
|
}
|
|
@@ -21,10 +21,8 @@ export type Context = {
|
|
|
21
21
|
fullscreenmode: boolean;
|
|
22
22
|
devicePixelRatio: number;
|
|
23
23
|
commentBoxes?: CommentBox[];
|
|
24
|
-
errorBoxes?: CellError[];
|
|
25
24
|
editingCommentBox?: CommentBox;
|
|
26
25
|
hoveredCommentBox?: CommentBox;
|
|
27
|
-
hoverErrorBox?: CellError;
|
|
28
26
|
insertedImgs?: Image[];
|
|
29
27
|
editingInsertedImgs?: Image;
|
|
30
28
|
activeImg?: string;
|
package/lib/events/mouse.js
CHANGED
|
@@ -918,7 +918,6 @@ function handleOverlayMouseMove(ctx, globalCache, e, cellInput, scrollX, scrollY
|
|
|
918
918
|
if ((0, _modules.onImageResize)(ctx, globalCache, e)) return;
|
|
919
919
|
(0, _modules.onCellsMove)(ctx, globalCache, e, scrollX, scrollY, container);
|
|
920
920
|
(0, _modules.overShowComment)(ctx, e, scrollX, scrollY, container);
|
|
921
|
-
(0, _modules.overShowError)(ctx, e, scrollX, scrollY, container);
|
|
922
921
|
(0, _searchReplace.onSearchDialogMove)(globalCache, e);
|
|
923
922
|
(0, _hyperlink.onRangeSelectionModalMove)(globalCache, e);
|
|
924
923
|
if (!!ctx.luckysheet_scroll_status || !!ctx.luckysheet_select_status || !!ctx.luckysheet_rows_selected_status || !!ctx.luckysheet_cols_selected_status || !!ctx.luckysheet_cell_selected_move || !!ctx.luckysheet_cell_selected_extend || !!ctx.luckysheet_cols_change_size || !!ctx.luckysheet_rows_change_size) {
|
package/lib/modules/cell.js
CHANGED
|
@@ -663,10 +663,8 @@ function updateCell(ctx, r, c, $input, value, canvas) {
|
|
|
663
663
|
Object.keys(value).forEach(function (attr) {
|
|
664
664
|
curv[attr] = value[attr];
|
|
665
665
|
});
|
|
666
|
-
(0, _api.clearCellError)(ctx, r, c);
|
|
667
666
|
}
|
|
668
667
|
} else {
|
|
669
|
-
(0, _api.clearCellError)(ctx, r, c);
|
|
670
668
|
(0, _formula.delFunctionGroup)(ctx, r, c);
|
|
671
669
|
curv = _lodash.default.cloneDeep(((_e = d === null || d === void 0 ? void 0 : d[r]) === null || _e === void 0 ? void 0 : _e[c]) || {});
|
|
672
670
|
curv.v = value;
|
|
@@ -740,14 +738,12 @@ function updateCell(ctx, r, c, $input, value, canvas) {
|
|
|
740
738
|
dynamicArrayItem = v[3].data;
|
|
741
739
|
}
|
|
742
740
|
} else {
|
|
743
|
-
(0, _api.clearCellError)(ctx, r, c);
|
|
744
741
|
var v = curv;
|
|
745
742
|
if (_lodash.default.isNil(value.v)) {
|
|
746
743
|
value.v = v;
|
|
747
744
|
}
|
|
748
745
|
}
|
|
749
746
|
} else {
|
|
750
|
-
(0, _api.clearCellError)(ctx, r, c);
|
|
751
747
|
(0, _formula.delFunctionGroup)(ctx, r, c);
|
|
752
748
|
(0, _formula.execFunctionGroup)(ctx, r, c, value);
|
|
753
749
|
isRunExecFunction = false;
|
package/lib/modules/formula.js
CHANGED
|
@@ -28,8 +28,8 @@ exports.rangeDragRow = rangeDragRow;
|
|
|
28
28
|
exports.rangeHightlightselected = rangeHightlightselected;
|
|
29
29
|
exports.rangeSetValue = rangeSetValue;
|
|
30
30
|
exports.setCaretPosition = setCaretPosition;
|
|
31
|
-
var _formulaParser = require("@fileverse-dev/formula-parser");
|
|
32
31
|
var _lodash = _interopRequireDefault(require("lodash"));
|
|
32
|
+
var _formulaParser = require("@fileverse-dev/formula-parser");
|
|
33
33
|
var _context = require("../context");
|
|
34
34
|
var _utils = require("../utils");
|
|
35
35
|
var _cell = require("./cell");
|
|
@@ -759,18 +759,7 @@ function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notInsertFunc
|
|
|
759
759
|
var resultStr = Number(result).toFixed(ctx.formulaCache.parser.cryptoDecimals).toLowerCase();
|
|
760
760
|
finalResult = "".concat(resultStr, " ").concat(ctx.formulaCache.parser.cryptoDenomination);
|
|
761
761
|
}
|
|
762
|
-
|
|
763
|
-
var detectedErrorFromValue = (0, _validation.detectErrorFromValue)(finalResult === null || finalResult === void 0 ? void 0 : finalResult.toString());
|
|
764
|
-
if (isError || detectedErrorFromValue) {
|
|
765
|
-
(0, _2.setCellError)(ctx, r, c, {
|
|
766
|
-
row_column: "".concat(r, "_").concat(c),
|
|
767
|
-
title: "Error",
|
|
768
|
-
message: (formulaError === null || formulaError === void 0 ? void 0 : formulaError.toString()) || detectedErrorFromValue || "Unknown Error"
|
|
769
|
-
});
|
|
770
|
-
} else {
|
|
771
|
-
(0, _2.clearCellError)(ctx, r, c);
|
|
772
|
-
}
|
|
773
|
-
return [true, !isError ? finalResult : (0, _validation.customErrorMessage)(formulaError), txt];
|
|
762
|
+
return [true, _lodash.default.isNil(formulaError) ? finalResult : formulaError, txt];
|
|
774
763
|
}
|
|
775
764
|
function insertUpdateDynamicArray(ctx, dynamicArrayItem) {
|
|
776
765
|
var r = dynamicArrayItem.r,
|
package/lib/modules/index.d.ts
CHANGED
package/lib/modules/index.js
CHANGED
|
@@ -398,15 +398,4 @@ Object.keys(_iframe).forEach(function (key) {
|
|
|
398
398
|
return _iframe[key];
|
|
399
399
|
}
|
|
400
400
|
});
|
|
401
|
-
});
|
|
402
|
-
var _errorStateHelpers = require("./error-state-helpers");
|
|
403
|
-
Object.keys(_errorStateHelpers).forEach(function (key) {
|
|
404
|
-
if (key === "default" || key === "__esModule") return;
|
|
405
|
-
if (key in exports && exports[key] === _errorStateHelpers[key]) return;
|
|
406
|
-
Object.defineProperty(exports, key, {
|
|
407
|
-
enumerable: true,
|
|
408
|
-
get: function get() {
|
|
409
|
-
return _errorStateHelpers[key];
|
|
410
|
-
}
|
|
411
|
-
});
|
|
412
401
|
});
|
|
@@ -9,9 +9,6 @@ export declare const error: {
|
|
|
9
9
|
nl: string;
|
|
10
10
|
sp: string;
|
|
11
11
|
};
|
|
12
|
-
export declare const errorMessagesFromValue: Record<string, string>;
|
|
13
|
-
export declare function detectErrorFromValue(input: string): string;
|
|
14
|
-
export declare function customErrorMessage(errorMessage: string): string;
|
|
15
12
|
export declare function valueIsError(value: string): boolean;
|
|
16
13
|
export declare function isRealNull(val: any): boolean;
|
|
17
14
|
export declare function isHexValue(str: string): boolean;
|
|
@@ -3,10 +3,8 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.customErrorMessage = customErrorMessage;
|
|
7
|
-
exports.detectErrorFromValue = detectErrorFromValue;
|
|
8
6
|
exports.diff = diff;
|
|
9
|
-
exports.
|
|
7
|
+
exports.error = void 0;
|
|
10
8
|
exports.hasPartMC = hasPartMC;
|
|
11
9
|
exports.isHexValue = isHexValue;
|
|
12
10
|
exports.isRealNull = isRealNull;
|
|
@@ -17,10 +15,8 @@ exports.isdatetime = isdatetime;
|
|
|
17
15
|
exports.valueIsError = valueIsError;
|
|
18
16
|
var _dayjs = _interopRequireDefault(require("dayjs"));
|
|
19
17
|
var _lodash = _interopRequireDefault(require("lodash"));
|
|
20
|
-
var _formulaParser = require("@fileverse-dev/formula-parser");
|
|
21
18
|
var _text = require("./text");
|
|
22
19
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
23
|
-
var _a;
|
|
24
20
|
var error = exports.error = {
|
|
25
21
|
v: "#VALUE!",
|
|
26
22
|
n: "#NAME?",
|
|
@@ -31,16 +27,6 @@ var error = exports.error = {
|
|
|
31
27
|
nl: "#NULL!",
|
|
32
28
|
sp: "#SPILL!"
|
|
33
29
|
};
|
|
34
|
-
var errorMessagesFromValue = exports.errorMessagesFromValue = (_a = {}, _a[_formulaParser.ERROR_DIV_ZERO] = "Invalid calculation: the divisor (second value) cannot be zero", _a[_formulaParser.ERROR_NAME] = "Wrong function name or parameter", _a[_formulaParser.ERROR_NA] = "Empty value", _a[_formulaParser.ERROR_NULL] = "Formula returned null", _a[_formulaParser.ERROR_NUM] = "Invalid number", _a[_formulaParser.ERROR_REF] = "Invalid reference", _a[_formulaParser.ERROR_VALUE] = "Invalid value", _a[_formulaParser.ERROR] = "Unknown error", _a);
|
|
35
|
-
function detectErrorFromValue(input) {
|
|
36
|
-
return errorMessagesFromValue[input];
|
|
37
|
-
}
|
|
38
|
-
function customErrorMessage(errorMessage) {
|
|
39
|
-
if (errorMessage === (0, _formulaParser.error)(_formulaParser.ERROR_NAME)) {
|
|
40
|
-
return "#ERROR";
|
|
41
|
-
}
|
|
42
|
-
return errorMessage;
|
|
43
|
-
}
|
|
44
30
|
var errorValues = Object.values(error);
|
|
45
31
|
function valueIsError(value) {
|
|
46
32
|
return errorValues.includes(value);
|
package/lib/types.d.ts
CHANGED
|
@@ -25,13 +25,6 @@ export type CellStyle = {
|
|
|
25
25
|
un?: number;
|
|
26
26
|
tr?: string;
|
|
27
27
|
};
|
|
28
|
-
export type CellError = {
|
|
29
|
-
title: string;
|
|
30
|
-
message: string;
|
|
31
|
-
left?: number;
|
|
32
|
-
top?: number;
|
|
33
|
-
row_column?: string;
|
|
34
|
-
};
|
|
35
28
|
export type Cell = {
|
|
36
29
|
v?: string | number | boolean;
|
|
37
30
|
m?: string | number;
|
|
@@ -69,7 +62,6 @@ export type Cell = {
|
|
|
69
62
|
c: number;
|
|
70
63
|
id: string;
|
|
71
64
|
};
|
|
72
|
-
error?: CellError;
|
|
73
65
|
} & CellStyle;
|
|
74
66
|
export type CellWithRowAndCol = {
|
|
75
67
|
r: number;
|
package/package.json
CHANGED
|
@@ -1,5 +0,0 @@
|
|
|
1
|
-
import { Context } from "../context";
|
|
2
|
-
import { CellError } from "../types";
|
|
3
|
-
export declare function overShowError(ctx: Context, e: MouseEvent, scrollX: HTMLDivElement, scrollY: HTMLDivElement, container: HTMLDivElement): void;
|
|
4
|
-
export declare function setCellError(ctx: Context, r: number, c: number, err: CellError): void;
|
|
5
|
-
export declare function clearCellError(ctx: Context, r: number, c: number): void;
|
|
@@ -1,82 +0,0 @@
|
|
|
1
|
-
var __assign = this && this.__assign || function () {
|
|
2
|
-
__assign = Object.assign || function (t) {
|
|
3
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
4
|
-
s = arguments[i];
|
|
5
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
|
|
6
|
-
}
|
|
7
|
-
return t;
|
|
8
|
-
};
|
|
9
|
-
return __assign.apply(this, arguments);
|
|
10
|
-
};
|
|
11
|
-
import _ from "lodash";
|
|
12
|
-
import { getFlowdata } from "../context";
|
|
13
|
-
import { colLocation, rowLocation } from "./location";
|
|
14
|
-
import { mergeBorder } from "./cell";
|
|
15
|
-
export function overShowError(ctx, e, scrollX, scrollY, container) {
|
|
16
|
-
var _a, _b, _c;
|
|
17
|
-
var _d, _e, _f, _g, _h;
|
|
18
|
-
var flowdata = getFlowdata(ctx);
|
|
19
|
-
if (!flowdata) return;
|
|
20
|
-
var scrollLeft = scrollX.scrollLeft;
|
|
21
|
-
var scrollTop = scrollY.scrollTop;
|
|
22
|
-
var rect = container.getBoundingClientRect();
|
|
23
|
-
var x = e.pageX - rect.left - ctx.rowHeaderWidth + scrollLeft;
|
|
24
|
-
var y = e.pageY - rect.top - ctx.columnHeaderHeight + scrollTop;
|
|
25
|
-
var r = rowLocation(y, ctx.visibledatarow)[2];
|
|
26
|
-
var c = colLocation(x, ctx.visibledatacolumn)[2];
|
|
27
|
-
var merge = mergeBorder(ctx, flowdata, r, c);
|
|
28
|
-
if (merge) {
|
|
29
|
-
_a = merge.row, r = _a[2];
|
|
30
|
-
_b = merge.column, c = _b[2];
|
|
31
|
-
}
|
|
32
|
-
var firstSelection = (_d = ctx.luckysheet_select_save) === null || _d === void 0 ? void 0 : _d[0];
|
|
33
|
-
var row_focus = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.row_focus;
|
|
34
|
-
var col_focus = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
|
|
35
|
-
if (r === row_focus && c === col_focus) {
|
|
36
|
-
ctx.hoverErrorBox = undefined;
|
|
37
|
-
return;
|
|
38
|
-
}
|
|
39
|
-
var row_column = "".concat(r, "_").concat(c);
|
|
40
|
-
var cell = (_e = flowdata[r]) === null || _e === void 0 ? void 0 : _e[c];
|
|
41
|
-
var err = cell === null || cell === void 0 ? void 0 : cell.error;
|
|
42
|
-
var errorAlreadyListed = Array.isArray(ctx.errorBoxes) ? _.findIndex(ctx.errorBoxes, function (v) {
|
|
43
|
-
return v.row_column === row_column;
|
|
44
|
-
}) !== -1 : false;
|
|
45
|
-
if (!err || errorAlreadyListed) {
|
|
46
|
-
ctx.hoverErrorBox = undefined;
|
|
47
|
-
return;
|
|
48
|
-
}
|
|
49
|
-
if (((_f = ctx.hoverErrorBox) === null || _f === void 0 ? void 0 : _f.row_column) === row_column) return;
|
|
50
|
-
var rowTop = r - 1 === -1 ? 0 : ctx.visibledatarow[r - 1];
|
|
51
|
-
var colLeft = ctx.visibledatacolumn[c];
|
|
52
|
-
if (merge) {
|
|
53
|
-
rowTop = merge.row[0];
|
|
54
|
-
_c = merge.column, colLeft = _c[1];
|
|
55
|
-
}
|
|
56
|
-
var toX = colLeft;
|
|
57
|
-
var toY = rowTop;
|
|
58
|
-
var zoom = ctx.zoomRatio;
|
|
59
|
-
var left = err.left == null ? toX + 8 * zoom : err.left * zoom;
|
|
60
|
-
var top = err.top == null ? toY - 2 * zoom : err.top * zoom;
|
|
61
|
-
if (top < 0) top = 2;
|
|
62
|
-
ctx.hoverErrorBox = {
|
|
63
|
-
row_column: row_column,
|
|
64
|
-
left: left,
|
|
65
|
-
top: top,
|
|
66
|
-
title: ((_g = cell.error) === null || _g === void 0 ? void 0 : _g.title) || "Error",
|
|
67
|
-
message: ((_h = cell.error) === null || _h === void 0 ? void 0 : _h.message) || "Default error message"
|
|
68
|
-
};
|
|
69
|
-
}
|
|
70
|
-
export function setCellError(ctx, r, c, err) {
|
|
71
|
-
var flow = getFlowdata(ctx);
|
|
72
|
-
if (!flow) return;
|
|
73
|
-
if (!flow[r]) flow[r] = [];
|
|
74
|
-
if (!flow[r][c]) flow[r][c] = {};
|
|
75
|
-
flow[r][c].error = __assign({}, err);
|
|
76
|
-
}
|
|
77
|
-
export function clearCellError(ctx, r, c) {
|
|
78
|
-
var _a;
|
|
79
|
-
var flow = getFlowdata(ctx);
|
|
80
|
-
if (!((_a = flow === null || flow === void 0 ? void 0 : flow[r]) === null || _a === void 0 ? void 0 : _a[c])) return;
|
|
81
|
-
delete flow[r][c].error;
|
|
82
|
-
}
|
|
@@ -1,5 +0,0 @@
|
|
|
1
|
-
import { Context } from "../context";
|
|
2
|
-
import { CellError } from "../types";
|
|
3
|
-
export declare function overShowError(ctx: Context, e: MouseEvent, scrollX: HTMLDivElement, scrollY: HTMLDivElement, container: HTMLDivElement): void;
|
|
4
|
-
export declare function setCellError(ctx: Context, r: number, c: number, err: CellError): void;
|
|
5
|
-
export declare function clearCellError(ctx: Context, r: number, c: number): void;
|
|
@@ -1,91 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.clearCellError = clearCellError;
|
|
7
|
-
exports.overShowError = overShowError;
|
|
8
|
-
exports.setCellError = setCellError;
|
|
9
|
-
var _lodash = _interopRequireDefault(require("lodash"));
|
|
10
|
-
var _context = require("../context");
|
|
11
|
-
var _location = require("./location");
|
|
12
|
-
var _cell = require("./cell");
|
|
13
|
-
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
14
|
-
var __assign = void 0 && (void 0).__assign || function () {
|
|
15
|
-
__assign = Object.assign || function (t) {
|
|
16
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
17
|
-
s = arguments[i];
|
|
18
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
|
|
19
|
-
}
|
|
20
|
-
return t;
|
|
21
|
-
};
|
|
22
|
-
return __assign.apply(this, arguments);
|
|
23
|
-
};
|
|
24
|
-
function overShowError(ctx, e, scrollX, scrollY, container) {
|
|
25
|
-
var _a, _b, _c;
|
|
26
|
-
var _d, _e, _f, _g, _h;
|
|
27
|
-
var flowdata = (0, _context.getFlowdata)(ctx);
|
|
28
|
-
if (!flowdata) return;
|
|
29
|
-
var scrollLeft = scrollX.scrollLeft;
|
|
30
|
-
var scrollTop = scrollY.scrollTop;
|
|
31
|
-
var rect = container.getBoundingClientRect();
|
|
32
|
-
var x = e.pageX - rect.left - ctx.rowHeaderWidth + scrollLeft;
|
|
33
|
-
var y = e.pageY - rect.top - ctx.columnHeaderHeight + scrollTop;
|
|
34
|
-
var r = (0, _location.rowLocation)(y, ctx.visibledatarow)[2];
|
|
35
|
-
var c = (0, _location.colLocation)(x, ctx.visibledatacolumn)[2];
|
|
36
|
-
var merge = (0, _cell.mergeBorder)(ctx, flowdata, r, c);
|
|
37
|
-
if (merge) {
|
|
38
|
-
_a = merge.row, r = _a[2];
|
|
39
|
-
_b = merge.column, c = _b[2];
|
|
40
|
-
}
|
|
41
|
-
var firstSelection = (_d = ctx.luckysheet_select_save) === null || _d === void 0 ? void 0 : _d[0];
|
|
42
|
-
var row_focus = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.row_focus;
|
|
43
|
-
var col_focus = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
|
|
44
|
-
if (r === row_focus && c === col_focus) {
|
|
45
|
-
ctx.hoverErrorBox = undefined;
|
|
46
|
-
return;
|
|
47
|
-
}
|
|
48
|
-
var row_column = "".concat(r, "_").concat(c);
|
|
49
|
-
var cell = (_e = flowdata[r]) === null || _e === void 0 ? void 0 : _e[c];
|
|
50
|
-
var err = cell === null || cell === void 0 ? void 0 : cell.error;
|
|
51
|
-
var errorAlreadyListed = Array.isArray(ctx.errorBoxes) ? _lodash.default.findIndex(ctx.errorBoxes, function (v) {
|
|
52
|
-
return v.row_column === row_column;
|
|
53
|
-
}) !== -1 : false;
|
|
54
|
-
if (!err || errorAlreadyListed) {
|
|
55
|
-
ctx.hoverErrorBox = undefined;
|
|
56
|
-
return;
|
|
57
|
-
}
|
|
58
|
-
if (((_f = ctx.hoverErrorBox) === null || _f === void 0 ? void 0 : _f.row_column) === row_column) return;
|
|
59
|
-
var rowTop = r - 1 === -1 ? 0 : ctx.visibledatarow[r - 1];
|
|
60
|
-
var colLeft = ctx.visibledatacolumn[c];
|
|
61
|
-
if (merge) {
|
|
62
|
-
rowTop = merge.row[0];
|
|
63
|
-
_c = merge.column, colLeft = _c[1];
|
|
64
|
-
}
|
|
65
|
-
var toX = colLeft;
|
|
66
|
-
var toY = rowTop;
|
|
67
|
-
var zoom = ctx.zoomRatio;
|
|
68
|
-
var left = err.left == null ? toX + 8 * zoom : err.left * zoom;
|
|
69
|
-
var top = err.top == null ? toY - 2 * zoom : err.top * zoom;
|
|
70
|
-
if (top < 0) top = 2;
|
|
71
|
-
ctx.hoverErrorBox = {
|
|
72
|
-
row_column: row_column,
|
|
73
|
-
left: left,
|
|
74
|
-
top: top,
|
|
75
|
-
title: ((_g = cell.error) === null || _g === void 0 ? void 0 : _g.title) || "Error",
|
|
76
|
-
message: ((_h = cell.error) === null || _h === void 0 ? void 0 : _h.message) || "Default error message"
|
|
77
|
-
};
|
|
78
|
-
}
|
|
79
|
-
function setCellError(ctx, r, c, err) {
|
|
80
|
-
var flow = (0, _context.getFlowdata)(ctx);
|
|
81
|
-
if (!flow) return;
|
|
82
|
-
if (!flow[r]) flow[r] = [];
|
|
83
|
-
if (!flow[r][c]) flow[r][c] = {};
|
|
84
|
-
flow[r][c].error = __assign({}, err);
|
|
85
|
-
}
|
|
86
|
-
function clearCellError(ctx, r, c) {
|
|
87
|
-
var _a;
|
|
88
|
-
var flow = (0, _context.getFlowdata)(ctx);
|
|
89
|
-
if (!((_a = flow === null || flow === void 0 ? void 0 : flow[r]) === null || _a === void 0 ? void 0 : _a[c])) return;
|
|
90
|
-
delete flow[r][c].error;
|
|
91
|
-
}
|