@fileverse-dev/fortune-core 1.1.48 → 1.1.49
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/mouse.js +1 -1
- package/es/modules/formula.d.ts +1 -1
- package/es/modules/formula.js +11 -11
- package/lib/events/mouse.js +1 -1
- package/lib/modules/formula.d.ts +1 -1
- package/lib/modules/formula.js +11 -11
- package/package.json +1 -1
package/es/events/mouse.js
CHANGED
|
@@ -178,7 +178,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
|
|
|
178
178
|
var spans = doc.querySelectorAll("span");
|
|
179
179
|
var firstSpan = spans[0];
|
|
180
180
|
var lastSpan = spans[spans.length - 1];
|
|
181
|
-
if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || israngeseleciton(ctx)) {
|
|
181
|
+
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("=")) && !(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes(")"))) {
|
|
182
182
|
var rowseleted = [row_index, row_index_ed];
|
|
183
183
|
var columnseleted = [col_index, col_index_ed];
|
|
184
184
|
var left = col_pre;
|
package/es/modules/formula.d.ts
CHANGED
|
@@ -39,8 +39,8 @@ export declare function createFormulaRangeSelect(ctx: Context, select: {
|
|
|
39
39
|
rangeIndex: number;
|
|
40
40
|
} & Rect): void;
|
|
41
41
|
export declare function createRangeHightlight(ctx: Context, inputInnerHtmlStr: string, ignoreRangeIndex?: number): void;
|
|
42
|
-
export declare function setCaretPosition(ctx: Context, textDom: HTMLElement, children: number, pos: number): void;
|
|
43
42
|
export declare function moveCursorToEnd(editableDiv: HTMLDivElement): void;
|
|
43
|
+
export declare function setCaretPosition(ctx: Context, textDom: HTMLElement, children: number, pos: number): void;
|
|
44
44
|
export declare function getrangeseleciton(): ParentNode | ChildNode | null | undefined;
|
|
45
45
|
export declare function rangeHightlightselected(ctx: Context, $editor: HTMLDivElement): void;
|
|
46
46
|
export declare function functionHTMLGenerate(txt: string): string;
|
package/es/modules/formula.js
CHANGED
|
@@ -1216,6 +1216,17 @@ export function createRangeHightlight(ctx, inputInnerHtmlStr, ignoreRangeIndex)
|
|
|
1216
1216
|
});
|
|
1217
1217
|
ctx.formulaRangeHighlight = formulaRanges;
|
|
1218
1218
|
}
|
|
1219
|
+
export function moveCursorToEnd(editableDiv) {
|
|
1220
|
+
editableDiv.focus();
|
|
1221
|
+
var range = document.createRange();
|
|
1222
|
+
var selection = window.getSelection();
|
|
1223
|
+
range.selectNodeContents(editableDiv);
|
|
1224
|
+
range.collapse(false);
|
|
1225
|
+
if (selection) {
|
|
1226
|
+
selection.removeAllRanges();
|
|
1227
|
+
selection.addRange(range);
|
|
1228
|
+
}
|
|
1229
|
+
}
|
|
1219
1230
|
export function setCaretPosition(ctx, textDom, children, pos) {
|
|
1220
1231
|
var _a, _b;
|
|
1221
1232
|
try {
|
|
@@ -1239,17 +1250,6 @@ export function setCaretPosition(ctx, textDom, children, pos) {
|
|
|
1239
1250
|
moveCursorToEnd(textDom);
|
|
1240
1251
|
}
|
|
1241
1252
|
}
|
|
1242
|
-
export function moveCursorToEnd(editableDiv) {
|
|
1243
|
-
editableDiv.focus();
|
|
1244
|
-
var range = document.createRange();
|
|
1245
|
-
var selection = window.getSelection();
|
|
1246
|
-
range.selectNodeContents(editableDiv);
|
|
1247
|
-
range.collapse(false);
|
|
1248
|
-
if (selection) {
|
|
1249
|
-
selection.removeAllRanges();
|
|
1250
|
-
selection.addRange(range);
|
|
1251
|
-
}
|
|
1252
|
-
}
|
|
1253
1253
|
function functionRange(ctx, obj, v, vp) {
|
|
1254
1254
|
if (window.getSelection) {
|
|
1255
1255
|
var currSelection = window.getSelection();
|
package/lib/events/mouse.js
CHANGED
|
@@ -197,7 +197,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
|
|
|
197
197
|
var spans = doc.querySelectorAll("span");
|
|
198
198
|
var firstSpan = spans[0];
|
|
199
199
|
var lastSpan = spans[spans.length - 1];
|
|
200
|
-
if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || (0, _modules.israngeseleciton)(ctx)) {
|
|
200
|
+
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("=")) && !(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes(")"))) {
|
|
201
201
|
var rowseleted = [row_index, row_index_ed];
|
|
202
202
|
var columnseleted = [col_index, col_index_ed];
|
|
203
203
|
var left = col_pre;
|
package/lib/modules/formula.d.ts
CHANGED
|
@@ -39,8 +39,8 @@ export declare function createFormulaRangeSelect(ctx: Context, select: {
|
|
|
39
39
|
rangeIndex: number;
|
|
40
40
|
} & Rect): void;
|
|
41
41
|
export declare function createRangeHightlight(ctx: Context, inputInnerHtmlStr: string, ignoreRangeIndex?: number): void;
|
|
42
|
-
export declare function setCaretPosition(ctx: Context, textDom: HTMLElement, children: number, pos: number): void;
|
|
43
42
|
export declare function moveCursorToEnd(editableDiv: HTMLDivElement): void;
|
|
43
|
+
export declare function setCaretPosition(ctx: Context, textDom: HTMLElement, children: number, pos: number): void;
|
|
44
44
|
export declare function getrangeseleciton(): ParentNode | ChildNode | null | undefined;
|
|
45
45
|
export declare function rangeHightlightselected(ctx: Context, $editor: HTMLDivElement): void;
|
|
46
46
|
export declare function functionHTMLGenerate(txt: string): string;
|
package/lib/modules/formula.js
CHANGED
|
@@ -1246,6 +1246,17 @@ function createRangeHightlight(ctx, inputInnerHtmlStr, ignoreRangeIndex) {
|
|
|
1246
1246
|
});
|
|
1247
1247
|
ctx.formulaRangeHighlight = formulaRanges;
|
|
1248
1248
|
}
|
|
1249
|
+
function moveCursorToEnd(editableDiv) {
|
|
1250
|
+
editableDiv.focus();
|
|
1251
|
+
var range = document.createRange();
|
|
1252
|
+
var selection = window.getSelection();
|
|
1253
|
+
range.selectNodeContents(editableDiv);
|
|
1254
|
+
range.collapse(false);
|
|
1255
|
+
if (selection) {
|
|
1256
|
+
selection.removeAllRanges();
|
|
1257
|
+
selection.addRange(range);
|
|
1258
|
+
}
|
|
1259
|
+
}
|
|
1249
1260
|
function setCaretPosition(ctx, textDom, children, pos) {
|
|
1250
1261
|
var _a, _b;
|
|
1251
1262
|
try {
|
|
@@ -1269,17 +1280,6 @@ function setCaretPosition(ctx, textDom, children, pos) {
|
|
|
1269
1280
|
moveCursorToEnd(textDom);
|
|
1270
1281
|
}
|
|
1271
1282
|
}
|
|
1272
|
-
function moveCursorToEnd(editableDiv) {
|
|
1273
|
-
editableDiv.focus();
|
|
1274
|
-
var range = document.createRange();
|
|
1275
|
-
var selection = window.getSelection();
|
|
1276
|
-
range.selectNodeContents(editableDiv);
|
|
1277
|
-
range.collapse(false);
|
|
1278
|
-
if (selection) {
|
|
1279
|
-
selection.removeAllRanges();
|
|
1280
|
-
selection.addRange(range);
|
|
1281
|
-
}
|
|
1282
|
-
}
|
|
1283
1283
|
function functionRange(ctx, obj, v, vp) {
|
|
1284
1284
|
if (window.getSelection) {
|
|
1285
1285
|
var currSelection = window.getSelection();
|