@fileverse-dev/fortune-core 1.1.2 → 1.1.4

package/lib/modules/ConditionFormat.js

@@ -31,6 +31,86 @@ var __assign = void 0 && (void 0).__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
+function hasAlphabeticChars(value) {
+  return /[a-zA-Z]/.test(String(value));
+}
+function compareGreaterThan(cellValue, conditionValue, symbol) {
+  var cellStr = String(cellValue);
+  var conditionStr = String(conditionValue);
+  if (hasAlphabeticChars(cellValue) || hasAlphabeticChars(conditionValue)) {
+    if (symbol === '>=') {
+      return cellStr.localeCompare(conditionStr) >= 0;
+    }
+    return cellStr.localeCompare(conditionStr) > 0;
+  }
+  var cellNum = Number(cellValue);
+  var conditionNum = Number(conditionValue);
+  if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol === '>=') {
+    return cellNum >= conditionNum;
+  }
+  if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol === '>') {
+    return cellNum > conditionNum;
+  }
+  if (symbol === '>=') {
+    return cellStr.localeCompare(conditionStr) >= 0;
+  }
+  return cellStr.localeCompare(conditionStr) > 0;
+}
+function compareLessThan(cellValue, conditionValue, symbol) {
+  var cellStr = String(cellValue);
+  var conditionStr = String(conditionValue);
+  if (hasAlphabeticChars(cellValue) || hasAlphabeticChars(conditionValue)) {
+    if (symbol === '<=') {
+      return cellStr.localeCompare(conditionStr) <= 0;
+    }
+    return cellStr.localeCompare(conditionStr) < 0;
+  }
+  var cellNum = Number(cellValue);
+  var conditionNum = Number(conditionValue);
+  if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol === '<=') {
+    return cellNum <= conditionNum;
+  }
+  if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum)) {
+    return cellNum < conditionNum;
+  }
+  if (symbol === '<=') {
+    return cellStr.localeCompare(conditionStr) <= 0;
+  }
+  return cellStr.localeCompare(conditionStr) < 0;
+}
+function compareBetween(cellValue, value1, value2) {
+  var cellStr = String(cellValue);
+  var val1Str = String(value1);
+  var val2Str = String(value2);
+  var smallerValue, biggerValue;
+  if (hasAlphabeticChars(value1) || hasAlphabeticChars(value2) || hasAlphabeticChars(cellValue)) {
+    if (val1Str.localeCompare(val2Str) > 0) {
+      biggerValue = val1Str;
+      smallerValue = val2Str;
+    } else {
+      biggerValue = val2Str;
+      smallerValue = val1Str;
+    }
+    return cellStr.localeCompare(smallerValue) >= 0 && cellStr.localeCompare(biggerValue) <= 0;
+  } else {
+    var cellNum = Number(cellValue);
+    var val1Num = Number(value1);
+    var val2Num = Number(value2);
+    if (!Number.isNaN(cellNum) && !Number.isNaN(val1Num) && !Number.isNaN(val2Num)) {
+      var smallerNum = Math.min(val1Num, val2Num);
+      var biggerNum = Math.max(val1Num, val2Num);
+      return cellNum >= smallerNum && cellNum <= biggerNum;
+    }
+    if (val1Str.localeCompare(val2Str) > 0) {
+      biggerValue = val1Str;
+      smallerValue = val2Str;
+    } else {
+      biggerValue = val2Str;
+      smallerValue = val1Str;
+    }
+    return cellStr.localeCompare(smallerValue) >= 0 && cellStr.localeCompare(biggerValue) <= 0;
+  }
+}
 function getHistoryRules(fileH) {
   var historyRules = [];
   for (var h = 0; h < fileH.length; h += 1) {
@@ -59,7 +139,7 @@ function setConditionRules(ctx, protection, generalDialog, conditionformat, rule
   var conditionName = rules.rulesType;
   var conditionRange = [];
   var conditionValue = [];
-  if (conditionName === "greaterThan" || conditionName === "lessThan" || conditionName === "equal" || conditionName === "textContains") {
+  if (conditionName === "greaterThan" || conditionName === "greaterThanOrEqual" || conditionName === "lessThan" || conditionName === "lessThanOrEqual" || conditionName === "equal" || conditionName === "textContains") {
     var v = rules.rulesValue;
     var rangeArr = (0, _cell.getRangeByTxt)(ctx, v);
     if (rangeArr.length > 1) {
@@ -483,7 +563,7 @@ function compute(ctx, ruleArr, d) {
         var textColor_1 = format.textColor,
           cellColor_1 = format.cellColor;
         for (var s = 0; s < cellrange.length; s += 1) {
-          if (conditionName === "greaterThan" || conditionName === "lessThan" || conditionName === "equal" || conditionName === "textContains") {
+          if (conditionName === "greaterThan" || conditionName === "greaterThanOrEqual" || conditionName === "lessThan" || conditionName === "lessThanOrEqual" || conditionName === "equal" || conditionName === "textContains") {
             for (var r = cellrange[s].row[0]; r <= cellrange[s].row[1]; r += 1) {
               for (var c = cellrange[s].column[0]; c <= cellrange[s].column[1]; c += 1) {
                 if (_lodash.default.isNil(d[r]) || _lodash.default.isNil(d[r][c])) {
@@ -493,7 +573,7 @@ function compute(ctx, ruleArr, d) {
                 if (_lodash.default.isNil(cell) || _lodash.default.isNil(cell.v) || (0, _validation.isRealNull)(cell.v)) {
                   continue;
                 }
-                if (conditionName === "greaterThan" && Number(cell.v) > Number(conditionValue0)) {
+                if (conditionName === "greaterThan" && compareGreaterThan(cell.v, conditionValue0, '>')) {
                   if ("".concat(r, "_").concat(c) in computeMap) {
                     computeMap["".concat(r, "_").concat(c)].textColor = textColor_1;
                     computeMap["".concat(r, "_").concat(c)].cellColor = cellColor_1;
@@ -503,7 +583,27 @@ function compute(ctx, ruleArr, d) {
                       cellColor: cellColor_1
                     };
                   }
-                } else if (conditionName === "lessThan" && Number(cell.v) < Number(conditionValue0)) {
+                } else if (conditionName === "greaterThanOrEqual" && compareGreaterThan(cell.v, conditionValue0, '>=')) {
+                  if ("".concat(r, "_").concat(c) in computeMap) {
+                    computeMap["".concat(r, "_").concat(c)].textColor = textColor_1;
+                    computeMap["".concat(r, "_").concat(c)].cellColor = cellColor_1;
+                  } else {
+                    computeMap["".concat(r, "_").concat(c)] = {
+                      textColor: textColor_1,
+                      cellColor: cellColor_1
+                    };
+                  }
+                } else if (conditionName === "lessThan" && compareLessThan(cell.v, conditionValue0, "<")) {
+                  if ("".concat(r, "_").concat(c) in computeMap) {
+                    computeMap["".concat(r, "_").concat(c)].textColor = textColor_1;
+                    computeMap["".concat(r, "_").concat(c)].cellColor = cellColor_1;
+                  } else {
+                    computeMap["".concat(r, "_").concat(c)] = {
+                      textColor: textColor_1,
+                      cellColor: cellColor_1
+                    };
+                  }
+                } else if (conditionName === "lessThanOrEqual" && compareLessThan(cell.v, conditionValue0, '<=')) {
                   if ("".concat(r, "_").concat(c) in computeMap) {
                     computeMap["".concat(r, "_").concat(c)].textColor = textColor_1;
                     computeMap["".concat(r, "_").concat(c)].cellColor = cellColor_1;
@@ -537,15 +637,6 @@ function compute(ctx, ruleArr, d) {
               }
             }
           } else if (conditionName === "between") {
-            var vBig = 0;
-            var vSmall = 0;
-            if (conditionValue0 > conditionValue1) {
-              vBig = conditionValue0;
-              vSmall = conditionValue1;
-            } else {
-              vBig = conditionValue1;
-              vSmall = conditionValue0;
-            }
             for (var r = cellrange[s].row[0]; r <= cellrange[s].row[1]; r += 1) {
               for (var c = cellrange[s].column[0]; c <= cellrange[s].column[1]; c += 1) {
                 if (_lodash.default.isNil(d[r]) || _lodash.default.isNil(d[r][c])) {
@@ -555,7 +646,7 @@ function compute(ctx, ruleArr, d) {
                 if (_lodash.default.isNil(cell) || _lodash.default.isNil(cell.v) || (0, _validation.isRealNull)(cell.v)) {
                   continue;
                 }
-                if (Number(cell.v) >= Number(vSmall) && Number(cell.v) <= Number(vBig)) {
+                if (compareBetween(cell.v, conditionValue0, conditionValue1)) {
                   if ("".concat(r, "_").concat(c) in computeMap) {
                     computeMap["".concat(r, "_").concat(c)].textColor = textColor_1;
                     computeMap["".concat(r, "_").concat(c)].cellColor = cellColor_1;
@@ -1019,7 +1110,7 @@ function CFSplitRange(range1, range2, range3, type) {
         row: [range2.row[1] + 1, r2],
         column: [c1, c2]
       }, {
-        row: [r1 + offset_r, range2.row[1] + offset_r],
+        row: [range2.row[0] + offset_r, r2 + offset_r],
         column: [range2.column[0] + offset_c, c2 + offset_c]
       }];
     } else if (type === "restPart") {
@@ -1032,7 +1123,7 @@ function CFSplitRange(range1, range2, range3, type) {
       }];
     } else if (type === "operatePart") {
       range = [{
-        row: [r1 + offset_r, range2.row[1] + offset_r],
+        row: [range2.row[0] + offset_r, r2 + offset_r],
         column: [range2.column[0] + offset_c, c2 + offset_c]
       }];
     }

package/lib/modules/selection.d.ts

@@ -25,6 +25,8 @@ export declare function rangeValueToHtml(ctx: Context, sheetId: string, ranges?:
 export declare function copy(ctx: Context): void;
 export declare function deleteSelectedCellText(ctx: Context): string;
 export declare function deleteSelectedCellFormat(ctx: Context): string;
+export declare function fillRightData(ctx: Context): string;
+export declare function fillDownData(ctx: Context): string;
 export declare function textFormat(ctx: Context, type: "left" | "center" | "right"): string;
 export declare function fillDate(ctx: Context): string;
 export declare function fillTime(ctx: Context): string;

package/lib/modules/selection.js

@@ -9,6 +9,8 @@ exports.copy = copy;
 exports.deleteSelectedCellFormat = deleteSelectedCellFormat;
 exports.deleteSelectedCellText = deleteSelectedCellText;
 exports.fillDate = fillDate;
+exports.fillDownData = fillDownData;
+exports.fillRightData = fillRightData;
 exports.fillTime = fillTime;
 exports.fixColumnStyleOverflowInFreeze = fixColumnStyleOverflowInFreeze;
 exports.fixRowStyleOverflowInFreeze = fixRowStyleOverflowInFreeze;
@@ -43,6 +45,16 @@ var _ConditionFormat = require("./ConditionFormat");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
 var selectionCache = exports.selectionCache = {
   isPasteAction: false
 };
@@ -1619,6 +1631,82 @@ function deleteSelectedCellFormat(ctx) {
   }
   return "success";
 }
+function fillRightData(ctx) {
+  var allowEdit = (0, _utils.isAllowEdit)(ctx);
+  if (allowEdit === false) {
+    return "allowEdit";
+  }
+  var selection = ctx.luckysheet_select_save;
+  if (selection && !_lodash.default.isEmpty(selection)) {
+    var d = (0, _context.getFlowdata)(ctx);
+    if (!d) return "dataNullError";
+    var has_PartMC = false;
+    for (var s = 0; s < selection.length; s += 1) {
+      var r1 = selection[s].row[0];
+      var r2 = selection[s].row[1];
+      var c1 = selection[s].column[0];
+      var c2 = selection[s].column[1];
+      if ((0, _validation.hasPartMC)(ctx, ctx.config, r1, r2, c1, c2)) {
+        has_PartMC = true;
+        break;
+      }
+    }
+    if (has_PartMC) {
+      return "partMC";
+    }
+    for (var s = 0; s < selection.length; s += 1) {
+      var r1 = selection[s].row[0];
+      var r2 = selection[s].row[1];
+      var c1 = selection[s].column[0];
+      var c2 = selection[s].column[1];
+      for (var r = r1; r <= r2; r += 1) {
+        for (var c = c1; c <= c2; c += 1) {
+          var previousCell = d[r][c - 1];
+          d[r][c] = __assign({}, previousCell);
+        }
+      }
+    }
+  }
+  return "success";
+}
+function fillDownData(ctx) {
+  var allowEdit = (0, _utils.isAllowEdit)(ctx);
+  if (allowEdit === false) {
+    return "allowEdit";
+  }
+  var selection = ctx.luckysheet_select_save;
+  if (selection && !_lodash.default.isEmpty(selection)) {
+    var d = (0, _context.getFlowdata)(ctx);
+    if (!d) return "dataNullError";
+    var has_PartMC = false;
+    for (var s = 0; s < selection.length; s += 1) {
+      var r1 = selection[s].row[0];
+      var r2 = selection[s].row[1];
+      var c1 = selection[s].column[0];
+      var c2 = selection[s].column[1];
+      if ((0, _validation.hasPartMC)(ctx, ctx.config, r1, r2, c1, c2)) {
+        has_PartMC = true;
+        break;
+      }
+    }
+    if (has_PartMC) {
+      return "partMC";
+    }
+    for (var s = 0; s < selection.length; s += 1) {
+      var r1 = selection[s].row[0];
+      var r2 = selection[s].row[1];
+      var c1 = selection[s].column[0];
+      var c2 = selection[s].column[1];
+      for (var r = r1; r <= r2; r += 1) {
+        for (var c = c1; c <= c2; c += 1) {
+          var previousCell = d[r - 1][c];
+          d[r][c] = __assign({}, previousCell);
+        }
+      }
+    }
+  }
+  return "success";
+}
 function textFormat(ctx, type) {
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (allowEdit === false) {

package/package.json

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