@fileverse-dev/fortune-core 1.0.2-mod-91 → 1.0.2-mod-89-patch-005

package/dist/api/common.d.ts

@@ -49,7 +49,6 @@ 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

@@ -56371,6 +56371,9 @@ 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();
   }
@@ -56684,8 +56687,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;
@@ -58276,25 +58279,6 @@ 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(",");
@@ -58599,7 +58583,7 @@ function compute(ctx, ruleArr, d) {
                       cellColor: cellColor
                     };
                   }
-                } else if (conditionName === "equal" && _cell6.v.toString() === conditionValue0) {
+                } else if (conditionName === "equal" && Number(_cell6.v) === Number(conditionValue0)) {
                   if ("".concat(_r0, "_").concat(_c0) in computeMap) {
                     computeMap["".concat(_r0, "_").concat(_c0)].textColor = textColor;
                     computeMap["".concat(_r0, "_").concat(_c0)].cellColor = cellColor;

package/dist/index.js

@@ -56381,6 +56381,9 @@ 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();
   }
@@ -56694,8 +56697,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;
@@ -58286,25 +58289,6 @@ 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(",");
@@ -58609,7 +58593,7 @@ function compute(ctx, ruleArr, d) {
                       cellColor: cellColor
                     };
                   }
-                } else if (conditionName === "equal" && _cell6.v.toString() === conditionValue0) {
+                } else if (conditionName === "equal" && Number(_cell6.v) === Number(conditionValue0)) {
                   if ("".concat(_r0, "_").concat(_c0) in computeMap) {
                     computeMap["".concat(_r0, "_").concat(_c0)].textColor = textColor;
                     computeMap["".concat(_r0, "_").concat(_c0)].cellColor = cellColor;

package/dist/types.d.ts

@@ -121,25 +121,6 @@ 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;
@@ -182,7 +163,6 @@ export type Sheet = {
     luckysheet_conditionformat_save?: any[];
     luckysheet_alternateformat_save?: any[];
     dataVerification?: any;
-    conditionRules?: ConditionRulesProps;
     hyperlink?: Record<string, {
         linkType: string;
         linkAddress: string;
@@ -251,6 +231,25 @@ 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-91",
+  "version": "1.0.2-mod-89-patch-005",
   "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",
+    "@fileverse-dev/formula-parser": "0.2.13-mod-25-patch-005",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",