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.

feat(formula): add rank/rank.avg/rank.eq function (#3140)

wpxp123456d2a3ec201142
diff --git a/packages/engine-formula/src/functions/compatibility/function-map.ts b/packages/engine-formula/src/functions/compatibility/function-map.ts
index d7b1206aba..ea4e9557dd 100644
--- a/packages/engine-formula/src/functions/compatibility/function-map.ts
+++ b/packages/engine-formula/src/functions/compatibility/function-map.ts
@@ -18,9 +18,11 @@ import { StdevP } from '../statistical/stdev-p';
import { StdevS } from '../statistical/stdev-s';
import { VarP } from '../statistical/var-p';
import { VarS } from '../statistical/var-s';
+import { Rank } from './rank';
import { FUNCTION_NAMES_COMPATIBILITY } from './function-names';
export const functionCompatibility = [
+ [Rank, FUNCTION_NAMES_COMPATIBILITY.RANK],
[StdevS, FUNCTION_NAMES_COMPATIBILITY.STDEV],
[StdevP, FUNCTION_NAMES_COMPATIBILITY.STDEVP],
[VarS, FUNCTION_NAMES_COMPATIBILITY.VAR],
diff --git a/packages/engine-formula/src/functions/compatibility/rank/__tests__/index.spec.ts b/packages/engine-formula/src/functions/compatibility/rank/__tests__/index.spec.ts
new file mode 100644
index 0000000000..c6e1887fd8
--- /dev/null
+++ b/packages/engine-formula/src/functions/compatibility/rank/__tests__/index.spec.ts
@@ -0,0 +1,209 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { Injector, IWorkbookData } from '@univerjs/core';
+import { beforeEach, describe, expect, it } from 'vitest';
+
+import { CellValueType, LocaleType } from '@univerjs/core';
+import { Lexer } from '../../../../engine/analysis/lexer';
+import type { LexerNode } from '../../../../engine/analysis/lexer-node';
+import { AstTreeBuilder } from '../../../../engine/analysis/parser';
+import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';
+import { Interpreter } from '../../../../engine/interpreter/interpreter';
+import { IFormulaCurrentConfigService } from '../../../../services/current-data.service';
+import { IFunctionService } from '../../../../services/function.service';
+import { IFormulaRuntimeService } from '../../../../services/runtime.service';
+import { createFunctionTestBed, getObjectValue } from '../../../__tests__/create-function-test-bed';
+import { FUNCTION_NAMES_COMPATIBILITY } from '../../function-names';
+import { Rank } from '../index';
+import { ErrorType } from '../../../../basics/error-type';
+
+const getTestWorkbookData = (): IWorkbookData => {
+ return {
+ id: 'test',
+ appVersion: '3.0.0-alpha',
+ sheets: {
+ sheet1: {
+ id: 'sheet1',
+ cellData: {
+ 0: {
+ 0: {
+ v: 1,
+ t: CellValueType.NUMBER,
+ },
+ 1: {
+ v: 2,
+ t: CellValueType.NUMBER,
+ },
+ 2: {
+ v: 'a',
+ t: CellValueType.STRING,
+ },
+ 3: {
+ v: true,
+ t: CellValueType.BOOLEAN,
+ },
+ 4: {
+ v: 0,
+ t: CellValueType.NUMBER,
+ },
+ 5: {
+ v: 5,
+ t: CellValueType.NUMBER,
+ },
+ 6: {
+ v: ErrorType.NAME,
+ t: CellValueType.STRING,
+ },
+ },
+ },
+ },
+ },
+ locale: LocaleType.ZH_CN,
+ name: '',
+ sheetOrder: [],
+ styles: {},
+ };
+};
+
+describe('Test rank function', () => {
+ let get: Injector['get'];
+ let lexer: Lexer;
+ let astTreeBuilder: AstTreeBuilder;
+ let interpreter: Interpreter;
+ let calculate: (formula: string) => (string | number | boolean | null)[][] | string | number | boolean;
+
+ beforeEach(() => {
+ const testBed = createFunctionTestBed(getTestWorkbookData());
+
+ get = testBed.get;
+
+ lexer = get(Lexer);
+ astTreeBuilder = get(AstTreeBuilder);
+ interpreter = get(Interpreter);
+
+ const functionService = get(IFunctionService);
+
+ const formulaCurrentConfigService = get(IFormulaCurrentConfigService);
+
+ const formulaRuntimeService = get(IFormulaRuntimeService);
+
+ formulaCurrentConfigService.load({
+ formulaData: {},
+ arrayFormulaCellData: {},
+ forceCalculate: false,
+ dirtyRanges: [],
+ dirtyNameMap: {},
+ dirtyDefinedNameMap: {},
+ dirtyUnitFeatureMap: {},
+ dirtyUnitOtherFormulaMap: {},
+ excludedCell: {},
+ allUnitData: {
+ [testBed.unitId]: testBed.sheetData,
+ },
+ });
+
+ const sheetItem = testBed.sheetData[testBed.sheetId];
+
+ formulaRuntimeService.setCurrent(
+ 0,
+ 0,
+ sheetItem.rowCount,
+ sheetItem.columnCount,
+ testBed.sheetId,
+ testBed.unitId
+ );
+
+ functionService.registerExecutors(
+ new Rank(FUNCTION_NAMES_COMPATIBILITY.RANK)
+ );
+
+ calculate = (formula: string) => {
+ const lexerNode = lexer.treeBuilder(formula);
+
+ const astNode = astTreeBuilder.parse(lexerNode as LexerNode);
+
+ const result = interpreter.execute(astNode as BaseAstNode);
+
+ return getObjectValue(result);
+ };
+ });
+
+ describe('Rank', () => {
+ it('Value is normal', async () => {
+ const result = await calculate('=RANK(A1,A1:F1,0)');
+ expect(result).toStrictEqual(3);
+ });
+
+ it('Number value test, string/true/false/blankCell/error/null', async () => {
+ const result = await calculate('=RANK("test",A1:F1,0)');
+ expect(result).toStrictEqual(ErrorType.VALUE);
+
+ const result2 = await calculate('=RANK(true,A1:F1,0)');
+ expect(result2).toStrictEqual(3);
+
+ const result3 = await calculate('=RANK(false,A1:F1,0)');
+ expect(result3).toStrictEqual(4);
+
+ const result4 = await calculate('=RANK(A2,A1:F1,0)');
+ expect(result4).toStrictEqual(4);
+
+ const result5 = await calculate('=RANK(#NAME?,A1:F1,0)');
+ expect(result5).toStrictEqual(ErrorType.NAME);
+
+ const result6 = await calculate('=RANK(,A1:F1,0)');
+ expect(result6).toStrictEqual(ErrorType.NA);
+ });
+
+ it('Ref value test, notReferenceObject/hasError', async () => {
+ const result = await calculate('=RANK(A1,1,0)');
+ expect(result).toStrictEqual(ErrorType.NA);
+
+ const result2 = await calculate('=RANK(A1,{1,2,3},0)');
+ expect(result2).toStrictEqual(ErrorType.NA);
+
+ const result3 = await calculate('=RANK(A1,A1:G1,0)');
+ expect(result3).toStrictEqual(ErrorType.NAME);
+ });
+
+ it('Order value test, string/true/false/blankCell/error/1', async () => {
+ const result = await calculate('=RANK(A1,A1:F1,"test")');
+ expect(result).toStrictEqual(ErrorType.VALUE);
+
+ const result2 = await calculate('=RANK(A1,A1:F1,true)');
+ expect(result2).toStrictEqual(2);
+
+ const result3 = await calculate('=RANK(A1,A1:F1,false)');
+ expect(result3).toStrictEqual(3);
+
+ const result4 = await calculate('=RANK(A1,A1:F1,A2)');
+ expect(result4).toStrictEqual(3);
+
+ const result5 = await calculate('=RANK(A1,A1:F1,#NAME?)');
+ expect(result5).toStrictEqual(ErrorType.NAME);
+
+ const result6 = await calculate('=RANK(A1,A1:F1,1)');
+ expect(result6).toStrictEqual(2);
+ });
+
+ it('Value is array', async () => {
+ const result = await calculate('=RANK({1,2,121,#NAME?},A1:F1,0)');
+ expect(result).toStrictEqual([
+ [3, 2, ErrorType.NA, ErrorType.NAME],
+ ]);
+ });
+ });
+});
diff --git a/packages/engine-formula/src/functions/compatibility/rank/index.ts b/packages/engine-formula/src/functions/compatibility/rank/index.ts
new file mode 100644
index 0000000000..7e860959aa
--- /dev/null
+++ b/packages/engine-formula/src/functions/compatibility/rank/index.ts
@@ -0,0 +1,149 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ErrorType } from '../../../basics/error-type';
+import type { BaseReferenceObject, FunctionVariantType } from '../../../engine/reference-object/base-reference-object';
+import { expandArrayValueObject } from '../../../engine/utils/array-object';
+import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';
+import { type BaseValueObject, ErrorValueObject } from '../../../engine/value-object/base-value-object';
+import { NumberValueObject } from '../../../engine/value-object/primitive-object';
+import { BaseFunction } from '../../base-function';
+
+interface IRefType {
+ refHasError: boolean;
+ refErrorObject: ErrorValueObject;
+ refNumbers: number[];
+}
+
+export class Rank extends BaseFunction {
+ override minParams = 2;
+
+ override maxParams = 3;
+
+ override needsReferenceObject = true;
+
+ override calculate(number: FunctionVariantType, ref: FunctionVariantType, order?: FunctionVariantType): BaseValueObject {
+ let _number = number;
+
+ if (_number.isReferenceObject()) {
+ _number = (_number as BaseReferenceObject).toArrayValueObject();
+ }
+
+ const { refHasError, refErrorObject, refNumbers } = this._checkRefReferenceObject(ref);
+
+ let _order = order ?? NumberValueObject.create(0);
+
+ if (_order.isReferenceObject()) {
+ _order = (_order as BaseReferenceObject).toArrayValueObject();
+ }
+
+ const maxRowLength = Math.max(
+ _number.isArray() ? (_number as ArrayValueObject).getRowCount() : 1,
+ _order.isArray() ? (_order as ArrayValueObject).getRowCount() : 1
+ );
+
+ const maxColumnLength = Math.max(
+ _number.isArray() ? (_number as ArrayValueObject).getColumnCount() : 1,
+ _order.isArray() ? (_order as ArrayValueObject).getColumnCount() : 1
+ );
+
+ const numberArray = expandArrayValueObject(maxRowLength, maxColumnLength, _number as BaseValueObject, ErrorValueObject.create(ErrorType.NA));
+ const orderArray = expandArrayValueObject(maxRowLength, maxColumnLength, _order as BaseValueObject, ErrorValueObject.create(ErrorType.NA));
+
+ const resultArray = numberArray.map((numberObject, rowIndex, columnIndex) => {
+ const orderObject = orderArray.get(rowIndex, columnIndex) as BaseValueObject;
+
+ if (!number.isReferenceObject() && (number as BaseValueObject).isNull()) {
+ return ErrorValueObject.create(ErrorType.NA);
+ }
+
+ if (refHasError) {
+ return refErrorObject;
+ }
+
+ if (orderObject.isError()) {
+ return orderObject;
+ }
+
+ const numberValue = +numberObject.getValue();
+ const orderValue = +orderObject.getValue();
+
+ if (Number.isNaN(numberValue) || Number.isNaN(orderValue)) {
+ return ErrorValueObject.create(ErrorType.VALUE);
+ }
+
+ const refOrderNumbers = refNumbers.sort((a, b) => !orderValue ? b - a : a - b);
+
+ const result = refOrderNumbers.indexOf(numberValue);
+
+ if (result === -1) {
+ return ErrorValueObject.create(ErrorType.NA);
+ }
+
+ return NumberValueObject.create(result + 1);
+ });
+
+ if (maxRowLength === 1 && maxColumnLength === 1) {
+ return (resultArray as ArrayValueObject).get(0, 0) as BaseValueObject;
+ }
+
+ return resultArray;
+ }
+
+ private _checkRefReferenceObject(ref: FunctionVariantType): IRefType {
+ let refHasError = false;
+ let refErrorObject = ErrorValueObject.create(ErrorType.NA);
+ const refNumbers: number[] = [];
+
+ if (!ref.isReferenceObject()) {
+ return {
+ refHasError: true,
+ refErrorObject,
+ refNumbers,
+ };
+ }
+
+ const _ref = (ref as BaseReferenceObject).toArrayValueObject();
+
+ _ref.iterator((refObject) => {
+ const _refObject = refObject as BaseValueObject;
+
+ if (_refObject.isError()) {
+ refHasError = true;
+ refErrorObject = _refObject as ErrorValueObject;
+ return false;
+ }
+
+ if (_refObject.isNull() || _refObject.isBoolean()) {
+ return true;
+ }
+
+ const refValue = +_refObject.getValue();
+
+ if (Number.isNaN(refValue)) {
+ return true;
+ }
+
+ refNumbers.push(refValue);
+ });
+
+ return {
+ refHasError,
+ refErrorObject,
+ refNumbers,
+ };
+ }
+}
diff --git a/packages/engine-formula/src/functions/lookup/index/index.ts b/packages/engine-formula/src/functions/lookup/index/index.ts
index 2e32b44b2d..1b57c670ca 100644
--- a/packages/engine-formula/src/functions/lookup/index/index.ts
+++ b/packages/engine-formula/src/functions/lookup/index/index.ts
@@ -62,7 +62,7 @@ export class Index extends BaseFunction {
referenceRowCount = 1;
referenceColumnCount = 1;
} else if (reference.isReferenceObject()) {
- const { startRow, endRow, startColumn, endColumn } = (reference as BaseReferenceObject).getRangeData();
+ const { startRow, endRow, startColumn, endColumn } = (reference as BaseReferenceObject).getRangePosition();
referenceRowCount = endRow - startRow + 1;
referenceColumnCount = endColumn - startColumn + 1;
} else {
@@ -224,7 +224,7 @@ export class Index extends BaseFunction {
}
private _getReferenceObject(reference: BaseReferenceObject, rowNumberValue: number, columnNumberValue: number, areaNumberValue: number) {
- const { startRow, endRow, startColumn, endColumn } = reference.getRangeData();
+ const { startRow, endRow, startColumn, endColumn } = reference.getRangePosition();
let referenceStartRow = 0;
let referenceEndRow = 0;
diff --git a/packages/engine-formula/src/functions/lookup/offset/index.ts b/packages/engine-formula/src/functions/lookup/offset/index.ts
index 34f6c5e65c..1aa0dbf9ab 100644
--- a/packages/engine-formula/src/functions/lookup/offset/index.ts
+++ b/packages/engine-formula/src/functions/lookup/offset/index.ts
@@ -158,7 +158,7 @@ export class Offset extends BaseFunction {
}
private _handleSingleObject(reference: BaseReferenceObject, rowsValue: BaseValueObject, columnsValue: BaseValueObject, heightValue: BaseValueObject, widthValue: BaseValueObject, isReportError = false) {
- const { startRow: referenceStartRow, startColumn: referenceStartColumn } = reference.getRangeData();
+ const { startRow: referenceStartRow, startColumn: referenceStartColumn } = reference.getRangePosition();
const rowOffset = this.getIndexNumValue(rowsValue);
const columnOffset = this.getIndexNumValue(columnsValue);
diff --git a/packages/engine-formula/src/functions/statistical/averageif/index.ts b/packages/engine-formula/src/functions/statistical/averageif/index.ts
index 4ce59bb0b6..6f53041986 100644
--- a/packages/engine-formula/src/functions/statistical/averageif/index.ts
+++ b/packages/engine-formula/src/functions/statistical/averageif/index.ts
@@ -122,7 +122,7 @@ export class Averageif extends BaseFunction {
return averageRange;
}
- const { startRow, startColumn } = averageRange.getRangeData();
+ const { startRow, startColumn } = averageRange.getRangePosition();
const rangeData = {
startRow,
startColumn,
diff --git a/packages/engine-formula/src/functions/statistical/function-map.ts b/packages/engine-formula/src/functions/statistical/function-map.ts
index a734b5c09f..c6d77c6977 100644
--- a/packages/engine-formula/src/functions/statistical/function-map.ts
+++ b/packages/engine-formula/src/functions/statistical/function-map.ts
@@ -31,6 +31,8 @@ import { Maxifs } from './maxifs';
import { Min } from './min';
import { Mina } from './mina';
import { Minifs } from './minifs';
+import { RankAvg } from './rank-avg';
+import { RankEq } from './rank-eq';
import { StdevP } from './stdev-p';
import { StdevS } from './stdev-s';
import { Stdeva } from './stdeva';
@@ -57,6 +59,8 @@ export const functionStatistical = [
[Min, FUNCTION_NAMES_STATISTICAL.MIN],
[Mina, FUNCTION_NAMES_STATISTICAL.MINA],
[Minifs, FUNCTION_NAMES_STATISTICAL.MINIFS],
+ [RankAvg, FUNCTION_NAMES_STATISTICAL.RANK_AVG],
+ [RankEq, FUNCTION_NAMES_STATISTICAL.RANK_EQ],
[StdevP, FUNCTION_NAMES_STATISTICAL.STDEV_P],
[StdevS, FUNCTION_NAMES_STATISTICAL.STDEV_S],
[Stdeva, FUNCTION_NAMES_STATISTICAL.STDEVA],
diff --git a/packages/engine-formula/src/functions/statistical/rank-avg/__tests__/index.spec.ts b/packages/engine-formula/src/functions/statistical/rank-avg/__tests__/index.spec.ts
new file mode 100644
index 0000000000..295d7d301b
--- /dev/null
+++ b/packages/engine-formula/src/functions/statistical/rank-avg/__tests__/index.spec.ts
@@ -0,0 +1,217 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { Injector, IWorkbookData } from '@univerjs/core';
+import { beforeEach, describe, expect, it } from 'vitest';
+
+import { CellValueType, LocaleType } from '@univerjs/core';
+import { Lexer } from '../../../../engine/analysis/lexer';
+import type { LexerNode } from '../../../../engine/analysis/lexer-node';
+import { AstTreeBuilder } from '../../../../engine/analysis/parser';
+import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';
+import { Interpreter } from '../../../../engine/interpreter/interpreter';
+import { IFormulaCurrentConfigService } from '../../../../services/current-data.service';
+import { IFunctionService } from '../../../../services/function.service';
+import { IFormulaRuntimeService } from '../../../../services/runtime.service';
+import { createFunctionTestBed, getObjectValue } from '../../../__tests__/create-function-test-bed';
+import { FUNCTION_NAMES_STATISTICAL } from '../../function-names';
+import { RankAvg } from '../index';
+import { ErrorType } from '../../../../basics/error-type';
+
+const getTestWorkbookData = (): IWorkbookData => {
+ return {
+ id: 'test',
+ appVersion: '3.0.0-alpha',
+ sheets: {
+ sheet1: {
+ id: 'sheet1',
+ cellData: {
+ 0: {
+ 0: {
+ v: 1,
+ t: CellValueType.NUMBER,
+ },
+ 1: {
+ v: 2,
+ t: CellValueType.NUMBER,
+ },
+ 2: {
+ v: 1,
+ t: CellValueType.NUMBER,
+ },
+ 3: {
+ v: 2,
+ t: CellValueType.NUMBER,
+ },
+ 4: {
+ v: 'a',
+ t: CellValueType.STRING,
+ },
+ 5: {
+ v: true,
+ t: CellValueType.BOOLEAN,
+ },
+ 6: {
+ v: 0,
+ t: CellValueType.NUMBER,
+ },
+ 7: {
+ v: 5,
+ t: CellValueType.NUMBER,
+ },
+ 8: {
+ v: ErrorType.NAME,
+ t: CellValueType.STRING,
+ },
+ },
+ },
+ },
+ },
+ locale: LocaleType.ZH_CN,
+ name: '',
+ sheetOrder: [],
+ styles: {},
+ };
+};
+
+describe('Test rank function', () => {
+ let get: Injector['get'];
+ let lexer: Lexer;
+ let astTreeBuilder: AstTreeBuilder;
+ let interpreter: Interpreter;
+ let calculate: (formula: string) => (string | number | boolean | null)[][] | string | number | boolean;
+
+ beforeEach(() => {
+ const testBed = createFunctionTestBed(getTestWorkbookData());
+
+ get = testBed.get;
+
+ lexer = get(Lexer);
+ astTreeBuilder = get(AstTreeBuilder);
+ interpreter = get(Interpreter);
+
+ const functionService = get(IFunctionService);
+
+ const formulaCurrentConfigService = get(IFormulaCurrentConfigService);
+
+ const formulaRuntimeService = get(IFormulaRuntimeService);
+
+ formulaCurrentConfigService.load({
+ formulaData: {},
+ arrayFormulaCellData: {},
+ forceCalculate: false,
+ dirtyRanges: [],
+ dirtyNameMap: {},
+ dirtyDefinedNameMap: {},
+ dirtyUnitFeatureMap: {},
+ dirtyUnitOtherFormulaMap: {},
+ excludedCell: {},
+ allUnitData: {
+ [testBed.unitId]: testBed.sheetData,
+ },
+ });
+
+ const sheetItem = testBed.sheetData[testBed.sheetId];
+
+ formulaRuntimeService.setCurrent(
+ 0,
+ 0,
+ sheetItem.rowCount,
+ sheetItem.columnCount,
+ testBed.sheetId,
+ testBed.unitId
+ );
+
+ functionService.registerExecutors(
+ new RankAvg(FUNCTION_NAMES_STATISTICAL.RANK_AVG)
+ );
+
+ calculate = (formula: string) => {
+ const lexerNode = lexer.treeBuilder(formula);
+
+ const astNode = astTreeBuilder.parse(lexerNode as LexerNode);
+
+ const result = interpreter.execute(astNode as BaseAstNode);
+
+ return getObjectValue(result);
+ };
+ });
+
+ describe('Rank', () => {
+ it('Value is normal', async () => {
+ const result = await calculate('=RANK.AVG(A1,A1:H1,0)');
+ expect(result).toStrictEqual(4.5);
+ });
+
+ it('Number value test, string/true/false/blankCell/error/null', async () => {
+ const result = await calculate('=RANK.AVG("test",A1:H1,0)');
+ expect(result).toStrictEqual(ErrorType.VALUE);
+
+ const result2 = await calculate('=RANK.AVG(true,A1:H1,0)');
+ expect(result2).toStrictEqual(4.5);
+
+ const result3 = await calculate('=RANK.AVG(false,A1:H1,0)');
+ expect(result3).toStrictEqual(6);
+
+ const result4 = await calculate('=RANK.AVG(A2,A1:H1,0)');
+ expect(result4).toStrictEqual(6);
+
+ const result5 = await calculate('=RANK.AVG(#NAME?,A1:H1,0)');
+ expect(result5).toStrictEqual(ErrorType.NAME);
+
+ const result6 = await calculate('=RANK.AVG(,A1:H1,0)');
+ expect(result6).toStrictEqual(ErrorType.NA);
+ });
+
+ it('Ref value test, notReferenceObject/hasError', async () => {
+ const result = await calculate('=RANK.AVG(A1,1,0)');
+ expect(result).toStrictEqual(ErrorType.NA);
+
+ const result2 = await calculate('=RANK.AVG(A1,{1,2,3},0)');
+ expect(result2).toStrictEqual(ErrorType.NA);
+
+ const result3 = await calculate('=RANK.AVG(A1,A1:I1,0)');
+ expect(result3).toStrictEqual(ErrorType.NAME);
+ });
+
+ it('Order value test, string/true/false/blankCell/error/1', async () => {
+ const result = await calculate('=RANK.AVG(A1,A1:H1,"test")');
+ expect(result).toStrictEqual(ErrorType.VALUE);
+
+ const result2 = await calculate('=RANK.AVG(A1,A1:H1,true)');
+ expect(result2).toStrictEqual(2.5);
+
+ const result3 = await calculate('=RANK.AVG(A1,A1:H1,false)');
+ expect(result3).toStrictEqual(4.5);
+
+ const result4 = await calculate('=RANK.AVG(A1,A1:H1,A2)');
+ expect(result4).toStrictEqual(4.5);
+
+ const result5 = await calculate('=RANK.AVG(A1,A1:H1,#NAME?)');
+ expect(result5).toStrictEqual(ErrorType.NAME);
+
+ const result6 = await calculate('=RANK.AVG(A1,A1:H1,1)');
+ expect(result6).toStrictEqual(2.5);
+ });
+
+ it('Value is array', async () => {
+ const result = await calculate('=RANK.AVG({1,2,121,#NAME?},A1:H1,0)');
+ expect(result).toStrictEqual([
+ [4.5, 2.5, ErrorType.NA, ErrorType.NAME],
+ ]);
+ });
+ });
+});
diff --git a/packages/engine-formula/src/functions/statistical/rank-avg/index.ts b/packages/engine-formula/src/functions/statistical/rank-avg/index.ts
new file mode 100644
index 0000000000..4a0604f79c
--- /dev/null
+++ b/packages/engine-formula/src/functions/statistical/rank-avg/index.ts
@@ -0,0 +1,162 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ErrorType } from '../../../basics/error-type';
+import type { BaseReferenceObject, FunctionVariantType } from '../../../engine/reference-object/base-reference-object';
+import { expandArrayValueObject } from '../../../engine/utils/array-object';
+import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';
+import { type BaseValueObject, ErrorValueObject } from '../../../engine/value-object/base-value-object';
+import { NumberValueObject } from '../../../engine/value-object/primitive-object';
+import { BaseFunction } from '../../base-function';
+
+interface IRefType {
+ refHasError: boolean;
+ refErrorObject: ErrorValueObject;
+ refNumbers: number[];
+}
+
+export class RankAvg extends BaseFunction {
+ override minParams = 2;
+
+ override maxParams = 3;
+
+ override needsReferenceObject = true;
+
+ override calculate(number: FunctionVariantType, ref: FunctionVariantType, order?: FunctionVariantType): BaseValueObject {
+ let _number = number;
+
+ if (_number.isReferenceObject()) {
+ _number = (_number as BaseReferenceObject).toArrayValueObject();
+ }
+
+ const { refHasError, refErrorObject, refNumbers } = this._checkRefReferenceObject(ref);
+
+ let _order = order ?? NumberValueObject.create(0);
+
+ if (_order.isReferenceObject()) {
+ _order = (_order as BaseReferenceObject).toArrayValueObject();
+ }
+
+ const maxRowLength = Math.max(
+ _number.isArray() ? (_number as ArrayValueObject).getRowCount() : 1,
+ _order.isArray() ? (_order as ArrayValueObject).getRowCount() : 1
+ );
+
+ const maxColumnLength = Math.max(
+ _number.isArray() ? (_number as ArrayValueObject).getColumnCount() : 1,
+ _order.isArray() ? (_order as ArrayValueObject).getColumnCount() : 1
+ );
+
+ const numberArray = expandArrayValueObject(maxRowLength, maxColumnLength, _number as BaseValueObject, ErrorValueObject.create(ErrorType.NA));
+ const orderArray = expandArrayValueObject(maxRowLength, maxColumnLength, _order as BaseValueObject, ErrorValueObject.create(ErrorType.NA));
+
+ const resultArray = numberArray.map((numberObject, rowIndex, columnIndex) => {
+ const orderObject = orderArray.get(rowIndex, columnIndex) as BaseValueObject;
+
+ if (!number.isReferenceObject() && (number as BaseValueObject).isNull()) {
+ return ErrorValueObject.create(ErrorType.NA);
+ }
+
+ if (refHasError) {
+ return refErrorObject;
+ }
+
+ if (orderObject.isError()) {
+ return orderObject;
+ }
+
+ const numberValue = +numberObject.getValue();
+ const orderValue = +orderObject.getValue();
+
+ if (Number.isNaN(numberValue) || Number.isNaN(orderValue)) {
+ return ErrorValueObject.create(ErrorType.VALUE);
+ }
+
+ return this._getResult(numberValue, orderValue, refNumbers);
+ });
+
+ if (maxRowLength === 1 && maxColumnLength === 1) {
+ return (resultArray as ArrayValueObject).get(0, 0) as BaseValueObject;
+ }
+
+ return resultArray;
+ }
+
+ private _getResult(numberValue: number, orderValue: number, refNumbers: number[]): BaseValueObject {
+ const refOrderNumbers = refNumbers.sort((a, b) => !orderValue ? b - a : a - b);
+
+ let index = refOrderNumbers.indexOf(numberValue);
+ const results = [];
+
+ while (index >= 0) {
+ const start = index + 1;
+ results.push(start);
+ index = refOrderNumbers.indexOf(numberValue, start);
+ }
+
+ if (results.length === 0) {
+ return ErrorValueObject.create(ErrorType.NA);
+ }
+
+ const result = results.reduce((acc, cur) => acc + cur, 0) / results.length;
+
+ return NumberValueObject.create(result);
+ }
+
+ private _checkRefReferenceObject(ref: FunctionVariantType): IRefType {
+ let refHasError = false;
+ let refErrorObject = ErrorValueObject.create(ErrorType.NA);
+ const refNumbers: number[] = [];
+
+ if (!ref.isReferenceObject()) {
+ return {
+ refHasError: true,
+ refErrorObject,
+ refNumbers,
+ };
+ }
+
+ const _ref = (ref as BaseReferenceObject).toArrayValueObject();
+
+ _ref.iterator((refObject) => {
+ const _refObject = refObject as BaseValueObject;
+
+ if (_refObject.isError()) {
+ refHasError = true;
+ refErrorObject = _refObject as ErrorValueObject;
+ return false;
+ }
+
+ if (_refObject.isNull() || _refObject.isBoolean()) {
+ return true;
+ }
+
+ const refValue = +_refObject.getValue();
+
+ if (Number.isNaN(refValue)) {
+ return true;
+ }
+
+ refNumbers.push(refValue);
+ });
+
+ return {
+ refHasError,
+ refErrorObject,
+ refNumbers,
+ };
+ }
+}
diff --git a/packages/engine-formula/src/functions/statistical/rank-eq/__tests__/index.spec.ts b/packages/engine-formula/src/functions/statistical/rank-eq/__tests__/index.spec.ts
new file mode 100644
index 0000000000..ab6df96506
--- /dev/null
+++ b/packages/engine-formula/src/functions/statistical/rank-eq/__tests__/index.spec.ts
@@ -0,0 +1,217 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { Injector, IWorkbookData } from '@univerjs/core';
+import { beforeEach, describe, expect, it } from 'vitest';
+
+import { CellValueType, LocaleType } from '@univerjs/core';
+import { Lexer } from '../../../../engine/analysis/lexer';
+import type { LexerNode } from '../../../../engine/analysis/lexer-node';
+import { AstTreeBuilder } from '../../../../engine/analysis/parser';
+import type { BaseAstNode } from '../../../../engine/ast-node/base-ast-node';
+import { Interpreter } from '../../../../engine/interpreter/interpreter';
+import { IFormulaCurrentConfigService } from '../../../../services/current-data.service';
+import { IFunctionService } from '../../../../services/function.service';
+import { IFormulaRuntimeService } from '../../../../services/runtime.service';
+import { createFunctionTestBed, getObjectValue } from '../../../__tests__/create-function-test-bed';
+import { FUNCTION_NAMES_STATISTICAL } from '../../function-names';
+import { RankEq } from '../index';
+import { ErrorType } from '../../../../basics/error-type';
+
+const getTestWorkbookData = (): IWorkbookData => {
+ return {
+ id: 'test',
+ appVersion: '3.0.0-alpha',
+ sheets: {
+ sheet1: {
+ id: 'sheet1',
+ cellData: {
+ 0: {
+ 0: {
+ v: 1,
+ t: CellValueType.NUMBER,
+ },
+ 1: {
+ v: 2,
+ t: CellValueType.NUMBER,
+ },
+ 2: {
+ v: 1,
+ t: CellValueType.NUMBER,
+ },
+ 3: {
+ v: 2,
+ t: CellValueType.NUMBER,
+ },
+ 4: {
+ v: 'a',
+ t: CellValueType.STRING,
+ },
+ 5: {
+ v: true,
+ t: CellValueType.BOOLEAN,
+ },
+ 6: {
+ v: 0,
+ t: CellValueType.NUMBER,
+ },
+ 7: {
+ v: 5,
+ t: CellValueType.NUMBER,
+ },
+ 8: {
+ v: ErrorType.NAME,
+ t: CellValueType.STRING,
+ },
+ },
+ },
+ },
+ },
+ locale: LocaleType.ZH_CN,
+ name: '',
+ sheetOrder: [],
+ styles: {},
+ };
+};
+
+describe('Test rank function', () => {
+ let get: Injector['get'];
+ let lexer: Lexer;
+ let astTreeBuilder: AstTreeBuilder;
+ let interpreter: Interpreter;
+ let calculate: (formula: string) => (string | number | boolean | null)[][] | string | number | boolean;
+
+ beforeEach(() => {
+ const testBed = createFunctionTestBed(getTestWorkbookData());
+
+ get = testBed.get;
+
+ lexer = get(Lexer);
+ astTreeBuilder = get(AstTreeBuilder);
+ interpreter = get(Interpreter);
+
+ const functionService = get(IFunctionService);
+
+ const formulaCurrentConfigService = get(IFormulaCurrentConfigService);
+
+ const formulaRuntimeService = get(IFormulaRuntimeService);
+
+ formulaCurrentConfigService.load({
+ formulaData: {},
+ arrayFormulaCellData: {},
+ forceCalculate: false,
+ dirtyRanges: [],
+ dirtyNameMap: {},
+ dirtyDefinedNameMap: {},
+ dirtyUnitFeatureMap: {},
+ dirtyUnitOtherFormulaMap: {},
+ excludedCell: {},
+ allUnitData: {
+ [testBed.unitId]: testBed.sheetData,
+ },
+ });
+
+ const sheetItem = testBed.sheetData[testBed.sheetId];
+
+ formulaRuntimeService.setCurrent(
+ 0,
+ 0,
+ sheetItem.rowCount,
+ sheetItem.columnCount,
+ testBed.sheetId,
+ testBed.unitId
+ );
+
+ functionService.registerExecutors(
+ new RankEq(FUNCTION_NAMES_STATISTICAL.RANK_EQ)
+ );
+
+ calculate = (formula: string) => {
+ const lexerNode = lexer.treeBuilder(formula);
+
+ const astNode = astTreeBuilder.parse(lexerNode as LexerNode);
+
+ const result = interpreter.execute(astNode as BaseAstNode);
+
+ return getObjectValue(result);
+ };
+ });
+
+ describe('Rank', () => {
+ it('Value is normal', async () => {
+ const result = await calculate('=RANK.EQ(A1,A1:H1,0)');
+ expect(result).toStrictEqual(4);
+ });
+
+ it('Number value test, string/true/false/blankCell/error/null', async () => {
+ const result = await calculate('=RANK.EQ("test",A1:H1,0)');
+ expect(result).toStrictEqual(ErrorType.VALUE);
+
+ const result2 = await calculate('=RANK.EQ(true,A1:H1,0)');
+ expect(result2).toStrictEqual(4);
+
+ const result3 = await calculate('=RANK.EQ(false,A1:H1,0)');
+ expect(result3).toStrictEqual(6);
+
+ const result4 = await calculate('=RANK.EQ(A2,A1:H1,0)');
+ expect(result4).toStrictEqual(6);
+
+ const result5 = await calculate('=RANK.EQ(#NAME?,A1:H1,0)');
+ expect(result5).toStrictEqual(ErrorType.NAME);
+
+ const result6 = await calculate('=RANK.EQ(,A1:H1,0)');
+ expect(result6).toStrictEqual(ErrorType.NA);
+ });
+
+ it('Ref value test, notReferenceObject/hasError', async () => {
+ const result = await calculate('=RANK.EQ(A1,1,0)');
+ expect(result).toStrictEqual(ErrorType.NA);
+
+ const result2 = await calculate('=RANK.EQ(A1,{1,2,3},0)');
+ expect(result2).toStrictEqual(ErrorType.NA);
+
+ const result3 = await calculate('=RANK.EQ(A1,A1:I1,0)');
+ expect(result3).toStrictEqual(ErrorType.NAME);
+ });
+
+ it('Order value test, string/true/false/blankCell/error/1', async () => {
+ const result = await calculate('=RANK.EQ(A1,A1:H1,"test")');
+ expect(result).toStrictEqual(ErrorType.VALUE);
+
+ const result2 = await calculate('=RANK.EQ(A1,A1:H1,true)');
+ expect(result2).toStrictEqual(2);
+
+ const result3 = await calculate('=RANK.EQ(A1,A1:H1,false)');
+ expect(result3).toStrictEqual(4);
+
+ const result4 = await calculate('=RANK.EQ(A1,A1:H1,A2)');
+ expect(result4).toStrictEqual(4);
+
+ const result5 = await calculate('=RANK.EQ(A1,A1:H1,#NAME?)');
+ expect(result5).toStrictEqual(ErrorType.NAME);
+
+ const result6 = await calculate('=RANK.EQ(A1,A1:H1,1)');
+ expect(result6).toStrictEqual(2);
+ });
+
+ it('Value is array', async () => {
+ const result = await calculate('=RANK.EQ({1,2,121,#NAME?},A1:H1,0)');
+ expect(result).toStrictEqual([
+ [4, 2, ErrorType.NA, ErrorType.NAME],
+ ]);
+ });
+ });
+});
diff --git a/packages/engine-formula/src/functions/statistical/rank-eq/index.ts b/packages/engine-formula/src/functions/statistical/rank-eq/index.ts
new file mode 100644
index 0000000000..c6d338561d
--- /dev/null
+++ b/packages/engine-formula/src/functions/statistical/rank-eq/index.ts
@@ -0,0 +1,149 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ErrorType } from '../../../basics/error-type';
+import type { BaseReferenceObject, FunctionVariantType } from '../../../engine/reference-object/base-reference-object';
+import { expandArrayValueObject } from '../../../engine/utils/array-object';
+import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';
+import { type BaseValueObject, ErrorValueObject } from '../../../engine/value-object/base-value-object';
+import { NumberValueObject } from '../../../engine/value-object/primitive-object';
+import { BaseFunction } from '../../base-function';
+
+interface IRefType {
+ refHasError: boolean;
+ refErrorObject: ErrorValueObject;
+ refNumbers: number[];
+}
+
+export class RankEq extends BaseFunction {
+ override minParams = 2;
+
+ override maxParams = 3;
+
+ override needsReferenceObject = true;
+
+ override calculate(number: FunctionVariantType, ref: FunctionVariantType, order?: FunctionVariantType): BaseValueObject {
+ let _number = number;
+
+ if (_number.isReferenceObject()) {
+ _number = (_number as BaseReferenceObject).toArrayValueObject();
+ }
+
+ const { refHasError, refErrorObject, refNumbers } = this._checkRefReferenceObject(ref);
+
+ let _order = order ?? NumberValueObject.create(0);
+
+ if (_order.isReferenceObject()) {
+ _order = (_order as BaseReferenceObject).toArrayValueObject();
+ }
+
+ const maxRowLength = Math.max(
+ _number.isArray() ? (_number as ArrayValueObject).getRowCount() : 1,
+ _order.isArray() ? (_order as ArrayValueObject).getRowCount() : 1
+ );
+
+ const maxColumnLength = Math.max(
+ _number.isArray() ? (_number as ArrayValueObject).getColumnCount() : 1,
+ _order.isArray() ? (_order as ArrayValueObject).getColumnCount() : 1
+ );
+
+ const numberArray = expandArrayValueObject(maxRowLength, maxColumnLength, _number as BaseValueObject, ErrorValueObject.create(ErrorType.NA));
+ const orderArray = expandArrayValueObject(maxRowLength, maxColumnLength, _order as BaseValueObject, ErrorValueObject.create(ErrorType.NA));
+
+ const resultArray = numberArray.map((numberObject, rowIndex, columnIndex) => {
+ const orderObject = orderArray.get(rowIndex, columnIndex) as BaseValueObject;
+
+ if (!number.isReferenceObject() && (number as BaseValueObject).isNull()) {
+ return ErrorValueObject.create(ErrorType.NA);
+ }
+
+ if (refHasError) {
+ return refErrorObject;
+ }
+
+ if (orderObject.isError()) {
+ return orderObject;
+ }
+
+ const numberValue = +numberObject.getValue();
+ const orderValue = +orderObject.getValue();
+
+ if (Number.isNaN(numberValue) || Number.isNaN(orderValue)) {
+ return ErrorValueObject.create(ErrorType.VALUE);
+ }
+
+ const refOrderNumbers = refNumbers.sort((a, b) => !orderValue ? b - a : a - b);
+
+ const result = refOrderNumbers.indexOf(numberValue);
+
+ if (result === -1) {
+ return ErrorValueObject.create(ErrorType.NA);
+ }
+
+ return NumberValueObject.create(result + 1);
+ });
+
+ if (maxRowLength === 1 && maxColumnLength === 1) {
+ return (resultArray as ArrayValueObject).get(0, 0) as BaseValueObject;
+ }
+
+ return resultArray;
+ }
+
+ private _checkRefReferenceObject(ref: FunctionVariantType): IRefType {
+ let refHasError = false;
+ let refErrorObject = ErrorValueObject.create(ErrorType.NA);
+ const refNumbers: number[] = [];
+
+ if (!ref.isReferenceObject()) {
+ return {
+ refHasError: true,
+ refErrorObject,
+ refNumbers,
+ };
+ }
+
+ const _ref = (ref as BaseReferenceObject).toArrayValueObject();
+
+ _ref.iterator((refObject) => {
+ const _refObject = refObject as BaseValueObject;
+
+ if (_refObject.isError()) {
+ refHasError = true;
+ refErrorObject = _refObject as ErrorValueObject;
+ return false;
+ }
+
+ if (_refObject.isNull() || _refObject.isBoolean()) {
+ return true;
+ }
+
+ const refValue = +_refObject.getValue();
+
+ if (Number.isNaN(refValue)) {
+ return true;
+ }
+
+ refNumbers.push(refValue);
+ });
+
+ return {
+ refHasError,
+ refErrorObject,
+ refNumbers,
+ };
+ }
+}
diff --git a/packages/sheets-formula/src/locale/function-list/compatibility/en-US.ts b/packages/sheets-formula/src/locale/function-list/compatibility/en-US.ts
index 3cece47587..1fe845181c 100644
--- a/packages/sheets-formula/src/locale/function-list/compatibility/en-US.ts
+++ b/packages/sheets-formula/src/locale/function-list/compatibility/en-US.ts
@@ -417,8 +417,9 @@ export default {
},
],
functionParameter: {
- number1: { name: 'number1', detail: 'first' },
- number2: { name: 'number2', detail: 'second' },
+ number: { name: 'number', detail: 'The number whose rank you want to find.' },
+ ref: { name: 'ref', detail: 'A reference to a list of numbers. Nonnumeric values in ref are ignored.' },
+ order: { name: 'order', detail: 'A number specifying how to rank number. If order is 0 (zero) or omitted, Microsoft Excel ranks number as if ref were a list sorted in descending order. If order is any nonzero value, Microsoft Excel ranks number as if ref were a list sorted in ascending order.' },
},
},
STDEV: {
diff --git a/packages/sheets-formula/src/locale/function-list/compatibility/ja-JP.ts b/packages/sheets-formula/src/locale/function-list/compatibility/ja-JP.ts
index e13c96882c..802147692c 100644
--- a/packages/sheets-formula/src/locale/function-list/compatibility/ja-JP.ts
+++ b/packages/sheets-formula/src/locale/function-list/compatibility/ja-JP.ts
@@ -417,8 +417,9 @@ export default {
},
],
functionParameter: {
- number1: { name: 'number1', detail: 'first' },
- number2: { name: 'number2', detail: 'second' },
+ number: { name: '数値', detail: '範囲内での順位 (位置) を調べる数値を指定します。' },
+ ref: { name: '数値範囲', detail: '数値の一覧への参照。 参照に含まれる数値以外の値は無視されます。' },
+ order: { name: '順序', detail: '範囲内の数値を並べる方法を指定します。降順の場合は 0 または省略され、昇順の場合は 0 以外です。' },
},
},
STDEV: {
diff --git a/packages/sheets-formula/src/locale/function-list/compatibility/vi-VN.ts b/packages/sheets-formula/src/locale/function-list/compatibility/vi-VN.ts
index ccdf4547de..ec40bab82c 100644
--- a/packages/sheets-formula/src/locale/function-list/compatibility/vi-VN.ts
+++ b/packages/sheets-formula/src/locale/function-list/compatibility/vi-VN.ts
@@ -420,8 +420,9 @@ export default {
},
],
functionParameter: {
- number1: { name: 'number1', detail: 'tham số thứ nhất' },
- number2: { name: 'number2', detail: 'tham số thứ hai' },
+ number: { name: 'số', detail: 'Số mà bạn muốn tìm thứ hạng của nó.' },
+ ref: { name: 'danh sách các số', detail: 'Tham chiếu tới danh sách các số. Các giá trị không phải là số trong tham chiếu sẽ được bỏ qua.' },
+ order: { name: 'xếp hạng số', detail: 'Một con số chỉ rõ cách xếp hạng số. 0 hoặc bị bỏ qua đối với thứ tự giảm dần, khác 0 đối với thứ tự tăng dần.' },
},
},
STDEV: {
diff --git a/packages/sheets-formula/src/locale/function-list/compatibility/zh-CN.ts b/packages/sheets-formula/src/locale/function-list/compatibility/zh-CN.ts
index 17eda91ea2..89be821b94 100644
--- a/packages/sheets-formula/src/locale/function-list/compatibility/zh-CN.ts
+++ b/packages/sheets-formula/src/locale/function-list/compatibility/zh-CN.ts
@@ -417,8 +417,9 @@ export default {
},
],
functionParameter: {
- number1: { name: 'number1', detail: 'first' },
- number2: { name: 'number2', detail: 'second' },
+ number: { name: '数值', detail: '要找到其排位的数字。' },
+ ref: { name: '数字列表', detail: '对数字列表的引用。Ref 中的非数字值会被忽略。' },
+ order: { name: '排位方式', detail: '一个指定数字排位方式的数字。0 或省略为降序,非 0 为升序。' },
},
},
STDEV: {
diff --git a/packages/sheets-formula/src/locale/function-list/compatibility/zh-TW.ts b/packages/sheets-formula/src/locale/function-list/compatibility/zh-TW.ts
index 675c5fb588..1cdd5c63f1 100644
--- a/packages/sheets-formula/src/locale/function-list/compatibility/zh-TW.ts
+++ b/packages/sheets-formula/src/locale/function-list/compatibility/zh-TW.ts
@@ -416,8 +416,9 @@ export default {
},
],
functionParameter: {
- number1: { name: 'number1', detail: 'first' },
- number2: { name: 'number2', detail: 'second' },
+ number: { name: '數值', detail: '這是要找出其排名的數字。' },
+ ref: { name: '數位清單', detail: '數位清單的參照。會忽略 ref 中的非數值。' },
+ order: { name: '排列方式', detail: '這是指定排列數值方式的數字。0 或省略為遞減順序排序,非 0 為遞增順序排序。' },
},
},
STDEV: {
diff --git a/packages/sheets-formula/src/locale/function-list/statistical/en-US.ts b/packages/sheets-formula/src/locale/function-list/statistical/en-US.ts
index 0209ca6107..2ec1ae91bd 100644
--- a/packages/sheets-formula/src/locale/function-list/statistical/en-US.ts
+++ b/packages/sheets-formula/src/locale/function-list/statistical/en-US.ts
@@ -1249,8 +1249,9 @@ export default {
},
],
functionParameter: {
- number1: { name: 'number1', detail: 'first' },
- number2: { name: 'number2', detail: 'second' },
+ number: { name: 'number', detail: 'The number whose rank you want to find.' },
+ ref: { name: 'ref', detail: 'A reference to a list of numbers. Nonnumeric values in ref are ignored.' },
+ order: { name: 'order', detail: 'A number specifying how to rank number. If order is 0 (zero) or omitted, Microsoft Excel ranks number as if ref were a list sorted in descending order. If order is any nonzero value, Microsoft Excel ranks number as if ref were a list sorted in ascending order.' },
},
},
RANK_EQ: {
@@ -1263,8 +1264,9 @@ export default {
},
],
functionParameter: {
- number1: { name: 'number1', detail: 'first' },
- number2: { name: 'number2', detail: 'second' },
+ number: { name: 'number', detail: 'The number whose rank you want to find.' },
+ ref: { name: 'ref', detail: 'A reference to a list of numbers. Nonnumeric values in ref are ignored.' },
+ order: { name: 'order', detail: 'A number specifying how to rank number. If order is 0 (zero) or omitted, Microsoft Excel ranks number as if ref were a list sorted in descending order. If order is any nonzero value, Microsoft Excel ranks number as if ref were a list sorted in ascending order.' },
},
},
RSQ: {
diff --git a/packages/sheets-formula/src/locale/function-list/statistical/ja-JP.ts b/packages/sheets-formula/src/locale/function-list/statistical/ja-JP.ts
index 667675dcf1..763057c5a4 100644
--- a/packages/sheets-formula/src/locale/function-list/statistical/ja-JP.ts
+++ b/packages/sheets-formula/src/locale/function-list/statistical/ja-JP.ts
@@ -1212,8 +1212,9 @@ export default {
},
],
functionParameter: {
- number1: { name: 'number1', detail: 'first' },
- number2: { name: 'number2', detail: 'second' },
+ number: { name: '数値', detail: '範囲内での順位 (位置) を調べる数値を指定します。' },
+ ref: { name: '数値範囲', detail: '数値の一覧への参照。 参照に含まれる数値以外の値は無視されます。' },
+ order: { name: '順序', detail: '範囲内の数値を並べる方法を指定します。降順の場合は 0 または省略され、昇順の場合は 0 以外です。' },
},
},
RANK_EQ: {
@@ -1226,8 +1227,9 @@ export default {
},
],
functionParameter: {
- number1: { name: 'number1', detail: 'first' },
- number2: { name: 'number2', detail: 'second' },
+ number: { name: '数値', detail: '範囲内での順位 (位置) を調べる数値を指定します。' },
+ ref: { name: '数値範囲', detail: '数値の一覧への参照。 参照に含まれる数値以外の値は無視されます。' },
+ order: { name: '順序', detail: '範囲内の数値を並べる方法を指定します。降順の場合は 0 または省略され、昇順の場合は 0 以外です。' },
},
},
RSQ: {
diff --git a/packages/sheets-formula/src/locale/function-list/statistical/vi-VN.ts b/packages/sheets-formula/src/locale/function-list/statistical/vi-VN.ts
index bafc4eef81..f653ba5a09 100644
--- a/packages/sheets-formula/src/locale/function-list/statistical/vi-VN.ts
+++ b/packages/sheets-formula/src/locale/function-list/statistical/vi-VN.ts
@@ -457,6 +457,36 @@ export default {
criteria2: { name: 'tiêu chí 2', detail: 'Điều kiện liên kết bổ sung. Có thể nhập tối đa 127 điều kiện.' },
},
},
+ RANK_AVG: {
+ description: 'Trả về thứ hạng của một số trong một danh sách các số',
+ abstract: 'Trả về thứ hạng của một số trong một danh sách các số',
+ links: [
+ {
+ title: 'Hướng dẫn',
+ url: 'https://support.microsoft.com/vi-vn/office/rank-avg-%E5%87%BD%E6%95%B0-bd406a6f-eb38-4d73-aa8e-6d1c3c72e83a',
+ },
+ ],
+ functionParameter: {
+ number: { name: 'số', detail: 'Số mà bạn muốn tìm thứ hạng của nó.' },
+ ref: { name: 'danh sách các số', detail: 'Tham chiếu tới danh sách các số. Các giá trị không phải là số trong tham chiếu sẽ được bỏ qua.' },
+ order: { name: 'xếp hạng số', detail: 'Một con số chỉ rõ cách xếp hạng số. 0 hoặc bị bỏ qua đối với thứ tự giảm dần, khác 0 đối với thứ tự tăng dần.' },
+ },
+ },
+ RANK_EQ: {
+ description: 'Trả về thứ hạng của một số trong một danh sách các số',
+ abstract: 'Trả về thứ hạng của một số trong một danh sách các số',
+ links: [
+ {
+ title: 'Hướng dẫn',
+ url: 'https://support.microsoft.com/vi-vn/office/rank-eq-%E5%87%BD%E6%95%B0-284858ce-8ef6-450e-b662-26245be04a40',
+ },
+ ],
+ functionParameter: {
+ number: { name: 'số', detail: 'Số mà bạn muốn tìm thứ hạng của nó.' },
+ ref: { name: 'danh sách các số', detail: 'Tham chiếu tới danh sách các số. Các giá trị không phải là số trong tham chiếu sẽ được bỏ qua.' },
+ order: { name: 'xếp hạng số', detail: 'Một con số chỉ rõ cách xếp hạng số. 0 hoặc bị bỏ qua đối với thứ tự giảm dần, khác 0 đối với thứ tự tăng dần.' },
+ },
+ },
STDEV_P: {
description: 'Tính toán độ lệch chuẩn dựa trên toàn bộ tổng thể được cung cấp ở dạng đối số (bỏ qua giá trị lô-gic và văn bản).',
abstract: 'Tính độ lệch chuẩn dựa trên toàn bộ quần thể mẫu',
diff --git a/packages/sheets-formula/src/locale/function-list/statistical/zh-CN.ts b/packages/sheets-formula/src/locale/function-list/statistical/zh-CN.ts
index fd0911b52f..0dd0b44337 100644
--- a/packages/sheets-formula/src/locale/function-list/statistical/zh-CN.ts
+++ b/packages/sheets-formula/src/locale/function-list/statistical/zh-CN.ts
@@ -1249,8 +1249,9 @@ export default {
},
],
functionParameter: {
- number1: { name: 'number1', detail: 'first' },
- number2: { name: 'number2', detail: 'second' },
+ number: { name: '数值', detail: '要找到其排位的数字。' },
+ ref: { name: '数字列表', detail: '对数字列表的引用。Ref 中的非数字值会被忽略。' },
+ order: { name: '排位方式', detail: '一个指定数字排位方式的数字。0 或省略为降序,非 0 为升序。' },
},
},
RANK_EQ: {
@@ -1263,8 +1264,9 @@ export default {
},
],
functionParameter: {
- number1: { name: 'number1', detail: 'first' },
- number2: { name: 'number2', detail: 'second' },
+ number: { name: '数值', detail: '要找到其排位的数字。' },
+ ref: { name: '数字列表', detail: '对数字列表的引用。Ref 中的非数字值会被忽略。' },
+ order: { name: '排位方式', detail: '一个指定数字排位方式的数字。0 或省略为降序,非 0 为升序。' },
},
},
RSQ: {
diff --git a/packages/sheets-formula/src/locale/function-list/statistical/zh-TW.ts b/packages/sheets-formula/src/locale/function-list/statistical/zh-TW.ts
index 8b2ccc4d10..873ec15433 100644
--- a/packages/sheets-formula/src/locale/function-list/statistical/zh-TW.ts
+++ b/packages/sheets-formula/src/locale/function-list/statistical/zh-TW.ts
@@ -1249,8 +1249,9 @@ export default {
},
],
functionParameter: {
- number1: { name: 'number1', detail: 'first' },
- number2: { name: 'number2', detail: 'second' },
+ number: { name: '數值', detail: '這是要找出其排名的數字。' },
+ ref: { name: '數位清單', detail: '數位清單的參照。會忽略 ref 中的非數值。' },
+ order: { name: '排列方式', detail: '這是指定排列數值方式的數字。0 或省略為遞減順序排序,非 0 為遞增順序排序。' },
},
},
RANK_EQ: {
@@ -1263,8 +1264,9 @@ export default {
},
],
functionParameter: {
- number1: { name: 'number1', detail: 'first' },
- number2: { name: 'number2', detail: 'second' },
+ number: { name: '數值', detail: '這是要找出其排名的數字。' },
+ ref: { name: '數位清單', detail: '數位清單的參照。會忽略 ref 中的非數值。' },
+ order: { name: '排列方式', detail: '這是指定排列數值方式的數字。0 或省略為遞減順序排序,非 0 為遞增順序排序。' },
},
},
RSQ: {
diff --git a/packages/sheets-formula/src/services/function-list/compatibility.ts b/packages/sheets-formula/src/services/function-list/compatibility.ts
index 4bd824f80e..f2985adb3f 100644
--- a/packages/sheets-formula/src/services/function-list/compatibility.ts
+++ b/packages/sheets-formula/src/services/function-list/compatibility.ts
@@ -640,19 +640,26 @@ export const FUNCTION_LIST_COMPATIBILITY: IFunctionInfo[] = [
abstract: 'formula.functionList.RANK.abstract',
functionParameter: [
{
- name: 'formula.functionList.RANK.functionParameter.number1.name',
- detail: 'formula.functionList.RANK.functionParameter.number1.detail',
- example: 'A1:A20',
+ name: 'formula.functionList.RANK.functionParameter.number.name',
+ detail: 'formula.functionList.RANK.functionParameter.number.detail',
+ example: 'A3',
require: 1,
repeat: 0,
},
{
- name: 'formula.functionList.RANK.functionParameter.number2.name',
- detail: 'formula.functionList.RANK.functionParameter.number2.detail',
- example: 'A1:A20',
+ name: 'formula.functionList.RANK.functionParameter.ref.name',
+ detail: 'formula.functionList.RANK.functionParameter.ref.detail',
+ example: 'A2:A6',
require: 1,
repeat: 0,
},
+ {
+ name: 'formula.functionList.RANK.functionParameter.order.name',
+ detail: 'formula.functionList.RANK.functionParameter.order.detail',
+ example: '1',
+ require: 0,
+ repeat: 0,
+ },
],
},
{
diff --git a/packages/sheets-formula/src/services/function-list/statistical.ts b/packages/sheets-formula/src/services/function-list/statistical.ts
index 7ab5a99473..9e06b40e1c 100644
--- a/packages/sheets-formula/src/services/function-list/statistical.ts
+++ b/packages/sheets-formula/src/services/function-list/statistical.ts
@@ -1955,19 +1955,26 @@ export const FUNCTION_LIST_STATISTICAL: IFunctionInfo[] = [
abstract: 'formula.functionList.RANK_AVG.abstract',
functionParameter: [
{
- name: 'formula.functionList.RANK_AVG.functionParameter.number1.name',
- detail: 'formula.functionList.RANK_AVG.functionParameter.number1.detail',
- example: 'A1:A20',
+ name: 'formula.functionList.RANK_AVG.functionParameter.number.name',
+ detail: 'formula.functionList.RANK_AVG.functionParameter.number.detail',
+ example: 'A3',
require: 1,
repeat: 0,
},
{
- name: 'formula.functionList.RANK_AVG.functionParameter.number2.name',
- detail: 'formula.functionList.RANK_AVG.functionParameter.number2.detail',
- example: 'A1:A20',
+ name: 'formula.functionList.RANK_AVG.functionParameter.ref.name',
+ detail: 'formula.functionList.RANK_AVG.functionParameter.ref.detail',
+ example: 'A2:A6',
require: 1,
repeat: 0,
},
+ {
+ name: 'formula.functionList.RANK_AVG.functionParameter.order.name',
+ detail: 'formula.functionList.RANK_AVG.functionParameter.order.detail',
+ example: '1',
+ require: 0,
+ repeat: 0,
+ },
],
},
{
@@ -1977,19 +1984,26 @@ export const FUNCTION_LIST_STATISTICAL: IFunctionInfo[] = [
abstract: 'formula.functionList.RANK_EQ.abstract',
functionParameter: [
{
- name: 'formula.functionList.RANK_EQ.functionParameter.number1.name',
- detail: 'formula.functionList.RANK_EQ.functionParameter.number1.detail',
- example: 'A1:A20',
+ name: 'formula.functionList.RANK_EQ.functionParameter.number.name',
+ detail: 'formula.functionList.RANK_EQ.functionParameter.number.detail',
+ example: 'A3',
require: 1,
repeat: 0,
},
{
- name: 'formula.functionList.RANK_EQ.functionParameter.number2.name',
- detail: 'formula.functionList.RANK_EQ.functionParameter.number2.detail',
- example: 'A1:A20',
+ name: 'formula.functionList.RANK_EQ.functionParameter.ref.name',
+ detail: 'formula.functionList.RANK_EQ.functionParameter.ref.detail',
+ example: 'A2:A6',
require: 1,
repeat: 0,
},
+ {
+ name: 'formula.functionList.RANK_EQ.functionParameter.order.name',
+ detail: 'formula.functionList.RANK_EQ.functionParameter.order.detail',
+ example: '1',
+ require: 0,
+ repeat: 0,
+ },
],
},
{