@fileverse-dev/fortune-core 1.1.4 → 1.1.5-live-query-3

package/es/animate.d.ts

@@ -0,0 +1,14 @@
+declare class CellFadeAnimator {
+    private durationMs;
+    private active;
+    private raf;
+    private onTick;
+    constructor(durationMs?: number);
+    markChanged(sheetId: string, r: number, c: number): void;
+    alpha(sheetId: string, r: number, c: number): number;
+    setOnTick(cb: (() => void) | null): void;
+    private ensureTicking;
+}
+export declare const cellFadeAnimator: CellFadeAnimator;
+export declare function markCellChanged(sheetId: string, r: number, c: number): void;
+export {};

package/es/animate.js

@@ -0,0 +1,52 @@
+var CellFadeAnimator = function () {
+  function CellFadeAnimator(durationMs) {
+    if (durationMs === void 0) {
+      durationMs = 350;
+    }
+    this.durationMs = durationMs;
+    this.active = new Map();
+    this.raf = null;
+    this.onTick = null;
+    this.durationMs = durationMs;
+  }
+  CellFadeAnimator.prototype.markChanged = function (sheetId, r, c) {
+    this.active.set("".concat(sheetId, ":").concat(r, ":").concat(c), {
+      start: performance.now(),
+      dur: this.durationMs
+    });
+    this.ensureTicking();
+  };
+  CellFadeAnimator.prototype.alpha = function (sheetId, r, c) {
+    var it = this.active.get("".concat(sheetId, ":").concat(r, ":").concat(c));
+    if (!it) return 1;
+    var t = Math.min(1, (performance.now() - it.start) / it.dur);
+    if (t >= 1) {
+      this.active.delete("".concat(sheetId, ":").concat(r, ":").concat(c));
+      return 1;
+    }
+    return Math.max(0.05, 1 - Math.pow(1 - t, 3));
+  };
+  CellFadeAnimator.prototype.setOnTick = function (cb) {
+    this.onTick = cb;
+    this.ensureTicking();
+  };
+  CellFadeAnimator.prototype.ensureTicking = function () {
+    var _this = this;
+    if (this.raf !== null) return;
+    if (this.active.size === 0 && !this.onTick) return;
+    var _loop = function loop() {
+      var _a;
+      _this.raf = null;
+      if (_this.active.size > 0) (_a = _this.onTick) === null || _a === void 0 ? void 0 : _a.call(_this);
+      if (_this.active.size > 0 || _this.onTick) {
+        _this.raf = requestAnimationFrame(_loop);
+      }
+    };
+    this.raf = requestAnimationFrame(_loop);
+  };
+  return CellFadeAnimator;
+}();
+export var cellFadeAnimator = new CellFadeAnimator(4000);
+export function markCellChanged(sheetId, r, c) {
+  cellFadeAnimator.markChanged(sheetId, r, c);
+}

package/es/api/common.d.ts

@@ -68,4 +68,5 @@ export declare function getSheetWithLatestCelldata(ctx: Context, options?: Commo
             column_focus: number;
         } | undefined;
     } | undefined;
+    liveQueryList?: Record<string, import("../types").LiveQueryData> | undefined;
 };

package/es/canvas.js

@@ -6,6 +6,7 @@ import { isInlineStringCell } from "./modules/inline-string";
 import { getSheetIndex, indexToColumnChar } from "./utils";
 import { getBorderInfoComputeRange } from "./modules/border";
 import { checkCF, getComputeMap, validateCellData } from "./modules";
