@fileverse-dev/fortune-core 1.1.43 → 1.1.44

package/es/events/mouse.js

@@ -177,7 +177,8 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
     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 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(")"))) {
       var rowseleted = [row_index, row_index_ed];
       var columnseleted = [col_index, col_index_ed];
       var left = col_pre;

package/es/locale/en.js

@@ -8684,7 +8684,7 @@ export default {
   }, {
     n: "SORT",
     t: "14",
-    d: "Sorts the rows of a given array or range by the values in a specified column.",
+    d: "Sorts the rows of a given array or range by the values in one or more columns.",
     a: "Sorts rows of range by specified column.",
     m: [1, 4],
     p: [{
@@ -8696,7 +8696,7 @@ export default {
       type: "rangenumber"
     }, {
       name: "sort_column",
-      detail: "The index of the column in `range` to sort by. defaults to the first column. index starts at 1.",
+      detail: "The index of the column in `range` to sort by. The first column in `range` is 1, the second column is 2, and so on.",
       example: "1",
       require: "o",
       repeat: "n",

package/es/locale/es.js

@@ -8674,7 +8674,7 @@ export default {
   }, {
     n: "SORT",
     t: "14",
-    d: "Sorts the rows of a given array or range by the values in a specified column.",
+    d: "Sorts the rows of a given array or range by the values in one or more columns.",
     a: "Sorts rows of range by specified column.",
     m: [1, 4],
     p: [{

package/es/modules/cell.js

@@ -126,6 +126,14 @@ export function setCellValue(ctx, r, c, d, v) {
   } else {
     vupdate = v;
   }
+  var commaPresent = false;
+  if (vupdate && typeof vupdate === "string" && vupdate.includes(",")) {
+    commaPresent = vupdate.includes(",");
+    var removeCommasValidated = function removeCommasValidated(str) {
+      return /^[\d,]+$/.test(str) ? str === null || str === void 0 ? void 0 : str.replace(/,/g, "") : str;
+    };
+    vupdate = removeCommasValidated(vupdate);
+  }
   if (isRealNull(vupdate)) {
     if (_.isPlainObject(cell)) {
       delete cell.m;
@@ -263,8 +271,18 @@ export function setCellValue(ctx, r, c, d, v) {
           }
         }
         cell.v = vupdate;
+        var format = void 0;
+        if (String(vupdate).includes(".")) {
+          format = "#,##0.00";
+        } else if (commaPresent) {
+          format = "#,##0.00";
+        } else {
+          format = "0";
+        }
+        cell.m = update(format, cell.v);
+        cell.ht = 2;
         cell.ct = {
-          fa: "General",
+          fa: format,
           t: "n"
         };
         if (cell.v === Infinity || cell.v === -Infinity) {

package/lib/events/mouse.js

@@ -196,7 +196,8 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
     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 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(")"))) {
       var rowseleted = [row_index, row_index_ed];
       var columnseleted = [col_index, col_index_ed];
       var left = col_pre;

package/lib/locale/en.js

@@ -8690,7 +8690,7 @@ var _default = exports.default = {
   }, {
     n: "SORT",
     t: "14",
-    d: "Sorts the rows of a given array or range by the values in a specified column.",
+    d: "Sorts the rows of a given array or range by the values in one or more columns.",
     a: "Sorts rows of range by specified column.",
     m: [1, 4],
     p: [{
@@ -8702,7 +8702,7 @@ var _default = exports.default = {
       type: "rangenumber"
     }, {
       name: "sort_column",
-      detail: "The index of the column in `range` to sort by. defaults to the first column. index starts at 1.",
+      detail: "The index of the column in `range` to sort by. The first column in `range` is 1, the second column is 2, and so on.",
       example: "1",
       require: "o",
       repeat: "n",

package/lib/locale/es.js

@@ -8680,7 +8680,7 @@ var _default = exports.default = {
   }, {
     n: "SORT",
     t: "14",
-    d: "Sorts the rows of a given array or range by the values in a specified column.",
+    d: "Sorts the rows of a given array or range by the values in one or more columns.",
     a: "Sorts rows of range by specified column.",
     m: [1, 4],
     p: [{

package/lib/modules/cell.js

@@ -156,6 +156,14 @@ function setCellValue(ctx, r, c, d, v) {
   } else {
     vupdate = v;
   }
+  var commaPresent = false;
+  if (vupdate && typeof vupdate === "string" && vupdate.includes(",")) {
+    commaPresent = vupdate.includes(",");
+    var removeCommasValidated = function removeCommasValidated(str) {
+      return /^[\d,]+$/.test(str) ? str === null || str === void 0 ? void 0 : str.replace(/,/g, "") : str;
+    };
+    vupdate = removeCommasValidated(vupdate);
+  }
   if ((0, _validation.isRealNull)(vupdate)) {
     if (_lodash.default.isPlainObject(cell)) {
       delete cell.m;
@@ -293,8 +301,18 @@ function setCellValue(ctx, r, c, d, v) {
           }
         }
         cell.v = vupdate;
+        var format = void 0;
+        if (String(vupdate).includes(".")) {
+          format = "#,##0.00";
+        } else if (commaPresent) {
+          format = "#,##0.00";
+        } else {
+          format = "0";
+        }
+        cell.m = (0, _format.update)(format, cell.v);
+        cell.ht = 2;
         cell.ct = {
-          fa: "General",
+          fa: format,
           t: "n"
         };
         if (cell.v === Infinity || cell.v === -Infinity) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.1.43",
+  "version": "1.1.44",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",
@@ -15,7 +15,7 @@
     "dev": "father-build --watch"
   },
   "dependencies": {
-    "@fileverse-dev/formula-parser": "0.2.70",
+    "@fileverse-dev/formula-parser": "0.2.69",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",