@fileverse-dev/fortune-core 1.0.2-mod-89-patch-006 → 1.0.2-mod-93

package/dist/api/common.d.ts

@@ -49,6 +49,7 @@ export declare function getSheetWithLatestCelldata(ctx: Context, options?: Commo
     luckysheet_conditionformat_save?: any[] | undefined;
     luckysheet_alternateformat_save?: any[] | undefined;
     dataVerification?: any;
+    conditionRules?: import("../types").ConditionRulesProps | undefined;
     hyperlink?: Record<string, {
         linkType: string;
         linkAddress: string;

package/dist/index.esm.js

@@ -9769,8 +9769,8 @@ var en = {
       example: ""
     }, {
       text: "Number",
-      value: "##0.00",
-      example: "1000.12"
+      value: "#,##0.00",
+      example: "1,000.12"
     }, {
       text: "Percent",
       value: "#0.00%",
@@ -9785,12 +9785,12 @@ var en = {
       example: ""
     }, {
       text: "Accounting",
-      value: "".concat(currency, "(0.00)"),
-      example: "".concat(currency, "(1200.09)")
+      value: "".concat(currency, "(#,##0.00)"),
+      example: "".concat(currency, "(1,200.09)")
     }, {
       text: "Currency",
-      value: "".concat(currency, "0.00"),
-      example: "".concat(currency, "1200.09")
+      value: "".concat(currency, "#,##0.00"),
+      example: "".concat(currency, "1,200.09")
     }, {
       text: "",
       value: "split",
@@ -56371,9 +56371,6 @@ function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notInsertFunc
   });
   var formulaError = parsedResponse.error;
   var result = parsedResponse.result;
-  console.log({
-    resultFROMEXECUTEFUNCTION: result
-  });
   if (Object.prototype.toString.call(result) === "[object Date]" && !_.isNil(result)) {
     result = result.toString();
   }
@@ -56687,8 +56684,8 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
       v: v[1],
       f: v[2]
     };
-    ctx.formulaCache.execFunctionExist = undefined;
   }
