@fileverse-dev/fortune-core 1.2.79 → 1.2.81-yield

package/es/modules/ConditionFormat.js

@@ -155,6 +155,10 @@ export function setConditionRules(ctx, protection, generalDialog, conditionforma
       }
     } else if (rangeArr.length === 0) {
       if (_.isNaN(v) || v === "") {
+        if (v === "") {
+          ctx.warnDialog = "Value is required";
+          return;
+        }
         ctx.warnDialog = conditionformat.conditionValueCanOnly;
         return;
       }
@@ -266,7 +270,6 @@ 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 : [];
-  console.log(rule, ruleArr, editKey, edit);
   if (edit) {
     ruleArr.splice(Number(editKey), 1, rule);
   } else {
@@ -1010,7 +1013,6 @@ export function getComputeMap(ctx) {
   var data = ctx.luckysheetfile[index].data;
   if (_.isNil(data)) return null;
   var editKey = (_c = ctx.luckysheetfile[index].conditionRules) === null || _c === void 0 ? void 0 : _c.editKey;
-  console.log("before", editKey, ruleArr);
   if (ctx.luckysheet_select_save && ((_d = ctx.luckysheetfile[index].conditionRules) === null || _d === void 0 ? void 0 : _d.rulesValue) !== "") {
     if (editKey !== null && editKey !== undefined) {
       ruleArr.splice(Number(editKey), 1);
@@ -1031,7 +1033,6 @@ export function getComputeMap(ctx) {
       conditionValue: [(_m = ctx.luckysheetfile[index].conditionRules) === null || _m === void 0 ? void 0 : _m.rulesValue]
     });
   }
-  console.log("after", editKey, ruleArr);
   var computeMap = compute(ctx, ruleArr, data);
   return computeMap;
 }

package/es/modules/selection.js

@@ -1527,6 +1527,11 @@ export function deleteSelectedCellText(ctx) {
       var c2 = selection[s].column[1];
       for (var r = r1; r <= r2; r += 1) {
         for (var c = c1; c <= c2; c += 1) {
+          var index = getSheetIndex(ctx, ctx.currentSheetId);
+          var dataVerification = ctx.luckysheetfile[index].dataVerification;
+          if (dataVerification && (dataVerification === null || dataVerification === void 0 ? void 0 : dataVerification["".concat(r, "_").concat(c)])) {
+            dataVerification === null || dataVerification === void 0 ? true : delete dataVerification["".concat(r, "_").concat(c)];
+          }
           if (_.isPlainObject(d[r][c])) {
             var cell = d[r][c];
             delete cell.m;

package/lib/modules/ConditionFormat.js

@@ -170,6 +170,10 @@ function setConditionRules(ctx, protection, generalDialog, conditionformat, rule
       }
     } else if (rangeArr.length === 0) {
       if (_lodash.default.isNaN(v) || v === "") {
+        if (v === "") {
+          ctx.warnDialog = "Value is required";
+          return;
+        }
         ctx.warnDialog = conditionformat.conditionValueCanOnly;
         return;
       }
@@ -281,7 +285,6 @@ 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 : [];
-  console.log(rule, ruleArr, editKey, edit);
   if (edit) {
     ruleArr.splice(Number(editKey), 1, rule);
   } else {
@@ -1025,7 +1028,6 @@ function getComputeMap(ctx) {
   var data = ctx.luckysheetfile[index].data;
   if (_lodash.default.isNil(data)) return null;
   var editKey = (_c = ctx.luckysheetfile[index].conditionRules) === null || _c === void 0 ? void 0 : _c.editKey;
-  console.log("before", editKey, ruleArr);
   if (ctx.luckysheet_select_save && ((_d = ctx.luckysheetfile[index].conditionRules) === null || _d === void 0 ? void 0 : _d.rulesValue) !== "") {
     if (editKey !== null && editKey !== undefined) {
       ruleArr.splice(Number(editKey), 1);
@@ -1046,7 +1048,6 @@ function getComputeMap(ctx) {
       conditionValue: [(_m = ctx.luckysheetfile[index].conditionRules) === null || _m === void 0 ? void 0 : _m.rulesValue]
     });
   }
-  console.log("after", editKey, ruleArr);
   var computeMap = compute(ctx, ruleArr, data);
   return computeMap;
 }

package/lib/modules/selection.js

@@ -1562,6 +1562,11 @@ function deleteSelectedCellText(ctx) {
       var c2 = selection[s].column[1];
       for (var r = r1; r <= r2; r += 1) {
         for (var c = c1; c <= c2; c += 1) {
+          var index = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
+          var dataVerification = ctx.luckysheetfile[index].dataVerification;
+          if (dataVerification && (dataVerification === null || dataVerification === void 0 ? void 0 : dataVerification["".concat(r, "_").concat(c)])) {
+            dataVerification === null || dataVerification === void 0 ? true : delete dataVerification["".concat(r, "_").concat(c)];
+          }
           if (_lodash.default.isPlainObject(d[r][c])) {
             var cell = d[r][c];
             delete cell.m;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.2.79",
+  "version": "1.2.81-yield",
   "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.89",
+    "@fileverse-dev/formula-parser": "0.2.89-yield",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",