@fileverse-dev/fortune-core 1.1.37 → 1.1.38

package/es/events/mouse.js

@@ -105,7 +105,7 @@ export function fixPositionOnFrozenCells(freeze, x, y, mouseX, mouseY) {
 }
 export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxInput, canvas) {
   var _a, _b;
-  var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+  var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
   if (!(fxInput === null || fxInput === void 0 ? void 0 : fxInput.innerHTML) && ctx) {
     ctx.defaultCandidates = [];
   }
@@ -124,11 +124,11 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
     return;
   }
   var freeze = (_c = globalCache.freezen) === null || _c === void 0 ? void 0 : _c[ctx.currentSheetId];
-  var _p = fixPositionOnFrozenCells(freeze, _x, _y, mouseX, mouseY),
-    x = _p.x,
-    y = _p.y,
-    inHorizontalFreeze = _p.inHorizontalFreeze,
-    inVerticalFreeze = _p.inVerticalFreeze;
+  var _q = fixPositionOnFrozenCells(freeze, _x, _y, mouseX, mouseY),
+    x = _q.x,
+    y = _q.y,
+    inHorizontalFreeze = _q.inHorizontalFreeze,
+    inVerticalFreeze = _q.inVerticalFreeze;
   var row_location = rowLocation(y, ctx.visibledatarow);
   var row = row_location[1];
   var row_pre = row_location[0];