+  ctx.formulaCache.execFunctionExist = undefined;
 }
 function findrangeindex(ctx, v, vp) {
   var re = /<span.*?>/g;
@@ -58279,6 +58276,25 @@ function setConditionRules(ctx, protection, generalDialog, conditionformat, rule
   var ruleArr = (_ctx$luckysheetfile$i = ctx.luckysheetfile[index].luckysheet_conditionformat_save) !== null && _ctx$luckysheetfile$i !== void 0 ? _ctx$luckysheetfile$i : [];
   ruleArr === null || ruleArr === void 0 ? void 0 : ruleArr.push(rule);
   ctx.luckysheetfile[index].luckysheet_conditionformat_save = ruleArr;
+  ctx.luckysheetfile[index].conditionRules = _objectSpread2(_objectSpread2({}, rules), {}, {
+    rulesType: rules.rulesType || "",
+    rulesValue: rules.rulesValue || "",
+    textColor: rules.textColor || {
+      check: true,
+      color: "#000000"
+    },
+    cellColor: rules.cellColor || {
+      check: true,
+      color: "#000000"
+    },
+    betweenValue: rules.betweenValue || {
+      value1: "",
+      value2: ""
+    },
+    dateValue: rules.dateValue || "",
+    repeatValue: rules.repeatValue || "0",
+    projectValue: rules.projectValue || "10"
+  });
 }
 function getColorGradation(color1, color2, value1, value2, value) {
   var rgb1 = color1.split(",");
@@ -58583,7 +58599,7 @@ function compute(ctx, ruleArr, d) {
                       cellColor: cellColor
                     };
                   }
-                } else if (conditionName === "equal" && Number(_cell6.v) === Number(conditionValue0)) {
+                } else if (conditionName === "equal" && _cell6.v.toString() === conditionValue0) {
                   if ("".concat(_r0, "_").concat(_c0) in computeMap) {
                     computeMap["".concat(_r0, "_").concat(_c0)].textColor = textColor;
                     computeMap["".concat(_r0, "_").concat(_c0)].cellColor = cellColor;
@@ -68505,7 +68521,7 @@ function handleCurrencyFormat(ctx, cellInput) {
   var flowdata = getFlowdata(ctx);
   if (!flowdata) return;
   var currency = ctx.currency || "¥";
-  updateFormat(ctx, cellInput, flowdata, "ct", "".concat(currency, " #.00"));
+  updateFormat(ctx, cellInput, flowdata, "ct", "".concat(currency, " #,##0.00"));
 }
 function handlePercentageFormat(ctx, cellInput) {
   var flowdata = getFlowdata(ctx);

package/dist/index.js

@@ -9779,8 +9779,8 @@ var en = {
       example: ""
     }, {
       text: "Number",
-      value: "##0.00",
-      example: "1000.12"
+      value: "#,##0.00",
+      example: "1,000.12"
     }, {
       text: "Percent",
       value: "#0.00%",
@@ -9795,12 +9795,12 @@ var en = {
       example: ""
     }, {
       text: "Accounting",
-      value: "".concat(currency, "(0.00)"),
-      example: "".concat(currency, "(1200.09)")
+      value: "".concat(currency, "(#,##0.00)"),
+      example: "".concat(currency, "(1,200.09)")
     }, {
       text: "Currency",
-      value: "".concat(currency, "0.00"),
-      example: "".concat(currency, "1200.09")
+      value: "".concat(currency, "#,##0.00"),
+      example: "".concat(currency, "1,200.09")
     }, {
       text: "",
       value: "split",
@@ -56381,9 +56381,6 @@ function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notInsertFunc
   });
   var formulaError = parsedResponse.error;
   var result = parsedResponse.result;
-  console.log({
-    resultFROMEXECUTEFUNCTION: result
-  });
   if (Object.prototype.toString.call(result) === "[object Date]" && !___default['default'].isNil(result)) {
     result = result.toString();
   }
@@ -56697,8 +56694,8 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data) {
       v: v[1],
       f: v[2]
     };
-    ctx.formulaCache.execFunctionExist = undefined;
   }
+  ctx.formulaCache.execFunctionExist = undefined;
 }
 function findrangeindex(ctx, v, vp) {
   var re = /<span.*?>/g;
@@ -58289,6 +58286,25 @@ function setConditionRules(ctx, protection, generalDialog, conditionformat, rule
   var ruleArr = (_ctx$luckysheetfile$i = ctx.luckysheetfile[index].luckysheet_conditionformat_save) !== null && _ctx$luckysheetfile$i !== void 0 ? _ctx$luckysheetfile$i : [];
   ruleArr === null || ruleArr === void 0 ? void 0 : ruleArr.push(rule);
   ctx.luckysheetfile[index].luckysheet_conditionformat_save = ruleArr;
+  ctx.luckysheetfile[index].conditionRules = _objectSpread2(_objectSpread2({}, rules), {}, {
+    rulesType: rules.rulesType || "",
+    rulesValue: rules.rulesValue || "",
+    textColor: rules.textColor || {
+      check: true,
+      color: "#000000"
+    },
+    cellColor: rules.cellColor || {
+      check: true,
+      color: "#000000"
+    },
+    betweenValue: rules.betweenValue || {
+      value1: "",
+      value2: ""
+    },
+    dateValue: rules.dateValue || "",
+    repeatValue: rules.repeatValue || "0",
+    projectValue: rules.projectValue || "10"
+  });
 }
 function getColorGradation(color1, color2, value1, value2, value) {
   var rgb1 = color1.split(",");
@@ -58593,7 +58609,7 @@ function compute(ctx, ruleArr, d) {
                       cellColor: cellColor
                     };
                   }
-                } else if (conditionName === "equal" && Number(_cell6.v) === Number(conditionValue0)) {
+                } else if (conditionName === "equal" && _cell6.v.toString() === conditionValue0) {
                   if ("".concat(_r0, "_").concat(_c0) in computeMap) {
                     computeMap["".concat(_r0, "_").concat(_c0)].textColor = textColor;
                     computeMap["".concat(_r0, "_").concat(_c0)].cellColor = cellColor;
@@ -68515,7 +68531,7 @@ function handleCurrencyFormat(ctx, cellInput) {
   var flowdata = getFlowdata(ctx);
   if (!flowdata) return;
   var currency = ctx.currency || "¥";
-  updateFormat(ctx, cellInput, flowdata, "ct", "".concat(currency, " #.00"));
+  updateFormat(ctx, cellInput, flowdata, "ct", "".concat(currency, " #,##0.00"));
 }
 function handlePercentageFormat(ctx, cellInput) {
   var flowdata = getFlowdata(ctx);

package/dist/types.d.ts

@@ -121,6 +121,25 @@ export type Image = {
     top: number;
     src: string;
 };
+export type ConditionRulesProps = {
+    rulesType: string;
+    rulesValue: string;
+    textColor: {
+        check: boolean;
+        color: string;
+    };
+    cellColor: {
+        check: boolean;
+        color: string;
+    };
+    betweenValue: {
+        value1: string;
+        value2: string;
+    };
+    dateValue: string;
+    repeatValue: string;
+    projectValue: string;
+};
 export type Sheet = {
     name: string;
     config?: SheetConfig;
@@ -163,6 +182,7 @@ export type Sheet = {
     luckysheet_conditionformat_save?: any[];
     luckysheet_alternateformat_save?: any[];
     dataVerification?: any;
+    conditionRules?: ConditionRulesProps;
     hyperlink?: Record<string, {
         linkType: string;
         linkAddress: string;
@@ -231,25 +251,6 @@ export type DataRegulationProps = {
     hintShow: boolean;
     hintValue: string;
 };
-export type ConditionRulesProps = {
-    rulesType: string;
-    rulesValue: string;
-    textColor: {
-        check: boolean;
-        color: string;
-    };
-    cellColor: {
-        check: boolean;
-        color: string;
-    };
-    betweenValue: {
-        value1: string;
-        value2: string;
-    };
-    dateValue: string;
-    repeatValue: string;
-    projectValue: string;
-};
 export type FilterOptions = {
     startRow: number;
     endRow: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.0.2-mod-89-patch-006",
+  "version": "1.0.2-mod-93",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",
@@ -10,7 +10,7 @@
   "repository": "https://github.com/ruilisi/fortune-sheet",
   "license": "MIT",
   "dependencies": {
-    "@fileverse-dev/formula-parser": "0.2.13-mod-25-patch-004",
+    "@fileverse-dev/formula-parser": "0.2.13-mod-26",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",