@fileverse-dev/fortune-core 1.1.2 → 1.1.4

package/es/events/keyboard.d.ts

@@ -3,4 +3,4 @@ import { GlobalCache } from "../types";
 export declare function handleGlobalEnter(ctx: Context, cellInput: HTMLDivElement, e: KeyboardEvent, canvas?: CanvasRenderingContext2D): void;
 export declare function handleWithCtrlOrMetaKey(ctx: Context, cache: GlobalCache, e: KeyboardEvent, cellInput: HTMLDivElement, fxInput: HTMLDivElement | null | undefined, handleUndo: () => void, handleRedo: () => void): void;
 export declare function handleArrowKey(ctx: Context, e: KeyboardEvent): void;
-export declare function handleGlobalKeyDown(ctx: Context, cellInput: HTMLDivElement, fxInput: HTMLDivElement | null | undefined, e: KeyboardEvent, cache: GlobalCache, handleUndo: () => void, handleRedo: () => void, canvas?: CanvasRenderingContext2D): void;
+export declare function handleGlobalKeyDown(ctx: Context, cellInput: HTMLDivElement, fxInput: HTMLDivElement | null | undefined, e: KeyboardEvent, cache: GlobalCache, handleUndo: () => void, handleRedo: () => void, canvas?: CanvasRenderingContext2D): Promise<void>;

package/es/events/keyboard.js

@@ -1,9 +1,124 @@
+var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+var __generator = this && this.__generator || function (thisArg, body) {
+  var _ = {
+      label: 0,
+      sent: function sent() {
+        if (t[0] & 1) throw t[1];
+        return t[1];
+      },
+      trys: [],
+      ops: []
+    },
+    f,
+    y,
+    t,
+    g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+    while (g && (g = 0, op[0] && (_ = 0)), _) try {
+      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+      if (y = 0, t) op = [op[0] & 2, t.value];
+      switch (op[0]) {
+        case 0:
+        case 1:
+          t = op;
+          break;
+        case 4:
+          _.label++;
+          return {
+            value: op[1],
+            done: false
+          };
+        case 5:
+          _.label++;
+          y = op[1];
+          op = [0];
+          continue;
+        case 7:
+          op = _.ops.pop();
+          _.trys.pop();
+          continue;
+        default:
+          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+            _ = 0;
+            continue;
+          }
+          if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+            _.label = op[1];
+            break;
+          }
+          if (op[0] === 6 && _.label < t[1]) {
+            _.label = t[1];
+            t = op;
+            break;
+          }
+          if (t && _.label < t[2]) {
+            _.label = t[2];
+            _.ops.push(op);
+            break;
+          }
+          if (t[2]) _.ops.pop();
+          _.trys.pop();
+          continue;
+      }
+      op = body.call(thisArg, _);
+    } catch (e) {
+      op = [6, e];
+      y = 0;
+    } finally {
+      f = t = 0;
+    }
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
 import _ from "lodash";
 import { hideCRCount, removeActiveImage } from "..";
 import { getFlowdata } from "../context";
 import { updateCell, cancelNormalSelected } from "../modules/cell";
 import { handleFormulaInput } from "../modules/formula";
-import { copy, deleteSelectedCellText, deleteSelectedCellFormat, textFormat, fillDate, fillTime, moveHighlightCell, moveHighlightRange, selectAll, selectionCache } from "../modules/selection";
+import { copy, deleteSelectedCellText, deleteSelectedCellFormat, textFormat, fillDate, fillTime, fillRightData, fillDownData, moveHighlightCell, moveHighlightRange, selectAll, selectionCache } from "../modules/selection";
 import { cancelPaintModel, handleBold, handleItalic, handleUnderline, handleLink } from "../modules/toolbar";
 import { hasPartMC } from "../modules/validation";
 import { getNowDateTime, getSheetIndex, isAllowEdit } from "../utils";
