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: fixed some formula and 0 value judgment issues (#5655)

wpxp1234566d18c8bbfa8b
diff --git a/packages/engine-formula/src/functions/financial/xnpv/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/xnpv/__tests__/index.spec.ts
index 1a1e9bac48..e2706e3a0e 100644
--- a/packages/engine-formula/src/functions/financial/xnpv/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/xnpv/__tests__/index.spec.ts
@@ -82,7 +82,7 @@ describe('Test xnpv function', () => {
const values3 = NumberValueObject.create(1);
const result3 = testFunction.calculate(rate2, values3, dates);
- expect(getObjectValue(result3)).toBe(ErrorType.NA);
+ expect(getObjectValue(result3)).toBe(ErrorType.NUM);
const dates2 = BooleanValueObject.create(true);
const result4 = testFunction.calculate(rate2, values, dates2);
@@ -90,7 +90,7 @@ describe('Test xnpv function', () => {
const dates3 = NumberValueObject.create(1);
const result5 = testFunction.calculate(rate2, values, dates3);
- expect(getObjectValue(result5)).toBe(ErrorType.NA);
+ expect(getObjectValue(result5)).toBe(ErrorType.NUM);
const dates4 = NumberValueObject.create(-1);
const result6 = testFunction.calculate(rate2, values, dates4);
@@ -232,7 +232,7 @@ describe('Test xnpv function', () => {
const values5 = ArrayValueObject.create('{-10000}');
const dates6 = ArrayValueObject.create('{39448}');
const result9 = testFunction.calculate(rate2, values5, dates6);
- expect(getObjectValue(result9)).toBe(ErrorType.NA);
+ expect(getObjectValue(result9)).toBe(-10000);
});
});
});
diff --git a/packages/engine-formula/src/functions/financial/xnpv/index.ts b/packages/engine-formula/src/functions/financial/xnpv/index.ts
index fde8f853c5..2ff27ee5c0 100644
--- a/packages/engine-formula/src/functions/financial/xnpv/index.ts
+++ b/packages/engine-formula/src/functions/financial/xnpv/index.ts
@@ -16,7 +16,6 @@
import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { isRealNum } from '@univerjs/core';
import { ErrorType } from '../../../basics/error-type';
import { checkVariantsErrorIsArrayOrBoolean } from '../../../engine/utils/check-variant-error';
import { ErrorValueObject } from '../../../engine/value-object/base-value-object';
@@ -171,21 +170,28 @@ export class Xnpv extends BaseFunction {
};
}
- if (_values.length <= 1) {
- return {
- isError: true,
- errorObejct: ErrorValueObject.create(ErrorType.NA),
- };
- }
-
return {
isError,
_values,
};
} else {
- const valuesValue = values.getValue();
+ if (values.isError()) {
+ return {
+ isError: true,
+ errorObejct: values as ErrorValueObject,
+ };
+ }
- if (values.isNull() || values.isBoolean() || (values.isString() && !isRealNum(valuesValue))) {
+ if (values.isNull() || values.isBoolean()) {
+ return {
+ isError: true,
+ errorObejct: ErrorValueObject.create(ErrorType.VALUE),
+ };
+ }
+
+ const value = +values.getValue();
+
+ if (Number.isNaN(value)) {
return {
isError: true,
errorObejct: ErrorValueObject.create(ErrorType.VALUE),
@@ -193,8 +199,8 @@ export class Xnpv extends BaseFunction {
}
return {
- isError: true,
- errorObejct: ErrorValueObject.create(ErrorType.NA),
+ isError: false,
+ _values: [value],
};
}
}
@@ -245,21 +251,28 @@ export class Xnpv extends BaseFunction {
};
}
- if (_dates.length <= 1) {
- return {
- isError: true,
- errorObejct: ErrorValueObject.create(ErrorType.NA),
- };
- }
-
return {
isError,
_dates,
};
} else {
- const datesValue = dates.getValue();
+ if (dates.isError()) {
+ return {
+ isError: true,
+ errorObejct: dates as ErrorValueObject,
+ };
+ }
- if (dates.isNull() || dates.isBoolean() || (dates.isString() && !isRealNum(datesValue))) {
+ if (dates.isNull() || dates.isBoolean()) {
+ return {
+ isError: true,
+ errorObejct: ErrorValueObject.create(ErrorType.VALUE),
+ };
+ }
+
+ const datesValue = +dates.getValue();
+
+ if (Number.isNaN(datesValue)) {
return {
isError: true,
errorObejct: ErrorValueObject.create(ErrorType.VALUE),
@@ -274,8 +287,8 @@ export class Xnpv extends BaseFunction {
}
return {
- isError: true,
- errorObejct: ErrorValueObject.create(ErrorType.NA),
+ isError: false,
+ _dates: [Math.floor(datesValue)],
};
}
}
diff --git a/packages/engine-formula/src/functions/math/sumproduct/__tests__/index.spec.ts b/packages/engine-formula/src/functions/math/sumproduct/__tests__/index.spec.ts
index fcc4c6df8c..a9aeab16a6 100644
--- a/packages/engine-formula/src/functions/math/sumproduct/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/math/sumproduct/__tests__/index.spec.ts
@@ -17,6 +17,8 @@
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
+import { BooleanValueObject, NullValueObject, NumberValueObject, StringValueObject } from '../../../../engine/value-object/primitive-object';
+import { getObjectValue } from '../../../util';
import { FUNCTION_NAMES_MATH } from '../../function-names';
import { Sumproduct } from '../index';
@@ -26,11 +28,11 @@ describe('Test sumproduct function', () => {
describe('Sumproduct', () => {
it('Array1 is array, not includes error', () => {
const array1 = ArrayValueObject.create({
- calculateValueList: transformToValueObject([
- [1, '2', 3],
- [null, 'test', 2],
- [true, ' ', false],
- ]),
+ calculateValueList: [
+ [NumberValueObject.create(1), StringValueObject.create('2'), NumberValueObject.create(3)],
+ [NullValueObject.create(), StringValueObject.create('test'), NumberValueObject.create(2)],
+ [BooleanValueObject.create(true), StringValueObject.create(' '), BooleanValueObject.create(false)],
+ ],
rowCount: 3,
columnCount: 3,
unitId: '',
@@ -39,7 +41,7 @@ describe('Test sumproduct function', () => {
column: 0,
});
const result = testFunction.calculate(array1);
- expect(result.getValue()).toBe(8);
+ expect(getObjectValue(result)).toBe(6);
});
it('Array1 is array, includes error', () => {
@@ -57,16 +59,16 @@ describe('Test sumproduct function', () => {
column: 0,
});
const result = testFunction.calculate(array1);
- expect(result.getValue()).toBe(ErrorType.NUM);
+ expect(getObjectValue(result)).toBe(ErrorType.NUM);
});
it('Array1 is array, other variants has same dimension', () => {
const array1 = ArrayValueObject.create({
- calculateValueList: transformToValueObject([
- [1, '2', 3],
- [null, 'test', 2],
- [true, ' ', false],
- ]),
+ calculateValueList: [
+ [NumberValueObject.create(1), StringValueObject.create('2'), NumberValueObject.create(3)],
+ [NullValueObject.create(), StringValueObject.create('test'), NumberValueObject.create(2)],
+ [BooleanValueObject.create(true), StringValueObject.create(' '), BooleanValueObject.create(false)],
+ ],
rowCount: 3,
columnCount: 3,
unitId: '',
@@ -75,11 +77,11 @@ describe('Test sumproduct function', () => {
column: 0,
});
const array2 = ArrayValueObject.create({
- calculateValueList: transformToValueObject([
- [1, 1, 1],
- [null, 'test', 2],
- [true, 1, false],
- ]),
+ calculateValueList: [
+ [NumberValueObject.create(1), NumberValueObject.create(1), NumberValueObject.create(1)],
+ [NullValueObject.create(), StringValueObject.create('test'), NumberValueObject.create(2)],
+ [BooleanValueObject.create(true), NumberValueObject.create(1), BooleanValueObject.create(false)],
+ ],
rowCount: 3,
columnCount: 3,
unitId: '',
@@ -88,7 +90,7 @@ describe('Test sumproduct function', () => {
column: 0,
});
const result = testFunction.calculate(array1, array2);
- expect(result.getValue()).toBe(10);
+ expect(getObjectValue(result)).toBe(8);
});
it('Array1 is array, other variants is not same dimension', () => {
@@ -118,7 +120,72 @@ describe('Test sumproduct function', () => {
column: 0,
});
const result = testFunction.calculate(array1, array2);
- expect(result.getValue()).toBe(ErrorType.VALUE);
+ expect(getObjectValue(result)).toBe(ErrorType.VALUE);
+ });
+
+ it('More test', () => {
+ const array1 = ArrayValueObject.create({
+ calculateValueList: [
+ [NumberValueObject.create(2)],
+ [NumberValueObject.create(1.570796327)],
+ [NumberValueObject.create(1.316957897)],
+ [NumberValueObject.create(1.570796327)],
+ [NumberValueObject.create(0.168236118)],
+ [NumberValueObject.create(57)],
+ [NumberValueObject.create(0)],
+ [NumberValueObject.create(2.99822295)],
+ [NumberValueObject.create(0.785398163)],
+ [NumberValueObject.create(0.643501109)],
+ [NumberValueObject.create(0.100335348)],
+ [StringValueObject.create('0000001111')],
+ [NumberValueObject.create(3)],
+ [NumberValueObject.create(-6)],
+ [NumberValueObject.create(6)],
+ [NumberValueObject.create(28)],
+ [NumberValueObject.create(36)],
+ [NumberValueObject.create(0.540302306)],
+ [NumberValueObject.create(27.30823284)],
+ [NumberValueObject.create(-0.156119952)],
+ ],
+ rowCount: 20,
+ columnCount: 1,
+ unitId: '',
+ sheetId: '',
+ row: 0,
+ column: 0,
+ });
+ const array2 = ArrayValueObject.create({
+ calculateValueList: [
+ [NumberValueObject.create(1.037314721)],
+ [NumberValueObject.create(1.537780562)],
+ [NumberValueObject.create(0.469642441)],
+ [NumberValueObject.create(255)],
+ [NumberValueObject.create(180)],
+ [NumberValueObject.create(2)],
+ [NumberValueObject.create(7.389056099)],
+ [NumberValueObject.create(120)],
+ [NumberValueObject.create(48)],
+ [NumberValueObject.create(2)],
+ [NumberValueObject.create(-4)],
+ [NumberValueObject.create(-4)],
+ [NumberValueObject.create(1)],
+ [NumberValueObject.create(8)],
+ [NumberValueObject.create(10)],
+ [NullValueObject.create()],
+ [NumberValueObject.create(3)],
+ [NumberValueObject.create(3)],
+ [NumberValueObject.create(5)],
+ [NumberValueObject.create(1)],
+ ],
+ rowCount: 20,
+ columnCount: 1,
+ unitId: '',
+ sheetId: '',
+ row: 0,
+ column: 0,
+ });
+ const result = testFunction.calculate(array1, array2);
+ expect(getObjectValue(result, true)).toBe(1209.32171126296);
});
});
});
diff --git a/packages/engine-formula/src/functions/math/sumproduct/index.ts b/packages/engine-formula/src/functions/math/sumproduct/index.ts
index a74a83f831..063220c036 100644
--- a/packages/engine-formula/src/functions/math/sumproduct/index.ts
+++ b/packages/engine-formula/src/functions/math/sumproduct/index.ts
@@ -14,10 +14,9 @@
* limitations under the License.
*/
-import { isRealNum } from '@univerjs/core';
+import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
import { ErrorType } from '../../../basics/error-type';
import { ArrayValueObject } from '../../../engine/value-object/array-value-object';
-import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
import { ErrorValueObject } from '../../../engine/value-object/base-value-object';
import { NumberValueObject } from '../../../engine/value-object/primitive-object';
import { BaseFunction } from '../../base-function';
@@ -76,12 +75,11 @@ export class Sumproduct extends BaseFunction {
return variantValueObject;
}
- const variantValue = variantValueObject.getValue();
-
- if (!variantValue || !isRealNum(variantValue)) {
- row.push(0);
+ // Only number values are considered for the sumproduct calculation
+ if (variantValueObject.isNumber()) {
+ row.push((variantValueObject.getValue() as number) * resultArray[r][c]);
} else {
- row.push(+variantValue * resultArray[r][c]);
+ row.push(0);
}
}
@@ -128,12 +126,11 @@ export class Sumproduct extends BaseFunction {
return array1ValueObject;
}
- const array1Value = array1ValueObject.getValue();
-
- if (!array1Value || !isRealNum(array1Value)) {
- row.push(0);
+ // Only number values are considered for the sumproduct calculation
+ if (array1ValueObject.isNumber()) {
+ row.push(array1ValueObject.getValue() as number);
} else {
- row.push(+array1Value);
+ row.push(0);
}
}
diff --git a/packages/sheets-formula-ui/src/views/formula-editor/hooks/use-formula-describe.ts b/packages/sheets-formula-ui/src/views/formula-editor/hooks/use-formula-describe.ts
index 19235dfcec..4d4f97650b 100644
--- a/packages/sheets-formula-ui/src/views/formula-editor/hooks/use-formula-describe.ts
+++ b/packages/sheets-formula-ui/src/views/formula-editor/hooks/use-formula-describe.ts
@@ -16,7 +16,7 @@
import type { Editor } from '@univerjs/docs-ui';
import type { IFunctionInfo } from '@univerjs/engine-formula';
-import { LexerTreeBuilder } from '@univerjs/engine-formula';
+import { LexerTreeBuilder, matchToken } from '@univerjs/engine-formula';
import { IDescriptionService } from '@univerjs/sheets-formula';
import { useDependency } from '@univerjs/ui';
import { useEffect, useRef, useState } from 'react';
@@ -55,16 +55,24 @@ export const useFormulaDescribe = (isNeed: boolean, formulaText: string, editor?
const [range] = e.textRanges;
if (range.collapsed && isShowRef.current) {
const { startOffset } = range;
- const currentSequenceNode = formulaPromptService.getCurrentSequenceNode(startOffset - 2);
+ const nodeIndex = formulaPromptService.getCurrentSequenceNodeIndex(startOffset - 2);
+ const currentSequenceNode = formulaPromptService.getCurrentSequenceNodeByIndex(nodeIndex);
+ const nextSequenceNode = formulaPromptService.getCurrentSequenceNodeByIndex(nodeIndex + 1);
if (currentSequenceNode) {
- if (typeof currentSequenceNode !== 'string' && currentSequenceNode.nodeType === 3 && !descriptionService.hasDefinedNameDescription(currentSequenceNode.token.trim())) {
+ if (
+ typeof currentSequenceNode !== 'string' &&
+ currentSequenceNode.nodeType === 3 &&
+ !descriptionService.hasDefinedNameDescription(currentSequenceNode.token.trim()) &&
+ nextSequenceNode === matchToken.OPEN_BRACKET
+ ) {
+ // If the current node is a function name and the next node is an open bracket '(', should show the function description.
const info = descriptionService.getFunctionInfo(currentSequenceNode.token);
setFunctionInfo(info);
setParamIndex(-1);
return;
} else {
- // 为什么减1,因为nodes是不包含初始 ‘=’ 字符的,但是 selection 会包含 '='
+ // Why subtract 1? Because the nodes do not include the initial '=' character, but the selection does include '='.
const res = lexerTreeBuilder.getFunctionAndParameter(`${formulaTextRef.current}A`, startOffset - 1);
if (res) {
const { functionName, paramIndex } = res;
diff --git a/packages/sheets-numfmt-ui/src/controllers/numfmt-alert-render.controller.ts b/packages/sheets-numfmt-ui/src/controllers/numfmt-alert-render.controller.ts
index 6a99228701..a798583282 100644
--- a/packages/sheets-numfmt-ui/src/controllers/numfmt-alert-render.controller.ts
+++ b/packages/sheets-numfmt-ui/src/controllers/numfmt-alert-render.controller.ts
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-import type { Workbook } from '@univerjs/core';
+import type { CellValue, Workbook } from '@univerjs/core';
import type { IRenderContext, IRenderModule } from '@univerjs/engine-render';
import type { IUniverSheetsNumfmtConfig } from '@univerjs/sheets-numfmt';
-import { Disposable, IConfigService, Inject, isRealNum, isTextFormat, LocaleService } from '@univerjs/core';
+import { Disposable, IConfigService, Inject, isRealNum, isTextFormat, LocaleService, Tools } from '@univerjs/core';
import { INumfmtService } from '@univerjs/sheets';
import { SHEETS_NUMFMT_PLUGIN_CONFIG_KEY } from '@univerjs/sheets-numfmt';
import { CellAlertManagerService, CellAlertType, HoverManagerService } from '@univerjs/sheets-ui';
@@ -76,7 +76,7 @@ export class NumfmtAlertRenderController extends Disposable implements IRenderMo
}
// Preventing blank object
- if (isTextFormat(numfmtValue.pattern) && cellData?.v && isRealNum(cellData.v)) {
+ if (isTextFormat(numfmtValue.pattern) && Tools.isDefine(cellData?.v) && isRealNum(cellData.v as CellValue)) {
// If the user has disabled the text format alert, do not show it
if (this._configService.getConfig<IUniverSheetsNumfmtConfig>(SHEETS_NUMFMT_PLUGIN_CONFIG_KEY)?.disableTextFormatAlert) {
return;
diff --git a/packages/sheets-ui/src/controllers/status-bar.controller.ts b/packages/sheets-ui/src/controllers/status-bar.controller.ts
index 4894f453e0..37b69c4df2 100644
--- a/packages/sheets-ui/src/controllers/status-bar.controller.ts
+++ b/packages/sheets-ui/src/controllers/status-bar.controller.ts
@@ -32,6 +32,7 @@ import {
RANGE_TYPE,
splitIntoGrid,
toDisposable,
+ Tools,
UniverInstanceType,
} from '@univerjs/core';
@@ -56,7 +57,7 @@ class CalculateValueSet {
private _max: number = Number.NEGATIVE_INFINITY;
add(value: Nullable<ICellData>, styles: Styles, patternInfoRecord: Record<string, any>) {
- if (!value?.v) {
+ if (!Tools.isDefine(value?.v)) {
return;
}
const t = value?.t;
diff --git a/packages/sheets/src/facade/f-range.ts b/packages/sheets/src/facade/f-range.ts
index 3e18ad272d..879af94a80 100644
--- a/packages/sheets/src/facade/f-range.ts
+++ b/packages/sheets/src/facade/f-range.ts
@@ -414,8 +414,7 @@ export class FRange extends FBaseInitialable {
getRawValue(): Nullable<CellValue> {
const cell = this._worksheet.getCellMatrix().getValue(this._range.startRow, this._range.startColumn);
if (cell?.p && cell.p.body?.dataStream) return cell.p.body.dataStream;
- if (cell?.v) return cell.v;
- return null;
+ return cell?.v ?? null;
}
/**
@@ -440,8 +439,7 @@ export class FRange extends FBaseInitialable {
getDisplayValue(): string {
const cell = this._worksheet.getCell(this._range.startRow, this._range.startColumn);
if (cell?.p && cell.p.body?.dataStream) return cell.p.body.dataStream;
- if (cell?.v) return String(cell.v);
- return '';
+ return cell?.v?.toString() ?? '';
}
/**
@@ -545,10 +543,8 @@ export class FRange extends FBaseInitialable {
const cell = cellMatrix.getValue(r, c);
if (cell?.p && cell.p.body?.dataStream) {
row.push(cell.p.body.dataStream);
- } else if (cell?.v) {
- row.push(cell.v);
} else {
- row.push(null);
+ row.push(cell?.v ?? null);
}
}
@@ -612,10 +608,8 @@ export class FRange extends FBaseInitialable {
if (cell?.p && cell.p.body?.dataStream) {
row.push(cell.p.body.dataStream);
- } else if (cell?.v) {
- row.push(String(cell.v));
} else {
- row.push('');
+ row.push(cell?.v?.toString() ?? '');
}
}