+import { cellFadeAnimator } from "./animate";
 export var defaultStyle = {
   fillStyle: "#000000",
   textBaseline: "middle",
@@ -760,7 +761,16 @@ var Canvas = function () {
       var horizonAlignPos = startX + 4 + offsetLeft;
       var verticalAlignPos = endY + offsetTop - 2;
       renderCtx.textBaseline = "bottom";
-      renderCtx.fillText(_.isNil(value) ? "" : value, horizonAlignPos, verticalAlignPos);
+      var sheetId = this.sheetCtx.currentSheetId;
+      var a = cellFadeAnimator.alpha(sheetId, r, c);
+      if (a < 0.999) {
+        renderCtx.save();
+        renderCtx.globalAlpha = a;
+        renderCtx.fillText(_.isNil(value) ? "" : value, horizonAlignPos, verticalAlignPos);
+        renderCtx.restore();
+      } else {
+        renderCtx.fillText(_.isNil(value) ? "" : value, horizonAlignPos, verticalAlignPos);
+      }
     }
     if ((_d = (_c = flowdata === null || flowdata === void 0 ? void 0 : flowdata[r]) === null || _c === void 0 ? void 0 : _c[c]) === null || _d === void 0 ? void 0 : _d.ps) {
       var ps_w = 12 * this.sheetCtx.zoomRatio;
@@ -1065,10 +1075,22 @@ var Canvas = function () {
       if (((_j = (_h = (_g = cell === null || cell === void 0 ? void 0 : cell.ct) === null || _g === void 0 ? void 0 : _g.fa) === null || _h === void 0 ? void 0 : _h.indexOf("[Red]")) !== null && _j !== void 0 ? _j : -1) > -1 && ((_k = cell === null || cell === void 0 ? void 0 : cell.ct) === null || _k === void 0 ? void 0 : _k.t) === "n" && (cell === null || cell === void 0 ? void 0 : cell.v) < 0) {
         renderCtx.fillStyle = "#ff0000";
       }
-      this.cellTextRender(textInfo, renderCtx, {
-        pos_x: pos_x,
-        pos_y: pos_y
-      });
+      var sheetId = this.sheetCtx.currentSheetId;
+      var a = cellFadeAnimator.alpha(sheetId, r, c);
+      if (a < 0.999) {
+        renderCtx.save();
+        renderCtx.globalAlpha = a;
+        this.cellTextRender(textInfo, renderCtx, {
+          pos_x: pos_x,
+          pos_y: pos_y
+        });
+        renderCtx.restore();
+      } else {
+        this.cellTextRender(textInfo, renderCtx, {
+          pos_x: pos_x,
+          pos_y: pos_y
+        });
+      }
       renderCtx.restore();
     }
     if (cellOverflow_bd_r_render) {
@@ -1150,10 +1172,22 @@ var Canvas = function () {
     if (checksCF === null || checksCF === void 0 ? void 0 : checksCF.textColor) {
       renderCtx.fillStyle = checksCF.textColor;
     }
-    this.cellTextRender(textInfo, renderCtx, {
-      pos_x: pos_x,
-      pos_y: pos_y
-    });
+    var sheetId = this.sheetCtx.currentSheetId;
+    var a = cellFadeAnimator.alpha(sheetId, r, c);
+    if (a < 0.999) {
+      renderCtx.save();
+      renderCtx.globalAlpha = a;
+      this.cellTextRender(textInfo, renderCtx, {
+        pos_x: pos_x,
+        pos_y: pos_y
+      });
+      renderCtx.restore();
+    } else {
+      this.cellTextRender(textInfo, renderCtx, {
+        pos_x: pos_x,
+        pos_y: pos_y
+      });
+    }
     renderCtx.restore();
   };
   Canvas.prototype.cellOverflow_trace = function (r, curC, traceC, traceDir, horizonAlign, textMetrics) {

package/es/index.d.ts

@@ -8,3 +8,4 @@ export * from "./locale";
 export * from "./modules";
 export * from "./utils";
 export * from "./types";
+export * from "./animate";

package/es/index.js

@@ -7,4 +7,5 @@ export * from "./events";
 export * from "./locale";
 export * from "./modules";
 export * from "./utils";
-export * from "./types";
+export * from "./types";
+export * from "./animate";

package/es/modules/ConditionFormat.js

@@ -23,20 +23,20 @@ function compareGreaterThan(cellValue, conditionValue, symbol) {
   var cellStr = String(cellValue);
   var conditionStr = String(conditionValue);
   if (hasAlphabeticChars(cellValue) || hasAlphabeticChars(conditionValue)) {
-    if (symbol === '>=') {
+    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 === '>=') {
+  if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol === ">=") {
     return cellNum >= conditionNum;
   }
-  if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol === '>') {
+  if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol === ">") {
     return cellNum > conditionNum;
   }
-  if (symbol === '>=') {
+  if (symbol === ">=") {
     return cellStr.localeCompare(conditionStr) >= 0;
   }
   return cellStr.localeCompare(conditionStr) > 0;
@@ -45,20 +45,20 @@ function compareLessThan(cellValue, conditionValue, symbol) {
   var cellStr = String(cellValue);
   var conditionStr = String(conditionValue);
   if (hasAlphabeticChars(cellValue) || hasAlphabeticChars(conditionValue)) {
-    if (symbol === '<=') {
+    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 === '<=') {
+  if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol === "<=") {
     return cellNum <= conditionNum;
   }
   if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum)) {
     return cellNum < conditionNum;
   }
-  if (symbol === '<=') {
+  if (symbol === "<=") {
     return cellStr.localeCompare(conditionStr) <= 0;
   }
   return cellStr.localeCompare(conditionStr) < 0;
@@ -67,7 +67,8 @@ function compareBetween(cellValue, value1, value2) {
   var cellStr = String(cellValue);
   var val1Str = String(value1);
   var val2Str = String(value2);
-  var smallerValue, biggerValue;
+  var smallerValue;
+  var biggerValue;
   if (hasAlphabeticChars(value1) || hasAlphabeticChars(value2) || hasAlphabeticChars(cellValue)) {
     if (val1Str.localeCompare(val2Str) > 0) {
       biggerValue = val1Str;
@@ -77,24 +78,23 @@ function compareBetween(cellValue, value1, value2) {
       smallerValue = val1Str;
     }
     return cellStr.localeCompare(smallerValue) >= 0 && cellStr.localeCompare(biggerValue) <= 0;
+  }
+  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 {
-    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;
+    biggerValue = val2Str;
+    smallerValue = val1Str;
   }
+  return cellStr.localeCompare(smallerValue) >= 0 && cellStr.localeCompare(biggerValue) <= 0;
 }
 export function getHistoryRules(fileH) {
   var historyRules = [];
@@ -558,7 +558,7 @@ export function compute(ctx, ruleArr, d) {
                 if (_.isNil(cell) || _.isNil(cell.v) || isRealNull(cell.v)) {
                   continue;
                 }
-                if (conditionName === "greaterThan" && compareGreaterThan(cell.v, 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;
@@ -568,7 +568,7 @@ export function compute(ctx, ruleArr, d) {
                       cellColor: cellColor_1
                     };
                   }
-                } else if (conditionName === "greaterThanOrEqual" && compareGreaterThan(cell.v, 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;
@@ -588,7 +588,7 @@ export function compute(ctx, ruleArr, d) {
                       cellColor: cellColor_1
                     };
                   }
-                } else if (conditionName === "lessThanOrEqual" && compareLessThan(cell.v, conditionValue0, '<=')) {
+                } 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;

package/es/types.d.ts

@@ -144,6 +144,18 @@ export type ConditionRulesProps = {
     repeatValue: string;
     projectValue: string;
 };
+export type LiveQueryData = {
+    data: {
+        row: number;
+        column: number;
+        function: string;
+        value: any;
+        id: string;
+        name: string;
+        subSheetId: string;
+    };
+    cellData: Cell;
+};
 export type Sheet = {
     name: string;
     config?: SheetConfig;
@@ -205,6 +217,7 @@ export type Sheet = {
             column_focus: number;
         };
     };
+    liveQueryList?: Record<string, LiveQueryData>;
 };
 export type CommentBox = {
     r: number;

package/lib/animate.d.ts

@@ -0,0 +1,14 @@
+declare class CellFadeAnimator {
+    private durationMs;
+    private active;
+    private raf;
+    private onTick;
+    constructor(durationMs?: number);
+    markChanged(sheetId: string, r: number, c: number): void;
+    alpha(sheetId: string, r: number, c: number): number;
+    setOnTick(cb: (() => void) | null): void;
+    private ensureTicking;
+}
+export declare const cellFadeAnimator: CellFadeAnimator;
+export declare function markCellChanged(sheetId: string, r: number, c: number): void;
+export {};

package/lib/animate.js

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.cellFadeAnimator = void 0;
+exports.markCellChanged = markCellChanged;
+var CellFadeAnimator = function () {
+  function CellFadeAnimator(durationMs) {
+    if (durationMs === void 0) {
+      durationMs = 350;
+    }
+    this.durationMs = durationMs;
+    this.active = new Map();
+    this.raf = null;
+    this.onTick = null;
+    this.durationMs = durationMs;
+  }
+  CellFadeAnimator.prototype.markChanged = function (sheetId, r, c) {
+    this.active.set("".concat(sheetId, ":").concat(r, ":").concat(c), {
+      start: performance.now(),
+      dur: this.durationMs
+    });
+    this.ensureTicking();
+  };
+  CellFadeAnimator.prototype.alpha = function (sheetId, r, c) {
+    var it = this.active.get("".concat(sheetId, ":").concat(r, ":").concat(c));
+    if (!it) return 1;
+    var t = Math.min(1, (performance.now() - it.start) / it.dur);
+    if (t >= 1) {
+      this.active.delete("".concat(sheetId, ":").concat(r, ":").concat(c));
+      return 1;
+    }
+    return Math.max(0.05, 1 - Math.pow(1 - t, 3));
+  };
+  CellFadeAnimator.prototype.setOnTick = function (cb) {
+    this.onTick = cb;
+    this.ensureTicking();
+  };
+  CellFadeAnimator.prototype.ensureTicking = function () {
+    var _this = this;
+    if (this.raf !== null) return;
+    if (this.active.size === 0 && !this.onTick) return;
+    var _loop = function loop() {
+      var _a;
+      _this.raf = null;
+      if (_this.active.size > 0) (_a = _this.onTick) === null || _a === void 0 ? void 0 : _a.call(_this);
+      if (_this.active.size > 0 || _this.onTick) {
+        _this.raf = requestAnimationFrame(_loop);
+      }
+    };
+    this.raf = requestAnimationFrame(_loop);
+  };
+  return CellFadeAnimator;
+}();
+var cellFadeAnimator = exports.cellFadeAnimator = new CellFadeAnimator(4000);
+function markCellChanged(sheetId, r, c) {
+  cellFadeAnimator.markChanged(sheetId, r, c);
+}

package/lib/api/common.d.ts

@@ -68,4 +68,5 @@ export declare function getSheetWithLatestCelldata(ctx: Context, options?: Commo
             column_focus: number;
         } | undefined;
     } | undefined;
+    liveQueryList?: Record<string, import("../types").LiveQueryData> | undefined;
 };

package/lib/canvas.js

@@ -12,6 +12,7 @@ var _inlineString = require("./modules/inline-string");
 var _utils = require("./utils");
 var _border = require("./modules/border");
 var _modules = require("./modules");
+var _animate = require("./animate");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var defaultStyle = exports.defaultStyle = {
   fillStyle: "#000000",
@@ -767,7 +768,16 @@ var Canvas = exports.Canvas = function () {
       var horizonAlignPos = startX + 4 + offsetLeft;
       var verticalAlignPos = endY + offsetTop - 2;
       renderCtx.textBaseline = "bottom";
-      renderCtx.fillText(_lodash.default.isNil(value) ? "" : value, horizonAlignPos, verticalAlignPos);
+      var sheetId = this.sheetCtx.currentSheetId;
+      var a = _animate.cellFadeAnimator.alpha(sheetId, r, c);
+      if (a < 0.999) {
+        renderCtx.save();
+        renderCtx.globalAlpha = a;
+        renderCtx.fillText(_lodash.default.isNil(value) ? "" : value, horizonAlignPos, verticalAlignPos);
+        renderCtx.restore();
+      } else {
+        renderCtx.fillText(_lodash.default.isNil(value) ? "" : value, horizonAlignPos, verticalAlignPos);
+      }
     }
     if ((_d = (_c = flowdata === null || flowdata === void 0 ? void 0 : flowdata[r]) === null || _c === void 0 ? void 0 : _c[c]) === null || _d === void 0 ? void 0 : _d.ps) {
       var ps_w = 12 * this.sheetCtx.zoomRatio;
@@ -1072,10 +1082,22 @@ var Canvas = exports.Canvas = function () {
       if (((_j = (_h = (_g = cell === null || cell === void 0 ? void 0 : cell.ct) === null || _g === void 0 ? void 0 : _g.fa) === null || _h === void 0 ? void 0 : _h.indexOf("[Red]")) !== null && _j !== void 0 ? _j : -1) > -1 && ((_k = cell === null || cell === void 0 ? void 0 : cell.ct) === null || _k === void 0 ? void 0 : _k.t) === "n" && (cell === null || cell === void 0 ? void 0 : cell.v) < 0) {
         renderCtx.fillStyle = "#ff0000";
       }
-      this.cellTextRender(textInfo, renderCtx, {
-        pos_x: pos_x,
-        pos_y: pos_y
-      });
+      var sheetId = this.sheetCtx.currentSheetId;
+      var a = _animate.cellFadeAnimator.alpha(sheetId, r, c);
+      if (a < 0.999) {
+        renderCtx.save();
+        renderCtx.globalAlpha = a;
+        this.cellTextRender(textInfo, renderCtx, {
+          pos_x: pos_x,
+          pos_y: pos_y
+        });
+        renderCtx.restore();
+      } else {
+        this.cellTextRender(textInfo, renderCtx, {
+          pos_x: pos_x,
+          pos_y: pos_y
+        });
+      }
       renderCtx.restore();
     }
     if (cellOverflow_bd_r_render) {
@@ -1157,10 +1179,22 @@ var Canvas = exports.Canvas = function () {
     if (checksCF === null || checksCF === void 0 ? void 0 : checksCF.textColor) {
       renderCtx.fillStyle = checksCF.textColor;
     }
-    this.cellTextRender(textInfo, renderCtx, {
-      pos_x: pos_x,
-      pos_y: pos_y
-    });
+    var sheetId = this.sheetCtx.currentSheetId;
+    var a = _animate.cellFadeAnimator.alpha(sheetId, r, c);
+    if (a < 0.999) {
+      renderCtx.save();
+      renderCtx.globalAlpha = a;
+      this.cellTextRender(textInfo, renderCtx, {
+        pos_x: pos_x,
+        pos_y: pos_y
+      });
+      renderCtx.restore();
+    } else {
+      this.cellTextRender(textInfo, renderCtx, {
+        pos_x: pos_x,
+        pos_y: pos_y
+      });
+    }
     renderCtx.restore();
   };
   Canvas.prototype.cellOverflow_trace = function (r, curC, traceC, traceDir, horizonAlign, textMetrics) {

package/lib/index.d.ts

@@ -8,3 +8,4 @@ export * from "./locale";
 export * from "./modules";
 export * from "./utils";
 export * from "./types";
+export * from "./animate";

package/lib/index.js

@@ -106,4 +106,16 @@ Object.keys(_types).forEach(function (key) {
     }
   });
 });
+var _animate = require("./animate");
+Object.keys(_animate).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _animate[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _animate[key];
+    }
+  });
+});
 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); }

package/lib/modules/ConditionFormat.js

@@ -38,20 +38,20 @@ function compareGreaterThan(cellValue, conditionValue, symbol) {
   var cellStr = String(cellValue);
   var conditionStr = String(conditionValue);
   if (hasAlphabeticChars(cellValue) || hasAlphabeticChars(conditionValue)) {
-    if (symbol === '>=') {
+    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 === '>=') {
+  if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol === ">=") {
     return cellNum >= conditionNum;
   }
-  if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol === '>') {
+  if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol === ">") {
     return cellNum > conditionNum;
   }
-  if (symbol === '>=') {
+  if (symbol === ">=") {
     return cellStr.localeCompare(conditionStr) >= 0;
   }
   return cellStr.localeCompare(conditionStr) > 0;
@@ -60,20 +60,20 @@ function compareLessThan(cellValue, conditionValue, symbol) {
   var cellStr = String(cellValue);
   var conditionStr = String(conditionValue);
   if (hasAlphabeticChars(cellValue) || hasAlphabeticChars(conditionValue)) {
-    if (symbol === '<=') {
+    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 === '<=') {
+  if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum) && symbol === "<=") {
     return cellNum <= conditionNum;
   }
   if (!Number.isNaN(cellNum) && !Number.isNaN(conditionNum)) {
     return cellNum < conditionNum;
   }
-  if (symbol === '<=') {
+  if (symbol === "<=") {
     return cellStr.localeCompare(conditionStr) <= 0;
   }
   return cellStr.localeCompare(conditionStr) < 0;
@@ -82,7 +82,8 @@ function compareBetween(cellValue, value1, value2) {
   var cellStr = String(cellValue);
   var val1Str = String(value1);
   var val2Str = String(value2);
-  var smallerValue, biggerValue;
+  var smallerValue;
+  var biggerValue;
   if (hasAlphabeticChars(value1) || hasAlphabeticChars(value2) || hasAlphabeticChars(cellValue)) {
     if (val1Str.localeCompare(val2Str) > 0) {
       biggerValue = val1Str;
@@ -92,24 +93,23 @@ function compareBetween(cellValue, value1, value2) {
       smallerValue = val1Str;
     }
     return cellStr.localeCompare(smallerValue) >= 0 && cellStr.localeCompare(biggerValue) <= 0;
+  }
+  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 {
-    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;
+    biggerValue = val2Str;
+    smallerValue = val1Str;
   }
+  return cellStr.localeCompare(smallerValue) >= 0 && cellStr.localeCompare(biggerValue) <= 0;
 }
 function getHistoryRules(fileH) {
   var historyRules = [];
@@ -573,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" && compareGreaterThan(cell.v, 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;
@@ -583,7 +583,7 @@ function compute(ctx, ruleArr, d) {
                       cellColor: cellColor_1
                     };
                   }
-                } else if (conditionName === "greaterThanOrEqual" && compareGreaterThan(cell.v, 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;
@@ -603,7 +603,7 @@ function compute(ctx, ruleArr, d) {
                       cellColor: cellColor_1
                     };
                   }
-                } else if (conditionName === "lessThanOrEqual" && compareLessThan(cell.v, conditionValue0, '<=')) {
+                } 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;

package/lib/types.d.ts

@@ -144,6 +144,18 @@ export type ConditionRulesProps = {
     repeatValue: string;
     projectValue: string;
 };
+export type LiveQueryData = {
+    data: {
+        row: number;
+        column: number;
+        function: string;
+        value: any;
+        id: string;
+        name: string;
+        subSheetId: string;
+    };
+    cellData: Cell;
+};
 export type Sheet = {
     name: string;
     config?: SheetConfig;
@@ -205,6 +217,7 @@ export type Sheet = {
             column_focus: number;
         };
     };
+    liveQueryList?: Record<string, LiveQueryData>;
 };
 export type CommentBox = {
     r: number;

package/package.json

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