@@ -256,105 +371,117 @@ export function handleArrowKey(ctx, e) {
 }
 export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, handleRedo, canvas) {
   var _a;
-  if (e.shiftKey && e.code === "Space") {
-    e.stopImmediatePropagation();
-    e.stopPropagation();
-    e.preventDefault();
-    return;
-  }
-  if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyE") {
-    textFormat(ctx, "center");
-  } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyL") {
-    textFormat(ctx, "left");
-  } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyR") {
-    textFormat(ctx, "right");
-  }
-  if ((e.metaKey || e.ctrlKey) && e.code === "KeyK") {
-    handleLink(ctx);
-  }
-  if ((e.metaKey || e.ctrlKey) && !e.shiftKey && e.code === "Semicolon") {
-    fillDate(ctx);
-  }
-  if ((e.metaKey || e.ctrlKey) && e.shiftKey && e.code === "Semicolon") {
-    fillTime(ctx);
-  }
-  ctx.luckysheet_select_status = false;
-  var kcode = e.keyCode;
-  var kstr = e.key;
-  if (!_.isEmpty(ctx.contextMenu) || ctx.filterContextMenu) {
-    return;
-  }
-  if (kstr === "Escape" && !!ctx.luckysheet_selection_range) {
-    ctx.luckysheet_selection_range = [];
-  }
-  var allowEdit = isAllowEdit(ctx);
-  if (ctx.luckysheetCellUpdate.length > 0 && kstr !== "Enter" && kstr !== "Tab" && kstr !== "ArrowUp" && kstr !== "ArrowDown" && kstr !== "ArrowLeft" && kstr !== "ArrowRight") {
-    return;
-  }
-  if (kstr === "Enter") {
-    if (!allowEdit) return;
-    handleGlobalEnter(ctx, cellInput, e, canvas);
-  } else if (kstr === "Tab") {
-    if (ctx.luckysheetCellUpdate.length > 0) {
-      return;
-    }
-    if (e.shiftKey) {
-      moveHighlightCell(ctx, "right", -1, "rangeOfSelect");
-    } else {
-      moveHighlightCell(ctx, "right", 1, "rangeOfSelect");
-    }
-    e.preventDefault();
-  } else if (kstr === "F2") {
-    if (!allowEdit) return;
-    if (ctx.luckysheetCellUpdate.length > 0) {
-      return;
-    }
-    var last = (_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[ctx.luckysheet_select_save.length - 1];
-    if (!last) return;
-    var row_index = last.row_focus;
-    var col_index = last.column_focus;
-    ctx.luckysheetCellUpdate = [row_index, col_index];
-    e.preventDefault();
-  } else if (kstr === "F4" && ctx.luckysheetCellUpdate.length > 0) {
-    e.preventDefault();
-  } else if (kstr === "Escape" && ctx.luckysheetCellUpdate.length > 0) {
-    cancelNormalSelected(ctx);
-    moveHighlightCell(ctx, "down", 0, "rangeOfSelect");
-    e.preventDefault();
-  } else {
-    if (e.ctrlKey || e.metaKey) {
-      handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handleUndo, handleRedo);
-      return;
-    }
-    if (e.shiftKey && (kstr === "ArrowUp" || kstr === "ArrowDown" || kstr === "ArrowLeft" || kstr === "ArrowRight")) {
-      handleShiftWithArrowKey(ctx, e);
-    } else if (kstr === "Escape") {
-      ctx.contextMenu = {};
-    } else if (kstr === "Delete" || kstr === "Backspace") {
-      if (!allowEdit) return;
-      if (ctx.activeImg != null) {
-        removeActiveImage(ctx);
-      } else {
-        deleteSelectedCellText(ctx);
+  return __awaiter(this, void 0, void 0, function () {
+    var kcode, kstr, allowEdit, last, row_index, col_index, last, row_index, col_index;
+    return __generator(this, function (_b) {
+      if (e.shiftKey && e.code === "Space") {
+        e.stopImmediatePropagation();
+        e.stopPropagation();
+        e.preventDefault();
+        return [2];
       }
-      jfrefreshgrid(ctx, null, undefined);
-      e.preventDefault();
-    } else if (kstr === "ArrowUp" || kstr === "ArrowDown" || kstr === "ArrowLeft" || kstr === "ArrowRight") {
-      handleArrowKey(ctx, e);
-    } else if (!(kcode >= 112 && kcode <= 123 || kcode <= 46 || kcode === 144 || kcode === 108 || e.ctrlKey || e.altKey || e.shiftKey && (kcode === 37 || kcode === 38 || kcode === 39 || kcode === 40)) || kcode === 8 || kcode === 32 || kcode === 46 || kcode === 0 || e.ctrlKey && kcode === 86) {
-      if (!allowEdit) return;
-      if (String.fromCharCode(kcode) != null && !_.isEmpty(ctx.luckysheet_select_save) && kstr !== "CapsLock" && kstr !== "Win" && kcode !== 18) {
-        var last = ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1];
-        var row_index = last.row_focus;
-        var col_index = last.column_focus;
+      if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyE") {
+        textFormat(ctx, "center");
+      } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyL") {
+        textFormat(ctx, "left");
+      } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyR") {
+        textFormat(ctx, "right");
+      }
+      if ((e.metaKey || e.ctrlKey) && e.code === "KeyK") {
+        handleLink(ctx);
+      }
+      if ((e.metaKey || e.ctrlKey) && !e.shiftKey && e.code === "Semicolon") {
+        fillDate(ctx);
+      }
+      if ((e.metaKey || e.ctrlKey) && e.shiftKey && e.code === "Semicolon") {
+        fillTime(ctx);
+      }
+      if ((e.metaKey || e.ctrlKey) && e.code === "KeyR") {
+        fillRightData(ctx);
+      }
+      if ((e.metaKey || e.ctrlKey) && e.code === "KeyD") {
+        fillDownData(ctx);
+      }
+      ctx.luckysheet_select_status = false;
+      kcode = e.keyCode;
+      kstr = e.key;
+      if (!_.isEmpty(ctx.contextMenu) || ctx.filterContextMenu) {
+        return [2];
+      }
+      if (kstr === "Escape" && !!ctx.luckysheet_selection_range) {
+        ctx.luckysheet_selection_range = [];
+      }
+      allowEdit = isAllowEdit(ctx);
+      if (ctx.luckysheetCellUpdate.length > 0 && kstr !== "Enter" && kstr !== "Tab" && kstr !== "ArrowUp" && kstr !== "ArrowDown" && kstr !== "ArrowLeft" && kstr !== "ArrowRight") {
+        return [2];
+      }
+      if (kstr === "Enter") {
+        if (!allowEdit) return [2];
+        handleGlobalEnter(ctx, cellInput, e, canvas);
+      } else if (kstr === "Tab") {
+        if (ctx.luckysheetCellUpdate.length > 0) {
+          return [2];
+        }
+        if (e.shiftKey) {
+          moveHighlightCell(ctx, "right", -1, "rangeOfSelect");
+        } else {
+          moveHighlightCell(ctx, "right", 1, "rangeOfSelect");
+        }
+        e.preventDefault();
+      } else if (kstr === "F2") {
+        if (!allowEdit) return [2];
+        if (ctx.luckysheetCellUpdate.length > 0) {
+          return [2];
+        }
+        last = (_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[ctx.luckysheet_select_save.length - 1];
+        if (!last) return [2];
+        row_index = last.row_focus;
+        col_index = last.column_focus;
         ctx.luckysheetCellUpdate = [row_index, col_index];
-        cache.overwriteCell = true;
-        handleFormulaInput(ctx, fxInput, cellInput, kcode);
+        e.preventDefault();
+      } else if (kstr === "F4" && ctx.luckysheetCellUpdate.length > 0) {
+        e.preventDefault();
+      } else if (kstr === "Escape" && ctx.luckysheetCellUpdate.length > 0) {
+        cancelNormalSelected(ctx);
+        moveHighlightCell(ctx, "down", 0, "rangeOfSelect");
+        e.preventDefault();
+      } else {
+        if (e.ctrlKey || e.metaKey) {
+          handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handleUndo, handleRedo);
+          return [2];
+        }
+        if (e.shiftKey && (kstr === "ArrowUp" || kstr === "ArrowDown" || kstr === "ArrowLeft" || kstr === "ArrowRight")) {
+          handleShiftWithArrowKey(ctx, e);
+        } else if (kstr === "Escape") {
+          ctx.contextMenu = {};
+        } else if (kstr === "Delete" || kstr === "Backspace") {
+          if (!allowEdit) return [2];
+          if (ctx.activeImg != null) {
+            removeActiveImage(ctx);
+          } else {
+            deleteSelectedCellText(ctx);
+          }
+          jfrefreshgrid(ctx, null, undefined);
+          e.preventDefault();
+        } else if (kstr === "ArrowUp" || kstr === "ArrowDown" || kstr === "ArrowLeft" || kstr === "ArrowRight") {
+          handleArrowKey(ctx, e);
+        } else if (!(kcode >= 112 && kcode <= 123 || kcode <= 46 || kcode === 144 || kcode === 108 || e.ctrlKey || e.altKey || e.shiftKey && (kcode === 37 || kcode === 38 || kcode === 39 || kcode === 40)) || kcode === 8 || kcode === 32 || kcode === 46 || kcode === 0 || e.ctrlKey && kcode === 86) {
+          if (!allowEdit) return [2];
+          if (String.fromCharCode(kcode) != null && !_.isEmpty(ctx.luckysheet_select_save) && kstr !== "CapsLock" && kstr !== "Win" && kcode !== 18) {
+            last = ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1];
+            row_index = last.row_focus;
+            col_index = last.column_focus;
+            ctx.luckysheetCellUpdate = [row_index, col_index];
+            cache.overwriteCell = true;
+            handleFormulaInput(ctx, fxInput, cellInput, kcode);
+          }
+        }
       }
-    }
-  }
-  if (cellInput !== document.activeElement) {
-    cellInput === null || cellInput === void 0 ? void 0 : cellInput.focus();
-  }
-  e.stopPropagation();
+      if (cellInput !== document.activeElement) {
+        cellInput === null || cellInput === void 0 ? void 0 : cellInput.focus();
+      }
+      e.stopPropagation();
+      return [2];
+    });
+  });
 }