@@ -173,7 +173,11 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
   }
   ctx.luckysheet_scroll_status = true;
   if (ctx.luckysheetCellUpdate.length > 0) {
-    if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || israngeseleciton(ctx)) {
+    var parser = new DOMParser();
+    var doc = parser.parseFromString("<div>".concat((_g = document.getElementById("luckysheet-rich-text-editor")) === null || _g === void 0 ? void 0 : _g.innerHTML, "</div>"), "text/html");
+    var spans = doc.querySelectorAll("span");
+    var firstSpan = spans[0];
+    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("="))) {
       var rowseleted = [row_index, row_index_ed];
       var columnseleted = [col_index, col_index_ed];
       var left = col_pre;
@@ -240,7 +244,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
         last.top_move = top_1;
         last.height_move = height;
         ctx.formulaCache.func_selectedrange = last;
-      } else if (e.ctrlKey && ((_g = _.last(cellInput.querySelectorAll("span"))) === null || _g === void 0 ? void 0 : _g.innerText) !== ",") {
+      } else if (e.ctrlKey && ((_h = _.last(cellInput.querySelectorAll("span"))) === null || _h === void 0 ? void 0 : _h.innerText) !== ",") {
         var vText = cellInput.innerText;
         if (vText[vText.length - 1] === ")") {
           vText = vText.substring(0, vText.length - 1);
@@ -256,7 +260,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
           if (window.getSelection) {
             var currSelection = window.getSelection();
             if (currSelection == null) return;
-            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];
+            ctx.formulaCache.functionRangeIndex = [_.indexOf((_l = (_k = (_j = currSelection.anchorNode) === null || _j === void 0 ? void 0 : _j.parentNode) === null || _k === void 0 ? void 0 : _k.parentNode) === null || _l === void 0 ? void 0 : _l.childNodes, (_m = currSelection.anchorNode) === null || _m === void 0 ? void 0 : _m.parentNode), currSelection.anchorOffset];
           } else {
             var textRange = document.selection.createRange();
             ctx.formulaCache.functionRangeIndex = textRange;
@@ -330,7 +334,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
   }
   if (ctx.luckysheet_select_status) {
     if (e.shiftKey) {
-      var last = (_m = ctx.luckysheet_select_save) === null || _m === void 0 ? void 0 : _m[ctx.luckysheet_select_save.length - 1];
+      var last = (_o = ctx.luckysheet_select_save) === null || _o === void 0 ? void 0 : _o[ctx.luckysheet_select_save.length - 1];
       if (last && last.top != null && last.left != null && last.height != null && last.width != null && last.row_focus != null && last.column_focus != null) {
         var top_2 = 0;
         var height = 0;
@@ -389,7 +393,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
         ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1] = last;
       }
     } else if (e.ctrlKey || e.metaKey) {
-      (_o = ctx.luckysheet_select_save) === null || _o === void 0 ? void 0 : _o.push({
+      (_p = ctx.luckysheet_select_save) === null || _p === void 0 ? void 0 : _p.push({
         left: col_pre,
         width: col - col_pre - 1,
         top: row_pre,

package/es/modules/formula.js

@@ -29,6 +29,7 @@ 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 = {
@@ -1235,7 +1236,7 @@ export function setCaretPosition(ctx, textDom, children, pos) {
     sel === null || sel === void 0 ? void 0 : sel.addRange(range);
     el.focus();
   } catch (err) {
-    console.warn("setCaretPosition error");
+    console.error(err);
     moveToEnd(ctx.formulaCache.rangeResizeTo[0]);
   }
 }
@@ -1938,6 +1939,14 @@ 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/es/utils/index.d.ts

@@ -17,3 +17,5 @@ export declare function getRegExpStr(str: string): string;
 export declare function chatatABC(n: number): string;
 export declare function isAllowEdit(ctx: Context, range?: Sheet["luckysheet_select_save"]): boolean;
 export declare function isAllowEditReadOnly(ctx: Context, range?: Sheet["luckysheet_select_save"]): boolean;
+export declare function isLetterNumberPattern(str: string): boolean;
+export declare function removeLastSpan(htmlString: string): string;

package/es/utils/index.js

@@ -195,4 +195,18 @@ export function isAllowEditReadOnly(ctx, range) {
     }
     return true;
   }) && (_.isUndefined(ctx.isFlvReadOnly) ? true : ctx.isFlvReadOnly);
+}
+export function isLetterNumberPattern(str) {
+  var regex = /^[a-zA-Z]\d+$/;
+  return regex.test(str);
+}
+export function removeLastSpan(htmlString) {
+  var container = document.createElement("div");
+  container.innerHTML = htmlString;
+  var spans = container.querySelectorAll("span");
+  if (spans.length > 0) {
+    var lastSpan = spans[spans.length - 1];
+    lastSpan.remove();
+  }
+  return container.innerHTML;
 }

package/lib/events/mouse.js

@@ -124,7 +124,7 @@ function fixPositionOnFrozenCells(freeze, x, y, mouseX, mouseY) {
 }
 function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxInput, canvas) {
   var _a, _b;
-  var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+  var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
   if (!(fxInput === null || fxInput === void 0 ? void 0 : fxInput.innerHTML) && ctx) {
     ctx.defaultCandidates = [];
   }
@@ -143,11 +143,11 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
     return;
   }
   var freeze = (_c = globalCache.freezen) === null || _c === void 0 ? void 0 : _c[ctx.currentSheetId];
-  var _p = fixPositionOnFrozenCells(freeze, _x, _y, mouseX, mouseY),
-    x = _p.x,
-    y = _p.y,
-    inHorizontalFreeze = _p.inHorizontalFreeze,
-    inVerticalFreeze = _p.inVerticalFreeze;
+  var _q = fixPositionOnFrozenCells(freeze, _x, _y, mouseX, mouseY),
+    x = _q.x,
+    y = _q.y,
+    inHorizontalFreeze = _q.inHorizontalFreeze,
+    inVerticalFreeze = _q.inVerticalFreeze;
   var row_location = (0, _location.rowLocation)(y, ctx.visibledatarow);
   var row = row_location[1];
   var row_pre = row_location[0];
@@ -192,7 +192,11 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
   }
   ctx.luckysheet_scroll_status = true;
   if (ctx.luckysheetCellUpdate.length > 0) {
-    if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || (0, _modules.israngeseleciton)(ctx)) {
+    var parser = new DOMParser();
+    var doc = parser.parseFromString("<div>".concat((_g = document.getElementById("luckysheet-rich-text-editor")) === null || _g === void 0 ? void 0 : _g.innerHTML, "</div>"), "text/html");
+    var spans = doc.querySelectorAll("span");
+    var firstSpan = spans[0];
+    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("="))) {
       var rowseleted = [row_index, row_index_ed];
       var columnseleted = [col_index, col_index_ed];
       var left = col_pre;
@@ -259,7 +263,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
         last.top_move = top_1;
         last.height_move = height;
         ctx.formulaCache.func_selectedrange = last;
-      } else if (e.ctrlKey && ((_g = _lodash.default.last(cellInput.querySelectorAll("span"))) === null || _g === void 0 ? void 0 : _g.innerText) !== ",") {
+      } else if (e.ctrlKey && ((_h = _lodash.default.last(cellInput.querySelectorAll("span"))) === null || _h === void 0 ? void 0 : _h.innerText) !== ",") {
         var vText = cellInput.innerText;
         if (vText[vText.length - 1] === ")") {
           vText = vText.substring(0, vText.length - 1);
@@ -275,7 +279,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
           if (window.getSelection) {
             var currSelection = window.getSelection();
             if (currSelection == null) return;
-            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];
+            ctx.formulaCache.functionRangeIndex = [_lodash.default.indexOf((_l = (_k = (_j = currSelection.anchorNode) === null || _j === void 0 ? void 0 : _j.parentNode) === null || _k === void 0 ? void 0 : _k.parentNode) === null || _l === void 0 ? void 0 : _l.childNodes, (_m = currSelection.anchorNode) === null || _m === void 0 ? void 0 : _m.parentNode), currSelection.anchorOffset];
           } else {
             var textRange = document.selection.createRange();
             ctx.formulaCache.functionRangeIndex = textRange;
@@ -349,7 +353,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
   }
   if (ctx.luckysheet_select_status) {
     if (e.shiftKey) {
-      var last = (_m = ctx.luckysheet_select_save) === null || _m === void 0 ? void 0 : _m[ctx.luckysheet_select_save.length - 1];
+      var last = (_o = ctx.luckysheet_select_save) === null || _o === void 0 ? void 0 : _o[ctx.luckysheet_select_save.length - 1];
       if (last && last.top != null && last.left != null && last.height != null && last.width != null && last.row_focus != null && last.column_focus != null) {
         var top_2 = 0;
         var height = 0;
@@ -408,7 +412,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
         ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1] = last;
       }
     } else if (e.ctrlKey || e.metaKey) {
-      (_o = ctx.luckysheet_select_save) === null || _o === void 0 ? void 0 : _o.push({
+      (_p = ctx.luckysheet_select_save) === null || _p === void 0 ? void 0 : _p.push({
         left: col_pre,
         width: col - col_pre - 1,
         top: row_pre,

package/lib/modules/formula.js

@@ -38,6 +38,7 @@ 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 () {
@@ -1264,7 +1265,7 @@ function setCaretPosition(ctx, textDom, children, pos) {
     sel === null || sel === void 0 ? void 0 : sel.addRange(range);
     el.focus();
   } catch (err) {
-    console.warn("setCaretPosition error");
+    console.error(err);
     (0, _cursor.moveToEnd)(ctx.formulaCache.rangeResizeTo[0]);
   }
 }
@@ -1967,6 +1968,14 @@ 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/lib/utils/index.d.ts

@@ -17,3 +17,5 @@ export declare function getRegExpStr(str: string): string;
 export declare function chatatABC(n: number): string;
 export declare function isAllowEdit(ctx: Context, range?: Sheet["luckysheet_select_save"]): boolean;
 export declare function isAllowEditReadOnly(ctx: Context, range?: Sheet["luckysheet_select_save"]): boolean;
+export declare function isLetterNumberPattern(str: string): boolean;
+export declare function removeLastSpan(htmlString: string): string;

package/lib/utils/index.js

@@ -18,7 +18,9 @@ var _exportNames = {
   getRegExpStr: true,
   chatatABC: true,
   isAllowEdit: true,
-  isAllowEditReadOnly: true
+  isAllowEditReadOnly: true,
+  isLetterNumberPattern: true,
+  removeLastSpan: true
 };
 exports.chatatABC = chatatABC;
 exports.columnCharToIndex = columnCharToIndex;
@@ -33,6 +35,8 @@ exports.getSheetIndex = getSheetIndex;
 exports.indexToColumnChar = indexToColumnChar;
 exports.isAllowEdit = isAllowEdit;
 exports.isAllowEditReadOnly = isAllowEditReadOnly;
+exports.isLetterNumberPattern = isLetterNumberPattern;
+exports.removeLastSpan = removeLastSpan;
 exports.replaceHtml = replaceHtml;
 exports.rgbToHex = rgbToHex;
 var _lodash = _interopRequireDefault(require("lodash"));
@@ -255,4 +259,18 @@ function isAllowEditReadOnly(ctx, range) {
     }
     return true;
   }) && (_lodash.default.isUndefined(ctx.isFlvReadOnly) ? true : ctx.isFlvReadOnly);
+}
+function isLetterNumberPattern(str) {
+  var regex = /^[a-zA-Z]\d+$/;
+  return regex.test(str);
+}
+function removeLastSpan(htmlString) {
+  var container = document.createElement("div");
+  container.innerHTML = htmlString;
+  var spans = container.querySelectorAll("span");
+  if (spans.length > 0) {
+    var lastSpan = spans[spans.length - 1];
+    lastSpan.remove();
+  }
+  return container.innerHTML;
 }

package/package.json

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