@fileverse-dev/fortune-core 1.1.39 → 1.1.40
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/events/keyboard.js +1 -9
- package/es/events/mouse.js +11 -15
- package/es/modules/cell.js +0 -1
- package/es/modules/formula.js +0 -9
- package/es/modules/validation.d.ts +1 -0
- package/es/modules/validation.js +6 -0
- package/es/utils/index.d.ts +0 -2
- package/es/utils/index.js +0 -14
- package/lib/events/keyboard.js +1 -9
- package/lib/events/mouse.js +11 -15
- package/lib/modules/cell.js +0 -1
- package/lib/modules/formula.js +0 -9
- package/lib/modules/validation.d.ts +1 -0
- package/lib/modules/validation.js +7 -0
- package/lib/utils/index.d.ts +0 -2
- package/lib/utils/index.js +1 -19
- package/package.json +1 -1
package/es/events/keyboard.js
CHANGED
|
@@ -348,16 +348,8 @@ function handleShiftWithArrowKey(ctx, e) {
|
|
|
348
348
|
e.preventDefault();
|
|
349
349
|
}
|
|
350
350
|
export function handleArrowKey(ctx, e) {
|
|
351
|
-
var _a, _b;
|
|
352
351
|
if (ctx.luckysheetCellUpdate.length > 0 || ctx.luckysheet_cell_selected_move || ctx.luckysheet_cell_selected_extend) {
|
|
353
|
-
|
|
354
|
-
var doc = parser.parseFromString("<div>".concat((_a = document.getElementById("luckysheet-rich-text-editor")) === null || _a === void 0 ? void 0 : _a.innerHTML, "</div>"), "text/html");
|
|
355
|
-
var spans = doc.querySelectorAll("span");
|
|
356
|
-
var lastSpan = spans[spans.length - 1];
|
|
357
|
-
var notFunctionInit = !((_b = document.getElementById("luckysheet-rich-text-editor")) === null || _b === void 0 ? void 0 : _b.innerText.includes("("));
|
|
358
|
-
if ((lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes(")")) || notFunctionInit && (lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.length) >= 1 && !_.includes(["="], lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText)) {
|
|
359
|
-
return;
|
|
360
|
-
}
|
|
352
|
+
return;
|
|
361
353
|
}
|
|
362
354
|
var moveCount = hideCRCount(ctx, e.key);
|
|
363
355
|
switch (e.key) {
|
package/es/events/mouse.js
CHANGED
|
@@ -105,7 +105,7 @@ export function fixPositionOnFrozenCells(freeze, x, y, mouseX, mouseY) {
|
|
|
105
105
|
}
|
|
106
106
|
export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxInput, canvas) {
|
|
107
107
|
var _a, _b;
|
|
108
|
-
var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o
|
|
108
|
+
var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
109
109
|
if (!(fxInput === null || fxInput === void 0 ? void 0 : fxInput.innerHTML) && ctx) {
|
|
110
110
|
ctx.defaultCandidates = [];
|
|
111
111
|
}
|
|
@@ -124,11 +124,11 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
|
|
|
124
124
|
return;
|
|
125
125
|
}
|
|
126
126
|
var freeze = (_c = globalCache.freezen) === null || _c === void 0 ? void 0 : _c[ctx.currentSheetId];
|
|
127
|
-
var
|
|
128
|
-
x =
|
|
129
|
-
y =
|
|
130
|
-
inHorizontalFreeze =
|
|
131
|
-
inVerticalFreeze =
|
|
127
|
+
var _p = fixPositionOnFrozenCells(freeze, _x, _y, mouseX, mouseY),
|
|
128
|
+
x = _p.x,
|
|
129
|
+
y = _p.y,
|
|
130
|
+
inHorizontalFreeze = _p.inHorizontalFreeze,
|
|
131
|
+
inVerticalFreeze = _p.inVerticalFreeze;
|
|
132
132
|
var row_location = rowLocation(y, ctx.visibledatarow);
|
|
133
133
|
var row = row_location[1];
|
|
134
134
|
var row_pre = row_location[0];
|
|
@@ -173,11 +173,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
|
|
|
173
173
|
}
|
|
174
174
|
ctx.luckysheet_scroll_status = true;
|
|
175
175
|
if (ctx.luckysheetCellUpdate.length > 0) {
|
|
176
|
-
|
|
177
|
-
var doc = parser.parseFromString("<div>".concat((_g = document.getElementById("luckysheet-rich-text-editor")) === null || _g === void 0 ? void 0 : _g.innerHTML, "</div>"), "text/html");
|
|
178
|
-
var spans = doc.querySelectorAll("span");
|
|
179
|
-
var firstSpan = spans[0];
|
|
180
|
-
if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || israngeseleciton(ctx) || (firstSpan === null || firstSpan === void 0 ? void 0 : firstSpan.innerText.includes("="))) {
|
|
176
|
+
if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || israngeseleciton(ctx)) {
|
|
181
177
|
var rowseleted = [row_index, row_index_ed];
|
|
182
178
|
var columnseleted = [col_index, col_index_ed];
|
|
183
179
|
var left = col_pre;
|
|
@@ -244,7 +240,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
|
|
|
244
240
|
last.top_move = top_1;
|
|
245
241
|
last.height_move = height;
|
|
246
242
|
ctx.formulaCache.func_selectedrange = last;
|
|
247
|
-
} else if (e.ctrlKey && ((
|
|
243
|
+
} else if (e.ctrlKey && ((_g = _.last(cellInput.querySelectorAll("span"))) === null || _g === void 0 ? void 0 : _g.innerText) !== ",") {
|
|
248
244
|
var vText = cellInput.innerText;
|
|
249
245
|
if (vText[vText.length - 1] === ")") {
|
|
250
246
|
vText = vText.substring(0, vText.length - 1);
|
|
@@ -260,7 +256,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
|
|
|
260
256
|
if (window.getSelection) {
|
|
261
257
|
var currSelection = window.getSelection();
|
|
262
258
|
if (currSelection == null) return;
|
|
263
|
-
ctx.formulaCache.functionRangeIndex = [_.indexOf((
|
|
259
|
+
ctx.formulaCache.functionRangeIndex = [_.indexOf((_k = (_j = (_h = currSelection.anchorNode) === null || _h === void 0 ? void 0 : _h.parentNode) === null || _j === void 0 ? void 0 : _j.parentNode) === null || _k === void 0 ? void 0 : _k.childNodes, (_l = currSelection.anchorNode) === null || _l === void 0 ? void 0 : _l.parentNode), currSelection.anchorOffset];
|
|
264
260
|
} else {
|
|
265
261
|
var textRange = document.selection.createRange();
|
|
266
262
|
ctx.formulaCache.functionRangeIndex = textRange;
|
|
@@ -334,7 +330,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
|
|
|
334
330
|
}
|
|
335
331
|
if (ctx.luckysheet_select_status) {
|
|
336
332
|
if (e.shiftKey) {
|
|
337
|
-
var last = (
|
|
333
|
+
var last = (_m = ctx.luckysheet_select_save) === null || _m === void 0 ? void 0 : _m[ctx.luckysheet_select_save.length - 1];
|
|
338
334
|
if (last && last.top != null && last.left != null && last.height != null && last.width != null && last.row_focus != null && last.column_focus != null) {
|
|
339
335
|
var top_2 = 0;
|
|
340
336
|
var height = 0;
|
|
@@ -393,7 +389,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
|
|
|
393
389
|
ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1] = last;
|
|
394
390
|
}
|
|
395
391
|
} else if (e.ctrlKey || e.metaKey) {
|
|
396
|
-
(
|
|
392
|
+
(_o = ctx.luckysheet_select_save) === null || _o === void 0 ? void 0 : _o.push({
|
|
397
393
|
left: col_pre,
|
|
398
394
|
width: col - col_pre - 1,
|
|
399
395
|
top: row_pre,
|
package/es/modules/cell.js
CHANGED
|
@@ -478,7 +478,6 @@ export function cancelNormalSelected(ctx) {
|
|
|
478
478
|
}
|
|
479
479
|
export function updateCell(ctx, r, c, $input, value, canvas) {
|
|
480
480
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
|
|
481
|
-
console.log("updateCell", r, c, $input, value);
|
|
482
481
|
var inputText = $input === null || $input === void 0 ? void 0 : $input.innerText;
|
|
483
482
|
var inputHtml = $input === null || $input === void 0 ? void 0 : $input.innerHTML;
|
|
484
483
|
var flowdata = getFlowdata(ctx);
|
package/es/modules/formula.js
CHANGED
|
@@ -29,7 +29,6 @@ import { locale } from "../locale";
|
|
|
29
29
|
import { colors } from "./color";
|
|
30
30
|
import { colLocation, mousePosition, rowLocation } from "./location";
|
|
31
31
|
import { cancelFunctionrangeSelected, seletedHighlistByindex, spillSortResult } from ".";
|
|
32
|
-
import { isLetterNumberPattern, removeLastSpan } from "./../utils/index";
|
|
33
32
|
var functionHTMLIndex = 0;
|
|
34
33
|
var rangeIndexes = [];
|
|
35
34
|
var operatorPriority = {
|
|
@@ -1939,14 +1938,6 @@ export function functionStrChange(txt, type, rc, orient, stindex, step) {
|
|
|
1939
1938
|
}
|
|
1940
1939
|
export function rangeSetValue(ctx, cellInput, selected, fxInput) {
|
|
1941
1940
|
var _a, _b, _c, _d, _e;
|
|
1942
|
-
var parser = new DOMParser();
|
|
1943
|
-
var doc = parser.parseFromString("<div>".concat(cellInput.innerHTML, "</div>"), "text/html");
|
|
1944
|
-
var spans = doc.querySelectorAll("span");
|
|
1945
|
-
var lastSpan = spans[spans.length - 1];
|
|
1946
|
-
if (lastSpan && isLetterNumberPattern(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText)) {
|
|
1947
|
-
var htmlR = removeLastSpan(cellInput.innerHTML);
|
|
1948
|
-
cellInput.innerHTML = "".concat(htmlR);
|
|
1949
|
-
}
|
|
1950
1941
|
var $editor = cellInput;
|
|
1951
1942
|
var $copyTo = fxInput;
|
|
1952
1943
|
if (((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.id) === "luckysheet-functionbox-cell") {
|
|
@@ -11,6 +11,7 @@ export declare const error: {
|
|
|
11
11
|
};
|
|
12
12
|
export declare function valueIsError(value: string): boolean;
|
|
13
13
|
export declare function isRealNull(val: any): boolean;
|
|
14
|
+
export declare function isHexValue(str: string): boolean;
|
|
14
15
|
export declare function isRealNum(val: any): boolean;
|
|
15
16
|
export declare function isdatetime(s: any): boolean;
|
|
16
17
|
export declare function diff(now: any, then: any): number;
|
package/es/modules/validation.js
CHANGED
|
@@ -18,7 +18,13 @@ export function valueIsError(value) {
|
|
|
18
18
|
export function isRealNull(val) {
|
|
19
19
|
return _.isNil(val) || val.toString().replace(/\s/g, "") === "";
|
|
20
20
|
}
|
|
21
|
+
export function isHexValue(str) {
|
|
22
|
+
return /^0x?[a-fA-F0-9]+$/.test(str);
|
|
23
|
+
}
|
|
21
24
|
export function isRealNum(val) {
|
|
25
|
+
if (isHexValue(val.toString())) {
|
|
26
|
+
return false;
|
|
27
|
+
}
|
|
22
28
|
if (_.isNil(val) || val.toString().replace(/\s/g, "") === "") {
|
|
23
29
|
return false;
|
|
24
30
|
}
|
package/es/utils/index.d.ts
CHANGED
|
@@ -17,5 +17,3 @@ export declare function getRegExpStr(str: string): string;
|
|
|
17
17
|
export declare function chatatABC(n: number): string;
|
|
18
18
|
export declare function isAllowEdit(ctx: Context, range?: Sheet["luckysheet_select_save"]): boolean;
|
|
19
19
|
export declare function isAllowEditReadOnly(ctx: Context, range?: Sheet["luckysheet_select_save"]): boolean;
|
|
20
|
-
export declare function isLetterNumberPattern(str: string): boolean;
|
|
21
|
-
export declare function removeLastSpan(htmlString: string): string;
|
package/es/utils/index.js
CHANGED
|
@@ -195,18 +195,4 @@ export function isAllowEditReadOnly(ctx, range) {
|
|
|
195
195
|
}
|
|
196
196
|
return true;
|
|
197
197
|
}) && (_.isUndefined(ctx.isFlvReadOnly) ? true : ctx.isFlvReadOnly);
|
|
198
|
-
}
|
|
199
|
-
export function isLetterNumberPattern(str) {
|
|
200
|
-
var regex = /^[a-zA-Z]\d+$/;
|
|
201
|
-
return regex.test(str);
|
|
202
|
-
}
|
|
203
|
-
export function removeLastSpan(htmlString) {
|
|
204
|
-
var container = document.createElement("div");
|
|
205
|
-
container.innerHTML = htmlString;
|
|
206
|
-
var spans = container.querySelectorAll("span");
|
|
207
|
-
if (spans.length > 0) {
|
|
208
|
-
var lastSpan = spans[spans.length - 1];
|
|
209
|
-
lastSpan.remove();
|
|
210
|
-
}
|
|
211
|
-
return container.innerHTML;
|
|
212
198
|
}
|
package/lib/events/keyboard.js
CHANGED
|
@@ -358,16 +358,8 @@ function handleShiftWithArrowKey(ctx, e) {
|
|
|
358
358
|
e.preventDefault();
|
|
359
359
|
}
|
|
360
360
|
function handleArrowKey(ctx, e) {
|
|
361
|
-
var _a, _b;
|
|
362
361
|
if (ctx.luckysheetCellUpdate.length > 0 || ctx.luckysheet_cell_selected_move || ctx.luckysheet_cell_selected_extend) {
|
|
363
|
-
|
|
364
|
-
var doc = parser.parseFromString("<div>".concat((_a = document.getElementById("luckysheet-rich-text-editor")) === null || _a === void 0 ? void 0 : _a.innerHTML, "</div>"), "text/html");
|
|
365
|
-
var spans = doc.querySelectorAll("span");
|
|
366
|
-
var lastSpan = spans[spans.length - 1];
|
|
367
|
-
var notFunctionInit = !((_b = document.getElementById("luckysheet-rich-text-editor")) === null || _b === void 0 ? void 0 : _b.innerText.includes("("));
|
|
368
|
-
if ((lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes(")")) || notFunctionInit && (lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.length) >= 1 && !_lodash.default.includes(["="], lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText)) {
|
|
369
|
-
return;
|
|
370
|
-
}
|
|
362
|
+
return;
|
|
371
363
|
}
|
|
372
364
|
var moveCount = (0, _2.hideCRCount)(ctx, e.key);
|
|
373
365
|
switch (e.key) {
|
package/lib/events/mouse.js
CHANGED
|
@@ -124,7 +124,7 @@ function fixPositionOnFrozenCells(freeze, x, y, mouseX, mouseY) {
|
|
|
124
124
|
}
|
|
125
125
|
function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxInput, canvas) {
|
|
126
126
|
var _a, _b;
|
|
127
|
-
var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o
|
|
127
|
+
var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
128
128
|
if (!(fxInput === null || fxInput === void 0 ? void 0 : fxInput.innerHTML) && ctx) {
|
|
129
129
|
ctx.defaultCandidates = [];
|
|
130
130
|
}
|
|
@@ -143,11 +143,11 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
|
|
|
143
143
|
return;
|
|
144
144
|
}
|
|
145
145
|
var freeze = (_c = globalCache.freezen) === null || _c === void 0 ? void 0 : _c[ctx.currentSheetId];
|
|
146
|
-
var
|
|
147
|
-
x =
|
|
148
|
-
y =
|
|
149
|
-
inHorizontalFreeze =
|
|
150
|
-
inVerticalFreeze =
|
|
146
|
+
var _p = fixPositionOnFrozenCells(freeze, _x, _y, mouseX, mouseY),
|
|
147
|
+
x = _p.x,
|
|
148
|
+
y = _p.y,
|
|
149
|
+
inHorizontalFreeze = _p.inHorizontalFreeze,
|
|
150
|
+
inVerticalFreeze = _p.inVerticalFreeze;
|
|
151
151
|
var row_location = (0, _location.rowLocation)(y, ctx.visibledatarow);
|
|
152
152
|
var row = row_location[1];
|
|
153
153
|
var row_pre = row_location[0];
|
|
@@ -192,11 +192,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
|
|
|
192
192
|
}
|
|
193
193
|
ctx.luckysheet_scroll_status = true;
|
|
194
194
|
if (ctx.luckysheetCellUpdate.length > 0) {
|
|
195
|
-
|
|
196
|
-
var doc = parser.parseFromString("<div>".concat((_g = document.getElementById("luckysheet-rich-text-editor")) === null || _g === void 0 ? void 0 : _g.innerHTML, "</div>"), "text/html");
|
|
197
|
-
var spans = doc.querySelectorAll("span");
|
|
198
|
-
var firstSpan = spans[0];
|
|
199
|
-
if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || (0, _modules.israngeseleciton)(ctx) || (firstSpan === null || firstSpan === void 0 ? void 0 : firstSpan.innerText.includes("="))) {
|
|
195
|
+
if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || (0, _modules.israngeseleciton)(ctx)) {
|
|
200
196
|
var rowseleted = [row_index, row_index_ed];
|
|
201
197
|
var columnseleted = [col_index, col_index_ed];
|
|
202
198
|
var left = col_pre;
|
|
@@ -263,7 +259,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
|
|
|
263
259
|
last.top_move = top_1;
|
|
264
260
|
last.height_move = height;
|
|
265
261
|
ctx.formulaCache.func_selectedrange = last;
|
|
266
|
-
} else if (e.ctrlKey && ((
|
|
262
|
+
} else if (e.ctrlKey && ((_g = _lodash.default.last(cellInput.querySelectorAll("span"))) === null || _g === void 0 ? void 0 : _g.innerText) !== ",") {
|
|
267
263
|
var vText = cellInput.innerText;
|
|
268
264
|
if (vText[vText.length - 1] === ")") {
|
|
269
265
|
vText = vText.substring(0, vText.length - 1);
|
|
@@ -279,7 +275,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
|
|
|
279
275
|
if (window.getSelection) {
|
|
280
276
|
var currSelection = window.getSelection();
|
|
281
277
|
if (currSelection == null) return;
|
|
282
|
-
ctx.formulaCache.functionRangeIndex = [_lodash.default.indexOf((
|
|
278
|
+
ctx.formulaCache.functionRangeIndex = [_lodash.default.indexOf((_k = (_j = (_h = currSelection.anchorNode) === null || _h === void 0 ? void 0 : _h.parentNode) === null || _j === void 0 ? void 0 : _j.parentNode) === null || _k === void 0 ? void 0 : _k.childNodes, (_l = currSelection.anchorNode) === null || _l === void 0 ? void 0 : _l.parentNode), currSelection.anchorOffset];
|
|
283
279
|
} else {
|
|
284
280
|
var textRange = document.selection.createRange();
|
|
285
281
|
ctx.formulaCache.functionRangeIndex = textRange;
|
|
@@ -353,7 +349,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
|
|
|
353
349
|
}
|
|
354
350
|
if (ctx.luckysheet_select_status) {
|
|
355
351
|
if (e.shiftKey) {
|
|
356
|
-
var last = (
|
|
352
|
+
var last = (_m = ctx.luckysheet_select_save) === null || _m === void 0 ? void 0 : _m[ctx.luckysheet_select_save.length - 1];
|
|
357
353
|
if (last && last.top != null && last.left != null && last.height != null && last.width != null && last.row_focus != null && last.column_focus != null) {
|
|
358
354
|
var top_2 = 0;
|
|
359
355
|
var height = 0;
|
|
@@ -412,7 +408,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
|
|
|
412
408
|
ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1] = last;
|
|
413
409
|
}
|
|
414
410
|
} else if (e.ctrlKey || e.metaKey) {
|
|
415
|
-
(
|
|
411
|
+
(_o = ctx.luckysheet_select_save) === null || _o === void 0 ? void 0 : _o.push({
|
|
416
412
|
left: col_pre,
|
|
417
413
|
width: col - col_pre - 1,
|
|
418
414
|
top: row_pre,
|
package/lib/modules/cell.js
CHANGED
|
@@ -508,7 +508,6 @@ function cancelNormalSelected(ctx) {
|
|
|
508
508
|
}
|
|
509
509
|
function updateCell(ctx, r, c, $input, value, canvas) {
|
|
510
510
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
|
|
511
|
-
console.log("updateCell", r, c, $input, value);
|
|
512
511
|
var inputText = $input === null || $input === void 0 ? void 0 : $input.innerText;
|
|
513
512
|
var inputHtml = $input === null || $input === void 0 ? void 0 : $input.innerHTML;
|
|
514
513
|
var flowdata = (0, _context.getFlowdata)(ctx);
|
package/lib/modules/formula.js
CHANGED
|
@@ -38,7 +38,6 @@ var _locale = require("../locale");
|
|
|
38
38
|
var _color = require("./color");
|
|
39
39
|
var _location = require("./location");
|
|
40
40
|
var _2 = require(".");
|
|
41
|
-
var _index = require("./../utils/index");
|
|
42
41
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
43
42
|
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); }
|
|
44
43
|
var __assign = void 0 && (void 0).__assign || function () {
|
|
@@ -1968,14 +1967,6 @@ function functionStrChange(txt, type, rc, orient, stindex, step) {
|
|
|
1968
1967
|
}
|
|
1969
1968
|
function rangeSetValue(ctx, cellInput, selected, fxInput) {
|
|
1970
1969
|
var _a, _b, _c, _d, _e;
|
|
1971
|
-
var parser = new DOMParser();
|
|
1972
|
-
var doc = parser.parseFromString("<div>".concat(cellInput.innerHTML, "</div>"), "text/html");
|
|
1973
|
-
var spans = doc.querySelectorAll("span");
|
|
1974
|
-
var lastSpan = spans[spans.length - 1];
|
|
1975
|
-
if (lastSpan && (0, _index.isLetterNumberPattern)(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText)) {
|
|
1976
|
-
var htmlR = (0, _index.removeLastSpan)(cellInput.innerHTML);
|
|
1977
|
-
cellInput.innerHTML = "".concat(htmlR);
|
|
1978
|
-
}
|
|
1979
1970
|
var $editor = cellInput;
|
|
1980
1971
|
var $copyTo = fxInput;
|
|
1981
1972
|
if (((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.id) === "luckysheet-functionbox-cell") {
|
|
@@ -11,6 +11,7 @@ export declare const error: {
|
|
|
11
11
|
};
|
|
12
12
|
export declare function valueIsError(value: string): boolean;
|
|
13
13
|
export declare function isRealNull(val: any): boolean;
|
|
14
|
+
export declare function isHexValue(str: string): boolean;
|
|
14
15
|
export declare function isRealNum(val: any): boolean;
|
|
15
16
|
export declare function isdatetime(s: any): boolean;
|
|
16
17
|
export declare function diff(now: any, then: any): number;
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.diff = diff;
|
|
7
7
|
exports.error = void 0;
|
|
8
8
|
exports.hasPartMC = hasPartMC;
|
|
9
|
+
exports.isHexValue = isHexValue;
|
|
9
10
|
exports.isRealNull = isRealNull;
|
|
10
11
|
exports.isRealNum = isRealNum;
|
|
11
12
|
exports.isdatatype = isdatatype;
|
|
@@ -33,7 +34,13 @@ function valueIsError(value) {
|
|
|
33
34
|
function isRealNull(val) {
|
|
34
35
|
return _lodash.default.isNil(val) || val.toString().replace(/\s/g, "") === "";
|
|
35
36
|
}
|
|
37
|
+
function isHexValue(str) {
|
|
38
|
+
return /^0x?[a-fA-F0-9]+$/.test(str);
|
|
39
|
+
}
|
|
36
40
|
function isRealNum(val) {
|
|
41
|
+
if (isHexValue(val.toString())) {
|
|
42
|
+
return false;
|
|
43
|
+
}
|
|
37
44
|
if (_lodash.default.isNil(val) || val.toString().replace(/\s/g, "") === "") {
|
|
38
45
|
return false;
|
|
39
46
|
}
|
package/lib/utils/index.d.ts
CHANGED
|
@@ -17,5 +17,3 @@ export declare function getRegExpStr(str: string): string;
|
|
|
17
17
|
export declare function chatatABC(n: number): string;
|
|
18
18
|
export declare function isAllowEdit(ctx: Context, range?: Sheet["luckysheet_select_save"]): boolean;
|
|
19
19
|
export declare function isAllowEditReadOnly(ctx: Context, range?: Sheet["luckysheet_select_save"]): boolean;
|
|
20
|
-
export declare function isLetterNumberPattern(str: string): boolean;
|
|
21
|
-
export declare function removeLastSpan(htmlString: string): string;
|
package/lib/utils/index.js
CHANGED
|
@@ -18,9 +18,7 @@ var _exportNames = {
|
|
|
18
18
|
getRegExpStr: true,
|
|
19
19
|
chatatABC: true,
|
|
20
20
|
isAllowEdit: true,
|
|
21
|
-
isAllowEditReadOnly: true
|
|
22
|
-
isLetterNumberPattern: true,
|
|
23
|
-
removeLastSpan: true
|
|
21
|
+
isAllowEditReadOnly: true
|
|
24
22
|
};
|
|
25
23
|
exports.chatatABC = chatatABC;
|
|
26
24
|
exports.columnCharToIndex = columnCharToIndex;
|
|
@@ -35,8 +33,6 @@ exports.getSheetIndex = getSheetIndex;
|
|
|
35
33
|
exports.indexToColumnChar = indexToColumnChar;
|
|
36
34
|
exports.isAllowEdit = isAllowEdit;
|
|
37
35
|
exports.isAllowEditReadOnly = isAllowEditReadOnly;
|
|
38
|
-
exports.isLetterNumberPattern = isLetterNumberPattern;
|
|
39
|
-
exports.removeLastSpan = removeLastSpan;
|
|
40
36
|
exports.replaceHtml = replaceHtml;
|
|
41
37
|
exports.rgbToHex = rgbToHex;
|
|
42
38
|
var _lodash = _interopRequireDefault(require("lodash"));
|
|
@@ -259,18 +255,4 @@ function isAllowEditReadOnly(ctx, range) {
|
|
|
259
255
|
}
|
|
260
256
|
return true;
|
|
261
257
|
}) && (_lodash.default.isUndefined(ctx.isFlvReadOnly) ? true : ctx.isFlvReadOnly);
|
|
262
|
-
}
|
|
263
|
-
function isLetterNumberPattern(str) {
|
|
264
|
-
var regex = /^[a-zA-Z]\d+$/;
|
|
265
|
-
return regex.test(str);
|
|
266
|
-
}
|
|
267
|
-
function removeLastSpan(htmlString) {
|
|
268
|
-
var container = document.createElement("div");
|
|
269
|
-
container.innerHTML = htmlString;
|
|
270
|
-
var spans = container.querySelectorAll("span");
|
|
271
|
-
if (spans.length > 0) {
|
|
272
|
-
var lastSpan = spans[spans.length - 1];
|
|
273
|
-
lastSpan.remove();
|
|
274
|
-
}
|
|
275
|
-
return container.innerHTML;
|
|
276
258
|
}
|