@fileverse-dev/fortune-core 1.1.48 → 1.1.50

package/es/events/keyboard.js

@@ -355,7 +355,7 @@ export function handleArrowKey(ctx, e) {
     var spans = doc.querySelectorAll("span");
     var lastSpan = spans[spans.length - 1];
     var notFunctionInit = !((_b = document.getElementById("luckysheet-rich-text-editor")) === null || _b === void 0 ? void 0 : _b.innerText.includes("("));
-    if ((lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes(")")) || notFunctionInit && /^[a-zA-Z]+$/.test(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) && !_.includes(["="], lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText)) {
+    if ((lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes(")")) || (lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) === '""' || notFunctionInit && /^[a-zA-Z]+$/.test(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) && !_.includes(["="], lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText)) {
       return;
     }
   }

package/es/events/mouse.js

@@ -178,7 +178,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
     var spans = doc.querySelectorAll("span");
     var firstSpan = spans[0];
     var lastSpan = spans[spans.length - 1];
-    if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || israngeseleciton(ctx)) {
+    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(")"))) {
       var rowseleted = [row_index, row_index_ed];
       var columnseleted = [col_index, col_index_ed];
       var left = col_pre;

package/es/modules/formula.d.ts

@@ -39,8 +39,8 @@ export declare function createFormulaRangeSelect(ctx: Context, select: {
     rangeIndex: number;
 } & Rect): void;
 export declare function createRangeHightlight(ctx: Context, inputInnerHtmlStr: string, ignoreRangeIndex?: number): void;
-export declare function setCaretPosition(ctx: Context, textDom: HTMLElement, children: number, pos: number): void;
 export declare function moveCursorToEnd(editableDiv: HTMLDivElement): void;
+export declare function setCaretPosition(ctx: Context, textDom: HTMLElement, children: number, pos: number): void;
 export declare function getrangeseleciton(): ParentNode | ChildNode | null | undefined;
 export declare function rangeHightlightselected(ctx: Context, $editor: HTMLDivElement): void;
 export declare function functionHTMLGenerate(txt: string): string;

package/es/modules/formula.js

@@ -28,7 +28,6 @@ import { locale } from "../locale";
 import { colors } from "./color";
 import { colLocation, mousePosition, rowLocation } from "./location";
 import { cancelFunctionrangeSelected, seletedHighlistByindex, spillSortResult } from ".";
-import { isLetterNumberPattern, removeLastSpan } from "../utils/index";
 var functionHTMLIndex = 0;
 var rangeIndexes = [];
 var operatorPriority = {
@@ -1216,6 +1215,17 @@ export function createRangeHightlight(ctx, inputInnerHtmlStr, ignoreRangeIndex)
   });
   ctx.formulaRangeHighlight = formulaRanges;
 }
