@fileverse-dev/fortune-core 1.1.47 → 1.1.48

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) || (firstSpan === null || firstSpan === void 0 ? void 0 : firstSpan.innerText.includes("=")) && !(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes(")"))) {
+    if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || israngeseleciton(ctx)) {
       var rowseleted = [row_index, row_index_ed];
       var columnseleted = [col_index, col_index_ed];
       var left = col_pre;

package/es/modules/cell.js

@@ -128,12 +128,10 @@ export function setCellValue(ctx, r, c, d, v) {
     vupdate = v;
   }
   var commaPresent = false;
-  var decimalPresent = false;
   if (vupdate && typeof vupdate === "string" && vupdate.includes(",")) {
     commaPresent = vupdate.includes(",");
-    decimalPresent = vupdate.includes(".");
     var removeCommasValidated = function removeCommasValidated(str) {
-      return /^[\d,\.]+$/.test(str) ? str === null || str === void 0 ? void 0 : str.replace(/,/g, "") : str;
+      return /^[\d,.]+$/.test(str) ? str === null || str === void 0 ? void 0 : str.replace(/,/g, "") : str;
     };
     vupdate = removeCommasValidated(vupdate);
   }
@@ -503,7 +501,7 @@ export function cancelNormalSelected(ctx) {
   ctx.formulaCache.rangedrag_row_start = false;
 }
 export function updateCell(ctx, r, c, $input, value, canvas) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
   console.log("updateCell", r, c, $input, value);
   var inputText = $input === null || $input === void 0 ? void 0 : $input.innerText;
   var inputHtml = $input === null || $input === void 0 ? void 0 : $input.innerHTML;
@@ -673,8 +671,8 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
         f: v[2]
       };
       if (/^[\d.,]+$/.test(value.v)) {
-        var args = getContentInParentheses(value === null || value === void 0 ? void 0 : value.f).split(",");
-        var cellRefs = args.map(function (arg) {
+        var args = (_k = getContentInParentheses(value === null || value === void 0 ? void 0 : value.f)) === null || _k === void 0 ? void 0 : _k.split(",");
+        var cellRefs = args === null || args === void 0 ? void 0 : args.map(function (arg) {
           return arg.trim().toUpperCase();
         });
         var formatted = processArray(cellRefs, d, flowdata);
@@ -725,8 +723,8 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
       isRunExecFunction = false;
     }
   }
-  var decemialCount = ((_k = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _k === void 0 ? void 0 : _k.toString().includes(".")) ? (_m = (_l = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _l === void 0 ? void 0 : _l.toString().split(" ")[0].split(".")[1]) === null || _m === void 0 ? void 0 : _m.length : 0;
-  var coin = (_o = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _o === void 0 ? void 0 : _o.toString().split(" ")[1];
+  var decemialCount = ((_l = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _l === void 0 ? void 0 : _l.toString().includes(".")) ? (_o = (_m = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _m === void 0 ? void 0 : _m.toString().split(" ")[0].split(".")[1]) === null || _o === void 0 ? void 0 : _o.length : 0;
+  var coin = (_p = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _p === void 0 ? void 0 : _p.toString().split(" ")[1];
   if (_typeof(value) === "object" && value.baseValue && !(value === null || value === void 0 ? void 0 : value.m)) {
     value.m = "".concat((parseFloat(value === null || value === void 0 ? void 0 : value.v) / (oldValue === null || oldValue === void 0 ? void 0 : oldValue.baseCurrencyPrice)).toFixed(decemialCount || 2), " ").concat(coin);
   }
@@ -742,7 +740,7 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
   } else if (_typeof(value) === "object" && !value.tb) {
     value.tb = "1";
   }
-  var isValueArray = Array.isArray((_p = value === null || value === void 0 ? void 0 : value.v) === null || _p === void 0 ? void 0 : _p[0]);
+  var isValueArray = Array.isArray((_q = value === null || value === void 0 ? void 0 : value.v) === null || _q === void 0 ? void 0 : _q[0]);
   try {
     if (isValueArray) {
       if (spillSortResult(ctx, r, c, value, d)) {
@@ -766,8 +764,8 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
   if ((curv === null || curv === void 0 ? void 0 : curv.tb) === "2" && curv.v || isInlineStringCell(d[r][c])) {
     var defaultrowlen = ctx.defaultrowlen;
     var cfg = ctx.luckysheetfile[getSheetIndex(ctx, ctx.currentSheetId)].config || {};
-    if (!(((_q = cfg.columnlen) === null || _q === void 0 ? void 0 : _q[c]) && ((_r = cfg.rowlen) === null || _r === void 0 ? void 0 : _r[r]))) {
-      var cellWidth = ((_s = cfg.columnlen) === null || _s === void 0 ? void 0 : _s[c]) || ctx.defaultcollen;
+    if (!(((_r = cfg.columnlen) === null || _r === void 0 ? void 0 : _r[c]) && ((_s = cfg.rowlen) === null || _s === void 0 ? void 0 : _s[r]))) {
+      var cellWidth = ((_t = cfg.columnlen) === null || _t === void 0 ? void 0 : _t[c]) || ctx.defaultcollen;
       var textInfo = canvas ? getCellTextInfo(d[r][c], canvas, ctx, {
         r: r,
         c: c,
@@ -778,7 +776,7 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
         currentRowLen = textInfo.textHeightAll + 2;
       }
       var previousRowHeight = getRowHeight(ctx, [r])[r];
-      if (currentRowLen > defaultrowlen && !((_t = cfg.customHeight) === null || _t === void 0 ? void 0 : _t[r]) && previousRowHeight < currentRowLen) {
+      if (currentRowLen > defaultrowlen && !((_u = cfg.customHeight) === null || _u === void 0 ? void 0 : _u[r]) && previousRowHeight < currentRowLen) {
         if (_.isNil(cfg.rowlen)) cfg.rowlen = {};
         cfg.rowlen[r] = currentRowLen;
       }

package/es/modules/formula.d.ts

@@ -40,6 +40,7 @@ export declare function createFormulaRangeSelect(ctx: Context, select: {
 } & 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 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

@@ -24,7 +24,6 @@ import { getFlowdata } from "../context";
 import { columnCharToIndex, escapeScriptTag, getSheetIndex, indexToColumnChar, getSheetIdByName, escapeHTMLTag } from "../utils";
 import { getcellFormula, getRangetxt, mergeMoveMain, setCellValue } from "./cell";
 import { error } from "./validation";
-import { moveToEnd } from "./cursor";
 import { locale } from "../locale";
 import { colors } from "./color";
 import { colLocation, mousePosition, rowLocation } from "./location";
@@ -1237,7 +1236,18 @@ export function setCaretPosition(ctx, textDom, children, pos) {
     el.focus();
   } catch (err) {
     console.error(err);
-    moveToEnd(ctx.formulaCache.rangeResizeTo[0]);
+    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) {

package/es/utils/index.js

@@ -212,8 +212,16 @@ export function removeLastSpan(htmlString) {
 }
 export function getContentInParentheses(str) {
   if (!str) return null;
-  var match = str.match(/\(([^)]+)\)/);
-  return match ? match[1] : null;
+  var parenMatch = str.match(/\(([^)]+)\)/);
+  if (parenMatch) return parenMatch[1];
+  var formulaMatch = str.match(/^=([\w\d:+\-*/]+)$/);
+  if (formulaMatch) {
+    var refs = formulaMatch[1].split(/[\+\-\*\/]/).map(function (part) {
+      return part.trim();
+    }).filter(Boolean);
+    return refs.join(",");
+  }
+  return null;
 }
 export function processArray(cellReferences, d, flowData) {
   function isValidCellReference(cell) {
@@ -238,7 +246,7 @@ export function processArray(cellReferences, d, flowData) {
       row: row
     };
   }
-  var validCellReferences = cellReferences.filter(function (cellRef) {
+  var validCellReferences = cellReferences === null || cellReferences === void 0 ? void 0 : cellReferences.filter(function (cellRef) {
     if (cellRef.includes(":")) {
       var _a = cellRef.split(":"),
         startCell = _a[0],
@@ -248,7 +256,7 @@ export function processArray(cellReferences, d, flowData) {
     return isValidCellReference(cellRef.trim());
   });
   var expandedCellReferences = [];
-  validCellReferences.forEach(function (cellRef) {
+  validCellReferences === null || validCellReferences === void 0 ? void 0 : validCellReferences.forEach(function (cellRef) {
     if (cellRef.includes(":")) {
       var _a = cellRef.split(":"),
         startCell = _a[0],

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) || (firstSpan === null || firstSpan === void 0 ? void 0 : firstSpan.innerText.includes("=")) && !(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes(")"))) {
+    if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || (0, _modules.israngeseleciton)(ctx)) {
       var rowseleted = [row_index, row_index_ed];
       var columnseleted = [col_index, col_index_ed];
       var left = col_pre;

package/lib/modules/cell.js

@@ -158,12 +158,10 @@ function setCellValue(ctx, r, c, d, v) {
     vupdate = v;
   }
   var commaPresent = false;
-  var decimalPresent = false;
   if (vupdate && typeof vupdate === "string" && vupdate.includes(",")) {
     commaPresent = vupdate.includes(",");
-    decimalPresent = vupdate.includes(".");
     var removeCommasValidated = function removeCommasValidated(str) {
-      return /^[\d,\.]+$/.test(str) ? str === null || str === void 0 ? void 0 : str.replace(/,/g, "") : str;
+      return /^[\d,.]+$/.test(str) ? str === null || str === void 0 ? void 0 : str.replace(/,/g, "") : str;
     };
     vupdate = removeCommasValidated(vupdate);
   }
@@ -533,7 +531,7 @@ function cancelNormalSelected(ctx) {
   ctx.formulaCache.rangedrag_row_start = false;
 }
 function updateCell(ctx, r, c, $input, value, canvas) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
   console.log("updateCell", r, c, $input, value);
   var inputText = $input === null || $input === void 0 ? void 0 : $input.innerText;
   var inputHtml = $input === null || $input === void 0 ? void 0 : $input.innerHTML;
@@ -703,8 +701,8 @@ function updateCell(ctx, r, c, $input, value, canvas) {
         f: v[2]
       };
       if (/^[\d.,]+$/.test(value.v)) {
-        var args = (0, _utils.getContentInParentheses)(value === null || value === void 0 ? void 0 : value.f).split(",");
-        var cellRefs = args.map(function (arg) {
+        var args = (_k = (0, _utils.getContentInParentheses)(value === null || value === void 0 ? void 0 : value.f)) === null || _k === void 0 ? void 0 : _k.split(",");
+        var cellRefs = args === null || args === void 0 ? void 0 : args.map(function (arg) {
           return arg.trim().toUpperCase();
         });
         var formatted = (0, _utils.processArray)(cellRefs, d, flowdata);
@@ -755,8 +753,8 @@ function updateCell(ctx, r, c, $input, value, canvas) {
       isRunExecFunction = false;
     }
   }
-  var decemialCount = ((_k = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _k === void 0 ? void 0 : _k.toString().includes(".")) ? (_m = (_l = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _l === void 0 ? void 0 : _l.toString().split(" ")[0].split(".")[1]) === null || _m === void 0 ? void 0 : _m.length : 0;
-  var coin = (_o = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _o === void 0 ? void 0 : _o.toString().split(" ")[1];
+  var decemialCount = ((_l = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _l === void 0 ? void 0 : _l.toString().includes(".")) ? (_o = (_m = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _m === void 0 ? void 0 : _m.toString().split(" ")[0].split(".")[1]) === null || _o === void 0 ? void 0 : _o.length : 0;
+  var coin = (_p = oldValue === null || oldValue === void 0 ? void 0 : oldValue.m) === null || _p === void 0 ? void 0 : _p.toString().split(" ")[1];
   if (_typeof(value) === "object" && value.baseValue && !(value === null || value === void 0 ? void 0 : value.m)) {
     value.m = "".concat((parseFloat(value === null || value === void 0 ? void 0 : value.v) / (oldValue === null || oldValue === void 0 ? void 0 : oldValue.baseCurrencyPrice)).toFixed(decemialCount || 2), " ").concat(coin);
   }
@@ -772,7 +770,7 @@ function updateCell(ctx, r, c, $input, value, canvas) {
   } else if (_typeof(value) === "object" && !value.tb) {
     value.tb = "1";
   }
-  var isValueArray = Array.isArray((_p = value === null || value === void 0 ? void 0 : value.v) === null || _p === void 0 ? void 0 : _p[0]);
+  var isValueArray = Array.isArray((_q = value === null || value === void 0 ? void 0 : value.v) === null || _q === void 0 ? void 0 : _q[0]);
   try {
     if (isValueArray) {
       if ((0, _sort.spillSortResult)(ctx, r, c, value, d)) {
@@ -796,8 +794,8 @@ function updateCell(ctx, r, c, $input, value, canvas) {
   if ((curv === null || curv === void 0 ? void 0 : curv.tb) === "2" && curv.v || (0, _inlineString.isInlineStringCell)(d[r][c])) {
     var defaultrowlen = ctx.defaultrowlen;
     var cfg = ctx.luckysheetfile[(0, _utils.getSheetIndex)(ctx, ctx.currentSheetId)].config || {};
-    if (!(((_q = cfg.columnlen) === null || _q === void 0 ? void 0 : _q[c]) && ((_r = cfg.rowlen) === null || _r === void 0 ? void 0 : _r[r]))) {
-      var cellWidth = ((_s = cfg.columnlen) === null || _s === void 0 ? void 0 : _s[c]) || ctx.defaultcollen;
+    if (!(((_r = cfg.columnlen) === null || _r === void 0 ? void 0 : _r[c]) && ((_s = cfg.rowlen) === null || _s === void 0 ? void 0 : _s[r]))) {
+      var cellWidth = ((_t = cfg.columnlen) === null || _t === void 0 ? void 0 : _t[c]) || ctx.defaultcollen;
       var textInfo = canvas ? (0, _text.getCellTextInfo)(d[r][c], canvas, ctx, {
         r: r,
         c: c,
@@ -808,7 +806,7 @@ function updateCell(ctx, r, c, $input, value, canvas) {
         currentRowLen = textInfo.textHeightAll + 2;
       }
       var previousRowHeight = (0, _api.getRowHeight)(ctx, [r])[r];
-      if (currentRowLen > defaultrowlen && !((_t = cfg.customHeight) === null || _t === void 0 ? void 0 : _t[r]) && previousRowHeight < currentRowLen) {
+      if (currentRowLen > defaultrowlen && !((_u = cfg.customHeight) === null || _u === void 0 ? void 0 : _u[r]) && previousRowHeight < currentRowLen) {
         if (_lodash.default.isNil(cfg.rowlen)) cfg.rowlen = {};
         cfg.rowlen[r] = currentRowLen;
       }

package/lib/modules/formula.d.ts

@@ -40,6 +40,7 @@ export declare function createFormulaRangeSelect(ctx: Context, select: {
 } & 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 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

@@ -20,6 +20,7 @@ exports.handleFormulaInput = handleFormulaInput;
 exports.insertUpdateFunctionGroup = insertUpdateFunctionGroup;
 exports.iscelldata = iscelldata;
 exports.israngeseleciton = israngeseleciton;
+exports.moveCursorToEnd = moveCursorToEnd;
 exports.onFormulaRangeDragEnd = onFormulaRangeDragEnd;
 exports.rangeDrag = rangeDrag;
 exports.rangeDragColumn = rangeDragColumn;
@@ -33,7 +34,6 @@ var _context = require("../context");
 var _utils = require("../utils");
 var _cell = require("./cell");
 var _validation = require("./validation");
-var _cursor = require("./cursor");
 var _locale = require("../locale");
 var _color = require("./color");
 var _location = require("./location");
@@ -1266,7 +1266,18 @@ function setCaretPosition(ctx, textDom, children, pos) {
     el.focus();
   } catch (err) {
     console.error(err);
-    (0, _cursor.moveToEnd)(ctx.formulaCache.rangeResizeTo[0]);
+    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) {

package/lib/utils/index.js

@@ -280,8 +280,16 @@ function removeLastSpan(htmlString) {
 }
 function getContentInParentheses(str) {
   if (!str) return null;
-  var match = str.match(/\(([^)]+)\)/);
-  return match ? match[1] : null;
+  var parenMatch = str.match(/\(([^)]+)\)/);
+  if (parenMatch) return parenMatch[1];
+  var formulaMatch = str.match(/^=([\w\d:+\-*/]+)$/);
+  if (formulaMatch) {
+    var refs = formulaMatch[1].split(/[\+\-\*\/]/).map(function (part) {
+      return part.trim();
+    }).filter(Boolean);
+    return refs.join(",");
+  }
+  return null;
 }
 function processArray(cellReferences, d, flowData) {
   function isValidCellReference(cell) {
@@ -306,7 +314,7 @@ function processArray(cellReferences, d, flowData) {
       row: row
     };
   }
-  var validCellReferences = cellReferences.filter(function (cellRef) {
+  var validCellReferences = cellReferences === null || cellReferences === void 0 ? void 0 : cellReferences.filter(function (cellRef) {
     if (cellRef.includes(":")) {
       var _a = cellRef.split(":"),
         startCell = _a[0],
@@ -316,7 +324,7 @@ function processArray(cellReferences, d, flowData) {
     return isValidCellReference(cellRef.trim());
   });
   var expandedCellReferences = [];
-  validCellReferences.forEach(function (cellRef) {
+  validCellReferences === null || validCellReferences === void 0 ? void 0 : validCellReferences.forEach(function (cellRef) {
     if (cellRef.includes(":")) {
       var _a = cellRef.split(":"),
         startCell = _a[0],

package/package.json

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