@fileverse-dev/fortune-core 1.2.72 → 1.2.74

package/es/context.js

@@ -153,6 +153,7 @@ export function defaultContext(refs) {
     },
     dataVerificationDropDownList: false,
     conditionRules: {
+      editKey: null,
       rulesType: "",
       rulesValue: "",
       textColor: {

package/es/modules/ConditionFormat.d.ts

@@ -8,7 +8,7 @@ export declare function getCurrentRules(fileC: Sheet[]): {
     sheetIndex: number;
     luckysheet_conditionformat_save: any[] | undefined;
 }[];
-export declare function setConditionRules(ctx: Context, protection: any, generalDialog: any, conditionformat: any, rules: any): void;
+export declare function setConditionRules(ctx: Context, protection: any, generalDialog: any, conditionformat: any, rules: any, edit?: boolean, editKey?: string): void;
 export declare function getColorGradation(color1: string, color2: string, value1: number, value2: number, value: number): string;
 export declare function compute(ctx: Context, ruleArr: any, d: CellMatrix): any;
 export declare function getComputeMap(ctx: Context): any;

package/es/modules/ConditionFormat.js

@@ -8,6 +8,15 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
 import _ from "lodash";
 import { getFlowdata } from "../context";
 import { getSheetIndex } from "../utils";
@@ -116,7 +125,7 @@ export function getCurrentRules(fileC) {
   }
   return currentRules;
 }
-export function setConditionRules(ctx, protection, generalDialog, conditionformat, rules) {
+export function setConditionRules(ctx, protection, generalDialog, conditionformat, rules, edit, editKey) {
   var _a, _b;
   if (!checkProtectionFormatCells(ctx)) {
     return;
@@ -257,7 +266,12 @@ export function setConditionRules(ctx, protection, generalDialog, conditionforma
   };
   var index = getSheetIndex(ctx, ctx.currentSheetId);
   var ruleArr = (_b = ctx.luckysheetfile[index].luckysheet_conditionformat_save) !== null && _b !== void 0 ? _b : [];
-  ruleArr === null || ruleArr === void 0 ? void 0 : ruleArr.push(rule);
+  console.log(rule, ruleArr, editKey, edit);
+  if (edit) {
+    ruleArr.splice(Number(editKey), 1, rule);
+  } else {
+    ruleArr.push(rule);
+  }
   ctx.luckysheetfile[index].luckysheet_conditionformat_save = ruleArr;
   ctx.luckysheetfile[index].conditionRules = __assign(__assign({}, rules), {
     rulesType: rules.rulesType || "",
@@ -990,10 +1004,32 @@ export function compute(ctx, ruleArr, d) {
   return computeMap;
 }
 export function getComputeMap(ctx) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
   var index = getSheetIndex(ctx, ctx.currentSheetId);
-  var ruleArr = ctx.luckysheetfile[index].luckysheet_conditionformat_save;
+  var ruleArr = ((_a = ctx.luckysheetfile[index]) === null || _a === void 0 ? void 0 : _a.luckysheet_conditionformat_save) ? __spreadArray([], (_b = ctx.luckysheetfile[index]) === null || _b === void 0 ? void 0 : _b.luckysheet_conditionformat_save, true) : [];
   var data = ctx.luckysheetfile[index].data;
   if (_.isNil(data)) return null;
+  if (ctx.luckysheet_select_save && ((_c = ctx.luckysheetfile[index].conditionRules) === null || _c === void 0 ? void 0 : _c.rulesValue) !== "") {
+    var editKey = (_d = ctx.luckysheetfile[index].conditionRules) === null || _d === void 0 ? void 0 : _d.editKey;
+    if (editKey !== null) {
+      ruleArr.splice(Number(editKey), 1);
+    }
+    ruleArr.push({
+      type: "default",
+      cellrange: ctx.luckysheet_select_save,
+      format: {
+        textColor: (_e = ctx.luckysheetfile[index].conditionRules) === null || _e === void 0 ? void 0 : _e.textColor.color,
+        cellColor: (_f = ctx.luckysheetfile[index].conditionRules) === null || _f === void 0 ? void 0 : _f.cellColor.color,
+        bold: (_g = ctx.luckysheetfile[index].conditionRules) === null || _g === void 0 ? void 0 : _g.font.bold,
+        italic: (_h = ctx.luckysheetfile[index].conditionRules) === null || _h === void 0 ? void 0 : _h.font.italic,
+        underline: (_j = ctx.luckysheetfile[index].conditionRules) === null || _j === void 0 ? void 0 : _j.font.underline,
+        strikethrough: (_k = ctx.luckysheetfile[index].conditionRules) === null || _k === void 0 ? void 0 : _k.font.strikethrough
+      },
+      conditionName: (_l = ctx.luckysheetfile[index].conditionRules) === null || _l === void 0 ? void 0 : _l.rulesType,
+      conditionRange: [],
+      conditionValue: [(_m = ctx.luckysheetfile[index].conditionRules) === null || _m === void 0 ? void 0 : _m.rulesValue]
+    });
+  }
   var computeMap = compute(ctx, ruleArr, data);
   return computeMap;
 }

package/es/types.d.ts

@@ -134,6 +134,7 @@ export type Image = {
     src: string;
 };
 export type ConditionRulesProps = {
+    editKey?: string | null;
     rulesType: string;
     rulesValue: string;
     textColor: {

package/lib/context.js

@@ -165,6 +165,7 @@ function defaultContext(refs) {
     },
     dataVerificationDropDownList: false,
     conditionRules: {
+      editKey: null,
       rulesType: "",
       rulesValue: "",
       textColor: {

package/lib/modules/ConditionFormat.d.ts

@@ -8,7 +8,7 @@ export declare function getCurrentRules(fileC: Sheet[]): {
     sheetIndex: number;
     luckysheet_conditionformat_save: any[] | undefined;
 }[];
-export declare function setConditionRules(ctx: Context, protection: any, generalDialog: any, conditionformat: any, rules: any): void;
+export declare function setConditionRules(ctx: Context, protection: any, generalDialog: any, conditionformat: any, rules: any, edit?: boolean, editKey?: string): void;
 export declare function getColorGradation(color1: string, color2: string, value1: number, value2: number, value: number): string;
 export declare function compute(ctx: Context, ruleArr: any, d: CellMatrix): any;
 export declare function getComputeMap(ctx: Context): any;

package/lib/modules/ConditionFormat.js

@@ -31,6 +31,15 @@ var __assign = void 0 && (void 0).__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
+var __spreadArray = void 0 && (void 0).__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
 function hasAlphabeticChars(value) {
   return /[a-zA-Z]/.test(String(value));
 }
@@ -131,7 +140,7 @@ function getCurrentRules(fileC) {
   }
   return currentRules;
 }
-function setConditionRules(ctx, protection, generalDialog, conditionformat, rules) {
+function setConditionRules(ctx, protection, generalDialog, conditionformat, rules, edit, editKey) {
   var _a, _b;
   if (!(0, _protection.checkProtectionFormatCells)(ctx)) {
     return;
@@ -272,7 +281,12 @@ function setConditionRules(ctx, protection, generalDialog, conditionformat, rule
   };
   var index = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
   var ruleArr = (_b = ctx.luckysheetfile[index].luckysheet_conditionformat_save) !== null && _b !== void 0 ? _b : [];
-  ruleArr === null || ruleArr === void 0 ? void 0 : ruleArr.push(rule);
+  console.log(rule, ruleArr, editKey, edit);
+  if (edit) {
+    ruleArr.splice(Number(editKey), 1, rule);
+  } else {
+    ruleArr.push(rule);
+  }
   ctx.luckysheetfile[index].luckysheet_conditionformat_save = ruleArr;
   ctx.luckysheetfile[index].conditionRules = __assign(__assign({}, rules), {
     rulesType: rules.rulesType || "",
@@ -1005,10 +1019,32 @@ function compute(ctx, ruleArr, d) {
   return computeMap;
 }
 function getComputeMap(ctx) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
   var index = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
-  var ruleArr = ctx.luckysheetfile[index].luckysheet_conditionformat_save;
+  var ruleArr = ((_a = ctx.luckysheetfile[index]) === null || _a === void 0 ? void 0 : _a.luckysheet_conditionformat_save) ? __spreadArray([], (_b = ctx.luckysheetfile[index]) === null || _b === void 0 ? void 0 : _b.luckysheet_conditionformat_save, true) : [];
   var data = ctx.luckysheetfile[index].data;
   if (_lodash.default.isNil(data)) return null;
+  if (ctx.luckysheet_select_save && ((_c = ctx.luckysheetfile[index].conditionRules) === null || _c === void 0 ? void 0 : _c.rulesValue) !== "") {
+    var editKey = (_d = ctx.luckysheetfile[index].conditionRules) === null || _d === void 0 ? void 0 : _d.editKey;
+    if (editKey !== null) {
+      ruleArr.splice(Number(editKey), 1);
+    }
+    ruleArr.push({
+      type: "default",
+      cellrange: ctx.luckysheet_select_save,
+      format: {
+        textColor: (_e = ctx.luckysheetfile[index].conditionRules) === null || _e === void 0 ? void 0 : _e.textColor.color,
+        cellColor: (_f = ctx.luckysheetfile[index].conditionRules) === null || _f === void 0 ? void 0 : _f.cellColor.color,
+        bold: (_g = ctx.luckysheetfile[index].conditionRules) === null || _g === void 0 ? void 0 : _g.font.bold,
+        italic: (_h = ctx.luckysheetfile[index].conditionRules) === null || _h === void 0 ? void 0 : _h.font.italic,
+        underline: (_j = ctx.luckysheetfile[index].conditionRules) === null || _j === void 0 ? void 0 : _j.font.underline,
+        strikethrough: (_k = ctx.luckysheetfile[index].conditionRules) === null || _k === void 0 ? void 0 : _k.font.strikethrough
+      },
+      conditionName: (_l = ctx.luckysheetfile[index].conditionRules) === null || _l === void 0 ? void 0 : _l.rulesType,
+      conditionRange: [],
+      conditionValue: [(_m = ctx.luckysheetfile[index].conditionRules) === null || _m === void 0 ? void 0 : _m.rulesValue]
+    });
+  }
   var computeMap = compute(ctx, ruleArr, data);
   return computeMap;
 }

package/lib/types.d.ts

@@ -134,6 +134,7 @@ export type Image = {
     src: string;
 };
 export type ConditionRulesProps = {
+    editKey?: string | null;
     rulesType: string;
     rulesValue: string;
     textColor: {

package/package.json

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