Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(formula): update compare logic (#6158)

Univerc884677fe80f
diff --git a/packages/engine-formula/src/engine/value-object/base-value-object.ts b/packages/engine-formula/src/engine/value-object/base-value-object.ts
index eab29c2359..e1b718193e 100644
--- a/packages/engine-formula/src/engine/value-object/base-value-object.ts
+++ b/packages/engine-formula/src/engine/value-object/base-value-object.ts
@@ -103,6 +103,10 @@ export class BaseValueObject extends ObjectClassType {
return false;
}
+ isDateFormat() {
+ return false;
+ }
+
override isError() {
return false;
}
@@ -256,7 +260,7 @@ export class BaseValueObject extends ObjectClassType {
return ErrorValueObject.create(ErrorType.VALUE);
}
- compareBy(value: string | number | boolean, operator: compareToken): BaseValueObject {
+ compareBy(value: string | number | boolean, operator: compareToken, isDateCompare: boolean = false): BaseValueObject {
/** abstract */
return ErrorValueObject.create(ErrorType.NAME);
}
diff --git a/packages/engine-formula/src/engine/value-object/primitive-object.ts b/packages/engine-formula/src/engine/value-object/primitive-object.ts
index c1678c88ea..a195f605a3 100644
--- a/packages/engine-formula/src/engine/value-object/primitive-object.ts
+++ b/packages/engine-formula/src/engine/value-object/primitive-object.ts
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { getNumfmtParseValueFilter, isRealNum } from '@univerjs/core';
+import { getNumfmtParseValueFilter, isRealNum, numfmt } from '@univerjs/core';
import { FormulaAstLRU } from '../../basics/cache-lru';
import { reverseCompareOperator } from '../../basics/calculate';
import { BooleanValue, ConcatenateType } from '../../basics/common';
@@ -645,11 +645,22 @@ export class NumberValueObject extends BaseValueObject {
return StringValueObject.create(this.concatenate(valueObject.getValue(), ConcatenateType.BACK));
}
+ override isDateFormat(): boolean {
+ const pattern = this.getPattern();
+ return numfmt.isDateFormat(pattern);
+ }
+
override compare(valueObject: BaseValueObject, operator: compareToken): BaseValueObject {
if (valueObject.isArray()) {
return valueObject.compare(this, reverseCompareOperator(operator));
}
- return this.compareBy(valueObject.getValue(), operator);
+
+ let isDateCompare = false;
+ if (valueObject.isDateFormat() && this.isDateFormat()) {
+ isDateCompare = true;
+ }
+
+ return this.compareBy(valueObject.getValue(), operator, isDateCompare);
}
override plusBy(value: string | number | boolean): BaseValueObject {
@@ -756,10 +767,22 @@ export class NumberValueObject extends BaseValueObject {
return NumberValueObject.create(result);
}
- override compareBy(value: string | number | boolean, operator: compareToken): BaseValueObject {
- const currentValue = this.getValue();
+ override compareBy(valueRaw: string | number | boolean, operator: compareToken, isDateCompare: boolean = false): BaseValueObject {
+ const currentValueRaw = this.getValue();
let result = false;
+ let currentValue = currentValueRaw;
+ let value = valueRaw;
+
+ /**
+ * When comparing dates, round to 6 decimal places to avoid precision issues
+ * e.g. 44561.99999999999 and 44562 both represent the date 2022-01-01
+ */
+ if (isDateCompare) {
+ currentValue = Math.round(currentValueRaw * 1e8) / 1e8;
+ value = Math.round((valueRaw as number) * 1e8) / 1e8;
+ }
+
if (typeof value === 'string') {
result = this._compareString(operator);
} else if (typeof value === 'number') {