@fileverse-dev/fortune-core 1.1.44 → 1.1.46

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 one or more columns.",
+    d: "Sorts the rows of a given array or range by the values in a specified column.",
     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. The first column in `range` is 1, the second column is 2, and so on.",
+      detail: "The index of the column in `range` to sort by. defaults to the first column. index starts at 1.",
       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 one or more columns.",
+    d: "Sorts the rows of a given array or range by the values in a specified column.",
     a: "Sorts rows of range by specified column.",
     m: [1, 4],
     p: [{

package/es/modules/cell.js

@@ -1,7 +1,7 @@
 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); }
 import _ from "lodash";
 import { getFlowdata } from "../context";
-import { getSheetIndex, indexToColumnChar, rgbToHex } from "../utils";
+import { getSheetIndex, indexToColumnChar, rgbToHex, processArray, getContentInParentheses } from "../utils";
 import { checkCF, getComputeMap } from "./ConditionFormat";
 import { getFailureText, validateCellData } from "./dataVerification";
 import { genarate, update } from "./format";
@@ -127,8 +127,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;
     };
@@ -274,12 +276,15 @@ export function setCellValue(ctx, r, c, d, v) {
         var format = void 0;
         if (String(vupdate).includes(".")) {
           format = "#,##0.00";
-        } else if (commaPresent) {
+        } else if (commaPresent && decimalPresent) {
           format = "#,##0.00";
+        } else if (commaPresent) {
+          format = '#,##0';
         } else {
           format = "0";
         }
-        cell.m = update(format, cell.v);
+        cell.m = v.m ? v.m : update(format, cell.v);
+        console.log("cell.m", cell.m, format, vupdate, v);
         cell.ht = 2;
         cell.ct = {
           fa: format,
@@ -592,6 +597,7 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
     if (!isCurInline) {
       if (_.isString(value) && value.slice(0, 1) === "=" && value.length > 1) {
         var v = execfunction(ctx, value, r, c, undefined, undefined, true);
+        console.log("v", v, value);
         isRunExecFunction = false;
         curv = _.cloneDeep(((_c = d === null || d === void 0 ? void 0 : d[r]) === null || _c === void 0 ? void 0 : _c[c]) || {});
         curv.v = v[1], curv.f = v[2];
@@ -663,6 +669,21 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
         v: v[1],
         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) {
+          return arg.trim().toUpperCase();
+        });
+        var formatted = processArray(cellRefs, d, flowdata);
+        if (formatted) {
+          value.m = update(formatted, value.v);
+          value.ct = {
+            fa: formatted,
+            t: "n"
+          };
+        }
+        value.ht = 2;
+      }
       if (v.length === 4 && v[3].type === "sparklines") {
         var curCalv = v[3].data;
         if (_.isArray(curCalv) && !_.isPlainObject(curCalv[0])) {

package/es/utils/index.d.ts

@@ -19,3 +19,5 @@ export declare function isAllowEdit(ctx: Context, range?: Sheet["luckysheet_sele
 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;
+export declare function getContentInParentheses(str: string | null): string | null;
+export declare function processArray(cellReferences: any, d: any, flowData: any): undefined;

package/es/utils/index.js

@@ -209,4 +209,91 @@ export function removeLastSpan(htmlString) {
     lastSpan.remove();
   }
   return container.innerHTML;
+}
+export function getContentInParentheses(str) {
+  if (!str) return null;
+  var match = str.match(/\(([^)]+)\)/);
+  return match ? match[1] : null;
+}
+export function processArray(cellReferences, d, flowData) {
+  function isValidCellReference(cell) {
+    var cellPattern = /^[A-Za-z]+\d+$/;
+    return cellPattern.test(cell);
+  }
+  function parseCellReference(cell) {
+    var match = cell.match(/^([A-Za-z]+)(\d+)$/);
+    if (!match) return null;
+    var letters = match[1].toLowerCase();
+    var number = parseInt(match[2]);
+    var col = 0;
+    for (var i = 0; i < letters.length; i++) {
+      col = col * 26 + (letters.charCodeAt(i) - 'a'.charCodeAt(0) + 1);
+    }
+    col -= 1;
+    var row = number - 1;
+    return {
+      letters: letters,
+      number: number,
+      col: col,
+      row: row
+    };
+  }
+  var validCellReferences = cellReferences.filter(function (cellRef) {
+    if (cellRef.includes(':')) {
+      var _a = cellRef.split(':'),
+        startCell = _a[0],
+        endCell = _a[1];
+      return isValidCellReference(startCell.trim()) && isValidCellReference(endCell.trim());
+    } else {
+      return isValidCellReference(cellRef.trim());
+    }
+  });
+  var expandedCellReferences = [];
+  validCellReferences.forEach(function (cellRef) {
+    if (cellRef.includes(':')) {
+      var _a = cellRef.split(':'),
+        startCell = _a[0],
+        endCell = _a[1];
+      var startParsed = parseCellReference(startCell.trim());
+      var endParsed = parseCellReference(endCell.trim());
+      if (!startParsed || !endParsed) return;
+      for (var row = startParsed.number; row <= endParsed.number; row++) {
+        for (var col = startParsed.col; col <= endParsed.col; col++) {
+          var letters = '';
+          var tempCol = col + 1;
+          while (tempCol > 0) {
+            tempCol--;
+            letters = String.fromCharCode('A'.charCodeAt(0) + tempCol % 26) + letters;
+            tempCol = Math.floor(tempCol / 26);
+          }
+          var cellName = letters + row;
+          expandedCellReferences.push(cellName);
+        }
+      }
+    } else {
+      expandedCellReferences.push(cellRef.toUpperCase());
+    }
+  });
+  var coordinates = [];
+  expandedCellReferences.forEach(function (cell) {
+    var parsed = parseCellReference(cell);
+    if (parsed) {
+      coordinates.push([parsed.row, parsed.col]);
+      console.log("".concat(cell, " -> [").concat(parsed.row, ", ").concat(parsed.col, "]"));
+    }
+  });
+  var formated;
+  coordinates.forEach(function (coord, index) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var row = coord[0],
+      col = coord[1];
+    if (row >= 0 && row < d.length && col >= 0 && col < d[row].length) {
+      if (((_b = (_a = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _a === void 0 ? void 0 : _a.ct) === null || _b === void 0 ? void 0 : _b.fa) && ((_e = (_d = (_c = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _c === void 0 ? void 0 : _c.ct) === null || _d === void 0 ? void 0 : _d.fa) === null || _e === void 0 ? void 0 : _e.includes('#,##0'))) {
+        formated = '#,##0';
+      } else if (((_g = (_f = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _f === void 0 ? void 0 : _f.ct) === null || _g === void 0 ? void 0 : _g.fa) && ((_k = (_j = (_h = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _h === void 0 ? void 0 : _h.ct) === null || _j === void 0 ? void 0 : _j.fa) === null || _k === void 0 ? void 0 : _k.includes('#,##0.00'))) {
+        formated = '#,##0.00';
+      }
+    }
+  });
+  return formated;
 }

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 one or more columns.",
+    d: "Sorts the rows of a given array or range by the values in a specified column.",
     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. The first column in `range` is 1, the second column is 2, and so on.",
+      detail: "The index of the column in `range` to sort by. defaults to the first column. index starts at 1.",
       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 one or more columns.",
+    d: "Sorts the rows of a given array or range by the values in a specified column.",
     a: "Sorts rows of range by specified column.",
     m: [1, 4],
     p: [{

package/lib/modules/cell.js

@@ -157,8 +157,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;
     };
@@ -304,12 +306,15 @@ function setCellValue(ctx, r, c, d, v) {
         var format = void 0;
         if (String(vupdate).includes(".")) {
           format = "#,##0.00";
-        } else if (commaPresent) {
+        } else if (commaPresent && decimalPresent) {
           format = "#,##0.00";
+        } else if (commaPresent) {
+          format = '#,##0';
         } else {
           format = "0";
         }
-        cell.m = (0, _format.update)(format, cell.v);
+        cell.m = v.m ? v.m : (0, _format.update)(format, cell.v);
+        console.log("cell.m", cell.m, format, vupdate, v);
         cell.ht = 2;
         cell.ct = {
           fa: format,
@@ -622,6 +627,7 @@ function updateCell(ctx, r, c, $input, value, canvas) {
     if (!isCurInline) {
       if (_lodash.default.isString(value) && value.slice(0, 1) === "=" && value.length > 1) {
         var v = (0, _formula.execfunction)(ctx, value, r, c, undefined, undefined, true);
+        console.log("v", v, value);
         isRunExecFunction = false;
         curv = _lodash.default.cloneDeep(((_c = d === null || d === void 0 ? void 0 : d[r]) === null || _c === void 0 ? void 0 : _c[c]) || {});
         curv.v = v[1], curv.f = v[2];
@@ -693,6 +699,21 @@ function updateCell(ctx, r, c, $input, value, canvas) {
         v: v[1],
         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) {
+          return arg.trim().toUpperCase();
+        });
+        var formatted = (0, _utils.processArray)(cellRefs, d, flowdata);
+        if (formatted) {
+          value.m = (0, _format.update)(formatted, value.v);
+          value.ct = {
+            fa: formatted,
+            t: "n"
+          };
+        }
+        value.ht = 2;
+      }
       if (v.length === 4 && v[3].type === "sparklines") {
         var curCalv = v[3].data;
         if (_lodash.default.isArray(curCalv) && !_lodash.default.isPlainObject(curCalv[0])) {

package/lib/utils/index.d.ts

@@ -19,3 +19,5 @@ export declare function isAllowEdit(ctx: Context, range?: Sheet["luckysheet_sele
 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;
+export declare function getContentInParentheses(str: string | null): string | null;
+export declare function processArray(cellReferences: any, d: any, flowData: any): undefined;

package/lib/utils/index.js

@@ -20,13 +20,16 @@ var _exportNames = {
   isAllowEdit: true,
   isAllowEditReadOnly: true,
   isLetterNumberPattern: true,
-  removeLastSpan: true
+  removeLastSpan: true,
+  getContentInParentheses: true,
+  processArray: true
 };
 exports.chatatABC = chatatABC;
 exports.columnCharToIndex = columnCharToIndex;
 exports.escapeHTMLTag = escapeHTMLTag;
 exports.escapeScriptTag = escapeScriptTag;
 exports.generateRandomSheetName = generateRandomSheetName;
+exports.getContentInParentheses = getContentInParentheses;
 exports.getNowDateTime = getNowDateTime;
 exports.getRegExpStr = getRegExpStr;
 exports.getSheetByIndex = getSheetByIndex;
@@ -36,6 +39,7 @@ exports.indexToColumnChar = indexToColumnChar;
 exports.isAllowEdit = isAllowEdit;
 exports.isAllowEditReadOnly = isAllowEditReadOnly;
 exports.isLetterNumberPattern = isLetterNumberPattern;
+exports.processArray = processArray;
 exports.removeLastSpan = removeLastSpan;
 exports.replaceHtml = replaceHtml;
 exports.rgbToHex = rgbToHex;
@@ -273,4 +277,91 @@ function removeLastSpan(htmlString) {
     lastSpan.remove();
   }
   return container.innerHTML;
+}
+function getContentInParentheses(str) {
+  if (!str) return null;
+  var match = str.match(/\(([^)]+)\)/);
+  return match ? match[1] : null;
+}
+function processArray(cellReferences, d, flowData) {
+  function isValidCellReference(cell) {
+    var cellPattern = /^[A-Za-z]+\d+$/;
+    return cellPattern.test(cell);
+  }
+  function parseCellReference(cell) {
+    var match = cell.match(/^([A-Za-z]+)(\d+)$/);
+    if (!match) return null;
+    var letters = match[1].toLowerCase();
+    var number = parseInt(match[2]);
+    var col = 0;
+    for (var i = 0; i < letters.length; i++) {
+      col = col * 26 + (letters.charCodeAt(i) - 'a'.charCodeAt(0) + 1);
+    }
+    col -= 1;
+    var row = number - 1;
+    return {
+      letters: letters,
+      number: number,
+      col: col,
+      row: row
+    };
+  }
+  var validCellReferences = cellReferences.filter(function (cellRef) {
+    if (cellRef.includes(':')) {
+      var _a = cellRef.split(':'),
+        startCell = _a[0],
+        endCell = _a[1];
+      return isValidCellReference(startCell.trim()) && isValidCellReference(endCell.trim());
+    } else {
+      return isValidCellReference(cellRef.trim());
+    }
+  });
+  var expandedCellReferences = [];
+  validCellReferences.forEach(function (cellRef) {
+    if (cellRef.includes(':')) {
+      var _a = cellRef.split(':'),
+        startCell = _a[0],
+        endCell = _a[1];
+      var startParsed = parseCellReference(startCell.trim());
+      var endParsed = parseCellReference(endCell.trim());
+      if (!startParsed || !endParsed) return;
+      for (var row = startParsed.number; row <= endParsed.number; row++) {
+        for (var col = startParsed.col; col <= endParsed.col; col++) {
+          var letters = '';
+          var tempCol = col + 1;
+          while (tempCol > 0) {
+            tempCol--;
+            letters = String.fromCharCode('A'.charCodeAt(0) + tempCol % 26) + letters;
+            tempCol = Math.floor(tempCol / 26);
+          }
+          var cellName = letters + row;
+          expandedCellReferences.push(cellName);
+        }
+      }
+    } else {
+      expandedCellReferences.push(cellRef.toUpperCase());
+    }
+  });
+  var coordinates = [];
+  expandedCellReferences.forEach(function (cell) {
+    var parsed = parseCellReference(cell);
+    if (parsed) {
+      coordinates.push([parsed.row, parsed.col]);
+      console.log("".concat(cell, " -> [").concat(parsed.row, ", ").concat(parsed.col, "]"));
+    }
+  });
+  var formated;
+  coordinates.forEach(function (coord, index) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var row = coord[0],
+      col = coord[1];
+    if (row >= 0 && row < d.length && col >= 0 && col < d[row].length) {
+      if (((_b = (_a = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _a === void 0 ? void 0 : _a.ct) === null || _b === void 0 ? void 0 : _b.fa) && ((_e = (_d = (_c = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _c === void 0 ? void 0 : _c.ct) === null || _d === void 0 ? void 0 : _d.fa) === null || _e === void 0 ? void 0 : _e.includes('#,##0'))) {
+        formated = '#,##0';
+      } else if (((_g = (_f = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _f === void 0 ? void 0 : _f.ct) === null || _g === void 0 ? void 0 : _g.fa) && ((_k = (_j = (_h = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _h === void 0 ? void 0 : _h.ct) === null || _j === void 0 ? void 0 : _j.fa) === null || _k === void 0 ? void 0 : _k.includes('#,##0.00'))) {
+        formated = '#,##0.00';
+      }
+    }
+  });
+  return formated;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.1.44",
+  "version": "1.1.46",
   "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.69",
+    "@fileverse-dev/formula-parser": "0.2.70",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",