@fileverse-dev/fortune-core 1.1.80 → 1.1.82

package/es/api/sheet.js

@@ -2,7 +2,7 @@ import _ from "lodash";
 import { v4 as uuidv4 } from "uuid";
 import { dataToCelldata, getSheet } from "./common";
 import { getSheetIndex } from "../utils";
-import { api, execfunction, insertUpdateFunctionGroup, locale } from "..";
+import { api, execfunction, getFlowdata, insertUpdateFunctionGroup, locale, spillSortResult } from "..";
 export function getAllSheets(ctx) {
   return ctx.luckysheetfile;
 }
@@ -121,7 +121,16 @@ export function calculateSheetFromula(ctx, id) {
         continue;
       }
       var result = execfunction(ctx, (_c = ctx.luckysheetfile[index].data[r][c]) === null || _c === void 0 ? void 0 : _c.f, r, c, id);
-      api.setCellValue(ctx, r, c, result[1], null);
+      var isValueArray = Array.isArray(result[1]);
+      if (isValueArray) {
+        var value = {
+          f: result[2],
+          v: result[1]
+        };
+        spillSortResult(ctx, r, c, value, getFlowdata(ctx));
+      } else {
+        api.setCellValue(ctx, r, c, result[1], null);
+      }
       insertUpdateFunctionGroup(ctx, r, c, id);
     }
   }

package/es/modules/cell.js

@@ -282,6 +282,7 @@ export function setCellValue(ctx, r, c, d, v) {
           });
         }
       }
+      console.log(fa, vupdate, "heeere or not");
       var mask = update(fa, vupdate);
       if (mask === vupdate) {
         mask = genarate(vupdate);
@@ -309,14 +310,14 @@ export function setCellValue(ctx, r, c, d, v) {
         var strValue = String(vupdate);
         var format = getNumberFormat(strValue, commaPresent);
         cell.m = v.m ? v.m : update(format, cell.v);
-        cell.ht = 2;
+        cell.ht = (v === null || v === void 0 ? void 0 : v.ct) ? cell.ht : 2;
         cell.ct = {
           fa: format,
           t: "n"
         };
         if (cell.v === Infinity || cell.v === -Infinity) {
           cell.m = cell.v.toString();
-        } else if (cell.v != null) {
+        } else if (cell.v != null && !cell.m) {
           var mask = genarate(cell.v);
           if (mask) {
             if (v.m) {
@@ -331,6 +332,9 @@ export function setCellValue(ctx, r, c, d, v) {
         if (mask) {
           cell.m = mask[0].toString();
           cell.ct = mask[1], cell.v = mask[2];
+          if ((v === null || v === void 0 ? void 0 : v.ct) && v.ct.t === "n" && (cell === null || cell === void 0 ? void 0 : cell.ct) && cell.ct.t !== "n" && (cell === null || cell === void 0 ? void 0 : cell.ht) === 2) {
+            cell.ht = 1;
+          }
         }
       }
     }

package/es/utils/index.js

@@ -313,7 +313,7 @@ export function getNumberFormat(strValue, commaPresent) {
   } else if (hasComma) {
     format = "#,##0";
   } else {
-    format = "0";
+    format = "General";
   }
   return format;
 }

package/lib/api/sheet.js

@@ -138,7 +138,16 @@ function calculateSheetFromula(ctx, id) {
         continue;
       }
       var result = (0, _2.execfunction)(ctx, (_c = ctx.luckysheetfile[index].data[r][c]) === null || _c === void 0 ? void 0 : _c.f, r, c, id);
-      _2.api.setCellValue(ctx, r, c, result[1], null);
+      var isValueArray = Array.isArray(result[1]);
+      if (isValueArray) {
+        var value = {
+          f: result[2],
+          v: result[1]
+        };
+        (0, _2.spillSortResult)(ctx, r, c, value, (0, _2.getFlowdata)(ctx));
+      } else {
+        _2.api.setCellValue(ctx, r, c, result[1], null);
+      }
       (0, _2.insertUpdateFunctionGroup)(ctx, r, c, id);
     }
   }

package/lib/modules/cell.js

@@ -315,6 +315,7 @@ function setCellValue(ctx, r, c, d, v) {
           });
         }
       }
+      console.log(fa, vupdate, "heeere or not");
       var mask = (0, _format.update)(fa, vupdate);
       if (mask === vupdate) {
         mask = (0, _format.genarate)(vupdate);
@@ -342,14 +343,14 @@ function setCellValue(ctx, r, c, d, v) {
         var strValue = String(vupdate);
         var format = (0, _utils.getNumberFormat)(strValue, commaPresent);
         cell.m = v.m ? v.m : (0, _format.update)(format, cell.v);
-        cell.ht = 2;
+        cell.ht = (v === null || v === void 0 ? void 0 : v.ct) ? cell.ht : 2;
         cell.ct = {
           fa: format,
           t: "n"
         };
         if (cell.v === Infinity || cell.v === -Infinity) {
           cell.m = cell.v.toString();
-        } else if (cell.v != null) {
+        } else if (cell.v != null && !cell.m) {
           var mask = (0, _format.genarate)(cell.v);
           if (mask) {
             if (v.m) {
@@ -364,6 +365,9 @@ function setCellValue(ctx, r, c, d, v) {
         if (mask) {
           cell.m = mask[0].toString();
           cell.ct = mask[1], cell.v = mask[2];
+          if ((v === null || v === void 0 ? void 0 : v.ct) && v.ct.t === "n" && (cell === null || cell === void 0 ? void 0 : cell.ct) && cell.ct.t !== "n" && (cell === null || cell === void 0 ? void 0 : cell.ht) === 2) {
+            cell.ht = 1;
+          }
         }
       }
     }

package/lib/utils/index.js

@@ -385,7 +385,7 @@ function getNumberFormat(strValue, commaPresent) {
   } else if (hasComma) {
     format = "#,##0";
   } else {
-    format = "0";
+    format = "General";
   }
   return format;
 }

package/package.json

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