+export function moveCursorToEnd(editableDiv) {
+  editableDiv.focus();
+  var range = document.createRange();
+  var selection = window.getSelection();
+  range.selectNodeContents(editableDiv);
+  range.collapse(false);
+  if (selection) {
+    selection.removeAllRanges();
+    selection.addRange(range);
+  }
+}
 export function setCaretPosition(ctx, textDom, children, pos) {
   var _a, _b;
   try {
@@ -1239,17 +1249,6 @@ export function setCaretPosition(ctx, textDom, children, pos) {
     moveCursorToEnd(textDom);
   }
 }
-export function moveCursorToEnd(editableDiv) {
-  editableDiv.focus();
-  var range = document.createRange();
-  var selection = window.getSelection();
-  range.selectNodeContents(editableDiv);
-  range.collapse(false);
-  if (selection) {
-    selection.removeAllRanges();
-    selection.addRange(range);
-  }
-}
 function functionRange(ctx, obj, v, vp) {
   if (window.getSelection) {
     var currSelection = window.getSelection();
@@ -1949,14 +1948,6 @@ export function functionStrChange(txt, type, rc, orient, stindex, step) {
 }
 export function rangeSetValue(ctx, cellInput, selected, fxInput) {
   var _a, _b, _c, _d, _e;
-  var parser = new DOMParser();
-  var doc = parser.parseFromString("<div>".concat(cellInput.innerHTML, "</div>"), "text/html");
-  var spans = doc.querySelectorAll("span");
-  var lastSpan = spans[spans.length - 1];
-  if (lastSpan && isLetterNumberPattern(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText)) {
-    var htmlR = removeLastSpan(cellInput.innerHTML);
-    cellInput.innerHTML = "".concat(htmlR);
-  }
   var $editor = cellInput;
   var $copyTo = fxInput;
   if (((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.id) === "luckysheet-functionbox-cell") {

package/lib/events/keyboard.js

@@ -365,7 +365,7 @@ function handleArrowKey(ctx, e) {
     var spans = doc.querySelectorAll("span");
     var lastSpan = spans[spans.length - 1];
     var notFunctionInit = !((_b = document.getElementById("luckysheet-rich-text-editor")) === null || _b === void 0 ? void 0 : _b.innerText.includes("("));
-    if ((lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes(")")) || notFunctionInit && /^[a-zA-Z]+$/.test(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) && !_lodash.default.includes(["="], lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText)) {
+    if ((lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes(")")) || (lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) === '""' || notFunctionInit && /^[a-zA-Z]+$/.test(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) && !_lodash.default.includes(["="], lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText)) {
       return;
     }
   }

package/lib/events/mouse.js

@@ -197,7 +197,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
     var spans = doc.querySelectorAll("span");
     var firstSpan = spans[0];
     var lastSpan = spans[spans.length - 1];
-    if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || (0, _modules.israngeseleciton)(ctx)) {
+    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(")"))) {
       var rowseleted = [row_index, row_index_ed];
       var columnseleted = [col_index, col_index_ed];
       var left = col_pre;

package/lib/modules/formula.d.ts

@@ -39,8 +39,8 @@ export declare function createFormulaRangeSelect(ctx: Context, select: {
     rangeIndex: number;
 } & Rect): void;
 export declare function createRangeHightlight(ctx: Context, inputInnerHtmlStr: string, ignoreRangeIndex?: number): void;
-export declare function setCaretPosition(ctx: Context, textDom: HTMLElement, children: number, pos: number): void;
 export declare function moveCursorToEnd(editableDiv: HTMLDivElement): void;
+export declare function setCaretPosition(ctx: Context, textDom: HTMLElement, children: number, pos: number): void;
 export declare function getrangeseleciton(): ParentNode | ChildNode | null | undefined;
 export declare function rangeHightlightselected(ctx: Context, $editor: HTMLDivElement): void;
 export declare function functionHTMLGenerate(txt: string): string;

package/lib/modules/formula.js

@@ -38,7 +38,6 @@ var _locale = require("../locale");
 var _color = require("./color");
 var _location = require("./location");
 var _2 = require(".");
-var _index = require("../utils/index");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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); }
 var __assign = void 0 && (void 0).__assign || function () {
@@ -1246,6 +1245,17 @@ function createRangeHightlight(ctx, inputInnerHtmlStr, ignoreRangeIndex) {
   });
   ctx.formulaRangeHighlight = formulaRanges;
 }
+function moveCursorToEnd(editableDiv) {
+  editableDiv.focus();
+  var range = document.createRange();
+  var selection = window.getSelection();
+  range.selectNodeContents(editableDiv);
+  range.collapse(false);
+  if (selection) {
+    selection.removeAllRanges();
+    selection.addRange(range);
+  }
+}
 function setCaretPosition(ctx, textDom, children, pos) {
   var _a, _b;
   try {
@@ -1269,17 +1279,6 @@ function setCaretPosition(ctx, textDom, children, pos) {
     moveCursorToEnd(textDom);
   }
 }
-function moveCursorToEnd(editableDiv) {
-  editableDiv.focus();
-  var range = document.createRange();
-  var selection = window.getSelection();
-  range.selectNodeContents(editableDiv);
-  range.collapse(false);
-  if (selection) {
-    selection.removeAllRanges();
-    selection.addRange(range);
-  }
-}
 function functionRange(ctx, obj, v, vp) {
   if (window.getSelection) {
     var currSelection = window.getSelection();
@@ -1979,14 +1978,6 @@ function functionStrChange(txt, type, rc, orient, stindex, step) {
 }
 function rangeSetValue(ctx, cellInput, selected, fxInput) {
   var _a, _b, _c, _d, _e;
-  var parser = new DOMParser();
-  var doc = parser.parseFromString("<div>".concat(cellInput.innerHTML, "</div>"), "text/html");
-  var spans = doc.querySelectorAll("span");
-  var lastSpan = spans[spans.length - 1];
-  if (lastSpan && (0, _index.isLetterNumberPattern)(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText)) {
-    var htmlR = (0, _index.removeLastSpan)(cellInput.innerHTML);
-    cellInput.innerHTML = "".concat(htmlR);
-  }
   var $editor = cellInput;
   var $copyTo = fxInput;
   if (((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.id) === "luckysheet-functionbox-cell") {

package/package.json

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