package/es/locale/en.d.ts

@@ -517,8 +517,12 @@ declare const _default: {
     conditionformat: {
         conditionformat_greaterThan: string;
         conditionformat_greaterThan_title: string;
+        conditionformat_greaterThanOrEqual: string;
+        conditionformat_greaterThanOrEqual_title: string;
         conditionformat_lessThan: string;
         conditionformat_lessThan_title: string;
+        conditionformat_lessThanOrEqual: string;
+        conditionformat_lessThanOrEqual_title: string;
         conditionformat_between: string;
         conditionformat_between_title: string;
         conditionformat_equal: string;
@@ -619,7 +623,9 @@ declare const _default: {
         specificText: string;
         occurrenceDate: string;
         greaterThan: string;
+        greaterThanOrEqual: string;
         lessThan: string;
+        lessThanOrEqual: string;
         between: string;
         equal: string;
         in: string;

package/es/locale/en.js

@@ -9075,6 +9075,11 @@ export default {
     pos: "before",
     value: "CLP$",
     geckoId: "clp"
+  }, {
+    name: "Czech Koruna",
+    pos: "after",
+    value: "CZK",
+    geckoId: "czk"
   }, {
     name: "Danish Krone",
     pos: "after",
@@ -9659,8 +9664,12 @@ export default {
   conditionformat: {
     conditionformat_greaterThan: "Conditional format - Greater than",
     conditionformat_greaterThan_title: "Format cells greater than",
+    conditionformat_greaterThanOrEqual: "Conditional format - Greater than or equal",
+    conditionformat_greaterThanOrEqual_title: "Format cells greater than or equal",
     conditionformat_lessThan: "Conditional format - Less than",
     conditionformat_lessThan_title: "Format cells smaller than",
+    conditionformat_lessThanOrEqual: "Conditional format - Less than or equal",
+    conditionformat_lessThanOrEqual_title: "Format cells less than or equal",
     conditionformat_between: "Conditional format - Betweenness",
     conditionformat_between_title: "Format cells with values between",
     conditionformat_equal: "Conditional format - Equal",
@@ -9761,7 +9770,9 @@ export default {
     specificText: "Specific text",
     occurrenceDate: "Date",
     greaterThan: "Greater than",
+    greaterThanOrEqual: "Greater than or equal",
     lessThan: "Less than",
+    lessThanOrEqual: "Less than or equal",
     between: "Between",
     equal: "Equal",
     in: "In",

package/es/modules/ConditionFormat.js

@@ -16,6 +16,86 @@ import { genarate } from "./format";
 import { execfunction, functionCopy } from "./formula";
 import { checkProtectionFormatCells } from "./protection";
 import { isRealNull } from "./validation";
+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;
+  }
+}
 export function getHistoryRules(fileH) {
   var historyRules = [];
   for (var h = 0; h < fileH.length; h += 1) {
@@ -44,7 +124,7 @@ export function setConditionRules(ctx, protection, generalDialog, conditionforma
   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 = getRangeByTxt(ctx, v);
     if (rangeArr.length > 1) {
@@ -468,7 +548,7 @@ export 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 (_.isNil(d[r]) || _.isNil(d[r][c])) {
@@ -478,7 +558,7 @@ export function compute(ctx, ruleArr, d) {
                 if (_.isNil(cell) || _.isNil(cell.v) || 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;
@@ -488,7 +568,27 @@ export 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;
@@ -522,15 +622,6 @@ export 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 (_.isNil(d[r]) || _.isNil(d[r][c])) {
@@ -540,7 +631,7 @@ export function compute(ctx, ruleArr, d) {
                 if (_.isNil(cell) || _.isNil(cell.v) || 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;
@@ -1004,7 +1095,7 @@ export 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") {
@@ -1017,7 +1108,7 @@ export 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/es/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;