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(date-system): align Excel serial handling (#7594)

wpxp1234568b2c5ad46df1
diff --git a/packages/core/src/shared/index.ts b/packages/core/src/shared/index.ts
index cea55c6d92..c61a421621 100644
--- a/packages/core/src/shared/index.ts
+++ b/packages/core/src/shared/index.ts
@@ -32,18 +32,24 @@ export * from './lifecycle';
export * from './locale';
export { LRUHelper, LRUMap } from './lru/lru-map';
export * from './max-row-column';
-export type { INumfmtLocaleTag } from './numfmt';
+export type { IExcelDateTimeParts, INumfmtLocaleTag, ParseOptions } from './numfmt';
export {
currencySymbols,
DEFAULT_NUMBER_FORMAT,
DEFAULT_TEXT_FORMAT,
DEFAULT_TEXT_FORMAT_EXCEL,
+ EXCEL_1904_OFFSET,
+ excelDateTimePartsToSerial,
+ excelSerialToDateTimeParts,
+ getDateSystemMaxSerial,
+ getNumfmtLocaleTag,
getNumfmtParseValueFilter,
isDefaultFormat,
isPatternEqualWithoutDecimal,
isTextFormat,
numfmt,
} from './numfmt';
+export { excelDateSerial, excelDateTimeSerial, excelSerialToDate, excelSerialToDateTime } from './numfmt/serial-date';
export * from './object-matrix';
export * from './random-id';
export { moveRangeByOffset, splitIntoGrid } from './range';
diff --git a/packages/core/src/shared/numfmt/__tests__/api-compatibility.spec.ts b/packages/core/src/shared/numfmt/__tests__/api-compatibility.spec.ts
index d7c7d147ee..4fe3708c70 100644
--- a/packages/core/src/shared/numfmt/__tests__/api-compatibility.spec.ts
+++ b/packages/core/src/shared/numfmt/__tests__/api-compatibility.spec.ts
@@ -24,6 +24,7 @@ import * as numfmt from '../api';
it('preserves the numfmt 3.2.6 type exports', () => {
expectTypeOf<numfmt.FormatDateInfo['clockType']>().toEqualTypeOf<12 | 24>();
+ expectTypeOf<numfmt.FormatDateInfo['isDuration']>().toEqualTypeOf<boolean>();
expectTypeOf<numfmt.FormatInfo['type']>().toMatchTypeOf<string>();
expectTypeOf<numfmt.FormatToken['raw']>().toEqualTypeOf<string>();
expectTypeOf<numfmt.LocaleData['decimal']>().toEqualTypeOf<string>();
@@ -39,6 +40,7 @@ it('preserves the numfmt 3.2.6 runtime exports', () => {
'dec2frac',
'format',
'formatColor',
+ 'getDateTimeEditPattern',
'getFormatDateInfo',
'getFormatInfo',
'getLocale',
diff --git a/packages/core/src/shared/numfmt/__tests__/date-and-parse.spec.ts b/packages/core/src/shared/numfmt/__tests__/date-and-parse.spec.ts
index 530b38f20a..74183fe15c 100644
--- a/packages/core/src/shared/numfmt/__tests__/date-and-parse.spec.ts
+++ b/packages/core/src/shared/numfmt/__tests__/date-and-parse.spec.ts
@@ -19,7 +19,8 @@
// @vitest-environment node
-import { describe, expect, it } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { DateSystem } from '../../../types/enum/date-system';
import {
isValidDate,
parseBool,
@@ -29,6 +30,11 @@ import {
parseValue,
} from '../parse-value';
import { dateFromSerial, dateToSerial } from '../serial-date';
+import { getNumfmtParseValueFilter } from '../utils';
+
+afterEach(() => {
+ vi.useRealTimers();
+});
describe('numfmt dates and value parsing', () => {
it('converts the spreadsheet serial epoch', () => {
@@ -41,6 +47,27 @@ describe('numfmt dates and value parsing', () => {
expect(dateFromSerial(60, { leap1900: false })).toEqual([1900, 2, 28, 0, 0, 0]);
});
+ it('parses dates into the selected Excel date system', () => {
+ expect(parseDate('1904-1-1', { dateSystem: DateSystem.Date1904 })).toEqual({ v: 0, z: 'yyyy-m-d' });
+ expect(parseDate('1/0/1900', { dateSystem: DateSystem.Date1900 })).toEqual({ v: 0, z: 'mm/dd/yyyy' });
+ expect(parseDate('2/29/1900', { dateSystem: DateSystem.Date1900 })).toEqual({ v: 60, z: 'm/d/yyyy' });
+ expect(parseDate('2/29/1900', { dateSystem: DateSystem.Date1904 })).toBeNull();
+ });
+
+ it('resolves an omitted year when parsing instead of when loading the module', () => {
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date('2031-06-01T00:00:00Z'));
+
+ expect(parseDate('1/2', { dateSystem: DateSystem.Date1900 })).toEqual({ v: 47850, z: 'm/d' });
+ });
+
+ it('passes workbook parsing options through the common value filter', () => {
+ expect(getNumfmtParseValueFilter('31/12/2025', {
+ locale: 'en_GB',
+ dateSystem: DateSystem.Date1904,
+ })).toEqual({ v: 44560, z: 'dd/mm/yyyy' });
+ });
+
it('parses representative values', () => {
expect(parseNumber('1,234.50')).toEqual({ v: 1234.5, z: '#,##0.00' });
expect(parseDate('3/13/1989')).toEqual({ v: 32580, z: 'm/d/yyyy' });
diff --git a/packages/core/src/shared/numfmt/__tests__/date-system.spec.ts b/packages/core/src/shared/numfmt/__tests__/date-system.spec.ts
new file mode 100644
index 0000000000..b815f038d7
--- /dev/null
+++ b/packages/core/src/shared/numfmt/__tests__/date-system.spec.ts
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * 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 { describe, expect, it } from 'vitest';
+import { DateSystem } from '../../../types/enum/date-system';
+import { excelDateSerial, excelDateTimePartsToSerial, excelDateTimeSerial, excelSerialToDate, excelSerialToDateTime, excelSerialToDateTimeParts } from '../serial-date';
+
+describe('Excel date systems', () => {
+ it('preserves the Excel 1900 compatibility dates', () => {
+ expect(excelSerialToDateTimeParts(0, { dateSystem: DateSystem.Date1900 })).toEqual({
+ year: 1900,
+ month: 1,
+ day: 0,
+ hours: 0,
+ minutes: 0,
+ seconds: 0,
+ fractionalSecond: 0,
+ });
+ expect(excelSerialToDateTimeParts(60, { dateSystem: DateSystem.Date1900 })).toEqual({
+ year: 1900,
+ month: 2,
+ day: 29,
+ hours: 0,
+ minutes: 0,
+ seconds: 0,
+ fractionalSecond: 0,
+ });
+ });
+
+ it('uses 1904-01-01 as serial zero in the Excel 1904 system', () => {
+ const parts = {
+ year: 1904,
+ month: 1,
+ day: 1,
+ hours: 0,
+ minutes: 0,
+ seconds: 0,
+ fractionalSecond: 0,
+ };
+
+ expect(excelSerialToDateTimeParts(0, { dateSystem: DateSystem.Date1904 })).toEqual(parts);
+ expect(excelDateTimePartsToSerial(parts, { dateSystem: DateSystem.Date1904 })).toBe(0);
+ });
+
+ it('preserves fractional seconds without using a native Date', () => {
+ const parts = excelSerialToDateTimeParts(0.5242683912037037, { dateSystem: DateSystem.Date1900 });
+
+ expect(parts).toMatchObject({
+ year: 1900,
+ month: 1,
+ day: 0,
+ hours: 12,
+ minutes: 34,
+ seconds: 56,
+ });
+ expect(parts?.fractionalSecond).toBeCloseTo(0.789, 9);
+ });
+
+ it('rejects invalid calendar inputs', () => {
+ expect(excelSerialToDateTimeParts(-1, { dateSystem: DateSystem.Date1900 })).toBeNull();
+ expect(excelSerialToDateTimeParts(Number.POSITIVE_INFINITY, { dateSystem: DateSystem.Date1900 })).toBeNull();
+ expect(excelDateTimePartsToSerial({
+ year: 1900,
+ month: 2,
+ day: 29,
+ hours: 0,
+ minutes: 0,
+ seconds: 0,
+ fractionalSecond: 0,
+ }, { dateSystem: DateSystem.Date1904 })).toBeNull();
+ });
+
+ it('converts serials to UTC native Dates and normalizes pseudo-dates', () => {
+ expect(excelSerialToDate(0, DateSystem.Date1900).getTime()).toBe(Date.UTC(1899, 11, 31));
+ expect(excelSerialToDate(60, DateSystem.Date1900).getTime()).toBe(Date.UTC(1900, 1, 28));
+ expect(excelSerialToDate(0, DateSystem.Date1904).getTime()).toBe(Date.UTC(1904, 0, 1));
+ expect(excelSerialToDateTime(0.5, DateSystem.Date1904).getTime()).toBe(Date.UTC(1904, 0, 1, 12));
+ expect(Number.isNaN(excelSerialToDate(-1, DateSystem.Date1900).getTime())).toBe(true);
+ });
+
+ it('converts UTC native Dates to serials for both Excel date systems', () => {
+ expect(excelDateSerial(new Date(Date.UTC(1900, 1, 28)))).toBe(59);
+ expect(excelDateSerial(new Date(Date.UTC(1900, 2, 1)))).toBe(61);
+ expect(excelDateSerial(new Date(Date.UTC(1904, 0, 1)), DateSystem.Date1904)).toBe(0);
+ expect(excelDateTimeSerial(new Date(Date.UTC(2024, 0, 2, 12)))).toBe(45293.5);
+ expect(Number.isNaN(excelDateSerial(new Date(Number.NaN)))).toBe(true);
+ });
+});
diff --git a/packages/core/src/shared/numfmt/__tests__/date-time-edit-pattern.spec.ts b/packages/core/src/shared/numfmt/__tests__/date-time-edit-pattern.spec.ts
new file mode 100644
index 0000000000..211a2ceabf
--- /dev/null
+++ b/packages/core/src/shared/numfmt/__tests__/date-time-edit-pattern.spec.ts
@@ -0,0 +1,62 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * 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.
+ */
+
+// @vitest-environment node
+
+import { describe, expect, it } from 'vitest';
+import { getDateTimeEditPattern } from '../api';
+
+const DATE_SERIAL = 45839;
+
+describe('date-time edit pattern', () => {
+ it('completes normal numeric date formats while preserving their style', () => {
+ expect(getDateTimeEditPattern('mm-dd', DATE_SERIAL)).toBe('yyyy-mm-dd');
+ expect(getDateTimeEditPattern('m-d', DATE_SERIAL)).toBe('yyyy-m-d');
+ expect(getDateTimeEditPattern('dd/mm', DATE_SERIAL)).toBe('dd/mm/yyyy');
+ expect(getDateTimeEditPattern('d/m', DATE_SERIAL)).toBe('d/m/yyyy');
+ expect(getDateTimeEditPattern('yyyy-mm', DATE_SERIAL)).toBe('yyyy-mm-dd');
+ expect(getDateTimeEditPattern('yyyy/m', DATE_SERIAL)).toBe('yyyy/m/d');
+ expect(getDateTimeEditPattern('yyyy-m-d', DATE_SERIAL)).toBe('yyyy-m-d');
+ expect(getDateTimeEditPattern('dd/mm/yyyy', DATE_SERIAL)).toBe('dd/mm/yyyy');
+ });
+
+ it('completes date and time components together', () => {
+ expect(getDateTimeEditPattern('mm-dd h:mm', DATE_SERIAL)).toBe('yyyy-mm-dd h:mm:ss');
+ expect(getDateTimeEditPattern('dd/mm hh:mm', DATE_SERIAL)).toBe('dd/mm/yyyy hh:mm:ss');
+ expect(getDateTimeEditPattern('yyyy-m-d h:mm', DATE_SERIAL)).toBe('yyyy-m-d h:mm:ss');
+ expect(getDateTimeEditPattern('h:mm', DATE_SERIAL)).toBe('h:mm:ss');
+ expect(getDateTimeEditPattern('hh:mm AM/PM', DATE_SERIAL)).toBe('hh:mm:ss AM/PM');
+ expect(getDateTimeEditPattern('AM/PM h:mm', DATE_SERIAL)).toBe('AM/PM h:mm:ss');
+ });
+
+ it('falls back for complex dates and preserves a normal clock time', () => {
+ expect(getDateTimeEditPattern('mmm d', DATE_SERIAL)).toBe('yyyy/mm/dd');
+ expect(getDateTimeEditPattern('m"月"d"日"', DATE_SERIAL)).toBe('yyyy/mm/dd');
+ expect(getDateTimeEditPattern('dddd, mmmm d', DATE_SERIAL)).toBe('yyyy/mm/dd');
+ expect(getDateTimeEditPattern('m"月"d"日" h:mm', DATE_SERIAL)).toBe('yyyy/mm/dd h:mm:ss');
+ expect(getDateTimeEditPattern('mm/dd-yyyy', DATE_SERIAL)).toBe('yyyy/mm/dd');
+ });
+
+ it('uses the effective number-format section', () => {
+ expect(getDateTimeEditPattern('[<50000]mm-dd;dd/mm', DATE_SERIAL)).toBe('yyyy-mm-dd');
+ expect(getDateTimeEditPattern('[<40000]mm-dd;dd/mm', DATE_SERIAL)).toBe('dd/mm/yyyy');
+ });
+
+ it('hides subsecond precision and leaves durations to the duration editor', () => {
+ expect(getDateTimeEditPattern('h:mm', 0.5242683912037037)).toBe('h:mm:ss');
+ expect(getDateTimeEditPattern('[h]:mm', 1.25)).toBeNull();
+ });
+});
diff --git a/packages/core/src/shared/numfmt/__tests__/format-api.spec.ts b/packages/core/src/shared/numfmt/__tests__/format-api.spec.ts
index 7cc8fe5623..aa49917693 100644
--- a/packages/core/src/shared/numfmt/__tests__/format-api.spec.ts
+++ b/packages/core/src/shared/numfmt/__tests__/format-api.spec.ts
@@ -31,6 +31,7 @@ describe('local numfmt API', () => {
'dec2frac',
'format',
'formatColor',
+ 'getDateTimeEditPattern',
'getFormatDateInfo',
'getFormatInfo',
'getLocale',
diff --git a/packages/core/src/shared/numfmt/__tests__/info.spec.ts b/packages/core/src/shared/numfmt/__tests__/info.spec.ts
index 0dd7eee36c..049bc463e6 100644
--- a/packages/core/src/shared/numfmt/__tests__/info.spec.ts
+++ b/packages/core/src/shared/numfmt/__tests__/info.spec.ts
@@ -416,6 +416,10 @@ numfmtTest('dateInfo', (t) => {
t.assertDateInfo('h', { hours: true });
t.assertDateInfo('h:mm', { hours: true, minutes: true });
t.assertDateInfo('h:m', { hours: true, minutes: true });
+ t.assertDateInfo('[h]:mm', { hours: true, minutes: true, isDuration: true });
+ t.assertDateInfo('[m]:ss', { minutes: true, seconds: true, isDuration: true });
+ t.assertDateInfo('[s]', { seconds: true, isDuration: true });
+ t.assertDateInfo('h:mm', { hours: true, minutes: true, isDuration: false });
t.assertDateInfo('ss', { seconds: true });
t.assertDateInfo('s', { seconds: true });
t.assertDateInfo('hh am/pm', { hours: true, clockType: 12 });
diff --git a/packages/core/src/shared/numfmt/__tests__/options.spec.ts b/packages/core/src/shared/numfmt/__tests__/options.spec.ts
index b65f95efda..01bc607c15 100644
--- a/packages/core/src/shared/numfmt/__tests__/options.spec.ts
+++ b/packages/core/src/shared/numfmt/__tests__/options.spec.ts
@@ -19,6 +19,7 @@
// @vitest-environment node
+import { DateSystem } from '../../../types/enum/date-system';
import { format } from '../api';
import { getTimeZoneName, numfmtTest } from './test-utils';
@@ -26,6 +27,22 @@ import { getTimeZoneName, numfmtTest } from './test-utils';
const excelOpts = { dateSpanLarge: false, dateErrorNumber: false };
+numfmtTest('option: Excel date system', (t) => {
+ t.format('yyyy-mm-dd', 0, '1904-01-01', { dateSystem: DateSystem.Date1904 });
+ t.format('yyyy-mm-dd', 1, '1904-01-02', { dateSystem: DateSystem.Date1904 });
+ t.format('dddd', 0, 'Friday', { dateSystem: DateSystem.Date1904 });
+ t.format('yyyy-mm-dd', 0, '1900-01-00', { dateSystem: DateSystem.Date1900 });
+ t.format('yyyy-mm-dd', 1, '1900-01-01', { dateSystem: DateSystem.Date1900 });
+ t.format('yyyy-mm-dd', 2958465, '9999-12-31', { dateSystem: DateSystem.Date1900 });
+ t.format('yyyy-mm-dd', 2958466, '######', { dateSystem: DateSystem.Date1900 });
+ t.format('yyyy-mm-dd', 2957003, '9999-12-31', { dateSystem: DateSystem.Date1904 });
+ t.format('yyyy-mm-dd', 2957004, '######', { dateSystem: DateSystem.Date1904 });
+});
+
+numfmtTest('default: Excel date overflow', (t) => {
+ t.format('yyyy', -1, '######');
+});
+
numfmtTest('option: overflow', (t) => {
t.format('yyyy', -1, '######', { ...excelOpts });
t.format('yyyy', -1, '🦆', { ...excelOpts, overflow: '🦆' });
@@ -58,14 +75,14 @@ numfmtTest('option: leap1900', (t) => {
});
numfmtTest('option: dateErrorThrows', (t) => {
- t.format('yyyy', -694325, '-694325', {});
- t.format('yyyy', -1, '-1', { dateSpanLarge: false });
+ t.format('yyyy', -694325, '######', {});
+ t.format('yyyy', -1, '######', { dateSpanLarge: false });
t.formatThrows('yyyy', -1, '-1', { dateSpanLarge: false, dateErrorThrows: true });
t.formatThrows('yyyy', -694325, '-694325', { dateErrorThrows: true });
});
numfmtTest('option: dateErrorNumber', (t) => {
- t.format('yyyy', -1, '-1', { dateSpanLarge: false });
+ t.format('yyyy', -1, '######', { dateSpanLarge: false });
t.format('yyyy', -1, '-1', { dateSpanLarge: false, dateErrorNumber: true });
t.format('yyyy', -1, '######', { dateSpanLarge: false, dateErrorNumber: false });
});
diff --git a/packages/core/src/shared/numfmt/__tests__/pattern-parser.spec.ts b/packages/core/src/shared/numfmt/__tests__/pattern-parser.spec.ts
index d0f9e36194..7dbab51026 100644
--- a/packages/core/src/shared/numfmt/__tests__/pattern-parser.spec.ts
+++ b/packages/core/src/shared/numfmt/__tests__/pattern-parser.spec.ts
@@ -68,6 +68,7 @@ describe('numfmt pattern parser', () => {
hours: true,
minutes: true,
seconds: true,
+ isDuration: false,
clockType: 24,
});
});
diff --git a/packages/core/src/shared/numfmt/__tests__/test-utils.ts b/packages/core/src/shared/numfmt/__tests__/test-utils.ts
index 88d7143813..f48b577be0 100644
--- a/packages/core/src/shared/numfmt/__tests__/test-utils.ts
+++ b/packages/core/src/shared/numfmt/__tests__/test-utils.ts
@@ -78,6 +78,7 @@ const COMMON_DATE_INFO: FormatDateInfo = {
hours: false,
minutes: false,
seconds: false,
+ isDuration: false,
clockType: 24,
};
diff --git a/packages/core/src/shared/numfmt/api.ts b/packages/core/src/shared/numfmt/api.ts
index c4731133d1..33e4d17a22 100644
--- a/packages/core/src/shared/numfmt/api.ts
+++ b/packages/core/src/shared/numfmt/api.ts
@@ -61,6 +61,7 @@ import {
TOKEN_TEXT,
TOKEN_ZERO,
} from './constants';
+import { createDateTimeEditPattern } from './date-time-edit-pattern';
import { dateInfo, info, isDate, isPercent, isText } from './format-info';
import { formatValue, formatColor as formatValueColor } from './format-number';
import { defaultOptions } from './options';
@@ -70,10 +71,10 @@ import { dateToSerial as handleDates } from './serial-date';
export { dec2frac } from './dec-to-frac';
export { addLocale, getLocale, parseLocale } from './locale';
export { parseBool, parseDate, parseNumber, parseTime, parseValue } from './parse-value';
+export type { ParseOptions } from './parse-value';
export { round } from './round';
export { dateFromSerial, dateToSerial } from './serial-date';
export { tokenize } from './tokenize';
-
export type {
FormatDateInfo,
FormatInfo,
@@ -192,6 +193,12 @@ export function getFormatDateInfo(pattern: string): FormatDateInfo {
return data.dateInfo;
}
+/** Completes omitted components in a calendar-date or clock pattern for editing; elapsed durations return null. */
+export function getDateTimeEditPattern(pattern: string, value: number): string | null {
+ const data = prepareFormatterData(pattern, false);
+ return createDateTimeEditPattern(data.partitions, value);
+}
+
/** A dictionary of the types used to identify token variants. */
export const tokenTypes = Object.freeze({
AMPM: TOKEN_AMPM,
diff --git a/packages/core/src/shared/numfmt/date-time-edit-pattern.ts b/packages/core/src/shared/numfmt/date-time-edit-pattern.ts
new file mode 100644
index 0000000000..7cde3245ce
--- /dev/null
+++ b/packages/core/src/shared/numfmt/date-time-edit-pattern.ts
@@ -0,0 +1,161 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * 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 { FormatSection, ParsedFormatSection, RenderToken } from './types';
+import { EPOCH_1900 } from './constants';
+import { getValueFormatSection } from './format-number';
+
+type DateComponentType = 'day' | 'month' | 'year';
+
+interface IDateComponent {
+ type: DateComponentType;
+ pattern: string;
+ tokenIndex: number;
+}
+
+function isParsedSection(section: FormatSection | undefined): section is ParsedFormatSection {
+ return !!section && 'scale' in section;
+}
+
+function getDateComponent(token: RenderToken, tokenIndex: number): IDateComponent | null {
+ if (token.type === 'year' || token.type === 'year-short') {
+ return { type: 'year', pattern: 'yyyy', tokenIndex };
+ }
+ if (token.type === 'month') {
+ return { type: 'month', pattern: token.pad ? 'mm' : 'm', tokenIndex };
+ }
+ if (token.type === 'day') {
+ return { type: 'day', pattern: token.pad ? 'dd' : 'd', tokenIndex };
+ }
+ return null;
+}
+
+function isComplexDateToken(token: RenderToken): boolean {
+ return token.type.startsWith('b-year') || token.type.startsWith('monthname') || token.type.startsWith('weekday');
+}
+
+function getSeparator(tokens: RenderToken[], leftIndex: number, rightIndex: number): '-' | '/' | null {
+ if (rightIndex !== leftIndex + 2) {
+ return null;
+ }
+ const token = tokens[leftIndex + 1];
+ return token.value === '-' || token.value === '/' ? token.value : null;
+}
+
+function getMissingComponentPattern(components: IDateComponent[], type: 'day' | 'month'): string {
+ const related = components.find((component) => component.type === (type === 'day' ? 'month' : 'day'));
+ const padded = related?.pattern.length === 2;
+ if (type === 'day') {
+ return padded ? 'dd' : 'd';
+ }
+ return padded ? 'mm' : 'm';
+}
+
+function completeNumericDatePattern(components: IDateComponent[], separator: '-' | '/'): string | null {
+ const types = components.map((component) => component.type).join('');
+ if (new Set(components.map((component) => component.type)).size !== components.length) {
+ return null;
+ }
+
+ const patterns = new Map(components.map((component) => [component.type, component.pattern]));
+ patterns.set('year', 'yyyy');
+ if (!patterns.has('month')) {
+ patterns.set('month', getMissingComponentPattern(components, 'month'));
+ }
+ if (!patterns.has('day')) {
+ patterns.set('day', getMissingComponentPattern(components, 'day'));
+ }
+
+ // Preserve an unambiguous existing order; when the year is omitted, put it where Excel exposes it while editing.
+ const completeOrder: Record<string, DateComponentType[]> = {
+ daymonth: ['day', 'month', 'year'],
+ daymonthyear: ['day', 'month', 'year'],
+ dayyear: ['day', 'month', 'year'],
+ monthday: ['year', 'month', 'day'],
+ monthdayyear: ['month', 'day', 'year'],
+ monthyear: ['month', 'day', 'year'],
+ yearmonth: ['year', 'month', 'day'],
+ yearmonthday: ['year', 'month', 'day'],
+ yearday: ['year', 'month', 'day'],
+ };
+ const order = completeOrder[types];
+ return order ? order.map((type) => patterns.get(type)).join(separator) : null;
+}
+
+function getDatePattern(section: ParsedFormatSection): string | null {
+ const components = section.tokens
+ .map((token, tokenIndex) => getDateComponent(token, tokenIndex))
+ .filter((component): component is IDateComponent => component !== null);
+ if (!components.length) {
+ return null;
+ }
+ // Only numeric dates with one consistent '-' or '/' separator are safe to extend without changing their meaning.
+ if (
+ components.length < 2 ||
+ components.length > 3 ||
+ section.locale ||
+ section.date_system !== EPOCH_1900 ||
+ section.tokens.some(isComplexDateToken)
+ ) {
+ return 'yyyy/mm/dd';
+ }
+
+ const separators = components.slice(1).map((component, index) => (
+ getSeparator(section.tokens, components[index].tokenIndex, component.tokenIndex)
+ ));
+ const separator = separators[0];
+ if (!separator || separators.some((item) => item !== separator)) {
+ return 'yyyy/mm/dd';
+ }
+ return completeNumericDatePattern(components, separator) ?? 'yyyy/mm/dd';
+}
+
+function getTimePattern(section: ParsedFormatSection): string | null {
+ const hourIndex = section.tokens.findIndex((token) => token.type === 'hour');
+ const minuteToken = section.tokens.find((token) => token.type === 'min');
+ const ampmIndex = section.tokens.findIndex((token) => token.type === 'ampm');
+ const ampmToken = ampmIndex < 0 ? undefined : section.tokens[ampmIndex];
+ const hasTime = hourIndex >= 0 || !!minuteToken || section.tokens.some((token) => token.type === 'sec') || !!ampmToken;
+ if (!hasTime) {
+ return null;
+ }
+
+ const hourToken = hourIndex < 0 ? undefined : section.tokens[hourIndex];
+ const hour = hourToken?.pad ? 'hh' : 'h';
+ const minute = minuteToken?.pad === false ? 'm' : 'mm';
+ const clock = `${hour}:${minute}:ss`;
+ if (!ampmToken || typeof ampmToken.value !== 'string') {
+ return clock;
+ }
+ return ampmIndex < hourIndex ? `${ampmToken.value} ${clock}` : `${clock} ${ampmToken.value}`;
+}
+
+export function createDateTimeEditPattern(
+ partitions: Array<FormatSection | undefined>,
+ value: number
+): string | null {
+ const section = getValueFormatSection(value, partitions);
+ if (!isParsedSection(section) || section.tokens.some((token) => token.type.endsWith('-elap'))) {
+ return null;
+ }
+
+ const datePattern = getDatePattern(section);
+ const timePattern = getTimePattern(section);
+ if (datePattern && timePattern) {
+ return `${datePattern} ${timePattern}`;
+ }
+ return datePattern ?? timePattern;
+}
diff --git a/packages/core/src/shared/numfmt/format-info.ts b/packages/core/src/shared/numfmt/format-info.ts
index 0c3ee68bf0..1d8ed1780c 100644
--- a/packages/core/src/shared/numfmt/format-info.ts
+++ b/packages/core/src/shared/numfmt/format-info.ts
@@ -229,6 +229,7 @@ export function dateInfo(partitions: Array<FormatSection | undefined>): FormatDa
hours: !!(date & u_HOUR),
minutes: !!(date & u_MIN),
seconds: !!(date & u_SEC),
+ isDuration: positive?.tokens.some((token) => token.type.endsWith('-elap')) ?? false,
clockType: positive?.clock === 12 ? 12 : 24,
};
}
diff --git a/packages/core/src/shared/numfmt/format-number.ts b/packages/core/src/shared/numfmt/format-number.ts
index db22cf7c56..1652e44e09 100644
--- a/packages/core/src/shared/numfmt/format-number.ts
+++ b/packages/core/src/shared/numfmt/format-number.ts
@@ -38,7 +38,8 @@ function isParsedSection(part: FormatSection | undefined): part is ParsedFormatS
return !!part && 'scale' in part;
}
-function getPart(
+/** Select the same conditional/sign format section for both display formatting and editor-value formatting. */
+export function getValueFormatSection(
value: number | bigint,
parts: Array<FormatSection | undefined>
): FormatSection | undefined {
@@ -89,7 +90,7 @@ export function formatColor(
// eslint-disable-next-line unicorn/prefer-number-properties
isFinite(value as number)
) {
- part = getPart(value, parts);
+ part = getValueFormatSection(value, parts);
}
if (isParsedSection(part) && part.color) {
color = part.color;
@@ -130,7 +131,7 @@ export function formatValue(
return ((renderValue as number) < 0 ? resolvedLocale.negative : '') + resolvedLocale.infinity;
}
// find and run the pattern part that applies to this number
- const part = getPart(value as number | bigint, parts);
+ const part = getValueFormatSection(value as number | bigint, parts);
const decimalValue =
part && typeof value === 'number' && Number.isFinite(value)
? decimalFromNumber(value)
diff --git a/packages/core/src/shared/numfmt/index.ts b/packages/core/src/shared/numfmt/index.ts
index 9a57b2d2f7..ea48df9427 100644
--- a/packages/core/src/shared/numfmt/index.ts
+++ b/packages/core/src/shared/numfmt/index.ts
@@ -15,12 +15,16 @@
*/
export * as numfmt from './api';
+export type { ParseOptions } from './parse-value';
+export type { IExcelDateTimeParts } from './serial-date';
+export { EXCEL_1904_OFFSET, excelDateTimePartsToSerial, excelSerialToDateTimeParts, getDateSystemMaxSerial } from './serial-date';
export type { INumfmtLocaleTag } from './utils';
export {
currencySymbols,
DEFAULT_NUMBER_FORMAT,
DEFAULT_TEXT_FORMAT,
DEFAULT_TEXT_FORMAT_EXCEL,
+ getNumfmtLocaleTag,
getNumfmtParseValueFilter,
isDefaultFormat,
isPatternEqualWithoutDecimal,
diff --git a/packages/core/src/shared/numfmt/options.ts b/packages/core/src/shared/numfmt/options.ts
index 158ef95825..e486b5eef9 100644
--- a/packages/core/src/shared/numfmt/options.ts
+++ b/packages/core/src/shared/numfmt/options.ts
@@ -18,6 +18,7 @@
// See packages/core/src/shared/numfmt/LICENSE.
import type { ResolvedFormatOptions } from './types';
+import { DateSystem } from '../../types/enum/date-system';
export const defaultOptions: Readonly<ResolvedFormatOptions> = {
// Overflow error string
@@ -25,13 +26,14 @@ export const defaultOptions: Readonly<ResolvedFormatOptions> = {
// Should it throw when there is an overflow error?
dateErrorThrows: false,
// Should it emit a number when date has an overflow error? (Sheets does this)
- dateErrorNumber: true, // dateErrorThrow needs to be off!
+ dateErrorNumber: false, // dateErrorThrow needs to be off!
// Should it emit a number when bigint has an is an overflow error?
bigintErrorNumber: false,
// Sheets mode (see #3)
- dateSpanLarge: true,
+ dateSpanLarge: false,
// Simulate the Lotus 1-2-3 leap year bug
leap1900: true,
+ dateSystem: DateSystem.Date1900,
// Emit regular vs. non-breaking spaces
nbsp: false,
// Robust/throw mode
diff --git a/packages/core/src/shared/numfmt/parse-value.ts b/packages/core/src/shared/numfmt/parse-value.ts
index 8fda9fcee1..e1cdc076c3 100644
--- a/packages/core/src/shared/numfmt/parse-value.ts
+++ b/packages/core/src/shared/numfmt/parse-value.ts
@@ -18,12 +18,15 @@
// See packages/core/src/shared/numfmt/LICENSE.
import type { LocaleData, ParseData } from './types';
+import { DateSystem } from '../../types/enum/date-system';
import { currencySymbols, reCurrencySymbols } from './constants';
import { defaultLocale, getLocale } from './locale';
+import { excelDateTimePartsToSerial } from './serial-date';
// eslint-disable-next-line ts/naming-convention
export interface ParseOptions {
locale?: string;
+ dateSystem?: DateSystem;
}
/*
@@ -182,8 +185,6 @@ okDateFormats.forEach((format) => {
}
});
-const currentYear = new Date().getUTCFullYear();
-
const PT = '.';
const CM = ',';
const SP = ' ';
@@ -396,9 +397,10 @@ interface IDateLocaleData {
day: LocaleLookup[];
dp: boolean;
locale?: string;
+ dateSystem: DateSystem;
}
-type DateLocaleLookups = Omit<IDateLocaleData, 'locale'>;
+type DateLocaleLookups = Omit<IDateLocaleData, 'dateSystem' | 'locale'>;
interface ICachedDateLocaleLookups {
lookups: DateLocaleLookups;
@@ -495,7 +497,7 @@ const nextToken = (
);
}
} else if (token === 'j' || token === 'd') {
- const match = /^(0?[1-9]|1\d|2\d|3[01])\b/.exec(string);
+ const match = /^(0{1,2}|0?[1-9]|1\d|2\d|3[01])\b/.exec(string);
if (match) {
result = nextToken(
string.slice(match[0].length),
@@ -569,10 +571,11 @@ const nextToken = (
throw new Error(`Unknown date token "${token}"`);
}
}
- if (
- result &&
- isValidDate(data.year || 1916, data.month || 1, data.day ? +data.day : 1)
- ) {
+ const year = result?.year || 1916;
+ const month = result?.month || 1;
+ const day = result?.day ? +result.day : 1;
+ const isDate1900SerialZero = localeData.dateSystem === DateSystem.Date1900 && year === 1900 && month === 1 && day === 0;
+ if (result && (isDate1900SerialZero || isValidDate(year, month, day))) {
return result;
}
}
@@ -627,12 +630,12 @@ const getDateLocaleLookups = (locale: LocaleData): DateLocaleLookups => {
};
/** Parse a date or datetime string and return its serial value and format. */
-// eslint-disable-next-line complexity
export function parseDate(value: string, options: ParseOptions = {}): ParseData<number> | null {
const l10n = getLocale(options.locale || '') || defaultLocale;
const localeData: IDateLocaleData = {
...getDateLocaleLookups(l10n),
locale: options.locale,
+ dateSystem: options.dateSystem ?? DateSystem.Date1900,
};
const date = nextToken(
normDateStr(value),
@@ -650,20 +653,32 @@ export function parseDate(value: string, options: ParseOptions = {}): ParseData<
return null;
}
- const year = +(date.year ?? currentYear);
+ const year = +(date.year ?? new Date().getUTCFullYear());
const day = date.day ?? '1';
- let epoch = -Infinity;
- if (year < 1900) {
+ const dateSystem = options.dateSystem ?? DateSystem.Date1900;
+ const dateSerial = excelDateTimePartsToSerial({
+ year,
+ month: date.month,
+ day: +day,
+ hours: 0,
+ minutes: 0,
+ seconds: 0,
+ fractionalSecond: 0,
+ }, { dateSystem });
+ if (dateSerial == null) {
return null;
- } else if (year <= 1900 && date.month <= 2) {
- epoch = 25568;
- } else if (year < 10000) {
- epoch = 25569;
}
- const dateValue = (
- Date.UTC(year, date.month - 1, +day) / 864e5
- ) + epoch + (date.time || 0);
- if (dateValue < 0 || dateValue > 2958465) {
+ const dateValue = dateSerial + (date.time || 0);
+ const maxDateSerial = excelDateTimePartsToSerial({
+ year: 9999,
+ month: 12,
+ day: 31,
+ hours: 0,
+ minutes: 0,
+ seconds: 0,
+ fractionalSecond: 0,
+ }, { dateSystem })!;
+ if (dateValue >= maxDateSerial + 1) {
return null;
}
diff --git a/packages/core/src/shared/numfmt/run-part.ts b/packages/core/src/shared/numfmt/run-part.ts
index 84da0c7ed8..22445dc217 100644
--- a/packages/core/src/shared/numfmt/run-part.ts
+++ b/packages/core/src/shared/numfmt/run-part.ts
@@ -25,11 +25,12 @@ import type {
ParsedFormatSection,
ResolvedFormatOptions,
} from './types';
+import { DateSystem } from '../../types/enum/date-system';
import { clamp } from './clamp';
import {
EPOCH_1317,
+ EPOCH_1904,
MAX_L_DATE,
- MAX_S_DATE,
MIN_L_DATE,
MIN_S_DATE,
u_CSEC,
@@ -42,17 +43,19 @@ import { general } from './general';
import { defaultLocale } from './locale';
import { getExponent, getSignificand } from './number-props';
import { pad } from './pad';
+import { getDateSystemMaxSerial } from './serial-date';
import { toYMD } from './to-ymd';
const DAYSIZE = 86400;
type RuntimeFormatSection = ParsedFormatSection & Partial<ErrorFormatSection>;
-function dateOverflows(inputValue: number, roundedValue: number, bigRange: boolean): boolean {
+function dateOverflows(inputValue: number, roundedValue: number, bigRange: boolean, dateSystem: DateSystem): boolean {
if (bigRange) {
return inputValue < MIN_L_DATE || roundedValue >= MAX_L_DATE;
}
- return inputValue < MIN_S_DATE || roundedValue >= MAX_S_DATE;
+ const maxDate = getDateSystemMaxSerial(dateSystem) + 1;
+ return inputValue < MIN_S_DATE || roundedValue >= maxDate;
}
function legacyRound(number: number, places = 0): number {
@@ -263,8 +266,12 @@ export function runPart(
}
}
// serial date/time to gregorian calendar
+ // Explicit non-Gregorian calendar tokens keep their own epoch; ordinary date tokens follow the workbook's system.
+ const dateSystem = section.date_system === EPOCH_1317
+ ? EPOCH_1317
+ : options.dateSystem === DateSystem.Date1904 ? EPOCH_1904 : section.date_system;
if (date || section.date_system) {
- const dateOutput = toYMD(numericValue, section.date_system, options.leap1900);
+ const dateOutput = toYMD(numericValue, dateSystem, options.leap1900);
year = dateOutput[0];
month = dateOutput[1];
day = dateOutput[2];
@@ -275,10 +282,10 @@ export function runPart(
minute = Math.floor(normalizedTime / 60) % 60;
hour = Math.floor((normalizedTime / 60) / 60) % 60;
}
- weekday = (6 + date) % 7;
+ weekday = ((dateSystem === EPOCH_1904 ? 5 : 6) + date) % 7;
if (
section.date_eval &&
- dateOverflows(numericValue, date + (time / DAYSIZE), options.dateSpanLarge)
+ dateOverflows(numericValue, date + (time / DAYSIZE), options.dateSpanLarge, options.dateSystem)
) {
// if value is out of bounds and formatting is date Excel emits a
// stream of "######" that fills the cell width.
diff --git a/packages/core/src/shared/numfmt/serial-date.ts b/packages/core/src/shared/numfmt/serial-date.ts
index c210a7581a..97ebd47fc1 100644
--- a/packages/core/src/shared/numfmt/serial-date.ts
+++ b/packages/core/src/shared/numfmt/serial-date.ts
@@ -18,11 +18,213 @@
// See packages/core/src/shared/numfmt/LICENSE.
import type { DateTimeParts } from './types';
+import { DateSystem } from '../../types/enum/date-system';
import { toYMD } from './to-ymd';
const floor = Math.floor;
const DAYSIZE = 86400;
+const MILLISECONDS_PER_DAY = DAYSIZE * 1000;
const dateUTC = Date.UTC as (...values: unknown[]) => number;
+// The 1904 epoch is 1,461 real days after the 1900 epoch; Excel's fictitious 1900-02-29 adds one serial day.
+export const EXCEL_1904_OFFSET = 1462;
+// Excel's supported calendar range ends at 9999-12-31.
+const EXCEL_1900_MAX_SERIAL = 2958465;
+const MAX_YEAR = 9999;
+
+/**
+ * Decoded Excel calendar and clock fields.
+ * In the 1900 system, serial 0 returns 1900-01-00 and serial 60 returns the fictitious 1900-02-29.
+ * Callers converting these fields to a native Date must choose how to normalize those two pseudo-dates.
+ */
+export interface IExcelDateTimeParts {
+ year: number;
+ month: number;
+ day: number;
+ hours: number;
+ minutes: number;
+ seconds: number;
+ fractionalSecond: number;
+}
+
+interface IDateSystemOptions {
+ dateSystem: DateSystem;
+}
+
+export function getDateSystemMaxSerial(dateSystem = DateSystem.Date1900): number {
+ return dateSystem === DateSystem.Date1904
+ ? EXCEL_1900_MAX_SERIAL - EXCEL_1904_OFFSET
+ : EXCEL_1900_MAX_SERIAL;
+}
+
+function isLeapYear(year: number): boolean {
+ return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0);
+}
+
+function isValidGregorianDate(year: number, month: number, day: number): boolean {
+ if (!Number.isInteger(year) || !Number.isInteger(month) || !Number.isInteger(day) || year < 1 || year > MAX_YEAR || month < 1 || month > 12) {
+ return false;
+ }
+
+ const daysInMonth = [31, isLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+ return day >= 1 && day <= daysInMonth[month - 1];
+}
+
+function civilDateToUnixDays(year: number, month: number, day: number): number {
+ // Use pure proleptic-Gregorian arithmetic so native Date normalization and host time zones cannot affect serials.
+ const adjustedYear = year - (month <= 2 ? 1 : 0);
+ const era = Math.floor(adjustedYear / 400);
+ const yearOfEra = adjustedYear - era * 400;
+ const adjustedMonth = month + (month > 2 ? -3 : 9);
+ const dayOfYear = Math.floor((153 * adjustedMonth + 2) / 5) + day - 1;
+ const dayOfEra = yearOfEra * 365 + Math.floor(yearOfEra / 4) - Math.floor(yearOfEra / 100) + dayOfYear;
+ return era * 146097 + dayOfEra - 719468;
+}
+
+function datePartsToExcel1900Serial(year: number, month: number, day: number): number | null {
+ // Excel exposes both serial 0 (1900-01-00) and serial 60 (the Lotus 1-2-3 leap-year bug) as editable dates.
+ if (year === 1900 && month === 1 && day === 0) {
+ return 0;
+ }
+ if (year === 1900 && month === 2 && day === 29) {
+ return 60;
+ }
+ if (!isValidGregorianDate(year, month, day)) {
+ return null;
+ }
+
+ const unixDays = civilDateToUnixDays(year, month, day);
+ // Serial 60 is reserved for the fictitious leap day, so real dates from 1900-03-01 use the larger offset.
+ return unixDays + (unixDays <= -25509 ? 25568 : 25569);
+}
+
+export function excelSerialToDateTimeParts(
+ serial: number,
+ options: IDateSystemOptions
+): IExcelDateTimeParts | null {
+ if (!Number.isFinite(serial) || serial < 0) {
+ return null;
+ }
+
+ const wholeDays = Math.floor(serial);
+ const excel1900Serial = options.dateSystem === DateSystem.Date1904
+ ? wholeDays + EXCEL_1904_OFFSET
+ : wholeDays;
+ const [year, month, day] = toYMD(excel1900Serial, 0, true);
+ if (year > MAX_YEAR) {
+ return null;
+ }
+
+ const totalSeconds = (serial - wholeDays) * DAYSIZE;
+ const wholeSeconds = Math.floor(totalSeconds);
+
+ return {
+ year,
+ month,
+ day,
+ hours: Math.floor(wholeSeconds / 3600),
+ minutes: Math.floor(wholeSeconds / 60) % 60,
+ seconds: wholeSeconds % 60,
+ fractionalSecond: totalSeconds - wholeSeconds,
+ };
+}
+
+function excelDateTimePartsToDate(parts: IExcelDateTimeParts, includeTime: boolean): Date {
+ // Native Date cannot represent Excel's serial 0 or fictitious 1900-02-29.
+ // Normalize those compatibility values to the nearest representable UTC date.
+ const day = parts.year === 1900 && parts.month === 2 && parts.day === 29 ? 28 : parts.day;
+ return new Date(Date.UTC(
+ parts.year,
+ parts.month - 1,
+ day,
+ includeTime ? parts.hours : 0,
+ includeTime ? parts.minutes : 0,
+ includeTime ? parts.seconds : 0,
+ includeTime ? Math.round(parts.fractionalSecond * 1000) : 0
+ ));
+}
+
+/** Convert an Excel serial to a native UTC Date, keeping only its calendar date. Returns an invalid Date for invalid serials. */
+export function excelSerialToDate(serial: number, dateSystem = DateSystem.Date1900): Date {
+ const parts = excelSerialToDateTimeParts(serial, { dateSystem });
+ return parts ? excelDateTimePartsToDate(parts, false) : new Date(Number.NaN);
+}
+
+/** Convert an Excel serial to a native UTC Date, including its time fraction. Returns an invalid Date for invalid serials. */
+export function excelSerialToDateTime(serial: number, dateSystem = DateSystem.Date1900): Date {
+ const parts = excelSerialToDateTimeParts(serial, { dateSystem });
+ return parts ? excelDateTimePartsToDate(parts, true) : new Date(Number.NaN);
+}
+
+export function excelDateTimePartsToSerial(
+ parts: IExcelDateTimeParts,
+ options: IDateSystemOptions
+): number | null {
+ const { year, month, day, hours, minutes, seconds, fractionalSecond } = parts;
+ if (
+ !Number.isInteger(hours) || hours < 0 || hours > 23 ||
+ !Number.isInteger(minutes) || minutes < 0 || minutes > 59 ||
+ !Number.isInteger(seconds) || seconds < 0 || seconds > 59 ||
+ !Number.isFinite(fractionalSecond) || fractionalSecond < 0 || fractionalSecond >= 1
+ ) {
+ return null;
+ }
+
+ if (options.dateSystem === DateSystem.Date1900 && year < 1900) {
+ return null;
+ }
+
+ let dateSerial = datePartsToExcel1900Serial(year, month, day);
+ if (dateSerial == null) {
+ return null;
+ }
+ if (options.dateSystem === DateSystem.Date1904) {
+ if ((year === 1900 && month === 1 && day === 0) || (year === 1900 && month === 2 && day === 29)) {
+ return null;
+ }
+ dateSerial -= EXCEL_1904_OFFSET;
+ }
+ if (dateSerial < 0) {
+ return null;
+ }
+
+ return dateSerial + (hours * 3600 + minutes * 60 + seconds + fractionalSecond) / DAYSIZE;
+}
+
+function dateToExcelSerial(date: Date, includeTime: boolean, dateSystem: DateSystem): number {
+ if (!Number.isFinite(date.getTime())) {
+ return Number.NaN;
+ }
+
+ const serial = excelDateTimePartsToSerial({
+ year: date.getUTCFullYear(),
+ month: date.getUTCMonth() + 1,
+ day: date.getUTCDate(),
+ hours: includeTime ? date.getUTCHours() : 0,
+ minutes: includeTime ? date.getUTCMinutes() : 0,
+ seconds: includeTime ? date.getUTCSeconds() : 0,
+ fractionalSecond: includeTime ? date.getUTCMilliseconds() / 1000 : 0,
+ }, { dateSystem });
+ if (serial != null) {
+ return serial;
+ }
+
+ // Keep compatibility for native dates outside the selected Excel epoch.
+ const dateTime = includeTime
+ ? date.getTime()
+ : Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate());
+ const epoch = dateSystem === DateSystem.Date1904 ? Date.UTC(1904, 0, 1) : Date.UTC(1899, 11, 31);
+ return (dateTime - epoch) / MILLISECONDS_PER_DAY;
+}
+
+/** Convert a native UTC Date's calendar fields to an Excel date serial. */
+export function excelDateSerial(date: Date, dateSystem = DateSystem.Date1900): number {
+ return dateToExcelSerial(date, false, dateSystem);
+}
+
+/** Convert a native UTC Date's calendar and clock fields to an Excel serial. */
+export function excelDateTimeSerial(date: Date, dateSystem = DateSystem.Date1900): number {
+ return dateToExcelSerial(date, true, dateSystem);
+}
/**
* Convert a native JavaScript Date, or array to a spreadsheet serial date.
diff --git a/packages/core/src/shared/numfmt/types.ts b/packages/core/src/shared/numfmt/types.ts
index 5b66c88b94..2d697a5a16 100644
--- a/packages/core/src/shared/numfmt/types.ts
+++ b/packages/core/src/shared/numfmt/types.ts
@@ -17,6 +17,8 @@
// Derived from numfmt 3.2.6 (MIT), commit c2cfdfa01bb1f24df51e985825671eb480daed4c.
// See packages/core/src/shared/numfmt/LICENSE.
+import type { DateSystem } from '../../types/enum/date-system';
+
export type ConditionOperator = '<' | '<=' | '=' | '>=' | '>' | '<>';
export type FormatCondition = [ConditionOperator, number];
@@ -70,6 +72,7 @@ export interface FormatOptions {
bigintErrorNumber?: boolean;
dateSpanLarge?: boolean;
leap1900?: boolean;
+ dateSystem?: DateSystem;
nbsp?: boolean;
throws?: boolean;
invalid?: string;
@@ -88,6 +91,7 @@ export interface ResolvedFormatOptions {
bigintErrorNumber: boolean;
dateSpanLarge: boolean;
leap1900: boolean;
+ dateSystem: DateSystem;
nbsp: boolean;
throws: boolean;
invalid: string;
@@ -190,6 +194,7 @@ export interface FormatDateInfo {
hours: boolean;
minutes: boolean;
seconds: boolean;
+ isDuration: boolean;
clockType: 12 | 24;
}
diff --git a/packages/core/src/shared/numfmt/utils.ts b/packages/core/src/shared/numfmt/utils.ts
index f2cab867fe..720b44b643 100644
--- a/packages/core/src/shared/numfmt/utils.ts
+++ b/packages/core/src/shared/numfmt/utils.ts
@@ -15,7 +15,9 @@
*/
import type { ParseData } from './api';
+import type { ParseOptions } from './parse-value';
import { regexp } from '../../common/regexp';
+import { LocaleType } from '../../types/enum/locale-type';
import { parseDate, parseNumber, parseTime, tokenize, tokenTypes } from './api';
export const DEFAULT_TEXT_FORMAT = '@@@'; // Compatible with old data
@@ -60,6 +62,48 @@ export type INumfmtLocaleTag =
| 'tr'
| 'vi';
+export function getNumfmtLocaleTag(locale: LocaleType): INumfmtLocaleTag {
+ switch (locale) {
+ case LocaleType.FR_FR:
+ return 'fr';
+ case LocaleType.RU_RU:
+ return 'ru';
+ case LocaleType.VI_VN:
+ return 'vi';
+ case LocaleType.ZH_CN:
+ return 'zh-CN';
+ case LocaleType.KO_KR:
+ return 'ko';
+ case LocaleType.ZH_TW:
+ return 'zh-TW';
+ case LocaleType.ZH_HK:
+ return 'zh-HK';
+ case LocaleType.ES_ES:
+ case LocaleType.CA_ES:
+ return 'es';
+ case LocaleType.SK_SK:
+ return 'sk';
+ case LocaleType.JA_JP:
+ return 'ja';
+ case LocaleType.PT_BR:
+ return 'pt';
+ case LocaleType.DE_DE:
+ return 'de';
+ case LocaleType.IT_IT:
+ return 'it';
+ case LocaleType.ID_ID:
+ return 'id';
+ case LocaleType.PL_PL:
+ return 'pl';
+ case LocaleType.AR_SA:
+ return 'ar';
+ case LocaleType.EN_US:
+ case LocaleType.FA_IR:
+ default:
+ return 'en';
+ }
+}
+
/**
* Determines whether two patterns are equal, excluding differences in decimal places.
* This function ignores the decimal part of the patterns and the positive color will be ignored but negative color will be considered.
@@ -165,8 +209,8 @@ const CURRENCY_SYMBOL_PREFIX_REG = new RegExp(`^${regexp.charset(...Array.from(n
/**
* Get the numfmt parse value, and filter out the parse error.
*/
-export const getNumfmtParseValueFilter = (value: string): ParseData | null => {
- const parseData = parseDate(value) ?? parseTime(value) ?? parseNumber(value);
+export const getNumfmtParseValueFilter = (value: string, options: ParseOptions = {}): ParseData | null => {
+ const parseData = parseDate(value, options) ?? parseTime(value, options) ?? parseNumber(value, options);
if (!parseData) return null;
diff --git a/packages/core/src/sheets/__tests__/workbook.spec.ts b/packages/core/src/sheets/__tests__/workbook.spec.ts
index 37fc9538df..d8eda2f09c 100644
--- a/packages/core/src/sheets/__tests__/workbook.spec.ts
+++ b/packages/core/src/sheets/__tests__/workbook.spec.ts
@@ -18,7 +18,7 @@ import type { Univer } from '../../univer';
import type { IWorkbookData } from '../typedef';
import type { Workbook } from '../workbook';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
-import { BooleanNumber } from '../../types/enum';
+import { BooleanNumber, DateSystem } from '../../types/enum';
import { LocaleType } from '../../types/enum/locale-type';
import { createCoreTestBed } from './create-core-test-bed';
@@ -79,6 +79,21 @@ describe('Test workbook', () => {
expect(workbook.getConfig()).toBe(workbook.getSnapshot());
});
+ it('should resolve the workbook date system without materializing legacy metadata', () => {
+ expect(workbook.getDateSystem()).toBe(DateSystem.Date1900);
+ expect(workbook.save().dateSystem).toBeUndefined();
+
+ const date1904TestBed = createCoreTestBed({
+ ...workbook.save(),
+ id: 'date-1904',
+ dateSystem: DateSystem.Date1904,
+ });
+
+ expect(date1904TestBed.sheet.getDateSystem()).toBe(DateSystem.Date1904);
+ expect(date1904TestBed.sheet.save().dateSystem).toBe(DateSystem.Date1904);
+ date1904TestBed.univer.dispose();
+ });
+
it('should manage sheets and lookups', () => {
expect(workbook.addWorksheet('sheet1', 1, { id: 'sheet1', name: 'Dup' })).toBe(false);
expect(workbook.addWorksheet('sheet2', 1, { id: 'sheet2', name: 'Sheet-002' })).toBe(true);
diff --git a/packages/core/src/sheets/empty-snapshot.ts b/packages/core/src/sheets/empty-snapshot.ts
index b96464539f..a57da18125 100644
--- a/packages/core/src/sheets/empty-snapshot.ts
+++ b/packages/core/src/sheets/empty-snapshot.ts
@@ -16,6 +16,7 @@
import type { IWorkbookData } from './typedef';
import pkg from '../../package.json';
+import { DateSystem } from '../types/enum/date-system';
import { LocaleType } from '../types/enum/locale-type';
export function getEmptySnapshot(
@@ -29,6 +30,7 @@ export function getEmptySnapshot(
name,
appVersion: pkg.version,
locale,
+ dateSystem: DateSystem.Date1900,
styles: {},
sheets: {},
resources: [],
diff --git a/packages/core/src/sheets/typedef.ts b/packages/core/src/sheets/typedef.ts
index 7b0571e9aa..bb51fddb9c 100644
--- a/packages/core/src/sheets/typedef.ts
+++ b/packages/core/src/sheets/typedef.ts
@@ -17,6 +17,7 @@
import type { IResources } from '../services/resource-manager/type';
import type { IObjectArrayPrimitiveType, IObjectMatrixPrimitiveType, Nullable } from '../shared';
import type { BooleanNumber } from '../types/enum';
+import type { DateSystem } from '../types/enum/date-system';
import type { LocaleType } from '../types/enum/locale-type';
import type { IDocumentData } from '../types/interfaces';
import type { ICellCustomRender } from '../types/interfaces/i-cell-custom-render';
@@ -53,6 +54,9 @@ export interface IWorkbookData {
*/
locale: LocaleType;
+ /** Date serial system used by this workbook. Missing values mean Excel 1900. */
+ dateSystem?: DateSystem;
+
/**
* Style references.
*/
diff --git a/packages/core/src/sheets/workbook.ts b/packages/core/src/sheets/workbook.ts
index 58640130ee..540bab67cb 100644
--- a/packages/core/src/sheets/workbook.ts
+++ b/packages/core/src/sheets/workbook.ts
@@ -24,6 +24,7 @@ import { ILogService } from '../services/log/log.service';
import { Tools } from '../shared';
import { generateRandomId } from '../shared/random-id';
import { BooleanNumber } from '../types/enum';
+import { DateSystem } from '../types/enum/date-system';
import { getEmptySnapshot } from './empty-snapshot';
import { Styles } from './styles';
import { Worksheet } from './worksheet';
@@ -93,6 +94,12 @@ export class Workbook extends UnitModel<IWorkbookData, UniverInstanceType.UNIVER
this._snapshot = DEFAULT_WORKBOOK;
} else {
this._snapshot = Tools.commonExtend(DEFAULT_WORKBOOK, workbookData);
+ if (workbookData.dateSystem == null) {
+ delete this._snapshot.dateSystem;
+ } else if (workbookData.dateSystem !== DateSystem.Date1900 && workbookData.dateSystem !== DateSystem.Date1904) {
+ this._logService.warn('[Workbook]', `Unknown date system "${String(workbookData.dateSystem)}"; falling back to Excel 1900.`);
+ this._snapshot.dateSystem = DateSystem.Date1900;
+ }
}
const { styles } = this._snapshot;
@@ -153,6 +160,12 @@ export class Workbook extends UnitModel<IWorkbookData, UniverInstanceType.UNIVER
return this._unitId;
}
+ getDateSystem(): DateSystem {
+ return this._snapshot.dateSystem === DateSystem.Date1904
+ ? DateSystem.Date1904
+ : DateSystem.Date1900;
+ }
+
override getRev(): number {
return this._snapshot.rev ?? 1; // the revision number should start with one
}
diff --git a/packages/core/src/types/enum/date-system.ts b/packages/core/src/types/enum/date-system.ts
new file mode 100644
index 0000000000..3e84133bb9
--- /dev/null
+++ b/packages/core/src/types/enum/date-system.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * 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.
+ */
+
+/** Workbook date serial systems supported by Univer. */
+export enum DateSystem {
+ /** Serial 1 is 1900-01-01; serials 0 and 60 preserve Excel's compatibility-only dates. */
+ Date1900 = 'date1900',
+ /** Serial 0 is 1904-01-01. */
+ Date1904 = 'date1904',
+}
diff --git a/packages/core/src/types/enum/index.ts b/packages/core/src/types/enum/index.ts
index dcaf8eec3b..67360ef76e 100644
--- a/packages/core/src/types/enum/index.ts
+++ b/packages/core/src/types/enum/index.ts
@@ -19,6 +19,7 @@ export * from './border-style-types';
export * from './color-type';
export * from './common-hide-types';
export * from './copy-paste-type';
+export * from './date-system';
export * from './delete-direction';
export * from './developer-metadata-visibility';
export * from './dimension';
diff --git a/packages/design/src/components/calendar/Calendar.tsx b/packages/design/src/components/calendar/Calendar.tsx
index 20b125ee1f..604633c86a 100644
--- a/packages/design/src/components/calendar/Calendar.tsx
+++ b/packages/design/src/components/calendar/Calendar.tsx
@@ -56,14 +56,15 @@ function DayButton(props: ButtonHTMLAttributes<HTMLButtonElement>) {
interface ICalendarProps {
className?: string;
showTime?: boolean;
+ showSelection?: boolean;
max?: Date;
min?: Date;
value?: Date;
- onValueChange?: (date: Date) => void;
+ onValueChange?: (date: Date, changeType: 'date' | 'time') => void;
}
export function Calendar(props: ICalendarProps) {
- const { className, max, min, showTime = false, value, onValueChange } = props;
+ const { className, max, min, showSelection = true, showTime = false, value, onValueChange } = props;
const { direction = 'ltr', locale } = useContext(ConfigContext);
@@ -151,7 +152,7 @@ export function Calendar(props: ICalendarProps) {
}, [daysInMonth, firstDay]);
function isSelected(day: number) {
- return day && currentYear === value?.getFullYear() && currentMonth === value?.getMonth() && day === value?.getDate();
+ return showSelection && day && currentYear === value?.getFullYear() && currentMonth === value?.getMonth() && day === value?.getDate();
}
function isToday(day: number) {
@@ -163,7 +164,8 @@ export function Calendar(props: ICalendarProps) {
const hours = value?.getHours() ?? today.getHours();
const minutes = value?.getMinutes() ?? today.getMinutes();
const seconds = value?.getSeconds() ?? today.getSeconds();
- const d = new Date(currentYear, currentMonth, day, hours, minutes, seconds);
+ const milliseconds = value?.getMilliseconds() ?? today.getMilliseconds();
+ const d = new Date(currentYear, currentMonth, day, hours, minutes, seconds, milliseconds);
if (min && d < min) return true;
if (max && d > max) return true;
return false;
@@ -174,20 +176,22 @@ export function Calendar(props: ICalendarProps) {
const hours = value?.getHours() ?? today.getHours();
const minutes = value?.getMinutes() ?? today.getMinutes();
const seconds = value?.getSeconds() ?? today.getSeconds();
+ const milliseconds = value?.getMilliseconds() ?? today.getMilliseconds();
- const selectedDate = new Date(currentYear, currentMonth, day, hours, minutes, seconds);
+ const selectedDate = new Date(currentYear, currentMonth, day, hours, minutes, seconds, milliseconds);
- onValueChange?.(selectedDate);
+ onValueChange?.(selectedDate, 'date');
}
function handleChangeTime(time: Date) {
const hours = time.getHours();
const minutes = time.getMinutes();
const seconds = time.getSeconds();
+ const milliseconds = time.getMilliseconds();
- const updatedDate = new Date(currentYear, currentMonth, value?.getDate() ?? today.getDate(), hours, minutes, seconds);
+ const updatedDate = new Date(currentYear, currentMonth, value?.getDate() ?? today.getDate(), hours, minutes, seconds, milliseconds);
- onValueChange?.(updatedDate);
+ onValueChange?.(updatedDate, 'time');
}
return (
diff --git a/packages/design/src/components/calendar/__tests__/index.spec.tsx b/packages/design/src/components/calendar/__tests__/index.spec.tsx
index e944633bb1..e988cbc1d2 100644
--- a/packages/design/src/components/calendar/__tests__/index.spec.tsx
+++ b/packages/design/src/components/calendar/__tests__/index.spec.tsx
@@ -58,6 +58,20 @@ describe('Calendar', () => {
expect(calledDate.getDate()).toBe(20);
});
+ it('should preserve fractional seconds when only the calendar date changes', () => {
+ const date = new Date(2023, 7, 15, 1, 2, 3, 456);
+ const { getByText } = render(
+ <ConfigProvider mountContainer={null} locale={{ Calendar: enUS.design.Calendar }}>
+ <Calendar value={date} onValueChange={onChange} />
+ </ConfigProvider>
+ );
+
+ getByText('20').click();
+
+ expect((onChange.mock.calls[0][0] as Date).getMilliseconds()).toBe(456);
+ expect(onChange).toHaveBeenCalledWith(expect.any(Date), 'date');
+ });
+
it('should show TimeInput when showTime is true', () => {
const { container } = renderCalendar({ showTime: true });
expect(container.querySelector('[data-u-comp="time-input"]')).toBeInTheDocument();
@@ -138,6 +152,6 @@ describe('Calendar', () => {
const timeInput = container.querySelector('input[type="time"]') as HTMLInputElement;
fireEvent.change(timeInput, { target: { value: '11:22:33' } });
- expect(onChange).toHaveBeenCalled();
+ expect(onChange).toHaveBeenCalledWith(expect.any(Date), 'time');
});
});
diff --git a/packages/design/src/components/time-input/__tests__/index.spec.tsx b/packages/design/src/components/time-input/__tests__/index.spec.tsx
index 509982196b..46d877095f 100644
--- a/packages/design/src/components/time-input/__tests__/index.spec.tsx
+++ b/packages/design/src/components/time-input/__tests__/index.spec.tsx
@@ -48,4 +48,19 @@ describe('TimeInput', () => {
expect(changed.getMinutes()).toBe(34);
expect(changed.getSeconds()).toBe(56);
});
+
+ it('should hide stored fractional seconds and clear them when time changes', () => {
+ const onValueChange = vi.fn();
+ const value = new Date(2024, 0, 1, 1, 2, 3, 456);
+ const { container, getByDisplayValue } = render(<TimeInput value={value} onValueChange={onValueChange} />);
+
+ expect(getByDisplayValue('01:02:03')).toBeInTheDocument();
+
+ const input = container.querySelector('input[type="time"]') as HTMLInputElement;
+ expect(input).toHaveAttribute('step', '1');
+ fireEvent.change(input, { target: { value: '12:34:56' } });
+
+ const changed = onValueChange.mock.calls[0][0] as Date;
+ expect(changed.getMilliseconds()).toBe(0);
+ });
});
diff --git a/packages/engine-formula/src/basics/__tests__/date.spec.ts b/packages/engine-formula/src/basics/__tests__/date.spec.ts
index 652308ac60..55ff23dd72 100644
--- a/packages/engine-formula/src/basics/__tests__/date.spec.ts
+++ b/packages/engine-formula/src/basics/__tests__/date.spec.ts
@@ -14,9 +14,17 @@
* limitations under the License.
*/
+import { DateSystem, excelDateSerial, excelDateTimeSerial, excelSerialToDate } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { stripErrorMargin } from '../../engine/utils/math-kit';
-import { excelDateSerial, excelDateTimeSerial, excelSerialToDate, formatDateDefault, isValidDateStr } from '../date';
+import { NumberValueObject } from '../../engine/value-object/primitive-object';
+import {
+ formatDateDefault,
+ getDateSerialNumberByObject,
+ getTwoDateDaysByBasis,
+ isValidDateStr,
+} from '../date';
+import { ErrorType } from '../error-type';
describe('Test date', () => {
it('Function excelDateSerial', () => {
@@ -42,6 +50,8 @@ describe('Test date', () => {
expect(formatDateDefault(excelSerialToDate(61))).toBe('1900/03/01');
expect(formatDateDefault(excelSerialToDate(367))).toBe('1901/01/01');
expect(formatDateDefault(excelSerialToDate(45324))).toBe('2024/02/02');
+ expect(formatDateDefault(excelSerialToDate(0, DateSystem.Date1904))).toBe('1904/01/01');
+ expect(excelDateSerial(new Date(Date.UTC(1904, 0, 2)), DateSystem.Date1904)).toBe(1);
});
it('Function isValidDateStr', () => {
expect(isValidDateStr('2020-1-1')).toBeTruthy();
@@ -49,4 +59,20 @@ describe('Test date', () => {
expect(isValidDateStr('2020-2-31')).toBeFalsy();
expect(isValidDateStr('2020/001/31')).toBeFalsy();
});
+
+ it('uses the decoded 1904 date when day-count calculations receive serial zero', () => {
+ expect(getTwoDateDaysByBasis(0, 1, 0, DateSystem.Date1904).days).toBe(1);
+ expect(getTwoDateDaysByBasis(0, 1, 1, DateSystem.Date1904)).toEqual({ days: 1, yearDays: 366 });
+ expect(getTwoDateDaysByBasis(0, 1, 4, DateSystem.Date1904).days).toBe(1);
+ });
+
+ it('validates the maximum serial against the active Excel date system', () => {
+ const invalid1900 = getDateSerialNumberByObject(NumberValueObject.create(2958466), DateSystem.Date1900);
+ const invalid1904 = getDateSerialNumberByObject(NumberValueObject.create(2957004), DateSystem.Date1904);
+
+ expect(getDateSerialNumberByObject(NumberValueObject.create(2958465), DateSystem.Date1900)).toBe(2958465);
+ expect(typeof invalid1900 === 'number' ? invalid1900 : invalid1900.getValue()).toBe(ErrorType.NUM);
+ expect(getDateSerialNumberByObject(NumberValueObject.create(2957003), DateSystem.Date1904)).toBe(2957003);
+ expect(typeof invalid1904 === 'number' ? invalid1904 : invalid1904.getValue()).toBe(ErrorType.NUM);
+ });
});
diff --git a/packages/engine-formula/src/basics/database.ts b/packages/engine-formula/src/basics/database.ts
index 2d636f9073..98a048a607 100644
--- a/packages/engine-formula/src/basics/database.ts
+++ b/packages/engine-formula/src/basics/database.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import type { DateSystem } from '@univerjs/core';
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';
@@ -212,7 +213,12 @@ export function checkCriteria(criteria: BaseValueObject) {
* Criteria match logic:
* Boolean AND in row direction, then Boolean OR in column direction
*/
-export function isCriteriaMatch(criteria: DatabaseValueType[][], database: DatabaseValueType[][], databaseRowIndex: number) {
+export function isCriteriaMatch(
+ criteria: DatabaseValueType[][],
+ database: DatabaseValueType[][],
+ databaseRowIndex: number,
+ dateSystem: DateSystem
+) {
const rowCount = criteria.length;
const columnCount = criteria[0].length;
@@ -255,8 +261,8 @@ export function isCriteriaMatch(criteria: DatabaseValueType[][], database: Datab
break;
}
- const [compareToken, criteriaObject] = findCompareToken(`${criteriaValue}`);
- const compareObject = ValueObjectFactory.create(`${databaseValue}`).compare(criteriaObject, compareToken);
+ const [compareToken, criteriaObject] = findCompareToken(`${criteriaValue}`, dateSystem);
+ const compareObject = ValueObjectFactory.create(`${databaseValue}`, false, dateSystem).compare(criteriaObject, compareToken);
const compareValue = compareObject.getValue();
if (!compareValue) {
diff --git a/packages/engine-formula/src/basics/date.ts b/packages/engine-formula/src/basics/date.ts
index 1c0e24e91e..135a0841cf 100644
--- a/packages/engine-formula/src/basics/date.ts
+++ b/packages/engine-formula/src/basics/date.ts
@@ -15,7 +15,15 @@
*/
import type { BaseValueObject } from '../engine/value-object/base-value-object';
-import { isRealNum, numfmt } from '@univerjs/core';
+import {
+ DateSystem,
+ excelDateSerial,
+ excelDateTimeSerial,
+ excelSerialToDate,
+ getDateSystemMaxSerial,
+ isRealNum,
+ numfmt,
+} from '@univerjs/core';
import { ErrorValueObject } from '../engine/value-object/base-value-object';
import { ErrorType } from './error-type';
@@ -23,84 +31,6 @@ export const DEFAULT_DATE_FORMAT = 'yyyy/mm/dd;@';
export const DEFAULT_NOW_FORMAT = 'yyyy/mm/dd hh:mm';
export const DEFAULT_TIME_FORMAT = 'h:mm A/P';
-const perDayMilliseconds = 24 * 60 * 60 * 1000;
-
-/**
- * Excel stores dates as sequential serial numbers so they can be used in calculations. By default, January 1, 1900 is serial number 1, and January 1, 2008 is serial number 39448 because it is 39,447 days after January 1, 1900.
- *
- * Excel has a leap year error in 1900. February 29, 1900 is considered a legal date. In fact, there is no February 29 in 1900.
- * 1900.2.28 Date Serial 59
- * 1900.2.29 Date Serial 61
- * 1900.3.1 Date Serial 61
- * 1901.1.1 Date Serial 367
- */
-export function excelDateSerial(date: Date): number {
- const baseDateTime = Date.UTC(1900, 0, 1); // January 1, 1900, UTC
- const leapDayDateTime = Date.UTC(1900, 1, 28); // February 28, 1900, UTC
- const dateTime = Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()); // Input date at UTC
-
- // Calculate the difference in days between the base date and the input date
- let dayDifference = (dateTime - baseDateTime) / perDayMilliseconds;
-
- // If the date is later than February 28, 1900, the day difference needs to be adjusted to account for Excel errors
- if (dateTime > leapDayDateTime) {
- dayDifference += 1;
- }
-
- return Math.floor(dayDifference) + 1; // Excel serial number starts from 1
-}
-
-/**
- * Time serial number with date
- */
-export function excelDateTimeSerial(date: Date): number {
- const baseDateTime = Date.UTC(1900, 0, 1, 0, 0, 0); // January 1, 1900, UTC at midnight
- const leapDayDateTime = Date.UTC(1900, 1, 28, 0, 0, 0); // February 28, 1900, UTC at midnight
- const dateTime = Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds(), date.getUTCMilliseconds()); // Input date at UTC midnight
-
- // Calculate the difference in milliseconds between the input date and the base date
- let dayDifference = (dateTime - baseDateTime) / perDayMilliseconds;
-
- // Adjusting for the Excel leap year bug
- if (dateTime > leapDayDateTime) {
- dayDifference += 1;
- }
-
- return dayDifference + 1; // Excel serial number starts from 1
-}
-
-export function excelSerialToDate(serial: number): Date {
- const baseDateTime = Date.UTC(1900, 0, 1); // January 1, 1900, UTC
- const leapDayDateTime = Date.UTC(1900, 1, 28); // February 28, 1900, UTC
-
- let dayDifference = Math.floor(serial) - 1; // Adjust for Excel serial number starting from 1
-
- // If the serial number corresponds to a date later than February 28, 1900, adjust the day difference
- if (dayDifference > (leapDayDateTime - baseDateTime) / perDayMilliseconds) {
- dayDifference -= 1;
- }
-
- return new Date(baseDateTime + dayDifference * perDayMilliseconds);
-}
-
-export function excelSerialToDateTime(serial: number): Date {
- const baseDateTime = Date.UTC(1900, 0, 1, 0, 0, 0); // January 1, 1900, UTC at midnight
- const leapDayDateTime = Date.UTC(1900, 1, 28, 0, 0, 0); // February 28, 1900, UTC at midnight
-
- let dayDifference = serial - 1; // Adjust for Excel serial number starting from 1
-
- // If the serial number corresponds to a date later than February 28, 1900, adjust the day difference
- if (dayDifference > (leapDayDateTime - baseDateTime) / perDayMilliseconds) {
- dayDifference -= 1;
- }
-
- if (dayDifference < 0) {
- dayDifference = serial;
- }
-
- return new Date(baseDateTime + dayDifference * perDayMilliseconds);
-}
-
export function formatDateDefault(date: Date): string {
// Get the year from the date object
const year: number = date.getFullYear();
@@ -150,12 +80,12 @@ export function isValidDateStr(dateStr: string): boolean {
return dateStrPad === reconstructedDateStr;
}
-export function parseFormattedDate(value: string) {
- return numfmt.parseDate(value);
+export function parseFormattedDate(value: string, options?: { dateSystem?: DateSystem }) {
+ return numfmt.parseDate(value, options);
}
-export function parseFormattedTime(value: string) {
- return numfmt.parseTime(value);
+export function parseFormattedTime(value: string, options?: { dateSystem?: DateSystem }) {
+ return numfmt.parseTime(value, options);
}
function parseEnglishMonthNameDate(value: string): Date | null {
@@ -271,7 +201,7 @@ export function getWeekendArray(weekend: number | string): number[] {
return weekendNumberMap[Number(weekend)] || [];
}
-export function countWorkingDays(startDateSerialNumber: number, endDateSerialNumber: number, weekend: number | string = 1, holidays?: number[]): number {
+export function countWorkingDays(startDateSerialNumber: number, endDateSerialNumber: number, weekend: number | string = 1, holidays?: number[], dateSystem = DateSystem.Date1900): number {
const weekendArray = getWeekendArray(weekend);
const start = Math.floor(startDateSerialNumber);
@@ -289,7 +219,7 @@ export function countWorkingDays(startDateSerialNumber: number, endDateSerialNum
continue;
}
- const weekDay = getWeekDayByDateSerialNumber(currentDateSerialNumber);
+ const weekDay = getWeekDayByDateSerialNumber(currentDateSerialNumber, dateSystem);
if (weekendArray.includes(weekDay)) {
continue;
@@ -301,7 +231,7 @@ export function countWorkingDays(startDateSerialNumber: number, endDateSerialNum
return end >= start ? workingDays : -workingDays;
}
-export function getDateSerialNumberByWorkingDays(startDateSerialNumber: number, workingDays: number, weekend: number | string = 1, holidays?: number[]): (number | ErrorValueObject) {
+export function getDateSerialNumberByWorkingDays(startDateSerialNumber: number, workingDays: number, weekend: number | string = 1, holidays?: number[], dateSystem = DateSystem.Date1900): number | ErrorValueObject {
const weekendArray = getWeekendArray(weekend);
const _startDateSerialNumber = Math.floor(startDateSerialNumber);
@@ -321,7 +251,7 @@ export function getDateSerialNumberByWorkingDays(startDateSerialNumber: number,
continue;
}
- const weekDay = getWeekDayByDateSerialNumber(currentDateSerialNumber);
+ const weekDay = getWeekDayByDateSerialNumber(currentDateSerialNumber, dateSystem);
if (weekendArray.includes(weekDay)) {
days++;
@@ -334,20 +264,25 @@ export function getDateSerialNumberByWorkingDays(startDateSerialNumber: number,
return targetDateSerialNumber;
}
-export function getDateSerialNumberByObject(serialNumberObject: BaseValueObject): (ErrorValueObject | number) {
+export function getDateSerialNumberByObject(
+ serialNumberObject: BaseValueObject,
+ dateSystem?: DateSystem
+): ErrorValueObject | number {
if (serialNumberObject.isError()) {
return serialNumberObject as ErrorValueObject;
}
const dateValue = serialNumberObject.getValue();
+ const maxSerial = getDateSystemMaxSerial(dateSystem);
if (serialNumberObject.isString()) {
let dateSerial: any;
+ const options = { dateSystem };
- if (parseFormattedDate(`${dateValue}`)) {
- dateSerial = parseFormattedDate(`${dateValue}`)!.v;
- } else if (parseFormattedTime(`${dateValue}`)) {
- dateSerial = parseFormattedTime(`${dateValue}`)!.v;
+ if (parseFormattedDate(`${dateValue}`, options)) {
+ dateSerial = parseFormattedDate(`${dateValue}`, options)!.v;
+ } else if (parseFormattedTime(`${dateValue}`, options)) {
+ dateSerial = parseFormattedTime(`${dateValue}`, options)!.v;
} else if (parseEnglishMonthNameDate(`${dateValue}`)) {
dateSerial = parseEnglishMonthNameDate(`${dateValue}`)!;
} else if (isRealNum(dateValue)) {
@@ -357,10 +292,10 @@ export function getDateSerialNumberByObject(serialNumberObject: BaseValueObject)
}
if (dateSerial instanceof Date) {
- dateSerial = excelDateTimeSerial(dateSerial);
+ dateSerial = excelDateTimeSerial(dateSerial, dateSystem);
}
- if (+dateSerial < 0 || +dateSerial > 2958465) { // 2958465 = 9999/12/31
+ if (+dateSerial < 0 || +dateSerial > maxSerial) {
return ErrorValueObject.create(ErrorType.NUM);
}
@@ -368,7 +303,7 @@ export function getDateSerialNumberByObject(serialNumberObject: BaseValueObject)
} else {
const dateSerial = +serialNumberObject.getValue();
- if (dateSerial < 0 || dateSerial > 2958465) { // 2958465 = 9999/12/31
+ if (dateSerial < 0 || dateSerial > maxSerial) {
return ErrorValueObject.create(ErrorType.NUM);
}
@@ -376,20 +311,9 @@ export function getDateSerialNumberByObject(serialNumberObject: BaseValueObject)
}
}
-export function getWeekDayByDateSerialNumber(dateSerialNumber: number): number {
- // special date 1900-02-29(serialNumber = 60)
- const isDate19000229 = Math.floor(dateSerialNumber) === 60;
-
- let date = excelSerialToDate(dateSerialNumber);
-
- const leapDayDateTime = Date.UTC(1900, 1, 28); // February 28, 1900, UTC
- const dateTime = Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate());
-
- if (!isDate19000229 && dateTime <= leapDayDateTime) {
- date = new Date(dateTime - perDayMilliseconds);
- }
-
- return date.getUTCDay();
+export function getWeekDayByDateSerialNumber(dateSerialNumber: number, dateSystem = DateSystem.Date1900): number {
+ const offset = dateSystem === DateSystem.Date1904 ? 5 : 6;
+ return ((Math.floor(dateSerialNumber) + offset) % 7 + 7) % 7;
}
interface ITwoDateDaysType {
@@ -397,14 +321,14 @@ interface ITwoDateDaysType {
yearDays: number;
}
-export function getTwoDateDaysByBasis(startDateSerialNumber: number, endDateSerialNumber: number, basis: number): ITwoDateDaysType {
+export function getTwoDateDaysByBasis(startDateSerialNumber: number, endDateSerialNumber: number, basis: number, dateSystem = DateSystem.Date1900): ITwoDateDaysType {
switch (basis) {
case 0:
// U.S. (NASD) method 30/360.
- return getDaysByNASD(startDateSerialNumber, endDateSerialNumber);
+ return getDaysByNASD(startDateSerialNumber, endDateSerialNumber, dateSystem);
case 1:
// Actual/actual
- return getDaysByActual(startDateSerialNumber, endDateSerialNumber);
+ return getDaysByActual(startDateSerialNumber, endDateSerialNumber, dateSystem);
case 2:
// Actual/360
return {
@@ -419,7 +343,7 @@ export function getTwoDateDaysByBasis(startDateSerialNumber: number, endDateSeri
};
case 4:
// European method 30/360.
- return getDaysByEuropean(startDateSerialNumber, endDateSerialNumber);
+ return getDaysByEuropean(startDateSerialNumber, endDateSerialNumber, dateSystem);
default:
return {
days: Math.abs(endDateSerialNumber - startDateSerialNumber),
@@ -428,16 +352,18 @@ export function getTwoDateDaysByBasis(startDateSerialNumber: number, endDateSeri
}
}
-function getDaysByNASD(startDateSerialNumber: number, endDateSerialNumber: number): ITwoDateDaysType {
- const startDateDate = excelSerialToDate(startDateSerialNumber);
- const startYear = startDateSerialNumber > 0 ? startDateDate.getUTCFullYear() : 1900;
- const startMonth = startDateSerialNumber > 0 ? startDateDate.getUTCMonth() + 1 : 1;
- let startDay = startDateSerialNumber > 0 ? startDateDate.getUTCDate() : 0;
+function getDaysByNASD(startDateSerialNumber: number, endDateSerialNumber: number, dateSystem: DateSystem): ITwoDateDaysType {
+ const startDateDate = excelSerialToDate(startDateSerialNumber, dateSystem);
+ const startIsDate1900SerialZero = dateSystem === DateSystem.Date1900 && startDateSerialNumber === 0;
+ const startYear = startIsDate1900SerialZero ? 1900 : startDateDate.getUTCFullYear();
+ const startMonth = startIsDate1900SerialZero ? 1 : startDateDate.getUTCMonth() + 1;
+ let startDay = startIsDate1900SerialZero ? 0 : startDateDate.getUTCDate();
- let endDateDate = excelSerialToDate(endDateSerialNumber);
- let endYear = endDateSerialNumber > 0 ? endDateDate.getUTCFullYear() : 1900;
- let endMonth = endDateSerialNumber > 0 ? endDateDate.getUTCMonth() + 1 : 1;
- let endDay = endDateSerialNumber > 0 ? endDateDate.getUTCDate() : 0;
+ let endDateDate = excelSerialToDate(endDateSerialNumber, dateSystem);
+ const endIsDate1900SerialZero = dateSystem === DateSystem.Date1900 && endDateSerialNumber === 0;
+ let endYear = endIsDate1900SerialZero ? 1900 : endDateDate.getUTCFullYear();
+ let endMonth = endIsDate1900SerialZero ? 1 : endDateDate.getUTCMonth() + 1;
+ let endDay = endIsDate1900SerialZero ? 0 : endDateDate.getUTCDate();
const startIsLastDayOfFebruary = startMonth === 2 && startDay === getDaysInMonth(startYear, startMonth - 1);
@@ -453,7 +379,7 @@ function getDaysByNASD(startDateSerialNumber: number, endDateSerialNumber: numbe
endDay = 30;
} else if (endDay === 31) {
if (startDay < 30) {
- endDateDate = excelSerialToDate(endDateSerialNumber + 1);
+ endDateDate = excelSerialToDate(endDateSerialNumber + 1, dateSystem);
endYear = endDateDate.getUTCFullYear();
endMonth = endDateDate.getUTCMonth() + 1;
endDay = endDateDate.getUTCDate();
@@ -474,14 +400,30 @@ function getDaysByNASD(startDateSerialNumber: number, endDateSerialNumber: numbe
};
}
-function getDaysByActual(startDateSerialNumber: number, endDateSerialNumber: number): ITwoDateDaysType {
- const startDateDate = excelSerialToDate(startDateSerialNumber);
- const startYear = startDateSerialNumber > 0 ? startDateDate.getUTCFullYear() : 1900;
+function getDaysByActual(startDateSerialNumber: number, endDateSerialNumber: number, dateSystem: DateSystem): ITwoDateDaysType {
+ const startDateDate = excelSerialToDate(startDateSerialNumber, dateSystem);
+ const startIsDate1900SerialZero = dateSystem === DateSystem.Date1900 && startDateSerialNumber === 0;
+ const startYear = startIsDate1900SerialZero ? 1900 : startDateDate.getUTCFullYear();
+ const startMonth = startIsDate1900SerialZero ? 1 : startDateDate.getUTCMonth() + 1;
+ const startDay = startIsDate1900SerialZero ? 0 : startDateDate.getUTCDate();
- const endDateDate = excelSerialToDate(endDateSerialNumber);
- const endYear = endDateSerialNumber > 0 ? endDateDate.getUTCFullYear() : 1900;
+ const endDateDate = excelSerialToDate(endDateSerialNumber, dateSystem);
+ const endIsDate1900SerialZero = dateSystem === DateSystem.Date1900 && endDateSerialNumber === 0;
+ const endYear = endIsDate1900SerialZero ? 1900 : endDateDate.getUTCFullYear();
+ const endMonth = endIsDate1900SerialZero ? 1 : endDateDate.getUTCMonth() + 1;
+ const endDay = endIsDate1900SerialZero ? 0 : endDateDate.getUTCDate();
const totalDays = Math.abs(endDateSerialNumber - startDateSerialNumber);
+
+ // A period from a date to the same date in a later year is a whole number of years.
+ // Excel uses the actual length of those years instead of averaging both boundary years.
+ if (endDateSerialNumber >= startDateSerialNumber && endYear > startYear && startMonth === endMonth && startDay === endDay) {
+ return {
+ days: totalDays,
+ yearDays: totalDays / (endYear - startYear),
+ };
+ }
+
const totalYear = Math.abs(endYear - startYear) + 1;
let startYearFirstDaySerialNumber;
@@ -491,20 +433,20 @@ function getDaysByActual(startDateSerialNumber: number, endDateSerialNumber: num
const startYearFirstDay = new Date(Date.UTC(endYear, 0, 1));
const endYearLastDay = new Date(Date.UTC(startYear, 11, 31));
- startYearFirstDaySerialNumber = excelDateSerial(startYearFirstDay);
- endYearLastDaySerialNumber = excelDateSerial(endYearLastDay);
+ startYearFirstDaySerialNumber = excelDateSerial(startYearFirstDay, dateSystem);
+ endYearLastDaySerialNumber = excelDateSerial(endYearLastDay, dateSystem);
- if (endYear === 1900) { // Special handle. excel 1900 days = 365, 1900/12/31 SerialNumber = 366. so start add 1
+ if (dateSystem === DateSystem.Date1900 && endYear === 1900) { // Special handle. excel 1900 days = 365, 1900/12/31 SerialNumber = 366. so start add 1
startYearFirstDaySerialNumber += 1;
}
} else {
const startYearFirstDay = new Date(Date.UTC(startYear, 0, 1));
const endYearLastDay = new Date(Date.UTC(endYear, 11, 31));
- startYearFirstDaySerialNumber = excelDateSerial(startYearFirstDay);
- endYearLastDaySerialNumber = excelDateSerial(endYearLastDay);
+ startYearFirstDaySerialNumber = excelDateSerial(startYearFirstDay, dateSystem);
+ endYearLastDaySerialNumber = excelDateSerial(endYearLastDay, dateSystem);
- if (startYear === 1900) { // Special handle. excel 1900 days = 365, 1900/12/31 SerialNumber = 366. so start add 1
+ if (dateSystem === DateSystem.Date1900 && startYear === 1900) { // Special handle. excel 1900 days = 365, 1900/12/31 SerialNumber = 366. so start add 1
startYearFirstDaySerialNumber += 1;
}
}
@@ -515,16 +457,18 @@ function getDaysByActual(startDateSerialNumber: number, endDateSerialNumber: num
};
}
-function getDaysByEuropean(startDateSerialNumber: number, endDateSerialNumber: number): ITwoDateDaysType {
- const startDateDate = excelSerialToDate(startDateSerialNumber);
- const startYear = startDateSerialNumber > 0 ? startDateDate.getUTCFullYear() : 1900;
- const startMonth = startDateSerialNumber > 0 ? startDateDate.getUTCMonth() + 1 : 1;
- let startDay = startDateSerialNumber > 0 ? startDateDate.getUTCDate() : 0;
+function getDaysByEuropean(startDateSerialNumber: number, endDateSerialNumber: number, dateSystem: DateSystem): ITwoDateDaysType {
+ const startDateDate = excelSerialToDate(startDateSerialNumber, dateSystem);
+ const startIsDate1900SerialZero = dateSystem === DateSystem.Date1900 && startDateSerialNumber === 0;
+ const startYear = startIsDate1900SerialZero ? 1900 : startDateDate.getUTCFullYear();
+ const startMonth = startIsDate1900SerialZero ? 1 : startDateDate.getUTCMonth() + 1;
+ let startDay = startIsDate1900SerialZero ? 0 : startDateDate.getUTCDate();
- const endDateDate = excelSerialToDate(endDateSerialNumber);
- const endYear = endDateSerialNumber > 0 ? endDateDate.getUTCFullYear() : 1900;
- const endMonth = endDateSerialNumber > 0 ? endDateDate.getUTCMonth() + 1 : 1;
- let endDay = endDateSerialNumber > 0 ? endDateDate.getUTCDate() : 0;
+ const endDateDate = excelSerialToDate(endDateSerialNumber, dateSystem);
+ const endIsDate1900SerialZero = dateSystem === DateSystem.Date1900 && endDateSerialNumber === 0;
+ const endYear = endIsDate1900SerialZero ? 1900 : endDateDate.getUTCFullYear();
+ const endMonth = endIsDate1900SerialZero ? 1 : endDateDate.getUTCMonth() + 1;
+ let endDay = endIsDate1900SerialZero ? 0 : endDateDate.getUTCDate();
// Starting dates and ending dates that occur on the 31st day of a month become equal to the 30th day of the same month.
if (startDay === 31) {
@@ -567,14 +511,14 @@ export function getDaysInYear(year: number): number {
return isLeapYear1900(year) ? 366 : 365;
}
-export function getNormalYearDaysByBasis(dateSerialNumber: number, basis: number): number {
+export function getNormalYearDaysByBasis(dateSerialNumber: number, basis: number, dateSystem = DateSystem.Date1900): number {
switch (basis) {
case 0:
case 2:
case 4:
return 360;
case 1:
- return getDaysInYear(excelSerialToDate(dateSerialNumber).getUTCFullYear());
+ return getDaysInYear(excelSerialToDate(dateSerialNumber, dateSystem).getUTCFullYear());
case 3:
return 365;
default:
diff --git a/packages/engine-formula/src/basics/financial.ts b/packages/engine-formula/src/basics/financial.ts
index b6f6f9f2c5..ed0f99c837 100644
--- a/packages/engine-formula/src/basics/financial.ts
+++ b/packages/engine-formula/src/basics/financial.ts
@@ -14,109 +14,181 @@
* limitations under the License.
*/
+import { DateSystem, excelDateSerial, excelDateTimePartsToSerial, excelSerialToDate, excelSerialToDateTimeParts } from '@univerjs/core';
import { ErrorValueObject } from '../engine/value-object/base-value-object';
import {
dateAddMonths,
- excelDateSerial,
- excelSerialToDate,
getDaysInMonth,
getTwoDateDaysByBasis,
lastDayOfMonth,
} from './date';
import { ErrorType } from './error-type';
-export function calculateCoupdaybs(settlementSerialNumber: number, maturitySerialNumber: number, frequency: number, basis: number): number {
- const coupDateSerialNumber = calculateCouppcd(settlementSerialNumber, maturitySerialNumber, frequency);
-
- const { days } = getTwoDateDaysByBasis(coupDateSerialNumber, settlementSerialNumber, basis);
+interface ICouponDateParts {
+ year: number;
+ month: number;
+ day: number;
+ monthEnd: boolean;
+}
- return days;
+interface ICouponSchedule {
+ previousSerial: number;
+ nextSerial: number;
+ count: number;
}
-export function calculateCoupdays(settlementSerialNumber: number, maturitySerialNumber: number, frequency: number, basis: number): number {
- let result;
+const COUPON_DATE_PARTS_OPTIONS = { hours: 0, minutes: 0, seconds: 0, fractionalSecond: 0 };
- if (basis === 1) {
- const beforeSettlementDateSerialNumber = calculateCouppcd(settlementSerialNumber, maturitySerialNumber, frequency);
+function getCouponDateParts(serial: number, dateSystem: DateSystem): ICouponDateParts {
+ const parts = excelSerialToDateTimeParts(serial, { dateSystem });
- let coupDate = excelSerialToDate(beforeSettlementDateSerialNumber);
- coupDate = dateAddMonths(coupDate, 12 / frequency);
+ if (parts) {
+ return {
+ year: parts.year,
+ month: parts.month,
+ day: parts.day,
+ monthEnd: parts.day === getDaysInMonth(parts.year, parts.month - 1),
+ };
+ }
- const afterSettlementDateSerialNumber = excelDateSerial(coupDate);
+ const date = excelSerialToDate(serial, dateSystem);
+ const year = date.getUTCFullYear();
+ const month = date.getUTCMonth() + 1;
+ const day = date.getUTCDate();
- // special handle for excel
- if (beforeSettlementDateSerialNumber < 0 && frequency === 1) {
- result = 365;
- } else {
- result = afterSettlementDateSerialNumber - beforeSettlementDateSerialNumber;
- }
- } else if (basis === 3) {
- result = 365 / frequency;
- } else {
- result = 360 / frequency;
+ return { year, month, day, monthEnd: day === getDaysInMonth(year, month - 1) };
+}
+
+function getCouponDateSerial(parts: ICouponDateParts, dateSystem: DateSystem): number {
+ if (dateSystem === DateSystem.Date1900 && parts.year === 1900 && parts.month === 1 && parts.day === 0) {
+ return 0;
}
- return result;
-}
+ if (dateSystem === DateSystem.Date1900 && parts.year === 1900 && parts.month === 2 && parts.day === 29) {
+ return 60;
+ }
-export function calculateCoupncd(settlementSerialNumber: number, maturitySerialNumber: number, frequency: number): number {
- const settlementDate = excelSerialToDate(settlementSerialNumber);
- let coupDate = excelSerialToDate(maturitySerialNumber);
+ const serial = excelDateTimePartsToSerial({
+ year: parts.year,
+ month: parts.month,
+ day: parts.day,
+ ...COUPON_DATE_PARTS_OPTIONS,
+ }, { dateSystem });
- coupDate.setUTCFullYear(settlementDate.getUTCFullYear());
+ if (serial != null) {
+ return serial;
+ }
- if (coupDate < settlementDate) {
- coupDate.setUTCFullYear(coupDate.getUTCFullYear() + 1);
+ return excelDateSerial(new Date(Date.UTC(parts.year, parts.month - 1, parts.day)), dateSystem);
+}
+
+function compareCouponDate(left: ICouponDateParts, right: ICouponDateParts): number {
+ if (left.year !== right.year) {
+ return left.year - right.year;
}
- while (coupDate > settlementDate) {
- coupDate = dateAddMonths(coupDate, -12 / frequency);
+ if (left.month !== right.month) {
+ return left.month - right.month;
}
- coupDate = dateAddMonths(coupDate, 12 / frequency);
+ return left.day - right.day;
+}
- const coupDateSerialNumber = excelDateSerial(coupDate);
+// Excel keeps the maturity day/month-end rule for every coupon period; it must not be inferred from an intermediate date.
+function addCouponMonths(parts: ICouponDateParts, months: number): ICouponDateParts {
+ const monthIndex = parts.year * 12 + parts.month - 1 + months;
+ const year = Math.floor(monthIndex / 12);
+ const month = monthIndex - year * 12 + 1;
+ const maxDay = getDaysInMonth(year, month - 1);
+ const day = parts.monthEnd ? maxDay : Math.min(parts.day, maxDay);
- return coupDateSerialNumber;
+ return { year, month, day, monthEnd: parts.monthEnd };
}
-export function calculateCoupnum(settlementSerialNumber: number, maturitySerialNumber: number, frequency: number): number {
- let result = 0;
+function getCouponSchedule(
+ settlementSerialNumber: number,
+ maturitySerialNumber: number,
+ frequency: number,
+ dateSystem: DateSystem
+): ICouponSchedule {
+ const settlement = getCouponDateParts(settlementSerialNumber, dateSystem);
+ const maturity = getCouponDateParts(maturitySerialNumber, dateSystem);
+ const periodMonths = 12 / frequency;
+ let candidate: ICouponDateParts = {
+ ...maturity,
+ year: settlement.year,
+ };
+
+ if (compareCouponDate(candidate, settlement) < 0) {
+ candidate = { ...candidate, year: candidate.year + 1 };
+ }
- const settlementDate = excelSerialToDate(settlementSerialNumber);
- let coupDate = excelSerialToDate(maturitySerialNumber);
+ while (compareCouponDate(candidate, settlement) > 0) {
+ candidate = addCouponMonths(candidate, -periodMonths);
+ }
+
+ const previousSerial = getCouponDateSerial(candidate, dateSystem);
+ const nextSerial = getCouponDateSerial(addCouponMonths(candidate, periodMonths), dateSystem);
- while (coupDate > settlementDate) {
- coupDate = dateAddMonths(coupDate, -12 / frequency);
- result++;
+ let count = 0;
+ let countCandidate = maturity;
+ while (compareCouponDate(countCandidate, settlement) > 0) {
+ countCandidate = addCouponMonths(countCandidate, -periodMonths);
+ count++;
}
- return result;
+ return { previousSerial, nextSerial, count };
}
-export function calculateCouppcd(settlementSerialNumber: number, maturitySerialNumber: number, frequency: number): number {
- const settlementDate = excelSerialToDate(settlementSerialNumber);
- let coupDate = excelSerialToDate(maturitySerialNumber);
+export function calculateCoupdaybs(settlementSerialNumber: number, maturitySerialNumber: number, frequency: number, basis: number, dateSystem = DateSystem.Date1900): number {
+ const coupDateSerialNumber = calculateCouppcd(settlementSerialNumber, maturitySerialNumber, frequency, dateSystem);
- coupDate.setUTCFullYear(settlementDate.getUTCFullYear());
+ const { days } = getTwoDateDaysByBasis(coupDateSerialNumber, settlementSerialNumber, basis, dateSystem);
- if (coupDate < settlementDate) {
- coupDate.setUTCFullYear(coupDate.getUTCFullYear() + 1);
- }
+ return days;
+}
+
+export function calculateCoupdays(settlementSerialNumber: number, maturitySerialNumber: number, frequency: number, basis: number, dateSystem = DateSystem.Date1900): number {
+ let result;
- while (coupDate > settlementDate) {
- coupDate = dateAddMonths(coupDate, -12 / frequency);
+ if (basis === 1) {
+ const beforeSettlementDateSerialNumber = calculateCouppcd(settlementSerialNumber, maturitySerialNumber, frequency, dateSystem);
+
+ const afterSettlementDateSerialNumber = getCouponSchedule(settlementSerialNumber, maturitySerialNumber, frequency, dateSystem).nextSerial;
+
+ // special handle for excel
+ if (beforeSettlementDateSerialNumber < 0 && frequency === 1) {
+ result = 365;
+ } else if (dateSystem === DateSystem.Date1900 && settlementSerialNumber === 0 && frequency === 2 && beforeSettlementDateSerialNumber < 0) {
+ result = 184;
+ } else {
+ result = afterSettlementDateSerialNumber - beforeSettlementDateSerialNumber;
+ }
+ } else if (basis === 3) {
+ result = 365 / frequency;
+ } else {
+ result = 360 / frequency;
}
- const coupDateSerialNumber = excelDateSerial(coupDate);
+ return result;
+}
+
+export function calculateCoupncd(settlementSerialNumber: number, maturitySerialNumber: number, frequency: number, dateSystem = DateSystem.Date1900): number {
+ return getCouponSchedule(settlementSerialNumber, maturitySerialNumber, frequency, dateSystem).nextSerial;
+}
- return coupDateSerialNumber;
+export function calculateCoupnum(settlementSerialNumber: number, maturitySerialNumber: number, frequency: number, dateSystem = DateSystem.Date1900): number {
+ return getCouponSchedule(settlementSerialNumber, maturitySerialNumber, frequency, dateSystem).count;
}
-export function calculateDuration(settlementSerialNumber: number, maturitySerialNumber: number, coupon: number, yld: number, frequency: number, basis: number): number {
- const coupdaybs = calculateCoupdaybs(settlementSerialNumber, maturitySerialNumber, frequency, basis);
- const coupdays = calculateCoupdays(settlementSerialNumber, maturitySerialNumber, frequency, basis);
- const coupnum = calculateCoupnum(settlementSerialNumber, maturitySerialNumber, frequency);
+export function calculateCouppcd(settlementSerialNumber: number, maturitySerialNumber: number, frequency: number, dateSystem = DateSystem.Date1900): number {
+ return getCouponSchedule(settlementSerialNumber, maturitySerialNumber, frequency, dateSystem).previousSerial;
+}
+
+export function calculateDuration(settlementSerialNumber: number, maturitySerialNumber: number, coupon: number, yld: number, frequency: number, basis: number, dateSystem = DateSystem.Date1900): number {
+ const coupdaybs = calculateCoupdaybs(settlementSerialNumber, maturitySerialNumber, frequency, basis, dateSystem);
+ const coupdays = calculateCoupdays(settlementSerialNumber, maturitySerialNumber, frequency, basis, dateSystem);
+ const coupnum = calculateCoupnum(settlementSerialNumber, maturitySerialNumber, frequency, dateSystem);
const coupdaysDiff = (coupdays - coupdaybs) / coupdays - 1;
const _yld = yld / frequency + 1;
@@ -213,13 +285,14 @@ export function calculateOddFPrice(
yld: number,
redemption: number,
frequency: number,
- basis: number
+ basis: number,
+ dateSystem = DateSystem.Date1900
): number {
// DFC = number of days from the beginning of the odd first coupon to the first coupon date.
- const DFC = getPositiveDaysBetween(issueSerialNumber, firstCouponSerialNumber, basis);
+ const DFC = getPositiveDaysBetween(issueSerialNumber, firstCouponSerialNumber, basis, dateSystem);
// E = number of days in the coupon period.
- const E = calculateCoupdays(settlementSerialNumber, firstCouponSerialNumber, frequency, basis);
+ const E = calculateCoupdays(settlementSerialNumber, firstCouponSerialNumber, frequency, basis, dateSystem);
if (DFC < E) {
return calculateOddShortFirstCoupon(
@@ -233,7 +306,8 @@ export function calculateOddFPrice(
frequency,
basis,
DFC,
- E
+ E,
+ dateSystem
);
} else {
return calculateOddLongFirstCoupon(
@@ -246,7 +320,8 @@ export function calculateOddFPrice(
redemption,
frequency,
basis,
- E
+ E,
+ dateSystem
);
}
}
@@ -262,7 +337,8 @@ function calculateOddShortFirstCoupon(
frequency: number,
basis: number,
DFC: number,
- E: number
+ E: number,
+ dateSystem: DateSystem
): number {
// calculate method from
// https://support.microsoft.com/en-us/office/oddfprice-function-d7d664a8-34df-4233-8d2b-922bcf6a69e1
@@ -270,10 +346,10 @@ function calculateOddShortFirstCoupon(
let result = 0;
// N = number of coupons payable between the settlement date and the redemption date. (If this number contains a fraction, it is raised to the next whole number.)
- const N = calculateCoupnum(settlementSerialNumber, maturitySerialNumber, frequency);
+ const N = calculateCoupnum(settlementSerialNumber, maturitySerialNumber, frequency, dateSystem);
// DSC = number of days from the settlement to the next coupon date.
- const DSC = getPositiveDaysBetween(settlementSerialNumber, firstCouponSerialNumber, basis);
+ const DSC = getPositiveDaysBetween(settlementSerialNumber, firstCouponSerialNumber, basis, dateSystem);
result += redemption / ((1 + yld / frequency) ** (N - 1 + DSC / E));
@@ -284,7 +360,7 @@ function calculateOddShortFirstCoupon(
}
// A = number of days from the beginning of the coupon period to the settlement date (accrued days).
- const A = getPositiveDaysBetween(issueSerialNumber, settlementSerialNumber, basis);
+ const A = getPositiveDaysBetween(issueSerialNumber, settlementSerialNumber, basis, dateSystem);
result -= 100 * rate / frequency * A / E;
@@ -301,7 +377,8 @@ function calculateOddLongFirstCoupon(
redemption: number,
frequency: number,
basis: number,
- E: number
+ E: number,
+ dateSystem: DateSystem
): number {
// calculate method from
// https://support.microsoft.com/en-us/office/oddfprice-function-d7d664a8-34df-4233-8d2b-922bcf6a69e1
@@ -309,42 +386,42 @@ function calculateOddLongFirstCoupon(
let result = 0;
// N = number of coupons payable between the first real coupon date and redemption date. (If this number contains a fraction, it is raised to the next whole number.)
- const N = calculateCoupnum(firstCouponSerialNumber, maturitySerialNumber, frequency);
+ const N = calculateCoupnum(firstCouponSerialNumber, maturitySerialNumber, frequency, dateSystem);
// Nq = number of whole quasi-coupon periods between settlement date and first coupon.
- const Nq = getCouponsNumber(firstCouponSerialNumber, settlementSerialNumber, 12 / frequency, true);
+ const Nq = getCouponsNumber(firstCouponSerialNumber, settlementSerialNumber, 12 / frequency, true, dateSystem);
// DSC = number of days from the settlement to the next coupon date.
let DSC;
if (basis === 2 || basis === 3) {
- const coupncd = calculateCoupncd(settlementSerialNumber, firstCouponSerialNumber, frequency);
- DSC = getPositiveDaysBetween(settlementSerialNumber, coupncd, basis);
+ const coupncd = calculateCoupncd(settlementSerialNumber, firstCouponSerialNumber, frequency, dateSystem);
+ DSC = getPositiveDaysBetween(settlementSerialNumber, coupncd, basis, dateSystem);
} else {
- const couppcd = calculateCouppcd(settlementSerialNumber, firstCouponSerialNumber, frequency);
- const { days } = getTwoDateDaysByBasis(couppcd, settlementSerialNumber, basis);
+ const couppcd = calculateCouppcd(settlementSerialNumber, firstCouponSerialNumber, frequency, dateSystem);
+ const { days } = getTwoDateDaysByBasis(couppcd, settlementSerialNumber, basis, dateSystem);
DSC = E - days;
}
result += redemption / ((1 + yld / frequency) ** (N + Nq + DSC / E));
// NC = number of quasi-coupon periods that fit in odd period. (If this number contains a fraction, it is raised to the next whole number.)
- const NC = calculateCoupnum(issueSerialNumber, firstCouponSerialNumber, frequency);
+ const NC = calculateCoupnum(issueSerialNumber, firstCouponSerialNumber, frequency, dateSystem);
let lateCoupon = firstCouponSerialNumber;
let DCiDivNLiSum = 0;
let AiDivNLiSum = 0;
for (let index = NC; index >= 1; index--) {
- const earlyCoupon = getDateSerialNumberByMonths(lateCoupon, -12 / frequency, false);
- const NLi = basis === 1 ? getPositiveDaysBetween(earlyCoupon, lateCoupon, basis) : E;
- const DCi = index > 1 ? NLi : getPositiveDaysBetween(issueSerialNumber, lateCoupon, basis);
+ const earlyCoupon = getDateSerialNumberByMonths(lateCoupon, -12 / frequency, false, dateSystem);
+ const NLi = basis === 1 ? getPositiveDaysBetween(earlyCoupon, lateCoupon, basis, dateSystem) : E;
+ const DCi = index > 1 ? NLi : getPositiveDaysBetween(issueSerialNumber, lateCoupon, basis, dateSystem);
DCiDivNLiSum += DCi / NLi;
const startDate = issueSerialNumber > earlyCoupon ? issueSerialNumber : earlyCoupon;
const endDate = settlementSerialNumber < lateCoupon ? settlementSerialNumber : lateCoupon;
- const Ai = getPositiveDaysBetween(startDate, endDate, basis);
+ const Ai = getPositiveDaysBetween(startDate, endDate, basis, dateSystem);
AiDivNLiSum += Ai / NLi;
@@ -362,20 +439,20 @@ function calculateOddLongFirstCoupon(
return result;
}
-function getPositiveDaysBetween(startDateSerialNumber: number, endDateSerialNumber: number, basis: number): number {
- const { days } = getTwoDateDaysByBasis(startDateSerialNumber, endDateSerialNumber, basis);
+function getPositiveDaysBetween(startDateSerialNumber: number, endDateSerialNumber: number, basis: number, dateSystem: DateSystem): number {
+ const { days } = getTwoDateDaysByBasis(startDateSerialNumber, endDateSerialNumber, basis, dateSystem);
return startDateSerialNumber < endDateSerialNumber ? days : 0;
}
-export function validDaysBetweenIsWholeFrequencyByTwoDate(date1SerialNumber: number, date2SerialNumber: number, frequency: number): boolean {
- const date1 = excelSerialToDate(date1SerialNumber);
+export function validDaysBetweenIsWholeFrequencyByTwoDate(date1SerialNumber: number, date2SerialNumber: number, frequency: number, dateSystem = DateSystem.Date1900): boolean {
+ const date1 = excelSerialToDate(date1SerialNumber, dateSystem);
const date1Year = date1.getUTCFullYear();
const date1Month = date1.getUTCMonth();
const date1Day = date1.getUTCDate();
const date1LastDayOfMonth = lastDayOfMonth(date1Year, date1Month, date1Day);
- const date2 = excelSerialToDate(date2SerialNumber);
+ const date2 = excelSerialToDate(date2SerialNumber, dateSystem);
const date2Year = date2.getUTCFullYear();
const date2Month = date2.getUTCMonth();
const date2Day = date2.getUTCDate();
@@ -394,13 +471,13 @@ export function validDaysBetweenIsWholeFrequencyByTwoDate(date1SerialNumber: num
return true;
}
-export function validCouppcdIsGte0ByTwoDate(date1SerialNumber: number, date2SerialNumber: number, frequency: number): boolean {
- const couppcd = calculateCouppcd(date1SerialNumber, date2SerialNumber, frequency);
+export function validCouppcdIsGte0ByTwoDate(date1SerialNumber: number, date2SerialNumber: number, frequency: number, dateSystem = DateSystem.Date1900): boolean {
+ const couppcd = calculateCouppcd(date1SerialNumber, date2SerialNumber, frequency, dateSystem);
return couppcd >= 0;
}
-export function getDateSerialNumberByMonths(serialNumber: number, months: number, returnLastDay: boolean): number {
- let date = excelSerialToDate(serialNumber);
+export function getDateSerialNumberByMonths(serialNumber: number, months: number, returnLastDay: boolean, dateSystem = DateSystem.Date1900): number {
+ let date = excelSerialToDate(serialNumber, dateSystem);
date = dateAddMonths(date, months);
if (returnLastDay) {
@@ -410,12 +487,12 @@ export function getDateSerialNumberByMonths(serialNumber: number, months: number
date.setUTCDate(daysInMonth);
}
- return excelDateSerial(date);
+ return excelDateSerial(date, dateSystem);
}
-function getCouponsNumber(startDateSerialNumber: number, endDateSerialNumber: number, months: number, isWholeNumber: boolean): number {
- const startDate = excelSerialToDate(startDateSerialNumber);
- const endDate = excelSerialToDate(endDateSerialNumber);
+function getCouponsNumber(startDateSerialNumber: number, endDateSerialNumber: number, months: number, isWholeNumber: boolean, dateSystem: DateSystem): number {
+ const startDate = excelSerialToDate(startDateSerialNumber, dateSystem);
+ const endDate = excelSerialToDate(endDateSerialNumber, dateSystem);
const startDateYear = startDate.getUTCFullYear();
const startDateMonth = startDate.getUTCMonth();
@@ -430,13 +507,13 @@ function getCouponsNumber(startDateSerialNumber: number, endDateSerialNumber: nu
? lastDayOfMonth(endDateYear, endDateMonth, endDateDay)
: endOfMonthTemp;
- const newDateSerialNumber = getDateSerialNumberByMonths(endDateSerialNumber, 0, endOfMonth);
+ const newDateSerialNumber = getDateSerialNumberByMonths(endDateSerialNumber, 0, endOfMonth, dateSystem);
let coupons = (+isWholeNumber - 0) + +(endDateSerialNumber < newDateSerialNumber);
- let frontDateSerialNumber = getDateSerialNumberByMonths(newDateSerialNumber, months, endOfMonth);
+ let frontDateSerialNumber = getDateSerialNumberByMonths(newDateSerialNumber, months, endOfMonth, dateSystem);
while (!(months > 0 ? frontDateSerialNumber >= endDateSerialNumber : frontDateSerialNumber <= endDateSerialNumber)) {
- frontDateSerialNumber = getDateSerialNumberByMonths(frontDateSerialNumber, months, endOfMonth);
+ frontDateSerialNumber = getDateSerialNumberByMonths(frontDateSerialNumber, months, endOfMonth, dateSystem);
coupons++;
}
@@ -551,16 +628,17 @@ export function calculatePrice(
yld: number,
redemption: number,
frequency: number,
- basis: number
+ basis: number,
+ dateSystem = DateSystem.Date1900
): number {
// N is the number of coupons payable between the settlement date and redemption date
- const N = calculateCoupnum(settlementSerialNumber, maturitySerialNumber, frequency);
+ const N = calculateCoupnum(settlementSerialNumber, maturitySerialNumber, frequency, dateSystem);
// E = number of days in coupon period in which the settlement date falls.
- const E = calculateCoupdays(settlementSerialNumber, maturitySerialNumber, frequency, basis);
+ const E = calculateCoupdays(settlementSerialNumber, maturitySerialNumber, frequency, basis, dateSystem);
// A = number of days from beginning of coupon period to settlement date.
- const A = calculateCoupdaybs(settlementSerialNumber, maturitySerialNumber, frequency, basis);
+ const A = calculateCoupdaybs(settlementSerialNumber, maturitySerialNumber, frequency, basis, dateSystem);
if (N === 1) {
const DSR = E - A;
diff --git a/packages/engine-formula/src/basics/format.ts b/packages/engine-formula/src/basics/format.ts
index e7f456cc2d..c874dea055 100644
--- a/packages/engine-formula/src/basics/format.ts
+++ b/packages/engine-formula/src/basics/format.ts
@@ -14,20 +14,20 @@
* limitations under the License.
*/
+import type { DateSystem } from '@univerjs/core';
import type { BaseValueObject } from '../engine/value-object/base-value-object';
import { numfmt } from '@univerjs/core';
import { stripErrorMargin } from '../engine/utils/math-kit';
/**
- * covert number to preview string by pattern
- * @TODODushusir: Internationalization, reuse with numfmt
+ * Convert a number to a preview string using the specified pattern.
*
- * @param pattern
- * @param value
- * @returns
+ * @param pattern Number format pattern.
+ * @param value Number to format.
+ * @returns Formatted preview string.
*/
-export const getFormatPreview = (pattern: string, value: number) => {
- return numfmt.format(pattern, value, { throws: false });
+export const getFormatPreview = (pattern: string, value: number, dateSystem?: DateSystem) => {
+ return numfmt.format(pattern, value, { dateSystem, throws: false });
};
export const getTextValueOfNumberFormat = (text: BaseValueObject): string => {
@@ -43,7 +43,7 @@ export const getTextValueOfNumberFormat = (text: BaseValueObject): string => {
if (text.isNumber()) {
if (text.getPattern() !== '') {
- textValue = getFormatPreview(text.getPattern(), +text.getValue());
+ textValue = getFormatPreview(text.getPattern(), +text.getValue(), text.getDateSystem());
} else {
// Specify Number.EPSILON to not discard necessary digits in the case of non-precision errors, for example, the length of 1/3 is 17
textValue = `${stripErrorMargin(+text.getValue())}`;
diff --git a/packages/engine-formula/src/engine/ast-node/__tests__/function-node.spec.ts b/packages/engine-formula/src/engine/ast-node/__tests__/function-node.spec.ts
new file mode 100644
index 0000000000..2556ded101
--- /dev/null
+++ b/packages/engine-formula/src/engine/ast-node/__tests__/function-node.spec.ts
@@ -0,0 +1,248 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * 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 { IWorkbookData, Workbook } from '@univerjs/core';
+import type { LambdaValueObjectObject } from '../../value-object/lambda-value-object';
+import { DateSystem, LocaleType, UniverInstanceType } from '@univerjs/core';
+import { describe, expect, it } from 'vitest';
+import { ErrorType } from '../../../basics/error-type';
+import { createFunctionTestBed } from '../../../functions/__tests__/create-function-test-bed';
+import { AsyncCustomFunction, CustomFunction } from '../../../functions/custom-function';
+import { DateFunction } from '../../../functions/date/date';
+import { FUNCTION_NAMES_DATE } from '../../../functions/date/function-names';
+import { Accrint } from '../../../functions/financial/accrint';
+import { FUNCTION_NAMES_FINANCIAL } from '../../../functions/financial/function-names';
+import { Abs } from '../../../functions/math/abs';
+import { FUNCTION_NAMES_MATH } from '../../../functions/math/function-names';
+import { FUNCTION_NAMES_META } from '../../../functions/meta/function-names';
+import { Plus } from '../../../functions/meta/plus';
+import { FUNCTION_NAMES_TEXT } from '../../../functions/text/function-names';
+import { Substitute } from '../../../functions/text/substitute';
+import { getObjectValue } from '../../../functions/util';
+import { IFormulaCurrentConfigService } from '../../../services/current-data.service';
+import { IFunctionService } from '../../../services/function.service';
+import { IFormulaRuntimeService } from '../../../services/runtime.service';
+import { Lexer } from '../../analysis/lexer';
+import { LexerNode } from '../../analysis/lexer-node';
+import { AstTreeBuilder } from '../../analysis/parser';
+import { Interpreter } from '../../interpreter/interpreter';
+import { generateExecuteAstNodeData } from '../../utils/ast-node-tool';
+import { BaseAstNode } from '../base-ast-node';
+
+function createWorkbookData(): IWorkbookData {
+ return {
+ id: 'test',
+ appVersion: '3.0.0-alpha',
+ locale: LocaleType.FR_FR,
+ name: 'Locale-independent date parsing',
+ sheetOrder: ['sheet1'],
+ sheets: {
+ sheet1: {
+ id: 'sheet1',
+ name: 'Sheet1',
+ rowCount: 1,
+ columnCount: 1,
+ },
+ },
+ styles: {},
+ };
+}
+
+function createDateSystemWorkbookData(id: string, dateSystem: DateSystem): IWorkbookData {
+ return {
+ ...createWorkbookData(),
+ id,
+ locale: LocaleType.EN_US,
+ name: id,
+ dateSystem,
+ };
+}
+
+describe('FunctionNode workbook context', () => {
+ it('does not use the executing workbook locale to parse formula text', () => {
+ const testBed = createFunctionTestBed(createWorkbookData());
+ const currentConfigService = testBed.get(IFormulaCurrentConfigService);
+ const runtimeService = testBed.get(IFormulaRuntimeService);
+ const lexer = testBed.get(Lexer);
+ const astTreeBuilder = testBed.get(AstTreeBuilder);
+ const interpreter = testBed.get(Interpreter);
+
+ currentConfigService.load({
+ formulaData: {},
+ arrayFormulaCellData: {},
+ arrayFormulaRange: {},
+ forceCalculate: false,
+ dirtyRanges: [],
+ dirtyNameMap: {},
+ dirtyDefinedNameMap: {},
+ dirtyUnitFeatureMap: {},
+ dirtyUnitOtherFormulaMap: {},
+ excludedCell: {},
+ allUnitData: { [testBed.unitId]: testBed.sheetData },
+ });
+ runtimeService.setCurrent(0, 0, 1, 1, testBed.sheetId, testBed.unitId);
+ testBed.get(IFunctionService).registerExecutors(new Accrint(FUNCTION_NAMES_FINANCIAL.ACCRINT));
+ testBed.get(IFunctionService).registerExecutors(new Plus(FUNCTION_NAMES_META.PLUS));
+
+ const calculate = (formula: string) => {
+ const lexerNode = lexer.treeBuilder(formula);
+ if (!(lexerNode instanceof LexerNode)) throw new TypeError(`Failed to parse formula: ${formula}`);
+ const astNode = astTreeBuilder.parse(lexerNode);
+ if (!(astNode instanceof BaseAstNode)) throw new TypeError(`Failed to build AST: ${formula}`);
+ return getObjectValue(interpreter.execute(generateExecuteAstNodeData(astNode)));
+ };
+
+ expect(calculate('=ACCRINT("31/01/2024","31/07/2024","01/05/2024",0.1,1000,2)'))
+ .toBe(ErrorType.VALUE);
+ expect(calculate('=1+"1,5"')).toBe(ErrorType.VALUE);
+ });
+
+ it('uses the executing workbook date system for implicit string coercion', async () => {
+ const testBed = createFunctionTestBed(createDateSystemWorkbookData('date-1900', DateSystem.Date1900));
+ const date1904Workbook = testBed.univer.createUnit<IWorkbookData, Workbook>(
+ UniverInstanceType.UNIVER_SHEET,
+ createDateSystemWorkbookData('date-1904', DateSystem.Date1904)
+ );
+ const currentConfigService = testBed.get(IFormulaCurrentConfigService);
+ const runtimeService = testBed.get(IFormulaRuntimeService);
+ const lexer = testBed.get(Lexer);
+ const astTreeBuilder = testBed.get(AstTreeBuilder);
+ const interpreter = testBed.get(Interpreter);
+
+ currentConfigService.load({
+ formulaData: {},
+ arrayFormulaCellData: {},
+ arrayFormulaRange: {},
+ forceCalculate: false,
+ dirtyRanges: [],
+ dirtyNameMap: {},
+ dirtyDefinedNameMap: {},
+ dirtyUnitFeatureMap: {},
+ dirtyUnitOtherFormulaMap: {},
+ excludedCell: {},
+ allUnitData: { [testBed.unitId]: testBed.sheetData },
+ });
+ testBed.get(IFunctionService).registerExecutors(new Plus(FUNCTION_NAMES_META.PLUS));
+ testBed.get(IFunctionService).registerExecutors(new Abs(FUNCTION_NAMES_MATH.ABS));
+ testBed.get(IFunctionService).registerExecutors(new Substitute(FUNCTION_NAMES_TEXT.SUBSTITUTE));
+ testBed.get(IFunctionService).registerExecutors(new DateFunction(FUNCTION_NAMES_DATE.DATE));
+ const customDate = new CustomFunction('CUSTOMDATE');
+ customDate.calculateCustom = () => '1904-1-1';
+ const customDateArray = new CustomFunction('CUSTOMDATEARRAY');
+ customDateArray.calculateCustom = () => [['1904-1-1']];
+ const asyncCustomDate = new AsyncCustomFunction('ASYNCCUSTOMDATE');
+ const date1904Result = createDeferred<string>();
+ const date1900Result = createDeferred<string>();
+ const date1904Started = createDeferred<void>();
+ const date1900Started = createDeferred<void>();
+ asyncCustomDate.calculateCustom = (dateSystem) => {
+ if (dateSystem === '1904') {
+ date1904Started.resolve();
+ return date1904Result.promise;
+ }
+
+ date1900Started.resolve();
+ return date1900Result.promise;
+ };
+ testBed.get(IFunctionService).registerExecutors(customDate, customDateArray, asyncCustomDate);
+
+ const calculate = (unitId: string, sheetId: string, formula = '="1904-1-1"+0') => {
+ runtimeService.setCurrent(0, 0, 1, 1, sheetId, unitId);
+ const lexerNode = lexer.treeBuilder(formula);
+ if (!(lexerNode instanceof LexerNode)) throw new TypeError('Failed to parse implicit date coercion formula');
+ const astNode = astTreeBuilder.parse(lexerNode);
+ if (!(astNode instanceof BaseAstNode)) throw new TypeError('Failed to build implicit date coercion AST');
+ return getObjectValue(interpreter.execute(generateExecuteAstNodeData(astNode)));
+ };
+ const calculateAsync = async (unitId: string, sheetId: string, formula: string) => {
+ runtimeService.setCurrent(0, 0, 1, 1, sheetId, unitId);
+ const lexerNode = lexer.treeBuilder(formula);
+ if (!(lexerNode instanceof LexerNode)) throw new TypeError('Failed to parse async custom function formula');
+ const astNode = astTreeBuilder.parse(lexerNode);
+ if (!(astNode instanceof BaseAstNode)) throw new TypeError('Failed to build async custom function AST');
+ return getObjectValue(await interpreter.executeAsync(generateExecuteAstNodeData(astNode)));
+ };
+
+ expect(calculate(testBed.unitId, testBed.sheetId)).toBe(1462);
+ expect(calculate(date1904Workbook.getUnitId(), date1904Workbook.getActiveSheet()!.getSheetId())).toBe(0);
+ expect(calculate(testBed.unitId, testBed.sheetId, '=DATE(1904,1,1)')).toBe(1462);
+ expect(calculate(
+ date1904Workbook.getUnitId(),
+ date1904Workbook.getActiveSheet()!.getSheetId(),
+ '=DATE(1904,1,1)'
+ )).toBe(0);
+ expect(calculate(
+ date1904Workbook.getUnitId(),
+ date1904Workbook.getActiveSheet()!.getSheetId(),
+ '=ABS("1904-1-1")'
+ )).toBe(0);
+ expect(calculate(
+ date1904Workbook.getUnitId(),
+ date1904Workbook.getActiveSheet()!.getSheetId(),
+ '=ABS(SUBSTITUTE("1904/1/1","/","-"))'
+ )).toBe(0);
+ expect(calculate(testBed.unitId, testBed.sheetId, '=ABS(SUBSTITUTE("1904/1/1","/","-"))')).toBe(1462);
+ expect(calculate(
+ date1904Workbook.getUnitId(),
+ date1904Workbook.getActiveSheet()!.getSheetId(),
+ '=ABS(CUSTOMDATE())'
+ )).toBe(0);
+ expect(calculate(
+ date1904Workbook.getUnitId(),
+ date1904Workbook.getActiveSheet()!.getSheetId(),
+ '=ABS(CUSTOMDATEARRAY())'
+ )).toStrictEqual([[0]]);
+
+ runtimeService.setCurrent(
+ 0,
+ 0,
+ 1,
+ 1,
+ date1904Workbook.getActiveSheet()!.getSheetId(),
+ date1904Workbook.getUnitId()
+ );
+ const lambdaLexerNode = lexer.treeBuilder('=LAMBDA(value,ABS(value))');
+ if (!(lambdaLexerNode instanceof LexerNode)) throw new TypeError('Failed to parse lambda formula');
+ const lambdaAstNode = astTreeBuilder.parse(lambdaLexerNode);
+ if (!(lambdaAstNode instanceof BaseAstNode)) throw new TypeError('Failed to build lambda AST');
+ const lambda = interpreter.execute(generateExecuteAstNodeData(lambdaAstNode)) as LambdaValueObjectObject;
+ expect(lambda.executeCustom('1904-1-1').getValue()).toBe(0);
+
+ const pending1904 = calculateAsync(
+ date1904Workbook.getUnitId(),
+ date1904Workbook.getActiveSheet()!.getSheetId(),
+ '=ABS(ASYNCCUSTOMDATE("1904"))'
+ );
+ await date1904Started.promise;
+ const pending1900 = calculateAsync(testBed.unitId, testBed.sheetId, '=ABS(ASYNCCUSTOMDATE("1900"))');
+ await date1900Started.promise;
+ date1904Result.resolve('1904-1-1');
+ expect(await pending1904).toBe(0);
+ date1900Result.resolve('1904-1-1');
+ expect(await pending1900).toBe(1462);
+
+ expect(calculate(testBed.unitId, testBed.sheetId)).toBe(1462);
+ });
+});
+
+function createDeferred<T>() {
+ let resolve!: (value: T) => void;
+ const promise = new Promise<T>((promiseResolve) => {
+ resolve = promiseResolve;
+ });
+
+ return { promise, resolve };
+}
diff --git a/packages/engine-formula/src/engine/ast-node/base-ast-node.ts b/packages/engine-formula/src/engine/ast-node/base-ast-node.ts
index 4b8ecf1d22..f19d7b9a03 100644
--- a/packages/engine-formula/src/engine/ast-node/base-ast-node.ts
+++ b/packages/engine-formula/src/engine/ast-node/base-ast-node.ts
@@ -14,11 +14,9 @@
* limitations under the License.
*/
-import type { Nullable } from '@univerjs/core';
+import type { DateSystem, Nullable } from '@univerjs/core';
import type { ErrorType } from '../../basics/error-type';
-
import type { FunctionVariantType } from '../reference-object/base-reference-object';
-
import { AstNodePromiseType } from '../../basics/common';
import { ErrorValueObject } from '../value-object/base-value-object';
import { NodeType } from './node-type';
@@ -144,7 +142,7 @@ export class BaseAstNode {
this._calculateState = true;
}
- execute() {
+ execute(_dateSystem?: DateSystem) {
/* abstract */
}
@@ -152,7 +150,7 @@ export class BaseAstNode {
/* abstract */
}
- async executeAsync(): Promise<AstNodePromiseType> {
+ async executeAsync(_dateSystem?: DateSystem): Promise<AstNodePromiseType> {
/* abstract */
return Promise.resolve(AstNodePromiseType.SUCCESS);
}
diff --git a/packages/engine-formula/src/engine/ast-node/function-node.ts b/packages/engine-formula/src/engine/ast-node/function-node.ts
index 99b30d5883..744ab02b4a 100644
--- a/packages/engine-formula/src/engine/ast-node/function-node.ts
+++ b/packages/engine-formula/src/engine/ast-node/function-node.ts
@@ -15,7 +15,6 @@
*/
import type { BaseFunction } from '../../functions/base-function';
-
import type { LexerNode } from '../analysis/lexer-node';
import type {
AsyncArrayObject,
@@ -26,7 +25,7 @@ import type {
} from '../reference-object/base-reference-object';
import type { BaseValueObject } from '../value-object/base-value-object';
import type { FormulaFunctionResultValueType } from '../value-object/primitive-object';
-import { Inject, Injector } from '@univerjs/core';
+import { DateSystem, Inject, Injector } from '@univerjs/core';
import { AstNodePromiseType } from '../../basics/common';
import { ErrorType } from '../../basics/error-type';
import { matchToken } from '../../basics/token';
@@ -90,14 +89,14 @@ export class FunctionNode extends BaseAstNode {
return this._functionExecutor.lazyIfReferenceArrayArgumentIndexes.includes(this.getChildren().indexOf(child));
}
- override async executeAsync() {
+ override async executeAsync(dateSystem: DateSystem = DateSystem.Date1900) {
const children = this.getChildren();
this._compatibility();
const resultVariant = this._functionExecutor.needsAstChildren
- ? this._calculateAst(children)
- : await this._calculateAsync(this._collectVariants(children));
+ ? this._calculateAst(children, dateSystem)
+ : await this._calculateAsync(this._collectVariants(children, dateSystem), dateSystem);
let result: FunctionVariantType;
if (resultVariant.isAsyncObject() || resultVariant.isAsyncArrayObject()) {
@@ -106,7 +105,7 @@ export class FunctionNode extends BaseAstNode {
result = resultVariant as FunctionVariantType;
}
- result = this._normalizeTopLevelLegacyArrayResult(result);
+ result = this._normalizeTopLevelLegacyArrayResult(result).withDateSystem(dateSystem) as FunctionVariantType;
this._setEmbeddedArrayFormulaToResult(result);
@@ -117,16 +116,16 @@ export class FunctionNode extends BaseAstNode {
return Promise.resolve(AstNodePromiseType.SUCCESS);
}
- override execute() {
+ override execute(dateSystem: DateSystem = DateSystem.Date1900) {
const children = this.getChildren();
this._compatibility();
const resultVariant = (this._functionExecutor.needsAstChildren
- ? this._calculateAst(children)
- : this._calculate(this._collectVariants(children))) as FunctionVariantType;
+ ? this._calculateAst(children, dateSystem)
+ : this._calculate(this._collectVariants(children, dateSystem), dateSystem)) as FunctionVariantType;
- const result = this._normalizeTopLevelLegacyArrayResult(resultVariant);
+ const result = this._normalizeTopLevelLegacyArrayResult(resultVariant).withDateSystem(dateSystem) as FunctionVariantType;
this._setEmbeddedArrayFormulaToResult(result);
@@ -135,12 +134,12 @@ export class FunctionNode extends BaseAstNode {
this.setValue(result as FunctionVariantType);
}
- private _collectVariants(children: BaseAstNode[]): BaseValueObject[] {
+ private _collectVariants(children: BaseAstNode[], dateSystem: DateSystem): BaseValueObject[] {
const variants: BaseValueObject[] = [];
const childrenCount = children.length;
for (let i = 0; i < childrenCount; i++) {
- const object = this._getChildVariant(children[i]);
+ const object = this._getChildVariant(children[i], dateSystem);
if (object == null) {
continue;
@@ -152,7 +151,7 @@ export class FunctionNode extends BaseAstNode {
return variants;
}
- private _getChildVariant(child: BaseAstNode): FunctionVariantType | undefined {
+ private _getChildVariant(child: BaseAstNode, dateSystem: DateSystem): FunctionVariantType | undefined {
const object = child.getValue();
if (object == null) {
@@ -166,10 +165,10 @@ export class FunctionNode extends BaseAstNode {
// In the SUBTOTAL function, we need to get rowData information, we can only use ReferenceObject
if (object.isReferenceObject() && !this._functionExecutor.needsReferenceObject) {
// Array converted from reference object needs to be marked
- return (object as BaseReferenceObject).toArrayValueObject();
+ return (object as BaseReferenceObject).withDateSystem(dateSystem).toArrayValueObject();
}
- return object;
+ return object.withDateSystem(dateSystem);
}
isFunctionExecutorArgumentsIgnoreNumberPattern() {
@@ -279,12 +278,15 @@ export class FunctionNode extends BaseAstNode {
/**
* Transform the result of a custom function to a NodeValueType.
*/
- private _handleCustomResult(resultVariantCustom: FormulaFunctionResultValueType): NodeValueType {
+ private _handleCustomResult(
+ resultVariantCustom: FormulaFunctionResultValueType,
+ dateSystem: DateSystem
+ ): NodeValueType {
if (typeof resultVariantCustom !== 'object' || resultVariantCustom == null) {
- return ValueObjectFactory.create(resultVariantCustom);
+ return ValueObjectFactory.create(resultVariantCustom, false, dateSystem);
}
- const arrayValues = transformToValueObject(resultVariantCustom);
+ const arrayValues = transformToValueObject(resultVariantCustom, false, dateSystem);
return ArrayValueObject.create({
calculateValueList: arrayValues,
rowCount: arrayValues.length,
@@ -322,7 +324,7 @@ export class FunctionNode extends BaseAstNode {
});
}
- private _calculate(variants: BaseValueObject[]) {
+ private _calculate(variants: BaseValueObject[], dateSystem: DateSystem) {
// Check the number of parameters
const { minParams, maxParams } = this._functionExecutor;
if (minParams !== -1 && maxParams !== -1 && (variants.length < minParams || variants.length > maxParams)) {
@@ -337,7 +339,7 @@ export class FunctionNode extends BaseAstNode {
...this._mapVariantsToValues(variants)
) as FormulaFunctionResultValueType;
- resultVariant = this._handleCustomResult(resultVariantCustom);
+ resultVariant = this._handleCustomResult(resultVariantCustom, dateSystem);
} else {
this._handleAddressFunction();
resultVariant = this._functionExecutor.calculate(...variants);
@@ -346,7 +348,7 @@ export class FunctionNode extends BaseAstNode {
return resultVariant;
}
- private _calculateAst(children: BaseAstNode[]) {
+ private _calculateAst(children: BaseAstNode[], dateSystem: DateSystem) {
const { minParams, maxParams } = this._functionExecutor;
if (minParams !== -1 && maxParams !== -1 && (children.length < minParams || children.length > maxParams)) {
return ErrorValueObject.create(ErrorType.NA);
@@ -355,10 +357,10 @@ export class FunctionNode extends BaseAstNode {
this._setRefInfo();
this._handleAddressFunction();
- return this._functionExecutor.calculateAst(children, (node) => this._getChildVariant(node) ?? null);
+ return this._functionExecutor.calculateAst(children, (node) => this._getChildVariant(node, dateSystem) ?? null);
}
- private async _calculateAsync(variants: BaseValueObject[]) {
+ private async _calculateAsync(variants: BaseValueObject[], dateSystem: DateSystem) {
// Check the number of parameters
const { minParams, maxParams } = this._functionExecutor;
if (minParams !== -1 && maxParams !== -1 && (variants.length < minParams || variants.length > maxParams)) {
@@ -374,7 +376,7 @@ export class FunctionNode extends BaseAstNode {
...this._mapVariantsToValues(variants)
);
- resultVariant = this._handleCustomResult(resultVariantCustom);
+ resultVariant = this._handleCustomResult(resultVariantCustom, dateSystem);
} else {
this._handleAddressFunction();
resultVariant = this._functionExecutor.calculate(...variants);
@@ -400,6 +402,7 @@ export class FunctionNode extends BaseAstNode {
const { currentUnitId, currentSubUnitId, currentRow, currentColumn, currentRowCount, currentColumnCount } = this._runtimeService;
this._functionExecutor.setRefInfo(currentUnitId, currentSubUnitId, currentRow, currentColumn, currentRowCount, currentColumnCount);
+ this._functionExecutor.setDateSystem(this._currentConfigService.getDateSystem(currentUnitId));
if (this._functionExecutor.needsSheetRowColumnCount) {
const { rowCount, columnCount } = this._currentConfigService.getSheetRowColumnCount(currentUnitId, currentSubUnitId);
diff --git a/packages/engine-formula/src/engine/ast-node/operator-node.ts b/packages/engine-formula/src/engine/ast-node/operator-node.ts
index 88e89e7df6..da528d533f 100644
--- a/packages/engine-formula/src/engine/ast-node/operator-node.ts
+++ b/packages/engine-formula/src/engine/ast-node/operator-node.ts
@@ -15,12 +15,12 @@
*/
import type { compareToken } from '../../basics/token';
-
import type { BaseFunction } from '../../functions/base-function';
import type { Compare } from '../../functions/meta/compare';
import type { BaseReferenceObject, FunctionVariantType } from '../reference-object/base-reference-object';
import type { ArrayValueObject } from '../value-object/array-value-object';
import type { BaseValueObject } from '../value-object/base-value-object';
+import { DateSystem } from '@univerjs/core';
import { ErrorType } from '../../basics/error-type';
import { OPERATOR_TOKEN_COMPARE_SET, OPERATOR_TOKEN_SET, operatorToken } from '../../basics/token';
import { FUNCTION_NAMES_MATH } from '../../functions/math/function-names';
@@ -48,7 +48,7 @@ export class OperatorNode extends BaseAstNode {
return NodeType.OPERATOR;
}
- override execute() {
+ override execute(dateSystem: DateSystem = DateSystem.Date1900) {
const children = this.getChildren();
if (this._functionExecutor.name === FUNCTION_NAMES_META.COMPARE) {
(this._functionExecutor as Compare).setCompareType(this.getToken() as compareToken);
@@ -83,6 +83,8 @@ export class OperatorNode extends BaseAstNode {
object2 = this._referenceToOperatorValue(object2 as BaseReferenceObject);
}
+ object1 = object1.withDateSystem(dateSystem);
+ object2 = object2.withDateSystem(dateSystem);
const result = this._functionExecutor.calculate(
object1 as BaseValueObject,
object2 as BaseValueObject
@@ -90,7 +92,7 @@ export class OperatorNode extends BaseAstNode {
this._setEmbeddedArrayFormulaToResult(result);
- this.setValue(result);
+ this.setValue(result.withDateSystem(dateSystem));
}
private _referenceToOperatorValue(reference: BaseReferenceObject): BaseValueObject {
diff --git a/packages/engine-formula/src/engine/ast-node/prefix-node.ts b/packages/engine-formula/src/engine/ast-node/prefix-node.ts
index db52f26ad9..f6e6e78b2b 100644
--- a/packages/engine-formula/src/engine/ast-node/prefix-node.ts
+++ b/packages/engine-formula/src/engine/ast-node/prefix-node.ts
@@ -16,9 +16,9 @@
import type { Nullable } from '@univerjs/core';
import type { BaseFunction } from '../../functions/base-function';
-
import type { BaseReferenceObject, FunctionVariantType } from '../reference-object/base-reference-object';
import type { BaseValueObject } from '../value-object/base-value-object';
+import { DateSystem } from '@univerjs/core';
import { ErrorType } from '../../basics/error-type';
import { OPERATOR_TOKEN_COMPARE_SET, prefixToken } from '../../basics/token';
import { FUNCTION_NAMES_LOOKUP } from '../../functions/lookup/function-names';
@@ -46,7 +46,7 @@ export class PrefixNode extends BaseAstNode {
return NodeType.PREFIX;
}
- override execute() {
+ override execute(dateSystem: DateSystem = DateSystem.Date1900) {
const children = this.getChildren();
let value = children[0].getValue();
let result: FunctionVariantType;
@@ -58,18 +58,18 @@ export class PrefixNode extends BaseAstNode {
if (this._operatorString === prefixToken.MINUS) {
if (value.isReferenceObject()) {
- value = (value as BaseReferenceObject).toArrayValueObject();
+ value = (value as BaseReferenceObject).withDateSystem(dateSystem).toArrayValueObject();
}
result = this._functionExecutor!.calculate(
NumberValueObject.create(0),
- value as BaseValueObject
+ (value as BaseValueObject).withDateSystem(dateSystem)
) as FunctionVariantType;
} else if (this._operatorString === prefixToken.AT) {
result = this._handlerAT(value);
} else {
result = ErrorValueObject.create(ErrorType.VALUE);
}
- this.setValue(result);
+ this.setValue(result.withDateSystem(dateSystem));
}
private _handlerAT(value: FunctionVariantType) {
diff --git a/packages/engine-formula/src/engine/ast-node/suffix-node.ts b/packages/engine-formula/src/engine/ast-node/suffix-node.ts
index 2b55f19ed7..3efbb55827 100644
--- a/packages/engine-formula/src/engine/ast-node/suffix-node.ts
+++ b/packages/engine-formula/src/engine/ast-node/suffix-node.ts
@@ -15,11 +15,10 @@
*/
import type { BaseFunction } from '../../functions/base-function';
-
import type { BaseReferenceObject, FunctionVariantType } from '../reference-object/base-reference-object';
import type { CellReferenceObject } from '../reference-object/cell-reference-object';
import type { BaseValueObject } from '../value-object/base-value-object';
-import { Inject } from '@univerjs/core';
+import { DateSystem, Inject } from '@univerjs/core';
import { ErrorType } from '../../basics/error-type';
import { suffixToken } from '../../basics/token';
import { FUNCTION_NAMES_META } from '../../functions/meta/function-names';
@@ -47,7 +46,7 @@ export class SuffixNode extends BaseAstNode {
return NodeType.SUFFIX;
}
- override execute() {
+ override execute(dateSystem: DateSystem = DateSystem.Date1900) {
const children = this.getChildren();
let value = children[0]?.getValue();
let result: FunctionVariantType;
@@ -58,10 +57,10 @@ export class SuffixNode extends BaseAstNode {
if (this._operatorString === suffixToken.PERCENTAGE) {
if (value.isReferenceObject()) {
- value = (value as BaseReferenceObject).toArrayValueObject();
+ value = (value as BaseReferenceObject).withDateSystem(dateSystem).toArrayValueObject();
}
result = this._functionExecutor!.calculate(
- value as BaseValueObject,
+ (value as BaseValueObject).withDateSystem(dateSystem),
NumberValueObject.create(100)
) as FunctionVariantType;
@@ -75,7 +74,7 @@ export class SuffixNode extends BaseAstNode {
} else {
result = ErrorValueObject.create(ErrorType.VALUE);
}
- this.setValue(result);
+ this.setValue(result.withDateSystem(dateSystem));
}
private _handlerPound(value: FunctionVariantType) {
diff --git a/packages/engine-formula/src/engine/ast-node/value-node.ts b/packages/engine-formula/src/engine/ast-node/value-node.ts
index 49cff6be7e..cd90abc8bb 100644
--- a/packages/engine-formula/src/engine/ast-node/value-node.ts
+++ b/packages/engine-formula/src/engine/ast-node/value-node.ts
@@ -16,6 +16,7 @@
import type { ErrorType } from '../../basics/error-type';
import type { FunctionNode } from './';
+import { DateSystem } from '@univerjs/core';
import { BooleanValue } from '../../basics/common';
import { ERROR_TYPE_SET } from '../../basics/error-type';
import { LexerNode } from '../analysis/lexer-node';
@@ -34,11 +35,13 @@ export class ValueNode extends BaseAstNode {
return NodeType.VALUE;
}
- override execute(): void {
+ override execute(dateSystem: DateSystem = DateSystem.Date1900): void {
const token = this.getToken();
const tokenTrim = token.trim();
if (tokenTrim.startsWith('"') && tokenTrim.endsWith('"')) {
- this.setValue(StringValueObject.create(tokenTrim.slice(1, -1).replace(/""/g, '"')));
+ this.setValue(
+ StringValueObject.create(tokenTrim.slice(1, -1).replace(/""/g, '"')).withDateSystem(dateSystem)
+ );
return;
}
@@ -47,7 +50,7 @@ export class ValueNode extends BaseAstNode {
if (parent?.nodeType === NodeType.FUNCTION) {
isIgnoreNumberPattern = (parent as FunctionNode).isFunctionExecutorArgumentsIgnoreNumberPattern?.() ?? true;
}
- this.setValue(ValueObjectFactory.create(token, isIgnoreNumberPattern));
+ this.setValue(ValueObjectFactory.create(token, isIgnoreNumberPattern, dateSystem));
}
}
diff --git a/packages/engine-formula/src/engine/interpreter/__tests__/interpreter.spec.ts b/packages/engine-formula/src/engine/interpreter/__tests__/interpreter.spec.ts
index 7cff53e0b9..4d5fd38039 100644
--- a/packages/engine-formula/src/engine/interpreter/__tests__/interpreter.spec.ts
+++ b/packages/engine-formula/src/engine/interpreter/__tests__/interpreter.spec.ts
@@ -16,6 +16,7 @@
import { describe, expect, it, vi } from 'vitest';
import { AstNodePromiseType } from '../../../basics/common';
+import { createFunctionTestBed } from '../../../functions/__tests__/create-function-test-bed';
import { BaseAstNode } from '../../ast-node/base-ast-node';
import { NumberValueObject } from '../../value-object/primitive-object';
import { Interpreter } from '../interpreter';
@@ -38,11 +39,8 @@ class AsyncReferenceLikeNode extends BaseAstNode {
describe('Interpreter async nodes', () => {
it('detects and awaits an async root node regardless of node type', async () => {
- const interpreter = new Interpreter({
- currentColumn: 0,
- currentRow: 0,
- isStopExecution: () => false,
- });
+ const testBed = createFunctionTestBed();
+ const interpreter = testBed.get(Interpreter);
const node = new AsyncReferenceLikeNode();
expect(interpreter.checkAsyncNode(node)).toBe(true);
diff --git a/packages/engine-formula/src/engine/interpreter/interpreter.ts b/packages/engine-formula/src/engine/interpreter/interpreter.ts
index 1b985168c4..e2aa53b222 100644
--- a/packages/engine-formula/src/engine/interpreter/interpreter.ts
+++ b/packages/engine-formula/src/engine/interpreter/interpreter.ts
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import type { Nullable } from '@univerjs/core';
+import type { DateSystem, Nullable } from '@univerjs/core';
import type { BaseAstNode } from '../ast-node/base-ast-node';
import type { LambdaNode } from '../ast-node/lambda-node';
import type { ReferenceNode } from '../ast-node/reference-node';
@@ -27,6 +27,7 @@ import { Disposable } from '@univerjs/core';
import { AstNodePromiseType } from '../../basics/common';
import { ErrorType } from '../../basics/error-type';
import { DEFAULT_TOKEN_LAMBDA_FUNCTION_NAME } from '../../basics/token-type';
+import { IFormulaCurrentConfigService } from '../../services/current-data.service';
import { IFormulaRuntimeService } from '../../services/runtime.service';
import { NodeType } from '../ast-node/node-type';
import { ErrorValueObject } from '../value-object/base-value-object';
@@ -34,11 +35,14 @@ import { BooleanValueObject, NumberValueObject } from '../value-object/primitive
type InterpreterRuntimeService = Pick<
IFormulaRuntimeService,
- 'currentColumn' | 'currentRow' | 'isStopExecution'
+ 'currentColumn' | 'currentRow' | 'currentUnitId' | 'isStopExecution'
>;
export class Interpreter extends Disposable {
- constructor(@IFormulaRuntimeService private readonly _runtimeService: InterpreterRuntimeService) {
+ constructor(
+ @IFormulaRuntimeService private readonly _runtimeService: InterpreterRuntimeService,
+ @IFormulaCurrentConfigService private readonly _currentConfigService: IFormulaCurrentConfigService
+ ) {
super();
}
@@ -55,7 +59,7 @@ export class Interpreter extends Disposable {
const refOffsetX = nodeData.refOffsetX;
const refOffsetY = nodeData.refOffsetY;
- await this._executeAsync(node, refOffsetX, refOffsetY);
+ await this._executeAsync(node, this.getDateSystem(), refOffsetX, refOffsetY);
const value = node.getValue();
@@ -79,7 +83,7 @@ export class Interpreter extends Disposable {
const refOffsetX = nodeData.refOffsetX;
const refOffsetY = nodeData.refOffsetY;
- this._execute(node, refOffsetX, refOffsetY);
+ this._execute(node, this.getDateSystem(), refOffsetX, refOffsetY);
const value = node.getValue();
@@ -91,7 +95,7 @@ export class Interpreter extends Disposable {
}
executePreCalculateNode(node: PreCalculateNodeType) {
- node.execute();
+ node.execute(this.getDateSystem());
return node.getValue();
}
@@ -125,11 +129,16 @@ export class Interpreter extends Disposable {
}
}
- private async _executeAsync(node: BaseAstNode, refOffsetX = 0, refOffsetY = 0): Promise<AstNodePromiseType> {
+ private async _executeAsync(
+ node: BaseAstNode,
+ dateSystem: DateSystem,
+ refOffsetX = 0,
+ refOffsetY = 0
+ ): Promise<AstNodePromiseType> {
if (this._runtimeService.isStopExecution()) {
return Promise.resolve(AstNodePromiseType.ERROR);
}
- if (await this._executeLazyFunctionAsync(node, refOffsetX, refOffsetY)) {
+ if (await this._executeLazyFunctionAsync(node, dateSystem, refOffsetX, refOffsetY)) {
return Promise.resolve(AstNodePromiseType.SUCCESS);
}
const children = node.getChildren();
@@ -144,10 +153,10 @@ export class Interpreter extends Disposable {
token.toUpperCase() === DEFAULT_TOKEN_LAMBDA_FUNCTION_NAME &&
(item as LambdaNode).isEmptyParamFunction()
) {
- item.execute();
+ item.execute(dateSystem);
continue;
}
- await this._executeAsync(item, refOffsetX, refOffsetY);
+ await this._executeAsync(item, dateSystem, refOffsetX, refOffsetY);
}
if (node.nodeType === NodeType.REFERENCE) {
@@ -155,19 +164,24 @@ export class Interpreter extends Disposable {
}
if (node.isAsync()) {
- await node.executeAsync();
+ await node.executeAsync(dateSystem);
} else {
- node.execute();
+ node.execute(dateSystem);
}
return Promise.resolve(AstNodePromiseType.SUCCESS);
}
- private _execute(node: BaseAstNode, refOffsetX = 0, refOffsetY = 0): AstNodePromiseType {
+ private _execute(
+ node: BaseAstNode,
+ dateSystem: DateSystem,
+ refOffsetX = 0,
+ refOffsetY = 0
+ ): AstNodePromiseType {
if (this._runtimeService.isStopExecution()) {
return AstNodePromiseType.ERROR;
}
- if (this._executeLazyFunction(node, refOffsetX, refOffsetY)) {
+ if (this._executeLazyFunction(node, dateSystem, refOffsetX, refOffsetY)) {
return AstNodePromiseType.SUCCESS;
}
const children = node.getChildren();
@@ -182,58 +196,73 @@ export class Interpreter extends Disposable {
token.toUpperCase() === DEFAULT_TOKEN_LAMBDA_FUNCTION_NAME &&
(item as LambdaNode).isEmptyParamFunction()
) {
- item.execute();
+ item.execute(dateSystem);
continue;
}
- this._execute(item, refOffsetX, refOffsetY);
+ this._execute(item, dateSystem, refOffsetX, refOffsetY);
}
if (node.nodeType === NodeType.REFERENCE) {
(node as ReferenceNode).setRefOffset(refOffsetX, refOffsetY);
}
- node.execute();
+ node.execute(dateSystem);
return AstNodePromiseType.SUCCESS;
}
- private async _executeLazyFunctionAsync(node: BaseAstNode, refOffsetX: number, refOffsetY: number): Promise<boolean> {
+ private async _executeLazyFunctionAsync(
+ node: BaseAstNode,
+ dateSystem: DateSystem,
+ refOffsetX: number,
+ refOffsetY: number
+ ): Promise<boolean> {
if (node.nodeType !== NodeType.FUNCTION) {
return false;
}
const token = node.getToken().toUpperCase();
if (token === 'IF') {
- return await this._executeLazyIfAsync(node, refOffsetX, refOffsetY);
+ return await this._executeLazyIfAsync(node, dateSystem, refOffsetX, refOffsetY);
}
if (token === 'IFERROR') {
- return await this._executeLazyIfErrorAsync(node, refOffsetX, refOffsetY);
+ return await this._executeLazyIfErrorAsync(node, dateSystem, refOffsetX, refOffsetY);
}
return false;
}
- private _executeLazyFunction(node: BaseAstNode, refOffsetX: number, refOffsetY: number): boolean {
+ private _executeLazyFunction(
+ node: BaseAstNode,
+ dateSystem: DateSystem,
+ refOffsetX: number,
+ refOffsetY: number
+ ): boolean {
if (node.nodeType !== NodeType.FUNCTION) {
return false;
}
const token = node.getToken().toUpperCase();
if (token === 'IF') {
- return this._executeLazyIf(node, refOffsetX, refOffsetY);
+ return this._executeLazyIf(node, dateSystem, refOffsetX, refOffsetY);
}
if (token === 'IFERROR') {
- return this._executeLazyIfError(node, refOffsetX, refOffsetY);
+ return this._executeLazyIfError(node, dateSystem, refOffsetX, refOffsetY);
}
return false;
}
- private async _executeLazyIfAsync(node: BaseAstNode, refOffsetX: number, refOffsetY: number): Promise<boolean> {
+ private async _executeLazyIfAsync(
+ node: BaseAstNode,
+ dateSystem: DateSystem,
+ refOffsetX: number,
+ refOffsetY: number
+ ): Promise<boolean> {
const children = node.getChildren();
if (children.length < 2 || children.length > 3) {
return false;
}
- await this._executeAsync(children[0], refOffsetX, refOffsetY);
+ await this._executeAsync(children[0], dateSystem, refOffsetX, refOffsetY);
const condition = children[0].getValue();
if (condition == null || condition.isReferenceObject() || condition.isArray()) {
return false;
@@ -249,18 +278,23 @@ export class Interpreter extends Disposable {
return true;
}
- await this._executeAsync(selected, refOffsetX, refOffsetY);
+ await this._executeAsync(selected, dateSystem, refOffsetX, refOffsetY);
node.setValue(this._toLazyIfSelectedValue(selected.getValue(), node));
return true;
}
- private _executeLazyIf(node: BaseAstNode, refOffsetX: number, refOffsetY: number): boolean {
+ private _executeLazyIf(
+ node: BaseAstNode,
+ dateSystem: DateSystem,
+ refOffsetX: number,
+ refOffsetY: number
+ ): boolean {
const children = node.getChildren();
if (children.length < 2 || children.length > 3) {
return false;
}
- this._execute(children[0], refOffsetX, refOffsetY);
+ this._execute(children[0], dateSystem, refOffsetX, refOffsetY);
const condition = children[0].getValue();
if (condition == null || condition.isReferenceObject() || condition.isArray()) {
return false;
@@ -276,18 +310,23 @@ export class Interpreter extends Disposable {
return true;
}
- this._execute(selected, refOffsetX, refOffsetY);
+ this._execute(selected, dateSystem, refOffsetX, refOffsetY);
node.setValue(this._toLazyIfSelectedValue(selected.getValue(), node));
return true;
}
- private async _executeLazyIfErrorAsync(node: BaseAstNode, refOffsetX: number, refOffsetY: number): Promise<boolean> {
+ private async _executeLazyIfErrorAsync(
+ node: BaseAstNode,
+ dateSystem: DateSystem,
+ refOffsetX: number,
+ refOffsetY: number
+ ): Promise<boolean> {
const children = node.getChildren();
if (children.length !== 2) {
return false;
}
- await this._executeAsync(children[0], refOffsetX, refOffsetY);
+ await this._executeAsync(children[0], dateSystem, refOffsetX, refOffsetY);
const rawValue = children[0].getValue();
const value = this._toLazyIfErrorValue(rawValue);
if (value == null || value.isArray()) {
@@ -298,18 +337,23 @@ export class Interpreter extends Disposable {
return true;
}
- await this._executeAsync(children[1], refOffsetX, refOffsetY);
+ await this._executeAsync(children[1], dateSystem, refOffsetX, refOffsetY);
node.setValue(children[1].getValue() ?? ErrorValueObject.create(ErrorType.VALUE));
return true;
}
- private _executeLazyIfError(node: BaseAstNode, refOffsetX: number, refOffsetY: number): boolean {
+ private _executeLazyIfError(
+ node: BaseAstNode,
+ dateSystem: DateSystem,
+ refOffsetX: number,
+ refOffsetY: number
+ ): boolean {
const children = node.getChildren();
if (children.length !== 2) {
return false;
}
- this._execute(children[0], refOffsetX, refOffsetY);
+ this._execute(children[0], dateSystem, refOffsetX, refOffsetY);
const rawValue = children[0].getValue();
const value = this._toLazyIfErrorValue(rawValue);
if (value == null || value.isArray()) {
@@ -320,11 +364,15 @@ export class Interpreter extends Disposable {
return true;
}
- this._execute(children[1], refOffsetX, refOffsetY);
+ this._execute(children[1], dateSystem, refOffsetX, refOffsetY);
node.setValue(children[1].getValue() ?? ErrorValueObject.create(ErrorType.VALUE));
return true;
}
+ getDateSystem(): DateSystem {
+ return this._currentConfigService.getDateSystem(this._runtimeService.currentUnitId);
+ }
+
private _toLazyIfErrorValue(value: Nullable<FunctionVariantType>): Nullable<BaseValueObject> {
if (value == null) {
return null;
diff --git a/packages/engine-formula/src/engine/reference-object/base-reference-object.ts b/packages/engine-formula/src/engine/reference-object/base-reference-object.ts
index 723a416415..68b8405cd2 100644
--- a/packages/engine-formula/src/engine/reference-object/base-reference-object.ts
+++ b/packages/engine-formula/src/engine/reference-object/base-reference-object.ts
@@ -17,7 +17,7 @@
import type { ICellData, IRange, IUnitRange, Nullable } from '@univerjs/core';
import type { IArrayFormulaRangeType, IRuntimeUnitDataType, IUnitData, IUnitSheetNameMap, IUnitStylesData } from '../../basics/common';
import type { BaseValueObject, IArrayValueObject } from '../value-object/base-value-object';
-import { CellValueType, isNullCell, isTextFormat, moveRangeByOffset, ObjectMatrix } from '@univerjs/core';
+import { CellValueType, DateSystem, isNullCell, isTextFormat, moveRangeByOffset, ObjectMatrix } from '@univerjs/core';
import { FormulaAstLRU } from '../../basics/cache-lru';
import { ERROR_TYPE_SET, ErrorType } from '../../basics/error-type';
import { ObjectClassType } from '../../basics/object-class-type';
@@ -41,6 +41,8 @@ const FORMULA_CACHE_LRU_COUNT = 10000;
export const FORMULA_REF_TO_ARRAY_CACHE = new FormulaAstLRU<ArrayValueObject>(FORMULA_CACHE_LRU_COUNT);
export class BaseReferenceObject extends ObjectClassType {
+ private _dateSystem = DateSystem.Date1900;
+
private _forcedSheetId: Nullable<string> = '';
private _forcedSheetName: string = '';
@@ -154,6 +156,15 @@ export class BaseReferenceObject extends ObjectClassType {
return true;
}
+ getDateSystem() {
+ return this._dateSystem;
+ }
+
+ withDateSystem(dateSystem: DateSystem): this {
+ this._dateSystem = dateSystem;
+ return this;
+ }
+
iterator(
callback: (valueObject: Nullable<BaseValueObject>, rowIndex: number, columnIndex: number) => Nullable<boolean>
) {
@@ -187,7 +198,7 @@ export class BaseReferenceObject extends ObjectClassType {
const pattern = this.getCellPattern(unitId, sheetId, r, c);
if (pattern && resultObjectValue.isNumber()) {
const value = Number(resultObjectValue.getValue());
- resultObjectValue = NumberValueObject.create(value, pattern);
+ resultObjectValue = NumberValueObject.create(value, pattern).withDateSystem(this._dateSystem);
}
}
@@ -221,7 +232,7 @@ export class BaseReferenceObject extends ObjectClassType {
const pattern = this.getCellPattern(unitId, sheetId, startRow, startColumn);
if (pattern && cellValueObject.isNumber()) {
const value = Number(cellValueObject.getValue());
- cellValueObject = NumberValueObject.create(value, pattern);
+ cellValueObject = NumberValueObject.create(value, pattern).withDateSystem(this._dateSystem);
}
return cellValueObject;
@@ -464,20 +475,20 @@ export class BaseReferenceObject extends ObjectClassType {
const pattern = this._getPatternByCell(cell);
if (isTextFormat(pattern)) {
- return StringValueObject.create(value.toString());
+ return StringValueObject.create(value.toString()).withDateSystem(this._dateSystem);
}
- return createNumberValueObjectByRawValue(value, pattern);
+ return createNumberValueObjectByRawValue(value, pattern).withDateSystem(this._dateSystem);
}
if (cellValueType === CellValueType.STRING || cellValueType === CellValueType.FORCE_STRING) {
// A1 is `"test"`, =A1 also needs to get `"test"`
- return StringValueObject.create(value.toString());
+ return StringValueObject.create(value.toString()).withDateSystem(this._dateSystem);
}
if (cellValueType === CellValueType.BOOLEAN) {
return createBooleanValueObjectByRawValue(value);
}
- return ValueObjectFactory.create(value);
+ return ValueObjectFactory.create(value, false, this._dateSystem);
}
private _getPatternByCell(cell: ICellData) {
@@ -629,7 +640,8 @@ export class BaseReferenceObject extends ObjectClassType {
toArrayValueObject(useCache: boolean = true): ArrayValueObject {
const { startRow, endRow, startColumn, endColumn } = this.getRangePosition();
- const key = `${this.getUnitId()}_${this.getSheetId()}_${startRow}_${endRow}_${startColumn}_${endColumn}`;
+ // A cached range can be reused only when its string and formatted-number interpretation matches.
+ const key = `${this.getUnitId()}_${this.getSheetId()}_${startRow}_${endRow}_${startColumn}_${endColumn}_${this._dateSystem}`;
const array = FORMULA_REF_TO_ARRAY_CACHE.get(key);
@@ -670,7 +682,7 @@ export class BaseReferenceObject extends ObjectClassType {
useInvertedIndexCache: true,
};
- const arrayValueObject = ArrayValueObject.create(arrayValueObjectData);
+ const arrayValueObject = ArrayValueObject.create(arrayValueObjectData, this._dateSystem);
useCache && FORMULA_REF_TO_ARRAY_CACHE.set(key, arrayValueObject);
@@ -707,7 +719,7 @@ export class BaseReferenceObject extends ObjectClassType {
column: 0,
};
- return ArrayValueObject.create(arrayValueObjectData);
+ return ArrayValueObject.create(arrayValueObjectData, this._dateSystem);
}
}
diff --git a/packages/engine-formula/src/engine/utils/__tests__/numfmt-kit.spec.ts b/packages/engine-formula/src/engine/utils/__tests__/numfmt-kit.spec.ts
index 2aca1409ba..135d9dfab4 100644
--- a/packages/engine-formula/src/engine/utils/__tests__/numfmt-kit.spec.ts
+++ b/packages/engine-formula/src/engine/utils/__tests__/numfmt-kit.spec.ts
@@ -14,9 +14,15 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { operatorToken } from '../../../basics/token';
-import { compareNumfmtPriority, comparePatternPriority } from '../numfmt-kit';
+import {
+ clearStringToNumberPatternCache,
+ compareNumfmtPriority,
+ comparePatternPriority,
+ stringIsNumberPattern,
+} from '../numfmt-kit';
const numfmtMap = {
currency: '"¥"#,##0.00_);[Red]("¥"#,##0.00)',
@@ -184,4 +190,14 @@ describe('Test numfmt kit', () => {
expect(comparePatternPriority(numfmtMap.date, '', operatorToken.PLUS)).toBe(numfmtMap.date);
expect(comparePatternPriority('', numfmtMap.accounting, operatorToken.MINUS)).toBe(numfmtMap.accounting);
});
+
+ it('isolates parsed string-number patterns by date system', () => {
+ clearStringToNumberPatternCache();
+ expect(stringIsNumberPattern('1904-1-1', {
+ dateSystem: DateSystem.Date1900,
+ })).toMatchObject({ isNumberPattern: true, value: 1462 });
+ expect(stringIsNumberPattern('1904-1-1', {
+ dateSystem: DateSystem.Date1904,
+ })).toMatchObject({ isNumberPattern: true, value: 0 });
+ });
});
diff --git a/packages/engine-formula/src/engine/utils/__tests__/value-object.spec.ts b/packages/engine-formula/src/engine/utils/__tests__/value-object.spec.ts
index 5715e270ba..0966ac1f63 100644
--- a/packages/engine-formula/src/engine/utils/__tests__/value-object.spec.ts
+++ b/packages/engine-formula/src/engine/utils/__tests__/value-object.spec.ts
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { cellToRange, CellValueType } from '@univerjs/core';
+import { cellToRange, CellValueType, DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../basics/error-type';
import { compareToken } from '../../../basics/token';
@@ -25,7 +25,8 @@ import { RowReferenceObject } from '../../reference-object/row-reference-object'
import { ArrayValueObject } from '../../value-object/array-value-object';
import { ErrorValueObject } from '../../value-object/base-value-object';
import { BooleanValueObject, NullValueObject, NumberValueObject, StringValueObject } from '../../value-object/primitive-object';
-import { convertTonNumber, isSingleValueObject, objectValueToCellValue } from '../value-object';
+import { valueObjectCompare } from '../object-compare';
+import { convertTonNumber, filterSameValueObjectResult, isSingleValueObject, objectValueToCellValue } from '../value-object';
describe('Test object cover', () => {
it('Function convertTonNumber', () => {
@@ -38,6 +39,17 @@ describe('Test object cover', () => {
expect(BooleanValueObject.create(false).compare(StringValueObject.create(''), compareToken.NOT_EQUAL).getValue()).toBe(true);
});
+ it('uses the supplied date system when matching date criteria against serial numbers', () => {
+ const range = ArrayValueObject.createByArray([[0]]);
+ const criteria = StringValueObject.create('1904-1-1').withDateSystem(DateSystem.Date1904);
+ const comparison = valueObjectCompare(range, criteria) as ArrayValueObject;
+
+ expect(comparison.get(0, 0)?.getValue()).toBe(true);
+ const result = filterSameValueObjectResult(comparison, range, criteria);
+
+ expect(result.get(0, 0)?.getValue()).toBe(true);
+ });
+
it('Function isSingleValueObject', () => {
expect(isSingleValueObject(BooleanValueObject.create(true))).toBe(true);
expect(isSingleValueObject(BooleanValueObject.create(false))).toBe(true);
diff --git a/packages/engine-formula/src/engine/utils/numfmt-kit.ts b/packages/engine-formula/src/engine/utils/numfmt-kit.ts
index e51327186e..0199815ed8 100644
--- a/packages/engine-formula/src/engine/utils/numfmt-kit.ts
+++ b/packages/engine-formula/src/engine/utils/numfmt-kit.ts
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import type { ICellData, Nullable, Styles } from '@univerjs/core';
+import type { DateSystem, ICellData, Nullable, Styles } from '@univerjs/core';
import { currencySymbols, getNumfmtParseValueFilter, LocaleType, numfmt } from '@univerjs/core';
import { FormulaAstLRU } from '../../basics/cache-lru';
import { operatorToken } from '../../basics/token';
@@ -128,7 +128,7 @@ export function handleNumfmtInCell(oldCell: Nullable<ICellData>, cell: Nullable<
*
* @param oldPattern
* @param pattern
- * @returns
+ * @returns The parsed number and format pattern when the input is recognized.
*/
export function compareNumfmtPriority(oldPattern: string, pattern: string) {
const oldPatternType = getNumberFormatType(oldPattern);
@@ -306,7 +306,8 @@ export function applyCurrencyFormat(locale: LocaleType, number: number, numberDi
* "2012-12-12"
* "16:48:00"
*
- * @param locale
+ * @param input Raw formula value to inspect.
+ * @param options Workbook-dependent parsing options.
* @returns
*/
const stringToNumberPatternCache = new FormulaAstLRU<{
@@ -314,14 +315,18 @@ const stringToNumberPatternCache = new FormulaAstLRU<{
pattern: string;
}>(100000);
-export function stringIsNumberPattern(input: string) {
+export function stringIsNumberPattern(
+ input: string,
+ options?: { dateSystem?: DateSystem }
+) {
let _input = input;
if (_input.startsWith('"') && _input.endsWith('"')) {
_input = _input.slice(1, -1);
}
- const cacheValue = stringToNumberPatternCache.get(_input);
+ const cacheKey = `${options?.dateSystem ?? ''}\u0000${_input}`;
+ const cacheValue = stringToNumberPatternCache.get(cacheKey);
if (cacheValue) {
return {
@@ -331,10 +336,10 @@ export function stringIsNumberPattern(input: string) {
};
}
- const parseData = getNumfmtParseValueFilter(_input);
+ const parseData = getNumfmtParseValueFilter(_input, options);
if (parseData && parseData.z) {
- return setNumberPatternCache(_input, parseData.v as number, parseData.z as string);
+ return setNumberPatternCache(cacheKey, parseData.v as number, parseData.z as string);
}
return {
diff --git a/packages/engine-formula/src/engine/utils/object-compare.ts b/packages/engine-formula/src/engine/utils/object-compare.ts
index fdee3ba4a8..ec742f61aa 100644
--- a/packages/engine-formula/src/engine/utils/object-compare.ts
+++ b/packages/engine-formula/src/engine/utils/object-compare.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import type { DateSystem } from '@univerjs/core';
import type { ArrayValueObject } from '../value-object/array-value-object';
import type { BaseValueObject } from '../value-object/base-value-object';
import { compareToken } from '../../basics/token';
@@ -21,7 +22,7 @@ import { ValueObjectFactory } from '../value-object/array-value-object';
import { BooleanValueObject, createBooleanValueObjectByRawValue } from '../value-object/primitive-object';
import { expandArrayValueObject } from './array-object';
-export function findCompareToken(str: string): [compareToken, BaseValueObject] {
+export function findCompareToken(str: string, dateSystem?: DateSystem): [compareToken, BaseValueObject] {
const comparisonTokens: compareToken[] = [
compareToken.EQUALS,
compareToken.NOT_EQUAL,
@@ -34,11 +35,11 @@ export function findCompareToken(str: string): [compareToken, BaseValueObject] {
for (const token of comparisonTokens) {
if (str.startsWith(token)) {
const content = str.substring(token.length);
- return [token, ValueObjectFactory.create(content) as BaseValueObject];
+ return [token, ValueObjectFactory.create(content, false, dateSystem) as BaseValueObject];
}
}
- return [compareToken.EQUALS, ValueObjectFactory.create(str) as BaseValueObject];
+ return [compareToken.EQUALS, ValueObjectFactory.create(str, false, dateSystem) as BaseValueObject];
}
/**
@@ -53,7 +54,10 @@ export function valueObjectCompare(range: BaseValueObject, criteria: BaseValueOb
// TODO: criteria: 32, ">32", B5, "3?", "apple*", "*~?", TODAY(), ">"&A1:B3
if (criteria.isString()) {
const criteriaValueString = `${criteria.getValue()}`;
- const [token, criteriaStringObject] = findCompareToken(criteriaValueString);
+ const [token, criteriaStringObject] = findCompareToken(
+ criteriaValueString,
+ criteria.getDateSystem()
+ );
operator = token;
criteria = criteriaStringObject;
} else {
diff --git a/packages/engine-formula/src/engine/utils/value-object.ts b/packages/engine-formula/src/engine/utils/value-object.ts
index 546d955754..55b2e41126 100644
--- a/packages/engine-formula/src/engine/utils/value-object.ts
+++ b/packages/engine-formula/src/engine/utils/value-object.ts
@@ -429,9 +429,13 @@ export function getPairedRangeAndCriteriaResult(
/**
* Two ArrayValueObject of the same type can be compared
*/
-export function filterSameValueObjectResult(array: ArrayValueObject, range: ArrayValueObject, criteria: BaseValueObject): ArrayValueObject {
+export function filterSameValueObjectResult(
+ array: ArrayValueObject,
+ range: ArrayValueObject,
+ criteria: BaseValueObject
+): ArrayValueObject {
const [operator, criteriaObject] = criteria.isString()
- ? findCompareToken(`${criteria.getValue()}`)
+ ? findCompareToken(`${criteria.getValue()}`, criteria.getDateSystem())
: [compareToken.EQUALS, criteria];
return array.mapValue((valueObject, r, c) => {
diff --git a/packages/engine-formula/src/engine/value-object/__tests__/array-value-object.spec.ts b/packages/engine-formula/src/engine/value-object/__tests__/array-value-object.spec.ts
index 5185f06b3b..eb5acf7c90 100644
--- a/packages/engine-formula/src/engine/value-object/__tests__/array-value-object.spec.ts
+++ b/packages/engine-formula/src/engine/value-object/__tests__/array-value-object.spec.ts
@@ -16,6 +16,7 @@
import type { Nullable } from '@univerjs/core';
import type { BaseValueObject } from '../base-value-object';
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../basics/error-type';
import { getObjectValue } from '../../../functions/util';
@@ -38,6 +39,38 @@ describe('arrayValueObject test', () => {
column: 0,
});
+ it('binds child values when the array already uses the requested date system', () => {
+ const array = ArrayValueObject.create({
+ calculateValueList: [[StringValueObject.create('1904-1-1')]],
+ rowCount: 1,
+ columnCount: 1,
+ unitId: '',
+ sheetId: '',
+ row: 0,
+ column: 0,
+ }, DateSystem.Date1904);
+
+ const value = array.withDateSystem(DateSystem.Date1904).get(0, 0) as BaseValueObject;
+
+ expect(value.convertToNumberObjectValue().getValue()).toBe(0);
+ });
+
+ it('binds the date system in place and updates child values', () => {
+ const array = ArrayValueObject.create({
+ calculateValueList: [[StringValueObject.create('1904-1-1')]],
+ rowCount: 1,
+ columnCount: 1,
+ unitId: '',
+ sheetId: '',
+ row: 0,
+ column: 0,
+ });
+
+ expect(array.withDateSystem(DateSystem.Date1904)).toBe(array);
+ expect(array.getDateSystem()).toBe(DateSystem.Date1904);
+ expect(array.get(0, 0)?.getDateSystem()).toBe(DateSystem.Date1904);
+ });
+
it('maps sparse comparison arrays with their default value', () => {
const sparseValues: BaseValueObject[][] = [];
sparseValues[1] = [BooleanValueObject.create(true)];
diff --git a/packages/engine-formula/src/engine/value-object/__tests__/primitive-object.spec.ts b/packages/engine-formula/src/engine/value-object/__tests__/primitive-object.spec.ts
new file mode 100644
index 0000000000..4066416339
--- /dev/null
+++ b/packages/engine-formula/src/engine/value-object/__tests__/primitive-object.spec.ts
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * 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 { DateSystem } from '@univerjs/core';
+import { describe, expect, it } from 'vitest';
+import { NumberValueObject, StringValueObject } from '../primitive-object';
+
+describe('StringValueObject', () => {
+ it('binds the date system in place for scalar values', () => {
+ const value = NumberValueObject.create(1);
+
+ expect(value.withDateSystem(DateSystem.Date1904)).toBe(value);
+ expect(value.getDateSystem()).toBe(DateSystem.Date1904);
+ });
+
+ it('uses the date system bound to the value for numeric conversion', () => {
+ const date1900Value = StringValueObject.create('1904-1-1').withDateSystem(DateSystem.Date1900);
+ const date1904Value = StringValueObject.create('1904-1-1').withDateSystem(DateSystem.Date1904);
+
+ expect(date1900Value.convertToNumberObjectValue().getValue()).toBe(1462);
+ expect(date1904Value.convertToNumberObjectValue().getValue()).toBe(0);
+ expect(date1900Value.convertToNumberObjectValue().getValue()).toBe(1462);
+ });
+
+ it('does not reuse a hyperlink object as a plain string', () => {
+ const hyperlink = StringValueObject.create('https://example.com/context-cache', {
+ isHyperlink: true,
+ hyperlinkUrl: 'https://example.com/context-cache',
+ });
+ const plainText = StringValueObject.create('https://example.com/context-cache');
+
+ expect(hyperlink.isHyperlink()).toBe(true);
+ expect(plainText.isHyperlink()).toBe(false);
+ });
+
+ it('does not share mutable metadata between plain strings', () => {
+ const first = StringValueObject.create('plain-string-cache-isolation').withCustomData({ source: 'first' });
+ const second = StringValueObject.create('plain-string-cache-isolation');
+
+ expect(second).not.toBe(first);
+ expect(second.getCustomData()).toBeUndefined();
+ });
+});
diff --git a/packages/engine-formula/src/engine/value-object/array-value-object.ts b/packages/engine-formula/src/engine/value-object/array-value-object.ts
index 5a5e42c631..bab42b8721 100644
--- a/packages/engine-formula/src/engine/value-object/array-value-object.ts
+++ b/packages/engine-formula/src/engine/value-object/array-value-object.ts
@@ -16,7 +16,7 @@
import type { Nullable } from '@univerjs/core';
import type { callbackMapFnType, IArrayValueObject } from './base-value-object';
-import { isRealNum } from '@univerjs/core';
+import { DateSystem, isRealNum } from '@univerjs/core';
import { BooleanValue } from '../../basics/common';
import { ERROR_TYPE_SET, ErrorType } from '../../basics/error-type';
import { CELL_INVERTED_INDEX_CACHE } from '../../basics/inverted-index-cache';
@@ -58,7 +58,11 @@ enum ArrayCalculateType {
SINGLE,
}
-export function transformToValueObject(array: Array<Array<number | string | boolean | null>> = [], isIgnoreNumberPattern: boolean = false) {
+export function transformToValueObject(
+ array: Array<Array<number | string | boolean | null>> = [],
+ isIgnoreNumberPattern: boolean = false,
+ dateSystem?: DateSystem
+) {
const arrayValueList: BaseValueObject[][] = [];
for (let r = 0; r < array.length; r++) {
@@ -71,7 +75,7 @@ export function transformToValueObject(array: Array<Array<number | string | bool
for (let c = 0; c < row.length; c++) {
const cell = row[c];
- arrayValueList[r][c] = ValueObjectFactory.create(cell, isIgnoreNumberPattern);
+ arrayValueList[r][c] = ValueObjectFactory.create(cell, isIgnoreNumberPattern, dateSystem);
}
}
@@ -110,8 +114,8 @@ export class ArrayValueObject extends BaseValueObject {
* @param rawValue
* @returns
*/
- static create(rawValue: string | IArrayValueObject) {
- return new ArrayValueObject(rawValue);
+ static create(rawValue: string | IArrayValueObject, dateSystem?: DateSystem) {
+ return new ArrayValueObject(rawValue, dateSystem);
}
/**
@@ -168,10 +172,10 @@ export class ArrayValueObject extends BaseValueObject {
numberPosition: number[];
}>;
- constructor(rawValue: string | IArrayValueObject) {
- super();
+ constructor(rawValue: string | IArrayValueObject, dateSystem?: DateSystem) {
+ super(dateSystem);
- this._values = this._formatValue(rawValue);
+ this._values = this._formatValue(rawValue, dateSystem);
}
override dispose(): void {
@@ -957,6 +961,14 @@ export class ArrayValueObject extends BaseValueObject {
return accumulatorAll;
}
+ override withDateSystem(dateSystem: DateSystem): this {
+ super.withDateSystem(dateSystem);
+ // Child values read their own date system during parsing and formatting.
+ this._values.forEach((row) => row.forEach((valueObject) => valueObject?.withDateSystem(dateSystem)));
+ this._defaultValue?.withDateSystem(dateSystem);
+ return this;
+ }
+
override getNegative(): BaseValueObject {
return this.mapValue((valueObject) => NumberValueObject.create(0).minus(valueObject));
}
@@ -1902,7 +1914,7 @@ export class ArrayValueObject extends BaseValueObject {
return ArrayCalculateType.PRODUCT;
}
- private _formatValue(rawValue: string | IArrayValueObject) {
+ private _formatValue(rawValue: string | IArrayValueObject, dateSystem?: DateSystem) {
if (typeof rawValue !== 'string') {
rawValue = rawValue as IArrayValueObject;
@@ -1941,7 +1953,7 @@ export class ArrayValueObject extends BaseValueObject {
const row: BaseValueObject[] = [];
for (let c = 0; c < columnArrayCount; c++) {
const cellRaw = columnArray[c].trim();
- row.push(ValueObjectFactory.create(cellRaw));
+ row.push(ValueObjectFactory.create(cellRaw, false, dateSystem));
}
result.push(row);
}
@@ -1975,12 +1987,16 @@ export class ArrayValueObject extends BaseValueObject {
column,
};
- return ArrayValueObject.create(arrayValueObjectData);
+ return ArrayValueObject.create(arrayValueObjectData, this.getDateSystem());
}
}
export class ValueObjectFactory {
- static create(rawValue: string | number | boolean | null, isIgnoreNumberPattern: boolean = false): BaseValueObject {
+ static create(
+ rawValue: string | number | boolean | null,
+ isIgnoreNumberPattern: boolean = false,
+ dateSystem: DateSystem = DateSystem.Date1900
+ ): BaseValueObject {
if (rawValue == null) {
return NullValueObject.create();
}
@@ -1997,31 +2013,32 @@ export class ValueObjectFactory {
}
if (isStringWrappedByDoubleQuotes(rawValue)) {
- return createStringValueObjectByRawValue(rawValue);
+ return createStringValueObjectByRawValue(rawValue).withDateSystem(dateSystem);
}
// "000123456" should be treated as string, not number, but "123456" should be treated as number
if (isRealNum(rawValue) && Number(rawValue).toString() === rawValue.trim()) {
- return NumberValueObject.create(Number(rawValue));
+ return NumberValueObject.create(Number(rawValue)).withDateSystem(dateSystem);
}
// value ignore whether it is a number pattern
if (!isIgnoreNumberPattern) {
- const { isNumberPattern, value, pattern } = stringIsNumberPattern(rawValue);
+ // Date text must be converted to a serial using the current workbook date system.
+ const { isNumberPattern, value, pattern } = stringIsNumberPattern(rawValue, { dateSystem });
if (isNumberPattern) {
- return NumberValueObject.create(value as number, pattern as string);
+ return NumberValueObject.create(value as number, pattern as string).withDateSystem(dateSystem);
}
}
const rawValueSingleLine = rawValue.replace(/\n/g, '').replace(/\r/g, '');
if (!isStringWrappedByDoubleQuotes(rawValueSingleLine) && regexTestArrayValue(rawValueSingleLine)) {
- return ArrayValueObject.create(rawValueSingleLine);
+ return ArrayValueObject.create(rawValueSingleLine, dateSystem);
}
- return createStringValueObjectByRawValue(rawValue);
+ return createStringValueObjectByRawValue(rawValue).withDateSystem(dateSystem);
}
if (typeof rawValue === 'number') {
- return createNumberValueObjectByRawValue(rawValue);
+ return createNumberValueObjectByRawValue(rawValue).withDateSystem(dateSystem);
}
return ErrorValueObject.create(ErrorType.VALUE);
}
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 a1a75f01cf..88637cdd02 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
@@ -15,6 +15,7 @@
*/
import type { CustomData, Nullable } from '@univerjs/core';
+import { DateSystem } from '@univerjs/core';
import { FormulaAstLRU } from '../../basics/cache-lru';
import { ConcatenateType } from '../../basics/common';
import { ErrorType } from '../../basics/error-type';
@@ -36,6 +37,12 @@ export interface IArrayValueObject {
}
export class BaseValueObject extends ObjectClassType {
private _customData: CustomData;
+ private _dateSystem: DateSystem;
+
+ constructor(dateSystem: DateSystem = DateSystem.Date1900) {
+ super();
+ this._dateSystem = dateSystem;
+ }
override isValueObject() {
return true;
@@ -81,6 +88,16 @@ export class BaseValueObject extends ObjectClassType {
return this._customData;
}
+ getDateSystem() {
+ return this._dateSystem;
+ }
+
+ /** Bind the current calculation context in place before the value is used. */
+ withDateSystem(dateSystem: DateSystem): this {
+ this._dateSystem = dateSystem;
+ return this;
+ }
+
isCube() {
return false;
}
diff --git a/packages/engine-formula/src/engine/value-object/lambda-value-object.ts b/packages/engine-formula/src/engine/value-object/lambda-value-object.ts
index 110f63a1cd..61a79e03cb 100644
--- a/packages/engine-formula/src/engine/value-object/lambda-value-object.ts
+++ b/packages/engine-formula/src/engine/value-object/lambda-value-object.ts
@@ -116,8 +116,9 @@ export class LambdaValueObjectObject extends BaseValueObject {
* @param variants
*/
executeCustom(...variants: PrimitiveValueType[]) {
- // Create base value object from primitive value, then execute
- const baseValueObjects = variants.map((variant) => ValueObjectFactory.create(variant));
+ const dateSystem = this._interpreter?.getDateSystem();
+ // Primitive arguments must be converted before nested execution, using the same workbook context.
+ const baseValueObjects = variants.map((variant) => ValueObjectFactory.create(variant, false, dateSystem));
return this.execute(...baseValueObjects);
}
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 5f0a462c04..1d0a47e423 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, numfmt, Tools } from '@univerjs/core';
+import { DateSystem, getNumfmtParseValueFilter, isRealNum, numfmt, Tools } from '@univerjs/core';
import { FormulaAstLRU } from '../../basics/cache-lru';
import { reverseCompareOperator } from '../../basics/calculate';
import { BooleanValue, ConcatenateType } from '../../basics/common';
@@ -447,8 +447,8 @@ export class NumberValueObject extends BaseValueObject {
return instance;
}
- constructor(rawValue: number) {
- super();
+ constructor(rawValue: number, dateSystem: DateSystem = DateSystem.Date1900) {
+ super(dateSystem);
this._value = Number(rawValue);
}
@@ -1432,8 +1432,8 @@ export class StringValueObject extends BaseValueObject {
return true;
};
- constructor(rawValue: string) {
- super();
+ constructor(rawValue: string, dateSystem: DateSystem = DateSystem.Date1900) {
+ super(dateSystem);
this._value = rawValue;
}
@@ -1581,13 +1581,13 @@ export class StringValueObject extends BaseValueObject {
return ErrorValueObject.create(ErrorType.VALUE);
}
- const parseData = getNumfmtParseValueFilter(rawValue);
+ const parseData = getNumfmtParseValueFilter(rawValue, { dateSystem: this.getDateSystem() });
if (parseData && parseData.z) {
- return createNumberValueObjectByRawValue(parseData.v, parseData.z);
+ return createNumberValueObjectByRawValue(parseData.v, parseData.z).withDateSystem(this.getDateSystem());
}
- return createNumberValueObjectByRawValue(rawValue);
+ return createNumberValueObjectByRawValue(rawValue).withDateSystem(this.getDateSystem());
}
override convertToBooleanObjectValue() {
diff --git a/packages/engine-formula/src/functions/base-function.ts b/packages/engine-formula/src/functions/base-function.ts
index d692610804..fd001acfba 100644
--- a/packages/engine-formula/src/functions/base-function.ts
+++ b/packages/engine-formula/src/functions/base-function.ts
@@ -29,6 +29,7 @@ import type { FormulaFunctionResultValueType, FormulaFunctionValueType } from '.
import type { FormulaDataModel } from '../models/formula-data.model';
import type { IDefinedNameMapItem } from '../services/defined-names.service';
import type { IFormulaUnitReferenceResolver } from '../services/unit-reference-resolver.service';
+import { DateSystem } from '@univerjs/core';
import { ErrorType } from '../basics/error-type';
import { regexTestSingeRange, regexTestSingleColumn, regexTestSingleRow } from '../basics/regex';
import { compareToken } from '../basics/token';
@@ -52,6 +53,7 @@ export class BaseFunction {
private _currentFormulaColumnCount: number = 1;
private _definedNames: Nullable<IDefinedNameMapItem>;
private _locale: LocaleType;
+ private _dateSystem = DateSystem.Date1900;
private _sheetOrder: string[];
private _sheetNameMap: { [sheetId: string]: string };
protected _formulaDataModel: Nullable<FormulaDataModel>;
@@ -188,6 +190,14 @@ export class BaseFunction {
this._locale = locale;
}
+ getDateSystem() {
+ return this._dateSystem;
+ }
+
+ setDateSystem(dateSystem: DateSystem) {
+ this._dateSystem = dateSystem;
+ }
+
getSheetsInfo() {
return {
sheetOrder: this._sheetOrder,
diff --git a/packages/engine-formula/src/functions/database/daverage/index.ts b/packages/engine-formula/src/functions/database/daverage/index.ts
index a0c807de15..06fd82b7db 100644
--- a/packages/engine-formula/src/functions/database/daverage/index.ts
+++ b/packages/engine-formula/src/functions/database/daverage/index.ts
@@ -55,7 +55,7 @@ export class Daverage extends BaseFunction {
continue;
}
- if (isCriteriaMatch(criteriaValues, databaseValues, r)) {
+ if (isCriteriaMatch(criteriaValues, databaseValues, r, criteria.getDateSystem())) {
sum += value;
count++;
}
diff --git a/packages/engine-formula/src/functions/database/dcount/index.ts b/packages/engine-formula/src/functions/database/dcount/index.ts
index 6e5492a407..c0b862e277 100644
--- a/packages/engine-formula/src/functions/database/dcount/index.ts
+++ b/packages/engine-formula/src/functions/database/dcount/index.ts
@@ -52,7 +52,7 @@ export class Dcount extends BaseFunction {
continue;
}
- if (isCriteriaMatch(criteriaValues, databaseValues, r)) {
+ if (isCriteriaMatch(criteriaValues, databaseValues, r, criteria.getDateSystem())) {
count++;
}
}
diff --git a/packages/engine-formula/src/functions/database/dcounta/index.ts b/packages/engine-formula/src/functions/database/dcounta/index.ts
index 778410782f..f740752dac 100644
--- a/packages/engine-formula/src/functions/database/dcounta/index.ts
+++ b/packages/engine-formula/src/functions/database/dcounta/index.ts
@@ -52,7 +52,7 @@ export class Dcounta extends BaseFunction {
continue;
}
- if (isCriteriaMatch(criteriaValues, databaseValues, r)) {
+ if (isCriteriaMatch(criteriaValues, databaseValues, r, criteria.getDateSystem())) {
count++;
}
}
diff --git a/packages/engine-formula/src/functions/database/dget/index.ts b/packages/engine-formula/src/functions/database/dget/index.ts
index c5f496247a..72ab7ac31a 100644
--- a/packages/engine-formula/src/functions/database/dget/index.ts
+++ b/packages/engine-formula/src/functions/database/dget/index.ts
@@ -55,7 +55,7 @@ export class Dget extends BaseFunction {
continue;
}
- if (isCriteriaMatch(criteriaValues, databaseValues, r)) {
+ if (isCriteriaMatch(criteriaValues, databaseValues, r, criteria.getDateSystem())) {
count++;
resultRowIndex = r;
}
diff --git a/packages/engine-formula/src/functions/database/dmax/index.ts b/packages/engine-formula/src/functions/database/dmax/index.ts
index 15dce521e2..72a3156dbe 100644
--- a/packages/engine-formula/src/functions/database/dmax/index.ts
+++ b/packages/engine-formula/src/functions/database/dmax/index.ts
@@ -53,7 +53,7 @@ export class Dmax extends BaseFunction {
continue;
}
- if (isCriteriaMatch(criteriaValues, databaseValues, r)) {
+ if (isCriteriaMatch(criteriaValues, databaseValues, r, criteria.getDateSystem())) {
result = Math.max(result, value);
count++;
}
diff --git a/packages/engine-formula/src/functions/database/dmin/index.ts b/packages/engine-formula/src/functions/database/dmin/index.ts
index 6b775ee367..dd73226583 100644
--- a/packages/engine-formula/src/functions/database/dmin/index.ts
+++ b/packages/engine-formula/src/functions/database/dmin/index.ts
@@ -53,7 +53,7 @@ export class Dmin extends BaseFunction {
continue;
}
- if (isCriteriaMatch(criteriaValues, databaseValues, r)) {
+ if (isCriteriaMatch(criteriaValues, databaseValues, r, criteria.getDateSystem())) {
result = Math.min(result, value);
count++;
}
diff --git a/packages/engine-formula/src/functions/database/dproduct/index.ts b/packages/engine-formula/src/functions/database/dproduct/index.ts
index 47c95bbbd2..d09d863ce3 100644
--- a/packages/engine-formula/src/functions/database/dproduct/index.ts
+++ b/packages/engine-formula/src/functions/database/dproduct/index.ts
@@ -53,7 +53,7 @@ export class Dproduct extends BaseFunction {
continue;
}
- if (isCriteriaMatch(criteriaValues, databaseValues, r)) {
+ if (isCriteriaMatch(criteriaValues, databaseValues, r, criteria.getDateSystem())) {
result *= value;
count++;
}
diff --git a/packages/engine-formula/src/functions/database/dstdev/index.ts b/packages/engine-formula/src/functions/database/dstdev/index.ts
index 207bd0be7f..c4bb530d79 100644
--- a/packages/engine-formula/src/functions/database/dstdev/index.ts
+++ b/packages/engine-formula/src/functions/database/dstdev/index.ts
@@ -57,7 +57,7 @@ export class Dstdev extends BaseFunction {
continue;
}
- if (isCriteriaMatch(criteriaValues, databaseValues, r)) {
+ if (isCriteriaMatch(criteriaValues, databaseValues, r, criteria.getDateSystem())) {
values.push(value);
sum += value;
count++;
diff --git a/packages/engine-formula/src/functions/database/dstdevp/index.ts b/packages/engine-formula/src/functions/database/dstdevp/index.ts
index 0d6ea66d46..3407b52444 100644
--- a/packages/engine-formula/src/functions/database/dstdevp/index.ts
+++ b/packages/engine-formula/src/functions/database/dstdevp/index.ts
@@ -57,7 +57,7 @@ export class Dstdevp extends BaseFunction {
continue;
}
- if (isCriteriaMatch(criteriaValues, databaseValues, r)) {
+ if (isCriteriaMatch(criteriaValues, databaseValues, r, criteria.getDateSystem())) {
values.push(value);
sum += value;
count++;
diff --git a/packages/engine-formula/src/functions/database/dsum/__tests__/index.spec.ts b/packages/engine-formula/src/functions/database/dsum/__tests__/index.spec.ts
index bcf7f14dee..d67f12a2e1 100644
--- a/packages/engine-formula/src/functions/database/dsum/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/database/dsum/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -62,6 +63,41 @@ describe('Test dsum function', () => {
expect(getObjectValue(result)).toStrictEqual(24);
});
+ it('uses the date system for date criteria comparisons', () => {
+ const database = ArrayValueObject.create({
+ calculateValueList: transformToValueObject([
+ ['日期', '金额'],
+ [0, 10],
+ [1, 20],
+ ]),
+ rowCount: 3,
+ columnCount: 2,
+ unitId: '',
+ sheetId: '',
+ row: 0,
+ column: 0,
+ });
+ const field = StringValueObject.create('金额');
+ const createCriteria = () => ArrayValueObject.create({
+ calculateValueList: transformToValueObject([
+ ['日期'],
+ ['>1904-01-01'],
+ ]),
+ rowCount: 2,
+ columnCount: 1,
+ unitId: '',
+ sheetId: '',
+ row: 0,
+ column: 0,
+ });
+
+ const criteria1900 = createCriteria().withDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(database, field, criteria1900))).toBe(0);
+
+ const criteria1904 = createCriteria().withDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(database, field, criteria1904))).toBe(20);
+ });
+
it('Database value test', () => {
const database = ArrayValueObject.create({
calculateValueList: transformToValueObject([
diff --git a/packages/engine-formula/src/functions/database/dsum/index.ts b/packages/engine-formula/src/functions/database/dsum/index.ts
index 3f4ef8705a..1f1c70b168 100644
--- a/packages/engine-formula/src/functions/database/dsum/index.ts
+++ b/packages/engine-formula/src/functions/database/dsum/index.ts
@@ -52,7 +52,7 @@ export class Dsum extends BaseFunction {
continue;
}
- if (isCriteriaMatch(criteriaValues, databaseValues, r)) {
+ if (isCriteriaMatch(criteriaValues, databaseValues, r, criteria.getDateSystem())) {
result += value;
}
}
diff --git a/packages/engine-formula/src/functions/database/dvar/index.ts b/packages/engine-formula/src/functions/database/dvar/index.ts
index 0cf6027710..84c8a7a8be 100644
--- a/packages/engine-formula/src/functions/database/dvar/index.ts
+++ b/packages/engine-formula/src/functions/database/dvar/index.ts
@@ -57,7 +57,7 @@ export class Dvar extends BaseFunction {
continue;
}
- if (isCriteriaMatch(criteriaValues, databaseValues, r)) {
+ if (isCriteriaMatch(criteriaValues, databaseValues, r, criteria.getDateSystem())) {
values.push(value);
sum += value;
count++;
diff --git a/packages/engine-formula/src/functions/database/dvarp/index.ts b/packages/engine-formula/src/functions/database/dvarp/index.ts
index 1a2283ec49..74070388c3 100644
--- a/packages/engine-formula/src/functions/database/dvarp/index.ts
+++ b/packages/engine-formula/src/functions/database/dvarp/index.ts
@@ -57,7 +57,7 @@ export class Dvarp extends BaseFunction {
continue;
}
- if (isCriteriaMatch(criteriaValues, databaseValues, r)) {
+ if (isCriteriaMatch(criteriaValues, databaseValues, r, criteria.getDateSystem())) {
values.push(value);
sum += value;
count++;
diff --git a/packages/engine-formula/src/functions/date/date/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/date/__tests__/index.spec.ts
index b6f77453cb..b27320c7f6 100644
--- a/packages/engine-formula/src/functions/date/date/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/date/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -50,6 +51,28 @@ describe('Test date function', () => {
expect(getObjectValue(result)).toBe(0);
});
+ it('preserves Excel 1900 leap-year compatibility dates', () => {
+ const month = NumberValueObject.create(2);
+
+ expect(getObjectValue(testFunction.calculate(NumberValueObject.create(1900), month, NumberValueObject.create(29)))).toBe(60);
+ expect(getObjectValue(testFunction.calculate(NumberValueObject.create(1900), month, NumberValueObject.create(30)))).toBe(61);
+ });
+
+ it('uses the configured Excel date system', () => {
+ const month = NumberValueObject.create(1);
+ const day = NumberValueObject.create(1);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(NumberValueObject.create(1904), month, day))).toBe(1462);
+ expect(getObjectValue(testFunction.calculate(NumberValueObject.create(2000), month, day))).toBe(36526);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(NumberValueObject.create(1904), month, day))).toBe(0);
+ expect(getObjectValue(testFunction.calculate(NumberValueObject.create(2000), month, day))).toBe(35064);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Edge case, 1900.1.-1', () => {
const year = NumberValueObject.create(1900);
const month = NumberValueObject.create(1);
diff --git a/packages/engine-formula/src/functions/date/date/index.ts b/packages/engine-formula/src/functions/date/date/index.ts
index 5273735a9b..b84e09a00d 100644
--- a/packages/engine-formula/src/functions/date/date/index.ts
+++ b/packages/engine-formula/src/functions/date/date/index.ts
@@ -16,7 +16,8 @@
import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { DEFAULT_DATE_FORMAT, excelDateSerial } from '../../../basics/date';
+import { excelDateSerial } from '@univerjs/core';
+import { DEFAULT_DATE_FORMAT } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { expandArrayValueObject } from '../../../engine/utils/array-object';
import { checkVariantsErrorIsStringToNumber } from '../../../engine/utils/check-variant-error';
@@ -81,9 +82,11 @@ export class DateFunction extends BaseFunction {
yearValue += 1900;
}
- const date = new Date(Date.UTC(yearValue, monthValue - 1, dayValue));
-
- const currentSerial = excelDateSerial(date);
+ // Build the serial from the first day of the normalized month. This keeps
+ // Excel's fictitious 1900-02-29 (serial 60) instead of letting native Date
+ // normalize it to 1900-03-01.
+ const firstDateOfMonth = new Date(Date.UTC(yearValue, monthValue - 1, 1));
+ const currentSerial = excelDateSerial(firstDateOfMonth, this.getDateSystem()) + dayValue - 1;
if (currentSerial < 0) {
return ErrorValueObject.create(ErrorType.NUM);
diff --git a/packages/engine-formula/src/functions/date/datedif/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/datedif/__tests__/index.spec.ts
index 544812019c..f16a16a18c 100644
--- a/packages/engine-formula/src/functions/date/datedif/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/datedif/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -55,6 +56,28 @@ describe('Test datedif function', () => {
expect(result.getValue()).toStrictEqual(61);
});
+ it('uses the configured date system for numeric serials', () => {
+ const startDate = NumberValueObject.create(0);
+ const endDate = NumberValueObject.create(60);
+ const unit = StringValueObject.create('M');
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(startDate, endDate, unit).getValue()).toBe(1);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(startDate, endDate, unit).getValue()).toBe(2);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
+ it('handles the 1900 leap-year boundary serial without normalizing it away', () => {
+ testFunction.setDateSystem(DateSystem.Date1900);
+
+ const result = testFunction.calculate(NumberValueObject.create(60), NumberValueObject.create(90), StringValueObject.create('MD'));
+
+ expect(result.getValue()).toBe(1);
+ });
+
it('value is normal, endDate < startDate', () => {
const startDate = StringValueObject.create('2021/3/31');
const endDate = StringValueObject.create('2011/1/29');
@@ -241,5 +264,20 @@ describe('Test datedif function', () => {
const result3 = testFunction.calculate(startDate3, endDate3, unit);
expect(result3.getValue()).toStrictEqual(364);
});
+
+ it('checks serial-zero day and year differences in both date systems', () => {
+ const startDate = NumberValueObject.create(0);
+ const endDate = NumberValueObject.create(366);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(startDate, endDate, StringValueObject.create('D')).getValue()).toBe(366);
+ expect(testFunction.calculate(startDate, endDate, StringValueObject.create('Y')).getValue()).toBe(0);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(startDate, endDate, StringValueObject.create('D')).getValue()).toBe(366);
+ expect(testFunction.calculate(startDate, endDate, StringValueObject.create('Y')).getValue()).toBe(1);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/date/datedif/index.ts b/packages/engine-formula/src/functions/date/datedif/index.ts
index 8e44a84d3b..8981af6ea6 100644
--- a/packages/engine-formula/src/functions/date/datedif/index.ts
+++ b/packages/engine-formula/src/functions/date/datedif/index.ts
@@ -16,7 +16,8 @@
import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { excelDateSerial, excelSerialToDate, getDateSerialNumberByObject, getDaysInMonth } from '../../../basics/date';
+import { DateSystem, excelDateSerial, excelSerialToDate, excelSerialToDateTimeParts } from '@univerjs/core';
+import { getDateSerialNumberByObject, getDaysInMonth } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { ErrorValueObject } from '../../../engine/value-object/base-value-object';
import { NumberValueObject } from '../../../engine/value-object/primitive-object';
@@ -56,13 +57,13 @@ export class Datedif extends BaseFunction {
return _unit;
}
- const startDateSerialNumber = getDateSerialNumberByObject(_startDate);
+ const startDateSerialNumber = getDateSerialNumberByObject(_startDate, this.getDateSystem());
if (typeof startDateSerialNumber !== 'number') {
return startDateSerialNumber;
}
- const endDateSerialNumber = getDateSerialNumberByObject(_endDate);
+ const endDateSerialNumber = getDateSerialNumberByObject(_endDate, this.getDateSystem());
if (typeof endDateSerialNumber !== 'number') {
return endDateSerialNumber;
@@ -80,15 +81,20 @@ export class Datedif extends BaseFunction {
}
private _getResultByUnit(startDateSerialNumber: number, endDateSerialNumber: number, unit: BaseValueObject): BaseValueObject {
- const startDateDate = excelSerialToDate(startDateSerialNumber);
- const startYear = startDateDate.getUTCFullYear();
- const startMonth = startDateDate.getUTCMonth() + 1;
- const startDay = startDateDate.getUTCDate();
-
- const endDateDate = excelSerialToDate(endDateSerialNumber);
- const endYear = endDateDate.getUTCFullYear();
- const endMonth = endDateDate.getUTCMonth() + 1;
- const endDay = endDateDate.getUTCDate();
+ const startDateDate = excelSerialToDate(startDateSerialNumber, this.getDateSystem());
+ // Native Date cannot represent Excel's fictitious 1900-02-29 (serial 60), so use
+ // the decoded Excel fields for calendar calculations that depend on the day value.
+ const startDateParts = excelSerialToDateTimeParts(startDateSerialNumber, { dateSystem: this.getDateSystem() });
+ const startIs1900SerialZero = this.getDateSystem() === DateSystem.Date1900 && startDateSerialNumber === 0;
+ const startYear = startIs1900SerialZero ? 1900 : startDateParts?.year ?? startDateDate.getUTCFullYear();
+ const startMonth = startIs1900SerialZero ? 1 : startDateParts?.month ?? startDateDate.getUTCMonth() + 1;
+ const startDay = startIs1900SerialZero ? 0 : startDateParts?.day ?? startDateDate.getUTCDate();
+
+ const endDateDate = excelSerialToDate(endDateSerialNumber, this.getDateSystem());
+ const endDateParts = excelSerialToDateTimeParts(endDateSerialNumber, { dateSystem: this.getDateSystem() });
+ const endYear = endDateParts?.year ?? endDateDate.getUTCFullYear();
+ const endMonth = endDateParts?.month ?? endDateDate.getUTCMonth() + 1;
+ const endDay = endDateParts?.day ?? endDateDate.getUTCDate();
const unitValue = `${unit.getValue()}`.toLocaleUpperCase();
@@ -146,7 +152,7 @@ export class Datedif extends BaseFunction {
newDate = new Date(Date.UTC(startYear + 1, endMonth - 1, endDay));
}
- diff = Math.floor(excelDateSerial(newDate)) - Math.floor(startDateSerialNumber);
+ diff = Math.floor(excelDateSerial(newDate, this.getDateSystem())) - Math.floor(startDateSerialNumber);
break;
default:
return ErrorValueObject.create(ErrorType.NUM);
diff --git a/packages/engine-formula/src/functions/date/datevalue/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/datevalue/__tests__/index.spec.ts
index 21bddade08..e4dace23f2 100644
--- a/packages/engine-formula/src/functions/date/datevalue/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/datevalue/__tests__/index.spec.ts
@@ -14,8 +14,8 @@
* limitations under the License.
*/
+import { DateSystem, excelDateSerial } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
-import { excelDateSerial } from '../../../../basics/date';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
import { ErrorValueObject } from '../../../../engine/value-object/base-value-object';
@@ -46,6 +46,18 @@ describe('Test datevalue function', () => {
expect(getObjectValue(result4)).toStrictEqual(0);
});
+ it('uses the configured Excel date system', () => {
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(StringValueObject.create('1904-1-1')))).toBe(1462);
+ expect(getObjectValue(testFunction.calculate(StringValueObject.create('1904-2-2')))).toBe(1494);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(StringValueObject.create('1904-1-1')))).toBe(0);
+ expect(getObjectValue(testFunction.calculate(StringValueObject.create('1904-2-2')))).toBe(32);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Date text number', () => {
const dateText = NumberValueObject.create(43832);
const result = testFunction.calculate(dateText);
diff --git a/packages/engine-formula/src/functions/date/datevalue/index.ts b/packages/engine-formula/src/functions/date/datevalue/index.ts
index 5004764176..cd938eee27 100644
--- a/packages/engine-formula/src/functions/date/datevalue/index.ts
+++ b/packages/engine-formula/src/functions/date/datevalue/index.ts
@@ -15,7 +15,8 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { excelDateTimeSerial, isDate, parseFormattedDate, parseFormattedTime } from '../../../basics/date';
+import { excelDateTimeSerial } from '@univerjs/core';
+import { isDate, parseFormattedDate, parseFormattedTime } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { ErrorValueObject } from '../../../engine/value-object/base-value-object';
import { NumberValueObject } from '../../../engine/value-object/primitive-object';
@@ -45,9 +46,10 @@ export class Datevalue extends BaseFunction {
if (dateTextObject.isString()) {
const value = `${dateTextObject.getValue()}`;
- let parsedDate = parseFormattedDate(value);
+ const options = { dateSystem: this.getDateSystem() };
+ let parsedDate = parseFormattedDate(value, options);
if (parsedDate === null) {
- parsedDate = parseFormattedTime(value);
+ parsedDate = parseFormattedTime(value, options);
}
if (parsedDate) {
let { v, z } = parsedDate;
@@ -55,7 +57,7 @@ export class Datevalue extends BaseFunction {
// currently, we the v is a number by numfmt the 3.2
if (z && isDate(z)) {
if ((v as any) instanceof Date) {
- v = excelDateTimeSerial(v as any);
+ v = excelDateTimeSerial(v as any, this.getDateSystem());
}
return NumberValueObject.create(Math.trunc(+v));
diff --git a/packages/engine-formula/src/functions/date/day/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/day/__tests__/index.spec.ts
index 6860e46afe..dc3c4db22c 100644
--- a/packages/engine-formula/src/functions/date/day/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/day/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValue, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -31,6 +32,18 @@ describe('Test day function', () => {
const result = testFunction.calculate(serialNumber);
expect(result.getValue()).toStrictEqual(2);
});
+
+ it('uses the configured date system at the epoch boundary', () => {
+ const serialNumber = NumberValueObject.create(0);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(serialNumber).getValue()).toBe(0);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(serialNumber).getValue()).toBe(1);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
it('Serial number is error', () => {
const serialNumber = ErrorValueObject.create(ErrorType.NAME);
const result = testFunction.calculate(serialNumber);
diff --git a/packages/engine-formula/src/functions/date/day/index.ts b/packages/engine-formula/src/functions/date/day/index.ts
index 20e8067014..006cd843c5 100644
--- a/packages/engine-formula/src/functions/date/day/index.ts
+++ b/packages/engine-formula/src/functions/date/day/index.ts
@@ -15,7 +15,8 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { excelSerialToDate, isValidDateStr } from '../../../basics/date';
+import { excelSerialToDateTimeParts } from '@univerjs/core';
+import { isValidDateStr } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { ErrorValueObject } from '../../../engine/value-object/base-value-object';
import { NumberValueObject } from '../../../engine/value-object/primitive-object';
@@ -55,13 +56,8 @@ export class Day extends BaseFunction {
return ErrorValueObject.create(ErrorType.NUM);
}
- // Excel serial 0 is 1900-01-00
- // Google Sheets serial 0 is 1899-12-30
- if (dateSerial === 0) {
- return NumberValueObject.create(0);
- }
-
- date = excelSerialToDate(dateSerial);
+ const parts = excelSerialToDateTimeParts(dateSerial, { dateSystem: this.getDateSystem() });
+ return parts ? NumberValueObject.create(parts.day) : ErrorValueObject.create(ErrorType.NUM);
}
const day = date.getUTCDate();
diff --git a/packages/engine-formula/src/functions/date/days/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/days/__tests__/index.spec.ts
index 5094dae6bb..afa9bfa66c 100644
--- a/packages/engine-formula/src/functions/date/days/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/days/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValue, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -91,5 +92,17 @@ describe('Test days function', () => {
[40950, ErrorType.VALUE, 0, -1, ErrorType.NAME, -1],
]);
});
+ it('uses the configured date system for serial-zero inputs', () => {
+ const startDate = NumberValueObject.create(0);
+ const endDate = NumberValueObject.create(366);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(endDate, startDate).getValue()).toBe(366);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(endDate, startDate).getValue()).toBe(366);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/date/days/index.ts b/packages/engine-formula/src/functions/date/days/index.ts
index 9223706b62..b95ef958b2 100644
--- a/packages/engine-formula/src/functions/date/days/index.ts
+++ b/packages/engine-formula/src/functions/date/days/index.ts
@@ -59,13 +59,13 @@ export class Days extends BaseFunction {
return startDateObject;
}
- const endDateSerialNumber = getDateSerialNumberByObject(endDateObject);
+ const endDateSerialNumber = getDateSerialNumberByObject(endDateObject, this.getDateSystem());
if (typeof endDateSerialNumber !== 'number') {
return endDateSerialNumber;
}
- const startDateSerialNumber = getDateSerialNumberByObject(startDateObject);
+ const startDateSerialNumber = getDateSerialNumberByObject(startDateObject, this.getDateSystem());
if (typeof startDateSerialNumber !== 'number') {
return startDateSerialNumber;
diff --git a/packages/engine-formula/src/functions/date/days360/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/days360/__tests__/index.spec.ts
index 13b08e125e..5353c31cac 100644
--- a/packages/engine-formula/src/functions/date/days360/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/days360/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValue, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -38,6 +39,19 @@ describe('Test days360 function', () => {
expect(result.getValue()).toStrictEqual(61);
});
+ it('uses the configured date system for numeric serials', () => {
+ const startDate = NumberValueObject.create(0);
+ const endDate = NumberValueObject.create(31);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(startDate, endDate).getValue()).toBe(31);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(startDate, endDate).getValue()).toBe(30);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('value is normal, endDate < startDate', () => {
const startDate = StringValueObject.create('2021/3/31');
const endDate = StringValueObject.create('2021/1/29');
@@ -126,5 +140,18 @@ describe('Test days360 function', () => {
[ErrorType.NA, ErrorType.VALUE, ErrorType.NA, ErrorType.NA, ErrorType.NAME],
]);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const startDate = NumberValueObject.create(0);
+ const endDate = NumberValueObject.create(366);
+ const method = NumberValueObject.create(0);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(startDate, endDate, method).getValue()).toBe(361);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(startDate, endDate, method).getValue()).toBe(360);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/date/days360/index.ts b/packages/engine-formula/src/functions/date/days360/index.ts
index 823a492d74..2ccf9f934b 100644
--- a/packages/engine-formula/src/functions/date/days360/index.ts
+++ b/packages/engine-formula/src/functions/date/days360/index.ts
@@ -67,7 +67,7 @@ export class Days360 extends BaseFunction {
return startDateObject;
}
- const startDateSerialNumber = getDateSerialNumberByObject(startDateObject);
+ const startDateSerialNumber = getDateSerialNumberByObject(startDateObject, this.getDateSystem());
if (typeof startDateSerialNumber !== 'number') {
return startDateSerialNumber;
@@ -77,7 +77,7 @@ export class Days360 extends BaseFunction {
return endDateObject;
}
- const endDateSerialNumber = getDateSerialNumberByObject(endDateObject);
+ const endDateSerialNumber = getDateSerialNumberByObject(endDateObject, this.getDateSystem());
if (typeof endDateSerialNumber !== 'number') {
return endDateSerialNumber;
@@ -93,7 +93,7 @@ export class Days360 extends BaseFunction {
const methodValue = +methodObject.getValue();
- const { days } = getTwoDateDaysByBasis(startDateSerialNumber, endDateSerialNumber, !methodValue ? 0 : 4);
+ const { days } = getTwoDateDaysByBasis(startDateSerialNumber, endDateSerialNumber, !methodValue ? 0 : 4, this.getDateSystem());
const result = endDateSerialNumber >= startDateSerialNumber ? days : -days;
diff --git a/packages/engine-formula/src/functions/date/edate/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/edate/__tests__/index.spec.ts
index 2094ba52e7..9cf646ed9e 100644
--- a/packages/engine-formula/src/functions/date/edate/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/edate/__tests__/index.spec.ts
@@ -14,8 +14,8 @@
* limitations under the License.
*/
+import { DateSystem, excelDateSerial } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
-import { excelDateSerial } from '../../../../basics/date';
import { ArrayValueObject, transformToValue, transformToValueObject } from '../../../../engine/value-object/array-value-object';
import { NumberValueObject } from '../../../../engine/value-object/primitive-object';
import { FUNCTION_NAMES_DATE } from '../../function-names';
@@ -32,6 +32,19 @@ describe('Test edate function', () => {
expect(transformToValue(result.getArrayValue())).toStrictEqual([[43862]]);
});
+ it('uses the configured date system for serials around the epoch', () => {
+ const startDate = NumberValueObject.create(31);
+ const months = NumberValueObject.create(1);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(transformToValue(testFunction.calculate(startDate, months).getArrayValue())).toStrictEqual([[59]]);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(transformToValue(testFunction.calculate(startDate, months).getArrayValue())).toStrictEqual([[60]]);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Clamps month-end overflow to the target month last day', () => {
const startDate = NumberValueObject.create(excelDateSerial(new Date(Date.UTC(2025, 7, 31))));
const months = NumberValueObject.create(-2);
@@ -108,5 +121,26 @@ describe('Test edate function', () => {
const result = testFunction.calculate(startDate, months);
expect(transformToValue(result.getArrayValue())).toStrictEqual([[43862, '#VALUE!', 43862, '#VALUE!', '#VALUE!', 43831], [43831, 46874, 43891, '#VALUE!', 43739, 101660]]);
});
+
+ it('checks the serial-zero boundary in both date systems', () => {
+ const startDate = NumberValueObject.create(0);
+ const months = NumberValueObject.create(1);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(transformToValue(testFunction.calculate(startDate, months).getArrayValue())).toStrictEqual([[31]]);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(transformToValue(testFunction.calculate(startDate, months).getArrayValue())).toStrictEqual([[31]]);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
+ it('preserves Excel serial 60 when no month is added', () => {
+ testFunction.setDateSystem(DateSystem.Date1900);
+
+ const result = testFunction.calculate(NumberValueObject.create(60), NumberValueObject.create(0));
+
+ expect(transformToValue(result.getArrayValue())).toStrictEqual([[59]]);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/date/edate/index.ts b/packages/engine-formula/src/functions/date/edate/index.ts
index 2e5913c89f..02f99ebfa6 100644
--- a/packages/engine-formula/src/functions/date/edate/index.ts
+++ b/packages/engine-formula/src/functions/date/edate/index.ts
@@ -16,7 +16,8 @@
import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { DEFAULT_DATE_FORMAT, excelDateSerial, excelSerialToDate } from '../../../basics/date';
+import { excelDateSerial, excelSerialToDate } from '@univerjs/core';
+import { DEFAULT_DATE_FORMAT } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { expandArrayValueObject } from '../../../engine/utils/array-object';
import { ErrorValueObject } from '../../../engine/value-object/base-value-object';
@@ -78,7 +79,7 @@ export class Edate extends BaseFunction {
const monthsValue = Math.floor(+monthsValueObject.getValue());
- const _startDate = excelSerialToDate(startDateSerial);
+ const _startDate = excelSerialToDate(startDateSerial, this.getDateSystem());
const year = _startDate.getUTCFullYear();
const month = _startDate.getUTCMonth() + monthsValue;
@@ -86,7 +87,7 @@ export class Edate extends BaseFunction {
const lastDayOfTargetMonth = new Date(Date.UTC(year, month + 1, 0)).getUTCDate();
const resultDate = new Date(Date.UTC(year, month, Math.min(day, lastDayOfTargetMonth)));
- const currentSerial = excelDateSerial(resultDate);
+ const currentSerial = excelDateSerial(resultDate, this.getDateSystem());
return NumberValueObject.create(currentSerial, DEFAULT_DATE_FORMAT);
});
diff --git a/packages/engine-formula/src/functions/date/eomonth/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/eomonth/__tests__/index.spec.ts
index 78fec25ee4..ba12f47a2c 100644
--- a/packages/engine-formula/src/functions/date/eomonth/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/eomonth/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -71,6 +72,16 @@ describe('Test eomonth function', () => {
expect(result.getValue()).toStrictEqual(42429);
});
+ it('treats serial zero as 1904-01-01 in the 1904 date system', () => {
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(NumberValueObject.create(0), NumberValueObject.create(0)).getValue()).toBe(31);
+ expect(testFunction.calculate(NumberValueObject.create(31), NumberValueObject.create(0)).getValue()).toBe(31);
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(NumberValueObject.create(0), NumberValueObject.create(0)).getValue()).toBe(30);
+ expect(testFunction.calculate(NumberValueObject.create(31), NumberValueObject.create(0)).getValue()).toBe(59);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('value is array', () => {
const startDate = ArrayValueObject.create({
calculateValueList: transformToValueObject([
@@ -87,5 +98,24 @@ describe('Test eomonth function', () => {
const result = testFunction.calculate(startDate, months);
expect(result.getValue()).toStrictEqual(ErrorType.VALUE);
});
+
+ it('checks the serial-zero boundary in both date systems', () => {
+ const startDate = NumberValueObject.create(0);
+ const months = NumberValueObject.create(0);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(startDate, months).getValue()).toBe(31);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(startDate, months).getValue()).toBe(30);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
+ it('keeps the fictitious 1900-02-29 serial when it is the month end', () => {
+ testFunction.setDateSystem(DateSystem.Date1900);
+
+ expect(testFunction.calculate(NumberValueObject.create(60), NumberValueObject.create(0)).getValue()).toBe(59);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/date/eomonth/index.ts b/packages/engine-formula/src/functions/date/eomonth/index.ts
index 263e03ffa6..8f79ec6c7c 100644
--- a/packages/engine-formula/src/functions/date/eomonth/index.ts
+++ b/packages/engine-formula/src/functions/date/eomonth/index.ts
@@ -16,7 +16,8 @@
import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { excelDateSerial, excelSerialToDate, getDateSerialNumberByObject } from '../../../basics/date';
+import { DateSystem, excelDateSerial, excelSerialToDate } from '@univerjs/core';
+import { getDateSerialNumberByObject } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { ErrorValueObject } from '../../../engine/value-object/base-value-object';
import { NumberValueObject } from '../../../engine/value-object/primitive-object';
@@ -61,7 +62,7 @@ export class Eomonth extends BaseFunction {
return _months;
}
- const startDateSerialNumber = getDateSerialNumberByObject(_startDate);
+ const startDateSerialNumber = getDateSerialNumberByObject(_startDate, this.getDateSystem());
if (typeof startDateSerialNumber !== 'number') {
return startDateSerialNumber;
@@ -71,9 +72,10 @@ export class Eomonth extends BaseFunction {
return ErrorValueObject.create(ErrorType.VALUE);
}
- const startDateDate = excelSerialToDate(startDateSerialNumber);
- const startYear = startDateSerialNumber > 0 ? startDateDate.getUTCFullYear() : 1900;
- const startMonth = startDateSerialNumber > 0 ? startDateDate.getUTCMonth() : 0;
+ const startDateDate = excelSerialToDate(startDateSerialNumber, this.getDateSystem());
+ const isDate1900SerialZero = this.getDateSystem() === DateSystem.Date1900 && startDateSerialNumber === 0;
+ const startYear = isDate1900SerialZero ? 1900 : startDateDate.getUTCFullYear();
+ const startMonth = isDate1900SerialZero ? 0 : startDateDate.getUTCMonth();
const monthsValue = Math.floor(+_months.getValue());
@@ -82,7 +84,7 @@ export class Eomonth extends BaseFunction {
}
const targetDate = new Date(Date.UTC(startYear, startMonth + monthsValue + 1, 0));
- const result = excelDateSerial(targetDate);
+ const result = excelDateSerial(targetDate, this.getDateSystem());
return NumberValueObject.create(result);
}
diff --git a/packages/engine-formula/src/functions/date/epochtodate/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/epochtodate/__tests__/index.spec.ts
index dd7d922533..9d57e8f3c7 100644
--- a/packages/engine-formula/src/functions/date/epochtodate/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/epochtodate/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -33,6 +34,18 @@ describe('Test epochtodate function', () => {
expect(getObjectValue(result)).toBe(44734.58692129629);
});
+ it('uses the configured date system for Unix epoch', () => {
+ const timestamp = NumberValueObject.create(0);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(timestamp))).toBe(25569);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(timestamp))).toBe(24107);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Timestamp value test', () => {
const timestamp = NullValueObject.create();
const result = testFunction.calculate(timestamp);
diff --git a/packages/engine-formula/src/functions/date/epochtodate/index.ts b/packages/engine-formula/src/functions/date/epochtodate/index.ts
index 33ef010623..2396612241 100644
--- a/packages/engine-formula/src/functions/date/epochtodate/index.ts
+++ b/packages/engine-formula/src/functions/date/epochtodate/index.ts
@@ -17,7 +17,7 @@
import type { BaseReferenceObject, FunctionVariantType } from '../../../engine/reference-object/base-reference-object';
import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { excelDateTimeSerial } from '../../../basics/date';
+import { excelDateTimeSerial } from '@univerjs/core';
import { ErrorType } from '../../../basics/error-type';
import { checkVariantsErrorIsStringToNumber } from '../../../engine/utils/check-variant-error';
import { ErrorValueObject } from '../../../engine/value-object/base-value-object';
@@ -75,11 +75,11 @@ export class Epochtodate extends BaseFunction {
const date = new Date(Date.UTC(1970, 0, 1, 0, 0, 0, 0) + timestampValue);
if (!Number.isNaN(date.getTime())) {
- const dateSerialNumber = excelDateTimeSerial(date);
+ const dateSerialNumber = excelDateTimeSerial(date, this.getDateSystem());
return NumberValueObject.create(dateSerialNumber, 'yyyy-MM-dd AM/PM hh:mm:ss');
} else {
- const result = 25569 + timestampValue / 86400000;
+ const result = excelDateTimeSerial(new Date(0), this.getDateSystem()) + timestampValue / 86400000;
return NumberValueObject.create(result);
}
diff --git a/packages/engine-formula/src/functions/date/hour/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/hour/__tests__/index.spec.ts
index 0f800b6ac7..62639484b5 100644
--- a/packages/engine-formula/src/functions/date/hour/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/hour/__tests__/index.spec.ts
@@ -32,6 +32,10 @@ describe('Test hour function', () => {
expect(result.getValue()).toStrictEqual(5);
});
+ it('keeps the time portion when the date portion is serial 60', () => {
+ expect(testFunction.calculate(NumberValueObject.create(60.5)).getValue()).toBe(12);
+ });
+
it('Serial number is error', () => {
const serialNumber = ErrorValueObject.create(ErrorType.NAME);
const result = testFunction.calculate(serialNumber);
diff --git a/packages/engine-formula/src/functions/date/hour/index.ts b/packages/engine-formula/src/functions/date/hour/index.ts
index fa051a82b2..f3e2b70c04 100644
--- a/packages/engine-formula/src/functions/date/hour/index.ts
+++ b/packages/engine-formula/src/functions/date/hour/index.ts
@@ -15,7 +15,8 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { excelSerialToDateTime, getDateSerialNumberByObject } from '../../../basics/date';
+import { excelSerialToDateTime } from '@univerjs/core';
+import { getDateSerialNumberByObject } from '../../../basics/date';
import { NumberValueObject } from '../../../engine/value-object/primitive-object';
import { BaseFunction } from '../../base-function';
@@ -43,7 +44,7 @@ export class Hour extends BaseFunction {
}
private _handleSingleObject(serialNumberObject: BaseValueObject) {
- const dateSerialNumber = getDateSerialNumberByObject(serialNumberObject);
+ const dateSerialNumber = getDateSerialNumberByObject(serialNumberObject, this.getDateSystem());
if (typeof dateSerialNumber !== 'number') {
return dateSerialNumber;
@@ -53,7 +54,7 @@ export class Hour extends BaseFunction {
return NumberValueObject.create(0);
}
- const date = excelSerialToDateTime(dateSerialNumber);
+ const date = excelSerialToDateTime(dateSerialNumber, this.getDateSystem());
const hours = date.getUTCHours();
return NumberValueObject.create(hours);
diff --git a/packages/engine-formula/src/functions/date/isoweeknum/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/isoweeknum/__tests__/index.spec.ts
index 9f4d80d4bf..3d72a6e69c 100644
--- a/packages/engine-formula/src/functions/date/isoweeknum/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/isoweeknum/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValue, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -42,6 +43,14 @@ describe('Test isoweeknum function', () => {
expect(result.getValue()).toStrictEqual(52);
});
+ it('uses the 1904 epoch when serial is zero', () => {
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(NumberValueObject.create(0)).getValue()).toBe(52);
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(NumberValueObject.create(0)).getValue()).toBe(53);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('date is error', () => {
const date = ErrorValueObject.create(ErrorType.NAME);
const result = testFunction.calculate(date);
@@ -77,5 +86,22 @@ describe('Test isoweeknum function', () => {
[52, 52, 52, 52, ErrorType.NAME, 4, 8],
]);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const date = NumberValueObject.create(0);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(date).getValue()).toBe(52);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(date).getValue()).toBe(53);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
+ it('uses the Excel weekday for serial 60 in the 1900 date system', () => {
+ testFunction.setDateSystem(DateSystem.Date1900);
+
+ expect(testFunction.calculate(NumberValueObject.create(60)).getValue()).toBe(9);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/date/isoweeknum/index.ts b/packages/engine-formula/src/functions/date/isoweeknum/index.ts
index 55ef089cd0..9261e5266c 100644
--- a/packages/engine-formula/src/functions/date/isoweeknum/index.ts
+++ b/packages/engine-formula/src/functions/date/isoweeknum/index.ts
@@ -15,7 +15,8 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { excelDateSerial, excelSerialToDate, getDateSerialNumberByObject, getWeekDayByDateSerialNumber } from '../../../basics/date';
+import { DateSystem, excelDateSerial, excelSerialToDate } from '@univerjs/core';
+import { getDateSerialNumberByObject, getWeekDayByDateSerialNumber } from '../../../basics/date';
import { NumberValueObject } from '../../../engine/value-object/primitive-object';
import { BaseFunction } from '../../base-function';
@@ -43,17 +44,19 @@ export class Isoweeknum extends BaseFunction {
}
private _handleSingleObject(date: BaseValueObject) {
- const dateSerialNumber = getDateSerialNumberByObject(date);
+ const dateSerialNumber = getDateSerialNumberByObject(date, this.getDateSystem());
if (typeof dateSerialNumber !== 'number') {
return dateSerialNumber;
}
- const currentDate = excelSerialToDate(dateSerialNumber);
- const currentYear = dateSerialNumber > 0 ? currentDate.getUTCFullYear() : 1900;
+ const currentDate = excelSerialToDate(dateSerialNumber, this.getDateSystem());
+ const currentYear = this.getDateSystem() === DateSystem.Date1900 && dateSerialNumber === 0
+ ? 1900
+ : currentDate.getUTCFullYear();
let yearStart = new Date(Date.UTC(currentYear, 0, 1));
- let yearStartSerialNumber = excelDateSerial(yearStart);
- let yearStartWeekDay = getWeekDayByDateSerialNumber(yearStartSerialNumber);
+ let yearStartSerialNumber = excelDateSerial(yearStart, this.getDateSystem());
+ let yearStartWeekDay = getWeekDayByDateSerialNumber(yearStartSerialNumber, this.getDateSystem());
let yearWeekStartSerialNumber: number;
@@ -67,8 +70,8 @@ export class Isoweeknum extends BaseFunction {
if (dateSerialNumber < yearWeekStartSerialNumber) {
yearStart = new Date(Date.UTC(currentYear - 1, 0, 1));
- yearStartSerialNumber = excelDateSerial(yearStart);
- yearStartWeekDay = getWeekDayByDateSerialNumber(yearStartSerialNumber);
+ yearStartSerialNumber = excelDateSerial(yearStart, this.getDateSystem());
+ yearStartWeekDay = getWeekDayByDateSerialNumber(yearStartSerialNumber, this.getDateSystem());
if (yearStartWeekDay < 1) {
yearWeekStartSerialNumber = yearStartSerialNumber + 1;
diff --git a/packages/engine-formula/src/functions/date/minute/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/minute/__tests__/index.spec.ts
index 8eca09ca6a..237c59b26d 100644
--- a/packages/engine-formula/src/functions/date/minute/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/minute/__tests__/index.spec.ts
@@ -32,6 +32,10 @@ describe('Test minute function', () => {
expect(result.getValue()).toStrictEqual(35);
});
+ it('keeps the time portion when the date portion is serial 60', () => {
+ expect(testFunction.calculate(NumberValueObject.create(60.5)).getValue()).toBe(0);
+ });
+
it('Serial number is error', () => {
const serialNumber = ErrorValueObject.create(ErrorType.NAME);
const result = testFunction.calculate(serialNumber);
diff --git a/packages/engine-formula/src/functions/date/minute/index.ts b/packages/engine-formula/src/functions/date/minute/index.ts
index 2e27852942..5b00217d47 100644
--- a/packages/engine-formula/src/functions/date/minute/index.ts
+++ b/packages/engine-formula/src/functions/date/minute/index.ts
@@ -15,7 +15,8 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { excelSerialToDateTime, getDateSerialNumberByObject } from '../../../basics/date';
+import { excelSerialToDateTime } from '@univerjs/core';
+import { getDateSerialNumberByObject } from '../../../basics/date';
import { NumberValueObject } from '../../../engine/value-object/primitive-object';
import { BaseFunction } from '../../base-function';
@@ -43,7 +44,7 @@ export class Minute extends BaseFunction {
}
private _handleSingleObject(serialNumberObject: BaseValueObject) {
- const dateSerialNumber = getDateSerialNumberByObject(serialNumberObject);
+ const dateSerialNumber = getDateSerialNumberByObject(serialNumberObject, this.getDateSystem());
if (typeof dateSerialNumber !== 'number') {
return dateSerialNumber;
@@ -53,7 +54,7 @@ export class Minute extends BaseFunction {
return NumberValueObject.create(0);
}
- const date = excelSerialToDateTime(dateSerialNumber);
+ const date = excelSerialToDateTime(dateSerialNumber, this.getDateSystem());
const minutes = date.getUTCMinutes();
return NumberValueObject.create(minutes);
diff --git a/packages/engine-formula/src/functions/date/month/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/month/__tests__/index.spec.ts
index 95b70ee24f..0f3b6d9eed 100644
--- a/packages/engine-formula/src/functions/date/month/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/month/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ArrayValueObject, transformToValue, transformToValueObject } from '../../../../engine/value-object/array-value-object';
import { NumberValueObject, StringValueObject } from '../../../../engine/value-object/primitive-object';
@@ -30,6 +31,18 @@ describe('Test month function', () => {
expect(result.getValue()).toStrictEqual(1);
});
+ it('uses the configured date system for serials around 1904', () => {
+ const serialNumber = NumberValueObject.create(31);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(serialNumber).getValue()).toBe(1);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(serialNumber).getValue()).toBe(2);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Serial number is date string', () => {
const serialNumber = StringValueObject.create('2020-01-02');
const result = testFunction.calculate(serialNumber);
diff --git a/packages/engine-formula/src/functions/date/month/index.ts b/packages/engine-formula/src/functions/date/month/index.ts
index 78b3157303..3422e2fc06 100644
--- a/packages/engine-formula/src/functions/date/month/index.ts
+++ b/packages/engine-formula/src/functions/date/month/index.ts
@@ -15,7 +15,8 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { excelSerialToDate, isValidDateStr } from '../../../basics/date';
+import { excelSerialToDateTimeParts } from '@univerjs/core';
+import { isValidDateStr } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { ErrorValueObject } from '../../../engine/value-object/base-value-object';
import { NumberValueObject } from '../../../engine/value-object/primitive-object';
@@ -55,13 +56,8 @@ export class Month extends BaseFunction {
return ErrorValueObject.create(ErrorType.NUM);
}
- // Excel serial 0 is 1900-01-00
- // Google Sheets serial 0 is 1899-12-30
- if (dateSerial === 0) {
- return NumberValueObject.create(1);
- }
-
- date = excelSerialToDate(dateSerial);
+ const parts = excelSerialToDateTimeParts(dateSerial, { dateSystem: this.getDateSystem() });
+ return parts ? NumberValueObject.create(parts.month) : ErrorValueObject.create(ErrorType.NUM);
}
const month = date.getUTCMonth() + 1;
diff --git a/packages/engine-formula/src/functions/date/networkdays-intl/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/networkdays-intl/__tests__/index.spec.ts
index 7f21140dbc..320df6e5ab 100644
--- a/packages/engine-formula/src/functions/date/networkdays-intl/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/networkdays-intl/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -24,7 +25,7 @@ import { FUNCTION_NAMES_DATE } from '../../function-names';
import { NetworkdaysIntl } from '../index';
describe('Test networkdays.intl function', () => {
- const testFunction = new NetworkdaysIntl(FUNCTION_NAMES_DATE.NETWORKDAYS);
+ const testFunction = new NetworkdaysIntl(FUNCTION_NAMES_DATE.NETWORKDAYS_INTL);
describe('NetworkdaysIntl', () => {
it('Value is all date string', () => {
@@ -56,6 +57,19 @@ describe('Test networkdays.intl function', () => {
expect(getObjectValue(result3)).toStrictEqual(85);
});
+ it('uses the configured date system for serial zero', () => {
+ const startDate = NumberValueObject.create(0);
+ const endDate = NumberValueObject.create(0);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(startDate, endDate))).toBe(0);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(startDate, endDate))).toBe(1);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Value is number or date string', () => {
const startDate = NumberValueObject.create(45122);
const endDate = StringValueObject.create('2013-3-1');
@@ -218,5 +232,18 @@ describe('Test networkdays.intl function', () => {
const result3 = testFunction.calculate(startDate3, endDate3);
expect(getObjectValue(result3)).toBe(2);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const startDate = NumberValueObject.create(0);
+ const endDate = NumberValueObject.create(366);
+ const weekend = NumberValueObject.create(1);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(startDate, endDate, weekend))).toBe(261);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(startDate, endDate, weekend))).toBe(261);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/date/networkdays-intl/index.ts b/packages/engine-formula/src/functions/date/networkdays-intl/index.ts
index 00db3a1172..1720e138a8 100644
--- a/packages/engine-formula/src/functions/date/networkdays-intl/index.ts
+++ b/packages/engine-formula/src/functions/date/networkdays-intl/index.ts
@@ -107,13 +107,13 @@ export class NetworkdaysIntl extends BaseFunction {
return ErrorValueObject.create(ErrorType.VALUE);
}
- const startDateSerialNumber = getDateSerialNumberByObject(_startDate);
+ const startDateSerialNumber = getDateSerialNumberByObject(_startDate, this.getDateSystem());
if (typeof startDateSerialNumber !== 'number') {
return startDateSerialNumber;
}
- const endDateSerialNumber = getDateSerialNumberByObject(_endDate);
+ const endDateSerialNumber = getDateSerialNumberByObject(_endDate, this.getDateSystem());
if (typeof endDateSerialNumber !== 'number') {
return endDateSerialNumber;
@@ -123,7 +123,7 @@ export class NetworkdaysIntl extends BaseFunction {
return this._getResultByHolidays(startDateSerialNumber, endDateSerialNumber, weekendValue, holidays);
}
- const result = countWorkingDays(startDateSerialNumber, endDateSerialNumber, weekendValue);
+ const result = countWorkingDays(startDateSerialNumber, endDateSerialNumber, weekendValue, undefined, this.getDateSystem());
return NumberValueObject.create(result);
}
@@ -147,7 +147,7 @@ export class NetworkdaysIntl extends BaseFunction {
continue;
}
- const holidaySerialNumber = getDateSerialNumberByObject(cell);
+ const holidaySerialNumber = getDateSerialNumberByObject(cell, this.getDateSystem());
if (typeof holidaySerialNumber !== 'number') {
if (cell.isString()) {
@@ -164,7 +164,7 @@ export class NetworkdaysIntl extends BaseFunction {
return ErrorValueObject.create(ErrorType.VALUE);
}
- const holidaySerialNumber = getDateSerialNumberByObject(holidays);
+ const holidaySerialNumber = getDateSerialNumberByObject(holidays, this.getDateSystem());
if (typeof holidaySerialNumber !== 'number') {
return holidaySerialNumber;
@@ -173,7 +173,7 @@ export class NetworkdaysIntl extends BaseFunction {
holidaysValueArray.push(holidaySerialNumber);
}
- const result = countWorkingDays(startDateSerialNumber, endDateSerialNumber, weekendValue, holidaysValueArray);
+ const result = countWorkingDays(startDateSerialNumber, endDateSerialNumber, weekendValue, holidaysValueArray, this.getDateSystem());
return NumberValueObject.create(result);
}
diff --git a/packages/engine-formula/src/functions/date/networkdays/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/networkdays/__tests__/index.spec.ts
index a75dc7fd0d..b958653461 100644
--- a/packages/engine-formula/src/functions/date/networkdays/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/networkdays/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -53,6 +54,19 @@ describe('Test networkdays function', () => {
expect(result3.getValue()).toStrictEqual(107);
});
+ it('uses the configured date system for serial zero', () => {
+ const startDate = NumberValueObject.create(0);
+ const endDate = NumberValueObject.create(0);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(startDate, endDate).getValue()).toBe(0);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(startDate, endDate).getValue()).toBe(1);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Value is number or date string', () => {
const startDate = NumberValueObject.create(45122);
const endDate = StringValueObject.create('2013-3-1');
@@ -135,5 +149,17 @@ describe('Test networkdays function', () => {
const result3 = testFunction.calculate(startDate3, endDate3, holidays3);
expect(result3.getValue()).toStrictEqual(ErrorType.NAME);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const startDate = NumberValueObject.create(0);
+ const endDate = NumberValueObject.create(366);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(startDate, endDate).getValue()).toBe(261);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(startDate, endDate).getValue()).toBe(261);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/date/networkdays/index.ts b/packages/engine-formula/src/functions/date/networkdays/index.ts
index abbf780c55..62a434564f 100644
--- a/packages/engine-formula/src/functions/date/networkdays/index.ts
+++ b/packages/engine-formula/src/functions/date/networkdays/index.ts
@@ -69,13 +69,13 @@ export class Networkdays extends BaseFunction {
return ErrorValueObject.create(ErrorType.VALUE);
}
- const startDateSerialNumber = getDateSerialNumberByObject(_startDate);
+ const startDateSerialNumber = getDateSerialNumberByObject(_startDate, this.getDateSystem());
if (typeof startDateSerialNumber !== 'number') {
return startDateSerialNumber;
}
- const endDateSerialNumber = getDateSerialNumberByObject(_endDate);
+ const endDateSerialNumber = getDateSerialNumberByObject(_endDate, this.getDateSystem());
if (typeof endDateSerialNumber !== 'number') {
return endDateSerialNumber;
@@ -85,7 +85,7 @@ export class Networkdays extends BaseFunction {
return this._getResultByHolidays(startDateSerialNumber, endDateSerialNumber, holidays);
}
- const result = countWorkingDays(startDateSerialNumber, endDateSerialNumber);
+ const result = countWorkingDays(startDateSerialNumber, endDateSerialNumber, 1, undefined, this.getDateSystem());
return NumberValueObject.create(result);
}
@@ -109,7 +109,7 @@ export class Networkdays extends BaseFunction {
continue;
}
- const holidaySerialNumber = getDateSerialNumberByObject(cell);
+ const holidaySerialNumber = getDateSerialNumberByObject(cell, this.getDateSystem());
if (typeof holidaySerialNumber !== 'number') {
if (cell.isString()) {
@@ -126,7 +126,7 @@ export class Networkdays extends BaseFunction {
return ErrorValueObject.create(ErrorType.VALUE);
}
- const holidaySerialNumber = getDateSerialNumberByObject(holidays);
+ const holidaySerialNumber = getDateSerialNumberByObject(holidays, this.getDateSystem());
if (typeof holidaySerialNumber !== 'number') {
return holidaySerialNumber;
@@ -135,7 +135,7 @@ export class Networkdays extends BaseFunction {
holidaysValueArray.push(holidaySerialNumber);
}
- const result = countWorkingDays(startDateSerialNumber, endDateSerialNumber, 1, holidaysValueArray);
+ const result = countWorkingDays(startDateSerialNumber, endDateSerialNumber, 1, holidaysValueArray, this.getDateSystem());
return NumberValueObject.create(result);
}
diff --git a/packages/engine-formula/src/functions/date/now/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/now/__tests__/index.spec.ts
index 6c84d0bd49..731f34923d 100644
--- a/packages/engine-formula/src/functions/date/now/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/now/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { stripErrorMargin } from '../../../../engine/utils/math-kit';
import { FUNCTION_NAMES_DATE } from '../../function-names';
@@ -36,5 +37,16 @@ describe('Test now function', () => {
const result = testFunction.calculate();
expect(stripErrorMargin(result.getValue())).toBe(43831.085462963);
});
+
+ it('uses the configured date system', () => {
+ testFunction.setDateSystem(DateSystem.Date1900);
+ const date1900 = testFunction.calculate().getValue();
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ const date1904 = testFunction.calculate().getValue();
+
+ expect(date1900 - date1904).toBeCloseTo(1462, 10);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/date/now/index.ts b/packages/engine-formula/src/functions/date/now/index.ts
index 261ffb7a7d..e3885c4fba 100644
--- a/packages/engine-formula/src/functions/date/now/index.ts
+++ b/packages/engine-formula/src/functions/date/now/index.ts
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-import { DEFAULT_NOW_FORMAT, excelDateTimeSerial } from '../../../basics/date';
+import { excelDateTimeSerial } from '@univerjs/core';
+import { DEFAULT_NOW_FORMAT } from '../../../basics/date';
import { NumberValueObject } from '../../../engine/value-object/primitive-object';
import { BaseFunction } from '../../base-function';
@@ -27,7 +28,7 @@ export class Now extends BaseFunction {
const now = new Date();
// Here we use local time to calculate UTC date time serial number
const utcNow = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate(), now.getHours(), now.getMinutes(), now.getSeconds()));
- const currentSerial = excelDateTimeSerial(utcNow);
+ const currentSerial = excelDateTimeSerial(utcNow, this.getDateSystem());
const valueObject = NumberValueObject.create(currentSerial, DEFAULT_NOW_FORMAT);
return valueObject;
}
diff --git a/packages/engine-formula/src/functions/date/second/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/second/__tests__/index.spec.ts
index be6a853ead..bcf6d792b8 100644
--- a/packages/engine-formula/src/functions/date/second/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/second/__tests__/index.spec.ts
@@ -32,6 +32,10 @@ describe('Test second function', () => {
expect(result.getValue()).toStrictEqual(31);
});
+ it('keeps the time portion when the date portion is serial 60', () => {
+ expect(testFunction.calculate(NumberValueObject.create(60.5)).getValue()).toBe(0);
+ });
+
it('Serial number is error', () => {
const serialNumber = ErrorValueObject.create(ErrorType.NAME);
const result = testFunction.calculate(serialNumber);
diff --git a/packages/engine-formula/src/functions/date/second/index.ts b/packages/engine-formula/src/functions/date/second/index.ts
index b7f59296fe..3924d20252 100644
--- a/packages/engine-formula/src/functions/date/second/index.ts
+++ b/packages/engine-formula/src/functions/date/second/index.ts
@@ -15,7 +15,8 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { excelSerialToDateTime, getDateSerialNumberByObject } from '../../../basics/date';
+import { excelSerialToDateTime } from '@univerjs/core';
+import { getDateSerialNumberByObject } from '../../../basics/date';
import { NumberValueObject } from '../../../engine/value-object/primitive-object';
import { BaseFunction } from '../../base-function';
@@ -43,7 +44,7 @@ export class Second extends BaseFunction {
}
private _handleSingleObject(serialNumberObject: BaseValueObject) {
- const dateSerialNumber = getDateSerialNumberByObject(serialNumberObject);
+ const dateSerialNumber = getDateSerialNumberByObject(serialNumberObject, this.getDateSystem());
if (typeof dateSerialNumber !== 'number') {
return dateSerialNumber;
@@ -53,7 +54,7 @@ export class Second extends BaseFunction {
return NumberValueObject.create(0);
}
- const date = excelSerialToDateTime(dateSerialNumber);
+ const date = excelSerialToDateTime(dateSerialNumber, this.getDateSystem());
const seconds = date.getUTCSeconds();
return NumberValueObject.create(seconds);
diff --git a/packages/engine-formula/src/functions/date/timevalue/index.ts b/packages/engine-formula/src/functions/date/timevalue/index.ts
index 5adac050e8..c75d509532 100644
--- a/packages/engine-formula/src/functions/date/timevalue/index.ts
+++ b/packages/engine-formula/src/functions/date/timevalue/index.ts
@@ -15,8 +15,8 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { getNumfmtParseValueFilter } from '@univerjs/core';
-import { excelDateTimeSerial, isDate } from '../../../basics/date';
+import { excelDateTimeSerial, getNumfmtParseValueFilter } from '@univerjs/core';
+import { isDate } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { getFractionalPart } from '../../../engine/utils/math-kit';
import { ErrorValueObject } from '../../../engine/value-object/base-value-object';
@@ -47,13 +47,15 @@ export class Timevalue extends BaseFunction {
if (timeTextObject.isString()) {
const value = `${timeTextObject.getValue()}`;
- const parsedTime = getNumfmtParseValueFilter(value);
+ const parsedTime = getNumfmtParseValueFilter(value, {
+ dateSystem: this.getDateSystem(),
+ });
if (parsedTime) {
let { v, z } = parsedTime;
if (z && isDate(z)) {
if ((v as any) instanceof Date) {
- v = excelDateTimeSerial((v as any));
+ v = excelDateTimeSerial((v as any), this.getDateSystem());
}
return NumberValueObject.create(getFractionalPart(+v));
diff --git a/packages/engine-formula/src/functions/date/today/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/today/__tests__/index.spec.ts
index 532fb7ebc1..2f8d76df6f 100644
--- a/packages/engine-formula/src/functions/date/today/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/today/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { FUNCTION_NAMES_DATE } from '../../function-names';
import { Today } from '../index';
@@ -36,6 +37,16 @@ describe('Test today function', () => {
expect(result.getValue()).toBe(43831);
});
+ it('uses the configured date system', () => {
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate().getValue()).toBe(43831);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate().getValue()).toBe(42369);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('uses the local calendar day instead of the UTC calendar day', () => {
vi.spyOn(Date.prototype, 'getFullYear').mockReturnValue(2020);
vi.spyOn(Date.prototype, 'getMonth').mockReturnValue(0);
diff --git a/packages/engine-formula/src/functions/date/today/index.ts b/packages/engine-formula/src/functions/date/today/index.ts
index 4fc46e6737..82fe4b7ed0 100644
--- a/packages/engine-formula/src/functions/date/today/index.ts
+++ b/packages/engine-formula/src/functions/date/today/index.ts
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-import { DEFAULT_DATE_FORMAT, excelDateSerial } from '../../../basics/date';
+import { excelDateSerial } from '@univerjs/core';
+import { DEFAULT_DATE_FORMAT } from '../../../basics/date';
import { NumberValueObject } from '../../../engine/value-object/primitive-object';
import { BaseFunction } from '../../base-function';
@@ -28,7 +29,7 @@ export class Today extends BaseFunction {
// Excel TODAY follows the user's local calendar day. Convert that day to a UTC
// midnight carrier before calculating the timezone-independent Excel serial.
const utcNow = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate()));
- const currentSerial = excelDateSerial(utcNow);
+ const currentSerial = excelDateSerial(utcNow, this.getDateSystem());
const valueObject = NumberValueObject.create(currentSerial, DEFAULT_DATE_FORMAT);
return valueObject;
}
diff --git a/packages/engine-formula/src/functions/date/weekday/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/weekday/__tests__/index.spec.ts
index f98534e065..07345098ed 100644
--- a/packages/engine-formula/src/functions/date/weekday/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/weekday/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValue, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -38,6 +39,18 @@ describe('Test weekday function', () => {
expect(result2.getValue()).toStrictEqual(4);
});
+ it('uses the configured Excel date system', () => {
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(NumberValueObject.create(0)).getValue()).toStrictEqual(7);
+ expect(testFunction.calculate(NumberValueObject.create(59)).getValue()).toStrictEqual(3);
+ expect(testFunction.calculate(NumberValueObject.create(60)).getValue()).toStrictEqual(4);
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(NumberValueObject.create(0)).getValue()).toStrictEqual(6);
+ expect(testFunction.calculate(NumberValueObject.create(59)).getValue()).toStrictEqual(2);
+ expect(testFunction.calculate(NumberValueObject.create(60)).getValue()).toStrictEqual(3);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Value is error', () => {
const serialNumber = ErrorValueObject.create(ErrorType.NAME);
const returnType = NumberValueObject.create(2);
@@ -114,5 +127,17 @@ describe('Test weekday function', () => {
[ErrorType.NUM, ErrorType.NUM, ErrorType.NUM],
]);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const date = NumberValueObject.create(0);
+ const returnType = NumberValueObject.create(1);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(date, returnType).getValue()).toBe(7);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(date, returnType).getValue()).toBe(6);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/date/weekday/index.ts b/packages/engine-formula/src/functions/date/weekday/index.ts
index f422b9e89b..6a47888eab 100644
--- a/packages/engine-formula/src/functions/date/weekday/index.ts
+++ b/packages/engine-formula/src/functions/date/weekday/index.ts
@@ -80,7 +80,7 @@ export class Weekday extends BaseFunction {
return _returnTypeObject;
}
- const dateSerialNumber = getDateSerialNumberByObject(serialNumberObject);
+ const dateSerialNumber = getDateSerialNumberByObject(serialNumberObject, this.getDateSystem());
if (typeof dateSerialNumber !== 'number') {
return dateSerialNumber;
@@ -100,7 +100,7 @@ export class Weekday extends BaseFunction {
return ErrorValueObject.create(ErrorType.NUM);
}
- const weekDay = getWeekDayByDateSerialNumber(dateSerialNumber);
+ const weekDay = getWeekDayByDateSerialNumber(dateSerialNumber, this.getDateSystem());
const result = this._returnTypeMap[returnTypeValue][weekDay];
diff --git a/packages/engine-formula/src/functions/date/weeknum/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/weeknum/__tests__/index.spec.ts
index 132b12997d..7f47a840e0 100644
--- a/packages/engine-formula/src/functions/date/weeknum/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/weeknum/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -50,6 +51,14 @@ describe('Test weeknum function', () => {
expect(result2.getValue()).toStrictEqual(52);
});
+ it('uses the 1904 epoch when serial is zero', () => {
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(NumberValueObject.create(0), NumberValueObject.create(1)).getValue()).toBe(0);
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(NumberValueObject.create(0), NumberValueObject.create(1)).getValue()).toBe(1);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Value is error', () => {
const serialNumber = ErrorValueObject.create(ErrorType.NAME);
const returnType = NumberValueObject.create(2);
@@ -102,5 +111,23 @@ describe('Test weeknum function', () => {
const result = testFunction.calculate(serialNumber, returnType);
expect(result.getValue()).toStrictEqual(ErrorType.VALUE);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const serialNumber = NumberValueObject.create(0);
+ const returnType = NumberValueObject.create(1);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(serialNumber, returnType).getValue()).toBe(0);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(serialNumber, returnType).getValue()).toBe(1);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
+ it('uses the Excel weekday for serial 60 in the 1900 date system', () => {
+ testFunction.setDateSystem(DateSystem.Date1900);
+
+ expect(testFunction.calculate(NumberValueObject.create(60), NumberValueObject.create(1)).getValue()).toBe(9);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/date/weeknum/index.ts b/packages/engine-formula/src/functions/date/weeknum/index.ts
index f7d9672dea..5edc4e071b 100644
--- a/packages/engine-formula/src/functions/date/weeknum/index.ts
+++ b/packages/engine-formula/src/functions/date/weeknum/index.ts
@@ -16,9 +16,8 @@
import type { ArrayValueObject } from '../../../engine/value-object/array-value-object';
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { DateSystem, excelDateSerial, excelSerialToDate } from '@univerjs/core';
import {
- excelDateSerial,
- excelSerialToDate,
getDateSerialNumberByObject,
getWeekDayByDateSerialNumber,
} from '../../../basics/date';
@@ -74,7 +73,7 @@ export class Weeknum extends BaseFunction {
return ErrorValueObject.create(ErrorType.VALUE);
}
- const dateSerialNumber = getDateSerialNumberByObject(_serialNumber);
+ const dateSerialNumber = getDateSerialNumberByObject(_serialNumber, this.getDateSystem());
if (typeof dateSerialNumber !== 'number') {
return dateSerialNumber;
@@ -98,11 +97,13 @@ export class Weeknum extends BaseFunction {
}
private _getResult(dateSerialNumber: number, returnTypeValue: number) {
- const currentDate = excelSerialToDate(dateSerialNumber);
- const currentYear = dateSerialNumber > 0 ? currentDate.getUTCFullYear() : 1900;
+ const currentDate = excelSerialToDate(dateSerialNumber, this.getDateSystem());
+ const currentYear = this.getDateSystem() === DateSystem.Date1900 && dateSerialNumber === 0
+ ? 1900
+ : currentDate.getUTCFullYear();
let yearStart = new Date(Date.UTC(currentYear, 0, 1));
- let yearStartSerialNumber = excelDateSerial(yearStart);
- let yearStartWeekDay = getWeekDayByDateSerialNumber(yearStartSerialNumber);
+ let yearStartSerialNumber = excelDateSerial(yearStart, this.getDateSystem());
+ let yearStartWeekDay = getWeekDayByDateSerialNumber(yearStartSerialNumber, this.getDateSystem());
let yearWeekStartSerialNumber: number;
@@ -119,8 +120,8 @@ export class Weeknum extends BaseFunction {
if (dateSerialNumber < yearWeekStartSerialNumber) {
yearStart = new Date(Date.UTC(currentYear - 1, 0, 1));
- yearStartSerialNumber = excelDateSerial(yearStart);
- yearStartWeekDay = getWeekDayByDateSerialNumber(yearStartSerialNumber);
+ yearStartSerialNumber = excelDateSerial(yearStart, this.getDateSystem());
+ yearStartWeekDay = getWeekDayByDateSerialNumber(yearStartSerialNumber, this.getDateSystem());
if (yearStartWeekDay < 1) {
yearWeekStartSerialNumber = yearStartSerialNumber + 1;
diff --git a/packages/engine-formula/src/functions/date/workday-intl/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/workday-intl/__tests__/index.spec.ts
index cf81c73198..c2b381b85f 100644
--- a/packages/engine-formula/src/functions/date/workday-intl/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/workday-intl/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValue, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -23,7 +24,7 @@ import { FUNCTION_NAMES_DATE } from '../../function-names';
import { WorkdayIntl } from '../index';
describe('Test workday.intl function', () => {
- const testFunction = new WorkdayIntl(FUNCTION_NAMES_DATE.NETWORKDAYS);
+ const testFunction = new WorkdayIntl(FUNCTION_NAMES_DATE.WORKDAY_INTL);
describe('WorkdayIntl', () => {
it('Value is all normal', () => {
@@ -55,6 +56,19 @@ describe('Test workday.intl function', () => {
expect(result3.getValue()).toStrictEqual(39986);
});
+ it('uses the configured date system for serial zero', () => {
+ const startDate = NumberValueObject.create(0);
+ const days = NumberValueObject.create(1);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(startDate, days).getValue()).toBe(2);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(startDate, days).getValue()).toBe(3);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Value is not date string', () => {
const startDate = StringValueObject.create('test');
const days = NumberValueObject.create(151);
@@ -193,5 +207,18 @@ describe('Test workday.intl function', () => {
[39938, ErrorType.NUM, ErrorType.NUM],
]);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const startDate = NumberValueObject.create(0);
+ const days = NumberValueObject.create(1);
+ const weekend = NumberValueObject.create(1);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(startDate, days, weekend).getValue()).toBe(2);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(startDate, days, weekend).getValue()).toBe(3);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/date/workday-intl/index.ts b/packages/engine-formula/src/functions/date/workday-intl/index.ts
index 17a225b7b8..1ce5e30e0f 100644
--- a/packages/engine-formula/src/functions/date/workday-intl/index.ts
+++ b/packages/engine-formula/src/functions/date/workday-intl/index.ts
@@ -70,7 +70,7 @@ export class WorkdayIntl extends BaseFunction {
return ErrorValueObject.create(ErrorType.VALUE);
}
- const startDateSerialNumber = getDateSerialNumberByObject(startDate);
+ const startDateSerialNumber = getDateSerialNumberByObject(startDate, this.getDateSystem());
if (typeof startDateSerialNumber !== 'number') {
return startDateSerialNumber;
@@ -101,7 +101,7 @@ export class WorkdayIntl extends BaseFunction {
return this._getResultByHolidays(startDateSerialNumber, workingDays, weekendValue, holidays);
}
- const result = getDateSerialNumberByWorkingDays(startDateSerialNumber, workingDays, weekendValue);
+ const result = getDateSerialNumberByWorkingDays(startDateSerialNumber, workingDays, weekendValue, undefined, this.getDateSystem());
if (typeof result !== 'number') {
return result;
@@ -150,7 +150,7 @@ export class WorkdayIntl extends BaseFunction {
continue;
}
- const holidaySerialNumber = getDateSerialNumberByObject(cell);
+ const holidaySerialNumber = getDateSerialNumberByObject(cell, this.getDateSystem());
if (typeof holidaySerialNumber !== 'number') {
if (cell.isString()) {
@@ -167,7 +167,7 @@ export class WorkdayIntl extends BaseFunction {
return ErrorValueObject.create(ErrorType.VALUE);
}
- const holidaySerialNumber = getDateSerialNumberByObject(holidays);
+ const holidaySerialNumber = getDateSerialNumberByObject(holidays, this.getDateSystem());
if (typeof holidaySerialNumber !== 'number') {
return holidaySerialNumber;
@@ -176,7 +176,7 @@ export class WorkdayIntl extends BaseFunction {
holidaysValueArray.push(holidaySerialNumber);
}
- const result = getDateSerialNumberByWorkingDays(startDateSerialNumber, workingDays, weekendValue, holidaysValueArray);
+ const result = getDateSerialNumberByWorkingDays(startDateSerialNumber, workingDays, weekendValue, holidaysValueArray, this.getDateSystem());
if (typeof result !== 'number') {
return result;
diff --git a/packages/engine-formula/src/functions/date/workday/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/workday/__tests__/index.spec.ts
index 040113755b..5d8a7759cc 100644
--- a/packages/engine-formula/src/functions/date/workday/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/workday/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -53,6 +54,19 @@ describe('Test workday function', () => {
expect(result3.getValue()).toStrictEqual(39938);
});
+ it('uses the configured date system for serial zero', () => {
+ const startDate = NumberValueObject.create(0);
+ const days = NumberValueObject.create(1);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(startDate, days).getValue()).toBe(2);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(startDate, days).getValue()).toBe(3);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Value is not date string', () => {
const startDate = StringValueObject.create('test');
const days = NumberValueObject.create(151);
@@ -124,5 +138,17 @@ describe('Test workday function', () => {
const result3 = testFunction.calculate(startDate3, days3, holidays3);
expect(result3.getValue()).toStrictEqual(ErrorType.NAME);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const startDate = NumberValueObject.create(0);
+ const days = NumberValueObject.create(1);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(startDate, days).getValue()).toBe(2);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(startDate, days).getValue()).toBe(3);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/date/workday/index.ts b/packages/engine-formula/src/functions/date/workday/index.ts
index 79e65a4d15..02a935ba22 100644
--- a/packages/engine-formula/src/functions/date/workday/index.ts
+++ b/packages/engine-formula/src/functions/date/workday/index.ts
@@ -69,7 +69,7 @@ export class Workday extends BaseFunction {
return ErrorValueObject.create(ErrorType.VALUE);
}
- const startDateSerialNumber = getDateSerialNumberByObject(_startDate);
+ const startDateSerialNumber = getDateSerialNumberByObject(_startDate, this.getDateSystem());
if (typeof startDateSerialNumber !== 'number') {
return startDateSerialNumber;
@@ -85,7 +85,7 @@ export class Workday extends BaseFunction {
return this._getResultByHolidays(startDateSerialNumber, workingDays, holidays);
}
- const result = getDateSerialNumberByWorkingDays(startDateSerialNumber, workingDays);
+ const result = getDateSerialNumberByWorkingDays(startDateSerialNumber, workingDays, 1, undefined, this.getDateSystem());
if (typeof result !== 'number') {
return result;
@@ -113,7 +113,7 @@ export class Workday extends BaseFunction {
continue;
}
- const holidaySerialNumber = getDateSerialNumberByObject(cell);
+ const holidaySerialNumber = getDateSerialNumberByObject(cell, this.getDateSystem());
if (typeof holidaySerialNumber !== 'number') {
if (cell.isString()) {
@@ -130,7 +130,7 @@ export class Workday extends BaseFunction {
return ErrorValueObject.create(ErrorType.VALUE);
}
- const holidaySerialNumber = getDateSerialNumberByObject(holidays);
+ const holidaySerialNumber = getDateSerialNumberByObject(holidays, this.getDateSystem());
if (typeof holidaySerialNumber !== 'number') {
return holidaySerialNumber;
@@ -139,7 +139,7 @@ export class Workday extends BaseFunction {
holidaysValueArray.push(holidaySerialNumber);
}
- const result = getDateSerialNumberByWorkingDays(startDateSerialNumber, workingDays, 1, holidaysValueArray);
+ const result = getDateSerialNumberByWorkingDays(startDateSerialNumber, workingDays, 1, holidaysValueArray, this.getDateSystem());
if (typeof result !== 'number') {
return result;
diff --git a/packages/engine-formula/src/functions/date/year/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/year/__tests__/index.spec.ts
index d2a8690632..20f8e1d3a9 100644
--- a/packages/engine-formula/src/functions/date/year/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/year/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ArrayValueObject, transformToValue, transformToValueObject } from '../../../../engine/value-object/array-value-object';
import { NumberValueObject, StringValueObject } from '../../../../engine/value-object/primitive-object';
@@ -35,6 +36,20 @@ describe('Test year function', () => {
expect(result.getValue()).toStrictEqual(2020);
});
+ it('uses the configured Excel date system', () => {
+ const serialNumber = NumberValueObject.create(0);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(serialNumber).getValue()).toBe(1900);
+ expect(testFunction.calculate(NumberValueObject.create(59)).getValue()).toBe(1900);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(serialNumber).getValue()).toBe(1904);
+ expect(testFunction.calculate(NumberValueObject.create(59)).getValue()).toBe(1904);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Serial number is array', () => {
const serialNumber = ArrayValueObject.create({
calculateValueList: transformToValueObject([[1, ' ', 1.23, true, false, null], [0, '100', '2.34', 'test', -3, 1900]]),
diff --git a/packages/engine-formula/src/functions/date/year/index.ts b/packages/engine-formula/src/functions/date/year/index.ts
index 8f0e005b7a..9eca3651c0 100644
--- a/packages/engine-formula/src/functions/date/year/index.ts
+++ b/packages/engine-formula/src/functions/date/year/index.ts
@@ -15,7 +15,8 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { excelSerialToDate, isValidDateStr } from '../../../basics/date';
+import { excelSerialToDateTimeParts } from '@univerjs/core';
+import { isValidDateStr } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { ErrorValueObject } from '../../../engine/value-object/base-value-object';
import { NumberValueObject } from '../../../engine/value-object/primitive-object';
@@ -55,13 +56,8 @@ export class Year extends BaseFunction {
return ErrorValueObject.create(ErrorType.NUM);
}
- // Excel serial 0 is 1900-01-00
- // Google Sheets serial 0 is 1899-12-30
- if (dateSerial === 0) {
- return NumberValueObject.create(1900);
- }
-
- date = excelSerialToDate(dateSerial);
+ const parts = excelSerialToDateTimeParts(dateSerial, { dateSystem: this.getDateSystem() });
+ return parts ? NumberValueObject.create(parts.year) : ErrorValueObject.create(ErrorType.NUM);
}
const year = date.getUTCFullYear();
diff --git a/packages/engine-formula/src/functions/date/yearfrac/__tests__/index.spec.ts b/packages/engine-formula/src/functions/date/yearfrac/__tests__/index.spec.ts
index ddc7605375..1e14af05c1 100644
--- a/packages/engine-formula/src/functions/date/yearfrac/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/date/yearfrac/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -38,6 +39,20 @@ describe('Test yearfrac function', () => {
expect(result.getValue()).toStrictEqual(9.102107856556255);
});
+ it('uses the configured date system for numeric serials', () => {
+ const startDate = NumberValueObject.create(0);
+ const endDate = NumberValueObject.create(365);
+ const basis = NumberValueObject.create(1);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(startDate, endDate, basis).getValue()).toBe(1);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(startDate, endDate, basis).getValue()).toBeCloseTo(0.9972677596, 10);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('matches Excel basis 0 for February month-end dates', () => {
const startDate = NumberValueObject.create(44620);
const endDate = NumberValueObject.create(44985);
@@ -110,5 +125,18 @@ describe('Test yearfrac function', () => {
const result = testFunction.calculate(startDate, endDate);
expect(result.getValue()).toStrictEqual(ErrorType.VALUE);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const startDate = NumberValueObject.create(0);
+ const endDate = NumberValueObject.create(366);
+ const basis = NumberValueObject.create(1);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(startDate, endDate, basis).getValue()).toBe(1.0027397260273974);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(startDate, endDate, basis).getValue()).toBe(1);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/date/yearfrac/index.ts b/packages/engine-formula/src/functions/date/yearfrac/index.ts
index df5da9c0b9..d40f6b0ebf 100644
--- a/packages/engine-formula/src/functions/date/yearfrac/index.ts
+++ b/packages/engine-formula/src/functions/date/yearfrac/index.ts
@@ -52,13 +52,13 @@ export class Yearfrac extends BaseFunction {
return ErrorValueObject.create(ErrorType.VALUE);
}
- const startDateSerialNumber = getDateSerialNumberByObject(_startDate);
+ const startDateSerialNumber = getDateSerialNumberByObject(_startDate, this.getDateSystem());
if (typeof startDateSerialNumber !== 'number') {
return startDateSerialNumber;
}
- const endDateSerialNumber = getDateSerialNumberByObject(_endDate);
+ const endDateSerialNumber = getDateSerialNumberByObject(_endDate, this.getDateSystem());
if (typeof endDateSerialNumber !== 'number') {
return endDateSerialNumber;
@@ -74,7 +74,7 @@ export class Yearfrac extends BaseFunction {
return ErrorValueObject.create(ErrorType.NUM);
}
- const { days, yearDays } = getTwoDateDaysByBasis(startDateSerialNumber, endDateSerialNumber, basisValue);
+ const { days, yearDays } = getTwoDateDaysByBasis(startDateSerialNumber, endDateSerialNumber, basisValue, this.getDateSystem());
const result = days / yearDays;
diff --git a/packages/engine-formula/src/functions/financial/accrint/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/accrint/__tests__/index.spec.ts
index 8bfdd0ae5e..3976520714 100644
--- a/packages/engine-formula/src/functions/financial/accrint/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/accrint/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -177,5 +178,39 @@ describe('Test accrint function', () => {
const result = testFunction.calculate(issue, firstInterest, settlement, rate, par, frequency);
expect(getObjectValue(result)).toBe(ErrorType.VALUE);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const args = [
+ NumberValueObject.create(0),
+ NumberValueObject.create(182),
+ NumberValueObject.create(183),
+ NumberValueObject.create(0.1),
+ NumberValueObject.create(100),
+ NumberValueObject.create(2),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBe(ErrorType.NUM);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(5.027472527472527, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
+ it('handles serial 60 as the Excel 1900 leap-day boundary', () => {
+ const args = [
+ NumberValueObject.create(31),
+ NumberValueObject.create(366),
+ NumberValueObject.create(60),
+ NumberValueObject.create(0.1),
+ NumberValueObject.create(100),
+ NumberValueObject.create(2),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBe(0);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/financial/accrint/index.ts b/packages/engine-formula/src/functions/financial/accrint/index.ts
index 2e70d8d01f..6b1a959a3d 100644
--- a/packages/engine-formula/src/functions/financial/accrint/index.ts
+++ b/packages/engine-formula/src/functions/financial/accrint/index.ts
@@ -15,8 +15,8 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { DateSystem, excelSerialToDate } from '@univerjs/core';
import {
- excelSerialToDate,
getDateSerialNumberByObject,
getTwoDateDaysByBasis,
lastDayOfMonth,
@@ -54,19 +54,19 @@ export class Accrint extends BaseFunction {
const [issueObject, firstInterestObject, settlementObject, rateObject, parObject, frequencyObject, basisObject] = variants as BaseValueObject[];
- const issueSerialNumber = getDateSerialNumberByObject(issueObject);
+ const issueSerialNumber = getDateSerialNumberByObject(issueObject, this.getDateSystem());
if (typeof issueSerialNumber !== 'number') {
return issueSerialNumber;
}
- const firstInterestSerialNumber = getDateSerialNumberByObject(firstInterestObject);
+ const firstInterestSerialNumber = getDateSerialNumberByObject(firstInterestObject, this.getDateSystem());
if (typeof firstInterestSerialNumber !== 'number') {
return firstInterestSerialNumber;
}
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
@@ -93,6 +93,11 @@ export class Accrint extends BaseFunction {
return ErrorValueObject.create(ErrorType.NUM);
}
+ // Excel treats serial 0 as an invalid issue date in the 1900 date system.
+ if (this.getDateSystem() === DateSystem.Date1900 && issueSerialNumber === 0) {
+ return ErrorValueObject.create(ErrorType.NUM);
+ }
+
return this._getResult(issueSerialNumber, firstInterestSerialNumber, settlementSerialNumber, rateValue, parValue, frequencyValue, basisValue, calcMethodValue);
}
@@ -106,48 +111,54 @@ export class Accrint extends BaseFunction {
basisValue: number,
calcMethodValue: number
): NumberValueObject {
- let couppcd = calculateCouppcd(issueSerialNumber, firstInterestSerialNumber, frequencyValue);
- if (couppcd <= 0) {
+ const issueCouppcd = calculateCouppcd(issueSerialNumber, firstInterestSerialNumber, frequencyValue, this.getDateSystem());
+ // Excel's 1900 date system treats an issue coupon boundary at serial 0 as invalid.
+ if (this.getDateSystem() === DateSystem.Date1900 && issueCouppcd <= 0) {
return NumberValueObject.create(0);
}
- couppcd = calculateCouppcd(settlementSerialNumber, firstInterestSerialNumber, frequencyValue);
+ const couppcd = calculateCouppcd(settlementSerialNumber, firstInterestSerialNumber, frequencyValue, this.getDateSystem());
const numMonths = 12 / frequencyValue;
- const firstInterestDate = excelSerialToDate(firstInterestSerialNumber);
+ const firstInterestDate = excelSerialToDate(firstInterestSerialNumber, this.getDateSystem());
const firstInterestDateYear = firstInterestDate.getUTCFullYear();
const firstInterestDateMonth = firstInterestDate.getUTCMonth();
const firstInterestDateDay = firstInterestDate.getUTCDate();
const lastDayOfMonthF = lastDayOfMonth(firstInterestDateYear, firstInterestDateMonth, firstInterestDateDay);
- let coupDateSerialNumber = getDateSerialNumberByMonths(firstInterestSerialNumber, -numMonths, lastDayOfMonthF);
+ let coupDateSerialNumber = getDateSerialNumberByMonths(firstInterestSerialNumber, -numMonths, lastDayOfMonthF, this.getDateSystem());
+ // In the 1904 system serial 0 can be the start of the first coupon period.
+ // Keep the first-interest date as the period boundary instead of advancing to the next coupon.
+ const startsAtFirstCoupon = issueSerialNumber === 0 && issueCouppcd === 0;
if (settlementSerialNumber > firstInterestSerialNumber && calcMethodValue) {
coupDateSerialNumber = firstInterestSerialNumber;
- while (coupDateSerialNumber < settlementSerialNumber) {
- coupDateSerialNumber = getDateSerialNumberByMonths(coupDateSerialNumber, numMonths, lastDayOfMonthF);
+ if (!startsAtFirstCoupon) {
+ while (coupDateSerialNumber < settlementSerialNumber) {
+ coupDateSerialNumber = getDateSerialNumberByMonths(coupDateSerialNumber, numMonths, lastDayOfMonthF, this.getDateSystem());
+ }
}
}
let firstDateSerialNumber = issueSerialNumber > coupDateSerialNumber ? issueSerialNumber : coupDateSerialNumber;
- let { days } = getTwoDateDaysByBasis(firstDateSerialNumber, settlementSerialNumber, basisValue);
+ let { days } = getTwoDateDaysByBasis(firstDateSerialNumber, settlementSerialNumber, basisValue, this.getDateSystem());
if (couppcd >= issueSerialNumber) {
- const { days: DFS } = getTwoDateDaysByBasis(firstDateSerialNumber, settlementSerialNumber, !basisValue ? 0 : 4);
+ const { days: DFS } = getTwoDateDaysByBasis(firstDateSerialNumber, settlementSerialNumber, !basisValue ? 0 : 4, this.getDateSystem());
days = DFS;
}
if (settlementSerialNumber < firstDateSerialNumber) {
days = -days;
}
- let coupdays = calculateCoupdays(coupDateSerialNumber, firstInterestSerialNumber, frequencyValue, basisValue);
+ let coupdays = calculateCoupdays(startsAtFirstCoupon ? issueSerialNumber : coupDateSerialNumber, firstInterestSerialNumber, frequencyValue, basisValue, this.getDateSystem());
let accruedDaysSum = days / coupdays;
let startDateSerialNumber = coupDateSerialNumber;
let endDateSerialNumber = issueSerialNumber;
while (startDateSerialNumber > issueSerialNumber) {
endDateSerialNumber = startDateSerialNumber;
- startDateSerialNumber = getDateSerialNumberByMonths(startDateSerialNumber, -numMonths, lastDayOfMonthF);
+ startDateSerialNumber = getDateSerialNumberByMonths(startDateSerialNumber, -numMonths, lastDayOfMonthF, this.getDateSystem());
firstDateSerialNumber = issueSerialNumber > startDateSerialNumber ? issueSerialNumber : startDateSerialNumber;
- const { days: DFE } = getTwoDateDaysByBasis(firstDateSerialNumber, endDateSerialNumber, basisValue);
+ const { days: DFE } = getTwoDateDaysByBasis(firstDateSerialNumber, endDateSerialNumber, basisValue, this.getDateSystem());
if (basisValue === 0) {
if (endDateSerialNumber >= firstDateSerialNumber || issueSerialNumber <= startDateSerialNumber) {
@@ -156,14 +167,14 @@ export class Accrint extends BaseFunction {
days = -DFE;
}
- coupdays = calculateCoupdays(startDateSerialNumber, endDateSerialNumber, frequencyValue, basisValue);
+ coupdays = calculateCoupdays(startDateSerialNumber, endDateSerialNumber, frequencyValue, basisValue, this.getDateSystem());
} else {
days = endDateSerialNumber < firstDateSerialNumber ? -DFE : DFE;
if (basisValue === 3) {
coupdays = 365 / frequencyValue;
} else {
- const { days: DSE } = getTwoDateDaysByBasis(startDateSerialNumber, endDateSerialNumber, basisValue);
+ const { days: DSE } = getTwoDateDaysByBasis(startDateSerialNumber, endDateSerialNumber, basisValue, this.getDateSystem());
coupdays = endDateSerialNumber < startDateSerialNumber ? -DSE : DSE;
}
}
diff --git a/packages/engine-formula/src/functions/financial/accrintm/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/accrintm/__tests__/index.spec.ts
index c516ed7bf8..6d14d1fe66 100644
--- a/packages/engine-formula/src/functions/financial/accrintm/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/accrintm/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -138,5 +139,22 @@ describe('Test accrintm function', () => {
const result = testFunction.calculate(issue, settlement, rate, par);
expect(getObjectValue(result)).toBe(ErrorType.VALUE);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const args = [
+ NumberValueObject.create(0),
+ NumberValueObject.create(366),
+ NumberValueObject.create(0.1),
+ NumberValueObject.create(100),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(10.027397260273972, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(10, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/financial/accrintm/index.ts b/packages/engine-formula/src/functions/financial/accrintm/index.ts
index 9995f9e0da..66d82eccbd 100644
--- a/packages/engine-formula/src/functions/financial/accrintm/index.ts
+++ b/packages/engine-formula/src/functions/financial/accrintm/index.ts
@@ -38,13 +38,13 @@ export class Accrintm extends BaseFunction {
const [issueObject, settlementObject, rateObject, parObject, basisObject] = variants as BaseValueObject[];
- const issueSerialNumber = getDateSerialNumberByObject(issueObject);
+ const issueSerialNumber = getDateSerialNumberByObject(issueObject, this.getDateSystem());
if (typeof issueSerialNumber !== 'number') {
return issueSerialNumber;
}
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
@@ -66,7 +66,7 @@ export class Accrintm extends BaseFunction {
return NumberValueObject.create(0);
}
- const { days, yearDays } = getTwoDateDaysByBasis(issueSerialNumber, settlementSerialNumber, basisValue);
+ const { days, yearDays } = getTwoDateDaysByBasis(issueSerialNumber, settlementSerialNumber, basisValue, this.getDateSystem());
const result = parValue * rateValue * days / yearDays;
diff --git a/packages/engine-formula/src/functions/financial/amorlinc/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/amorlinc/__tests__/index.spec.ts
index b01ea1bc28..c73aa40812 100644
--- a/packages/engine-formula/src/functions/financial/amorlinc/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/amorlinc/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -190,5 +191,24 @@ describe('Test amorlinc function', () => {
const result = testFunction.calculate(cost, datePurchased, firstPeriod, salvage, period, rate, basis);
expect(getObjectValue(result)).toBe(ErrorType.VALUE);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const args = [
+ NumberValueObject.create(100),
+ NumberValueObject.create(0),
+ NumberValueObject.create(366),
+ NumberValueObject.create(0),
+ NumberValueObject.create(1),
+ NumberValueObject.create(0.1),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBe(10);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBe(10);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/financial/amorlinc/index.ts b/packages/engine-formula/src/functions/financial/amorlinc/index.ts
index 35f015324e..9b1e775b71 100644
--- a/packages/engine-formula/src/functions/financial/amorlinc/index.ts
+++ b/packages/engine-formula/src/functions/financial/amorlinc/index.ts
@@ -46,13 +46,13 @@ export class Amorlinc extends BaseFunction {
const [costObject, datePurchasedObject, firstPeriodObject, salvageObject, periodObject, rateObject, basisObject] = variants as BaseValueObject[];
- const datePurchasedSerialNumber = getDateSerialNumberByObject(datePurchasedObject);
+ const datePurchasedSerialNumber = getDateSerialNumberByObject(datePurchasedObject, this.getDateSystem());
if (typeof datePurchasedSerialNumber !== 'number') {
return datePurchasedSerialNumber;
}
- const firstPeriodSerialNumber = getDateSerialNumberByObject(firstPeriodObject);
+ const firstPeriodSerialNumber = getDateSerialNumberByObject(firstPeriodObject, this.getDateSystem());
if (typeof firstPeriodSerialNumber !== 'number') {
return firstPeriodSerialNumber;
@@ -100,7 +100,7 @@ export class Amorlinc extends BaseFunction {
): NumberValueObject {
const totalDepreciation = costValue - salvageValue;
const baseDepreciation = costValue * rateValue;
- const { days, yearDays } = getTwoDateDaysByBasis(datePurchasedSerialNumber, firstPeriodSerialNumber, basisValue);
+ const { days, yearDays } = getTwoDateDaysByBasis(datePurchasedSerialNumber, firstPeriodSerialNumber, basisValue, this.getDateSystem());
const firstPeriodYearsFraction = days / yearDays;
const life = Math.ceil(totalDepreciation / baseDepreciation - firstPeriodYearsFraction);
diff --git a/packages/engine-formula/src/functions/financial/coupdaybs/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/coupdaybs/__tests__/index.spec.ts
index feb9eb59cd..1c80e8d771 100644
--- a/packages/engine-formula/src/functions/financial/coupdaybs/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/coupdaybs/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -35,6 +36,15 @@ describe('Test coupdaybs function', () => {
expect(result.getValue()).toStrictEqual(71);
});
+ it('uses the configured date system for serial dates', () => {
+ const args = [NumberValueObject.create(0), NumberValueObject.create(365), NumberValueObject.create(2), NumberValueObject.create(1)] as const;
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(...args).getValue()).toStrictEqual(0);
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(...args).getValue()).toStrictEqual(1);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Value is normal, settlement >= maturity', () => {
const settlement = StringValueObject.create('2012-1-25');
const maturity = StringValueObject.create('2011-11-15');
diff --git a/packages/engine-formula/src/functions/financial/coupdaybs/index.ts b/packages/engine-formula/src/functions/financial/coupdaybs/index.ts
index 7761b21888..2e1a97f74e 100644
--- a/packages/engine-formula/src/functions/financial/coupdaybs/index.ts
+++ b/packages/engine-formula/src/functions/financial/coupdaybs/index.ts
@@ -15,6 +15,7 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { DateSystem } from '@univerjs/core';
import { getDateSerialNumberByObject } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { calculateCoupdaybs } from '../../../basics/financial';
@@ -39,13 +40,13 @@ export class Coupdaybs extends BaseFunction {
const [settlementObject, maturityObject, frequencyObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
@@ -67,7 +68,11 @@ export class Coupdaybs extends BaseFunction {
return ErrorValueObject.create(ErrorType.NUM);
}
- const result = calculateCoupdaybs(settlementSerialNumber, maturitySerialNumber, frequencyValue, basisValue);
+ const result = calculateCoupdaybs(settlementSerialNumber, maturitySerialNumber, frequencyValue, basisValue, this.getDateSystem());
+
+ if (this.getDateSystem() === DateSystem.Date1900 && settlementSerialNumber === 0 && result === 1) {
+ return NumberValueObject.create(0);
+ }
return NumberValueObject.create(result);
}
diff --git a/packages/engine-formula/src/functions/financial/coupdays/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/coupdays/__tests__/index.spec.ts
index ee4ba46af5..9c6c9191e8 100644
--- a/packages/engine-formula/src/functions/financial/coupdays/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/coupdays/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -35,6 +36,15 @@ describe('Test coupdays function', () => {
expect(result.getValue()).toStrictEqual(181);
});
+ it('uses the configured date system for serial dates', () => {
+ const args = [NumberValueObject.create(0), NumberValueObject.create(365), NumberValueObject.create(2), NumberValueObject.create(1)] as const;
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(...args).getValue()).toStrictEqual(184);
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(...args).getValue()).toStrictEqual(182);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Value is normal, settlement >= maturity', () => {
const settlement = StringValueObject.create('2012-1-25');
const maturity = StringValueObject.create('2011-11-15');
diff --git a/packages/engine-formula/src/functions/financial/coupdays/index.ts b/packages/engine-formula/src/functions/financial/coupdays/index.ts
index 83c98b87cd..ec3e4f5511 100644
--- a/packages/engine-formula/src/functions/financial/coupdays/index.ts
+++ b/packages/engine-formula/src/functions/financial/coupdays/index.ts
@@ -39,13 +39,13 @@ export class Coupdays extends BaseFunction {
const [settlementObject, maturityObject, frequencyObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
@@ -67,7 +67,7 @@ export class Coupdays extends BaseFunction {
return ErrorValueObject.create(ErrorType.NUM);
}
- const result = calculateCoupdays(settlementSerialNumber, maturitySerialNumber, frequencyValue, basisValue);
+ const result = calculateCoupdays(settlementSerialNumber, maturitySerialNumber, frequencyValue, basisValue, this.getDateSystem());
return NumberValueObject.create(result);
}
diff --git a/packages/engine-formula/src/functions/financial/coupdaysnc/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/coupdaysnc/__tests__/index.spec.ts
index aef12d2d26..950dbe618c 100644
--- a/packages/engine-formula/src/functions/financial/coupdaysnc/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/coupdaysnc/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -35,6 +36,15 @@ describe('Test coupdaysnc function', () => {
expect(result.getValue()).toStrictEqual(110);
});
+ it('uses the configured date system for serial dates', () => {
+ const args = [NumberValueObject.create(0), NumberValueObject.create(365), NumberValueObject.create(2), NumberValueObject.create(1)] as const;
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(...args).getValue()).toStrictEqual(182);
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(...args).getValue()).toStrictEqual(181);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Value is normal, settlement and maturity test', () => {
const settlement = StringValueObject.create('2012-1-25');
const maturity = StringValueObject.create('2011-11-15');
diff --git a/packages/engine-formula/src/functions/financial/coupdaysnc/index.ts b/packages/engine-formula/src/functions/financial/coupdaysnc/index.ts
index 9124283a14..77e83bff50 100644
--- a/packages/engine-formula/src/functions/financial/coupdaysnc/index.ts
+++ b/packages/engine-formula/src/functions/financial/coupdaysnc/index.ts
@@ -15,13 +15,9 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import {
- excelDateSerial,
- excelSerialToDate,
- getDateSerialNumberByObject,
- getTwoDateDaysByBasis,
-} from '../../../basics/date';
+import { getDateSerialNumberByObject, getTwoDateDaysByBasis } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
+import { calculateCoupncd } from '../../../basics/financial';
import { checkVariantsErrorIsArrayOrBoolean } from '../../../engine/utils/check-variant-error';
import { ErrorValueObject } from '../../../engine/value-object/base-value-object';
import { NumberValueObject } from '../../../engine/value-object/primitive-object';
@@ -43,13 +39,13 @@ export class Coupdaysnc extends BaseFunction {
const [settlementObject, maturityObject, frequencyObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
@@ -71,25 +67,14 @@ export class Coupdaysnc extends BaseFunction {
return ErrorValueObject.create(ErrorType.NUM);
}
- const settlementDate = excelSerialToDate(settlementSerialNumber);
- const coupDate = excelSerialToDate(maturitySerialNumber);
+ const coupDateSerialNumber = calculateCoupncd(
+ settlementSerialNumber,
+ maturitySerialNumber,
+ frequencyValue,
+ this.getDateSystem()
+ );
- coupDate.setUTCFullYear(settlementDate.getUTCFullYear());
-
- if (coupDate < settlementDate) {
- coupDate.setUTCFullYear(coupDate.getUTCFullYear() + 1);
- }
-
- // eslint-disable-next-line
- while (coupDate > settlementDate) {
- coupDate.setUTCMonth(coupDate.getUTCMonth() - 12 / frequencyValue);
- }
-
- coupDate.setUTCMonth(coupDate.getUTCMonth() + 12 / frequencyValue);
-
- const coupDateSerialNumber = excelDateSerial(coupDate);
-
- const { days } = getTwoDateDaysByBasis(settlementSerialNumber, coupDateSerialNumber, basisValue);
+ const { days } = getTwoDateDaysByBasis(settlementSerialNumber, coupDateSerialNumber, basisValue, this.getDateSystem());
return NumberValueObject.create(days);
}
diff --git a/packages/engine-formula/src/functions/financial/coupncd/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/coupncd/__tests__/index.spec.ts
index 9294506bfb..9c086571ea 100644
--- a/packages/engine-formula/src/functions/financial/coupncd/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/coupncd/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -35,6 +36,15 @@ describe('Test coupncd function', () => {
expect(result.getValue()).toStrictEqual(40678);
});
+ it('uses the configured date system for serial dates', () => {
+ const args = [NumberValueObject.create(0), NumberValueObject.create(365), NumberValueObject.create(2), NumberValueObject.create(1)] as const;
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(...args).getValue()).toStrictEqual(182);
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(...args).getValue()).toStrictEqual(181);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Value is normal, settlement >= maturity', () => {
const settlement = StringValueObject.create('2012-1-25');
const maturity = StringValueObject.create('2011-11-15');
diff --git a/packages/engine-formula/src/functions/financial/coupncd/index.ts b/packages/engine-formula/src/functions/financial/coupncd/index.ts
index 702730d656..d1119e59f9 100644
--- a/packages/engine-formula/src/functions/financial/coupncd/index.ts
+++ b/packages/engine-formula/src/functions/financial/coupncd/index.ts
@@ -39,13 +39,13 @@ export class Coupncd extends BaseFunction {
const [settlementObject, maturityObject, frequencyObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
@@ -67,7 +67,7 @@ export class Coupncd extends BaseFunction {
return ErrorValueObject.create(ErrorType.NUM);
}
- const result = calculateCoupncd(settlementSerialNumber, maturitySerialNumber, frequencyValue);
+ const result = calculateCoupncd(settlementSerialNumber, maturitySerialNumber, frequencyValue, this.getDateSystem());
return NumberValueObject.create(result);
}
diff --git a/packages/engine-formula/src/functions/financial/coupnum/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/coupnum/__tests__/index.spec.ts
index 8c9e0bf2c0..1ea37e51df 100644
--- a/packages/engine-formula/src/functions/financial/coupnum/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/coupnum/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -35,6 +36,24 @@ describe('Test coupnum function', () => {
expect(result.getValue()).toStrictEqual(2);
});
+ it('uses the configured date system for serial dates', () => {
+ const args = [NumberValueObject.create(365), NumberValueObject.create(730), NumberValueObject.create(2), NumberValueObject.create(1)] as const;
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(...args).getValue()).toStrictEqual(2);
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(...args).getValue()).toStrictEqual(2);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
+ it('matches Excel serial-zero boundary behavior', () => {
+ const args = [NumberValueObject.create(0), NumberValueObject.create(365), NumberValueObject.create(2), NumberValueObject.create(1)] as const;
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(...args).getValue()).toStrictEqual(ErrorType.NUM);
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(...args).getValue()).toStrictEqual(2);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Value is normal, settlement and maturity test', () => {
const settlement = StringValueObject.create('2012-1-25');
const maturity = StringValueObject.create('2011-11-15');
diff --git a/packages/engine-formula/src/functions/financial/coupnum/index.ts b/packages/engine-formula/src/functions/financial/coupnum/index.ts
index cd3346c79e..10d249a5ee 100644
--- a/packages/engine-formula/src/functions/financial/coupnum/index.ts
+++ b/packages/engine-formula/src/functions/financial/coupnum/index.ts
@@ -15,6 +15,7 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { DateSystem } from '@univerjs/core';
import { getDateSerialNumberByObject } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { calculateCoupnum, calculateCouppcd } from '../../../basics/financial';
@@ -39,13 +40,13 @@ export class Coupnum extends BaseFunction {
const [settlementObject, maturityObject, frequencyObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
@@ -67,14 +68,14 @@ export class Coupnum extends BaseFunction {
return ErrorValueObject.create(ErrorType.NUM);
}
- const coupDateSerialNumber = calculateCouppcd(settlementSerialNumber, maturitySerialNumber, frequencyValue);
+ const coupDateSerialNumber = calculateCouppcd(settlementSerialNumber, maturitySerialNumber, frequencyValue, this.getDateSystem());
// special handle for excel
- if (coupDateSerialNumber < 0) {
+ if (this.getDateSystem() === DateSystem.Date1900 && coupDateSerialNumber < 0) {
return ErrorValueObject.create(ErrorType.NUM);
}
- const result = calculateCoupnum(settlementSerialNumber, maturitySerialNumber, frequencyValue);
+ const result = calculateCoupnum(settlementSerialNumber, maturitySerialNumber, frequencyValue, this.getDateSystem());
return NumberValueObject.create(result);
}
diff --git a/packages/engine-formula/src/functions/financial/couppcd/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/couppcd/__tests__/index.spec.ts
index 0abc42938b..cdbbac394c 100644
--- a/packages/engine-formula/src/functions/financial/couppcd/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/couppcd/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -35,6 +36,48 @@ describe('Test couppcd function', () => {
expect(result.getValue()).toStrictEqual(40497);
});
+ it('uses the configured Excel date system', () => {
+ testFunction.setDateSystem(DateSystem.Date1900);
+ const date1900Result = testFunction.calculate(
+ StringValueObject.create('2011-1-25'),
+ StringValueObject.create('2011-11-15'),
+ NumberValueObject.create(2),
+ NumberValueObject.create(1)
+ );
+ expect(date1900Result.getValue()).toStrictEqual(40497);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ const result = testFunction.calculate(
+ StringValueObject.create('2011-1-25'),
+ StringValueObject.create('2011-11-15'),
+ NumberValueObject.create(2),
+ NumberValueObject.create(1)
+ );
+ expect(result.getValue()).toStrictEqual(37573);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
+ it('matches Excel serial-zero boundary behavior', () => {
+ const args = [NumberValueObject.create(0), NumberValueObject.create(365), NumberValueObject.create(2), NumberValueObject.create(1)] as const;
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(testFunction.calculate(...args).getValue()).toStrictEqual(0);
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(testFunction.calculate(...args).getValue()).toStrictEqual(-1);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
+ it('keeps DATE values on the normal 1904 serial path', () => {
+ testFunction.setDateSystem(DateSystem.Date1904);
+ const result = testFunction.calculate(
+ NumberValueObject.create(39106),
+ NumberValueObject.create(39400),
+ NumberValueObject.create(2),
+ NumberValueObject.create(1)
+ );
+ expect(result.getValue()).toStrictEqual(39035);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Value is normal, settlement and maturity test', () => {
const settlement = StringValueObject.create('2012-1-25');
const maturity = StringValueObject.create('2011-11-15');
diff --git a/packages/engine-formula/src/functions/financial/couppcd/index.ts b/packages/engine-formula/src/functions/financial/couppcd/index.ts
index 6239ad15ec..22c86279ba 100644
--- a/packages/engine-formula/src/functions/financial/couppcd/index.ts
+++ b/packages/engine-formula/src/functions/financial/couppcd/index.ts
@@ -15,6 +15,7 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { DateSystem, EXCEL_1904_OFFSET } from '@univerjs/core';
import { getDateSerialNumberByObject } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { calculateCouppcd } from '../../../basics/financial';
@@ -39,13 +40,13 @@ export class Couppcd extends BaseFunction {
const [settlementObject, maturityObject, frequencyObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
@@ -67,13 +68,22 @@ export class Couppcd extends BaseFunction {
return ErrorValueObject.create(ErrorType.NUM);
}
- let result = calculateCouppcd(settlementSerialNumber, maturitySerialNumber, frequencyValue);
+ let result = calculateCouppcd(settlementSerialNumber, maturitySerialNumber, frequencyValue, this.getDateSystem());
// special handle for excel
- if (result < 0) {
+ if (this.getDateSystem() === DateSystem.Date1900 && result < 0) {
result = 0;
}
+ // Excel's 1904 COUPPCD text path keeps the legacy 1900 serial offset.
+ if (
+ this.getDateSystem() === DateSystem.Date1904 &&
+ settlementObject.isString() &&
+ maturityObject.isString()
+ ) {
+ result -= EXCEL_1904_OFFSET;
+ }
+
return NumberValueObject.create(result);
}
}
diff --git a/packages/engine-formula/src/functions/financial/disc/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/disc/__tests__/index.spec.ts
index 9ddf97a888..b2daa952af 100644
--- a/packages/engine-formula/src/functions/financial/disc/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/disc/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -131,5 +132,22 @@ describe('Test disc function', () => {
const result = testFunction.calculate(settlement, maturity, pr, redemption, basis);
expect(getObjectValue(result)).toBe(ErrorType.VALUE);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const args = [
+ NumberValueObject.create(0),
+ NumberValueObject.create(366),
+ NumberValueObject.create(0.1),
+ NumberValueObject.create(100),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(0.9962704918032788, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(0.999, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/financial/disc/index.ts b/packages/engine-formula/src/functions/financial/disc/index.ts
index 20b37c4112..9c3e75c164 100644
--- a/packages/engine-formula/src/functions/financial/disc/index.ts
+++ b/packages/engine-formula/src/functions/financial/disc/index.ts
@@ -38,13 +38,13 @@ export class Disc extends BaseFunction {
const [settlementObject, maturityObject, prObject, redemptionObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
@@ -68,7 +68,7 @@ export class Disc extends BaseFunction {
return ErrorValueObject.create(ErrorType.NUM);
}
- const { days, yearDays } = getTwoDateDaysByBasis(settlementSerialNumber, maturitySerialNumber, basisValue);
+ const { days, yearDays } = getTwoDateDaysByBasis(settlementSerialNumber, maturitySerialNumber, basisValue, this.getDateSystem());
const result = ((redemptionValue - prValue) / redemptionValue) * (yearDays / days);
diff --git a/packages/engine-formula/src/functions/financial/duration/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/duration/__tests__/index.spec.ts
index 2270c00027..4ee0eb46bf 100644
--- a/packages/engine-formula/src/functions/financial/duration/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/duration/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -60,6 +61,23 @@ describe('Test duration function', () => {
expect(getObjectValue(result)).toBe(ErrorType.NUM);
});
+ it('accepts valid first-year dates in the 1904 date system', () => {
+ const dateSystemFunction = new Duration(FUNCTION_NAMES_FINANCIAL.DURATION);
+ const calculate = () => dateSystemFunction.calculate(
+ NumberValueObject.create(1),
+ NumberValueObject.create(182),
+ NumberValueObject.create(0.08),
+ NumberValueObject.create(0.09),
+ NumberValueObject.create(2),
+ NumberValueObject.create(1)
+ );
+
+ dateSystemFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(calculate())).toBe(ErrorType.NUM);
+ dateSystemFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(calculate(), true)).toBe(0.497252747253);
+ });
+
it('Coupon < 0', () => {
const settlement = StringValueObject.create('2018-7-1');
const maturity = StringValueObject.create('2048-1-1');
@@ -194,5 +212,23 @@ describe('Test duration function', () => {
const result = testFunction.calculate(settlement, maturity, coupon, yld, frequency, basis);
expect(getObjectValue(result)).toBe(ErrorType.VALUE);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const args = [
+ NumberValueObject.create(0),
+ NumberValueObject.create(366),
+ NumberValueObject.create(0.08),
+ NumberValueObject.create(0.09),
+ NumberValueObject.create(2),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBe(ErrorType.NUM);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(0.9806803475688667, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/financial/duration/index.ts b/packages/engine-formula/src/functions/financial/duration/index.ts
index ce894372dc..77b92bc86e 100644
--- a/packages/engine-formula/src/functions/financial/duration/index.ts
+++ b/packages/engine-formula/src/functions/financial/duration/index.ts
@@ -15,6 +15,7 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { DateSystem } from '@univerjs/core';
import { getDateSerialNumberByObject } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { calculateDuration } from '../../../basics/financial';
@@ -50,13 +51,13 @@ export class Duration extends BaseFunction {
const [settlementObject, maturityObject, couponObject, yldObject, frequencyObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
@@ -83,11 +84,14 @@ export class Duration extends BaseFunction {
}
// Special handle for excel (1900)
- if (settlementSerialNumber <= 0 || maturitySerialNumber <= 366) {
+ if (
+ this.getDateSystem() === DateSystem.Date1900 &&
+ (settlementSerialNumber <= 0 || maturitySerialNumber <= 366)
+ ) {
return ErrorValueObject.create(ErrorType.NUM);
}
- const result = calculateDuration(settlementSerialNumber, maturitySerialNumber, couponValue, yldValue, frequencyValue, basisValue);
+ const result = calculateDuration(settlementSerialNumber, maturitySerialNumber, couponValue, yldValue, frequencyValue, basisValue, this.getDateSystem());
return NumberValueObject.create(result);
}
diff --git a/packages/engine-formula/src/functions/financial/intrate/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/intrate/__tests__/index.spec.ts
index 59d3ef1a4c..b7a301333a 100644
--- a/packages/engine-formula/src/functions/financial/intrate/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/intrate/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -131,5 +132,22 @@ describe('Test intrate function', () => {
const result = testFunction.calculate(settlement, maturity, investment, redemption, basis);
expect(getObjectValue(result)).toBe(ErrorType.VALUE);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const args = [
+ NumberValueObject.create(0),
+ NumberValueObject.create(366),
+ NumberValueObject.create(90),
+ NumberValueObject.create(100),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(0.11080752884031572, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(0.1111111111111111, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/financial/intrate/index.ts b/packages/engine-formula/src/functions/financial/intrate/index.ts
index e0feb5ec37..8f484de6b0 100644
--- a/packages/engine-formula/src/functions/financial/intrate/index.ts
+++ b/packages/engine-formula/src/functions/financial/intrate/index.ts
@@ -44,13 +44,13 @@ export class Intrate extends BaseFunction {
const [settlementObject, maturityObject, investmentObject, redemptionObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
@@ -74,7 +74,7 @@ export class Intrate extends BaseFunction {
return ErrorValueObject.create(ErrorType.NUM);
}
- const { days, yearDays } = getTwoDateDaysByBasis(settlementSerialNumber, maturitySerialNumber, basisValue);
+ const { days, yearDays } = getTwoDateDaysByBasis(settlementSerialNumber, maturitySerialNumber, basisValue, this.getDateSystem());
const result = ((redemptionValue - investmentValue) / investmentValue) * (yearDays / days);
diff --git a/packages/engine-formula/src/functions/financial/mduration/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/mduration/__tests__/index.spec.ts
index 558e63748d..85412a2901 100644
--- a/packages/engine-formula/src/functions/financial/mduration/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/mduration/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -183,5 +184,23 @@ describe('Test mduration function', () => {
const result = testFunction.calculate(settlement, maturity, coupon, yld, frequency, basis);
expect(getObjectValue(result)).toBe(ErrorType.VALUE);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const args = [
+ NumberValueObject.create(0),
+ NumberValueObject.create(366),
+ NumberValueObject.create(0.08),
+ NumberValueObject.create(0.09),
+ NumberValueObject.create(2),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBe(ErrorType.NUM);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(0.9384500933673366, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/financial/mduration/index.ts b/packages/engine-formula/src/functions/financial/mduration/index.ts
index 2f5c493273..87102e0138 100644
--- a/packages/engine-formula/src/functions/financial/mduration/index.ts
+++ b/packages/engine-formula/src/functions/financial/mduration/index.ts
@@ -15,6 +15,7 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { DateSystem } from '@univerjs/core';
import { getDateSerialNumberByObject } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { calculateDuration } from '../../../basics/financial';
@@ -50,13 +51,13 @@ export class Mduration extends BaseFunction {
const [settlementObject, maturityObject, couponObject, yldObject, frequencyObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
@@ -82,7 +83,15 @@ export class Mduration extends BaseFunction {
return ErrorValueObject.create(ErrorType.NUM);
}
- let result = calculateDuration(settlementSerialNumber, maturitySerialNumber, couponValue, yldValue, frequencyValue, basisValue);
+ // Excel's 1900 system does not accept the fictitious leap-year boundary as a valid financial date.
+ if (
+ this.getDateSystem() === DateSystem.Date1900 &&
+ (settlementSerialNumber <= 0 || maturitySerialNumber <= 366)
+ ) {
+ return ErrorValueObject.create(ErrorType.NUM);
+ }
+
+ let result = calculateDuration(settlementSerialNumber, maturitySerialNumber, couponValue, yldValue, frequencyValue, basisValue, this.getDateSystem());
result /= 1 + yldValue / frequencyValue;
diff --git a/packages/engine-formula/src/functions/financial/oddfprice/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/oddfprice/__tests__/index.spec.ts
index 010a53b405..c0a0d359be 100644
--- a/packages/engine-formula/src/functions/financial/oddfprice/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/oddfprice/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -41,6 +42,27 @@ describe('Test oddfprice function', () => {
expect(getObjectValue(result, true)).toBe(113.597717474);
});
+ it('returns #NUM! for the serial boundary formula in both date systems', () => {
+ const args = [
+ NumberValueObject.create(31),
+ NumberValueObject.create(366),
+ NumberValueObject.create(0),
+ NumberValueObject.create(0.08),
+ NumberValueObject.create(0.09),
+ NumberValueObject.create(100),
+ NumberValueObject.create(2),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBe(ErrorType.NUM);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBe(ErrorType.NUM);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Value is normal, but date valid error, return #NUM!', () => {
const settlement = StringValueObject.create('2018-11-11');
const maturity = StringValueObject.create('2021-3-1');
diff --git a/packages/engine-formula/src/functions/financial/oddfprice/index.ts b/packages/engine-formula/src/functions/financial/oddfprice/index.ts
index cf0477cf8c..7d40183a02 100644
--- a/packages/engine-formula/src/functions/financial/oddfprice/index.ts
+++ b/packages/engine-formula/src/functions/financial/oddfprice/index.ts
@@ -53,25 +53,25 @@ export class Oddfprice extends BaseFunction {
const [settlementObject, maturityObject, issueObject, firstCouponObject, rateObject, yldObject, redemptionObject, frequencyObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
}
- const issueSerialNumber = getDateSerialNumberByObject(issueObject);
+ const issueSerialNumber = getDateSerialNumberByObject(issueObject, this.getDateSystem());
if (typeof issueSerialNumber !== 'number') {
return issueSerialNumber;
}
- const firstCouponSerialNumber = getDateSerialNumberByObject(firstCouponObject);
+ const firstCouponSerialNumber = getDateSerialNumberByObject(firstCouponObject, this.getDateSystem());
if (typeof firstCouponSerialNumber !== 'number') {
return firstCouponSerialNumber;
@@ -99,15 +99,15 @@ export class Oddfprice extends BaseFunction {
return ErrorValueObject.create(ErrorType.NUM);
}
- const result = calculateOddFPrice(settlementSerialNumber, maturitySerialNumber, issueSerialNumber, firstCouponSerialNumber, rateValue, yldValue, redemptionValue, frequencyValue, basisValue);
+ const result = calculateOddFPrice(settlementSerialNumber, maturitySerialNumber, issueSerialNumber, firstCouponSerialNumber, rateValue, yldValue, redemptionValue, frequencyValue, basisValue, this.getDateSystem());
return NumberValueObject.create(result);
}
private _validDate(maturitySerialNumber: number, firstCouponSerialNumber: number, settlementSerialNumber: number, issueSerialNumber: number, frequencyValue: number): boolean {
return this._getDateCorrectOrder(maturitySerialNumber, firstCouponSerialNumber, settlementSerialNumber, issueSerialNumber)
- && validDaysBetweenIsWholeFrequencyByTwoDate(maturitySerialNumber, firstCouponSerialNumber, frequencyValue)
- && validCouppcdIsGte0ByTwoDate(issueSerialNumber, maturitySerialNumber, frequencyValue);
+ && validDaysBetweenIsWholeFrequencyByTwoDate(maturitySerialNumber, firstCouponSerialNumber, frequencyValue, this.getDateSystem())
+ && validCouppcdIsGte0ByTwoDate(issueSerialNumber, maturitySerialNumber, frequencyValue, this.getDateSystem());
}
private _getDateCorrectOrder(maturitySerialNumber: number, firstCouponSerialNumber: number, settlementSerialNumber: number, issueSerialNumber: number): boolean {
diff --git a/packages/engine-formula/src/functions/financial/oddfyield/index.ts b/packages/engine-formula/src/functions/financial/oddfyield/index.ts
index bc94e296da..7b5794721e 100644
--- a/packages/engine-formula/src/functions/financial/oddfyield/index.ts
+++ b/packages/engine-formula/src/functions/financial/oddfyield/index.ts
@@ -53,25 +53,25 @@ export class Oddfyield extends BaseFunction {
const [settlementObject, maturityObject, issueObject, firstCouponObject, rateObject, prObject, redemptionObject, frequencyObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
}
- const issueSerialNumber = getDateSerialNumberByObject(issueObject);
+ const issueSerialNumber = getDateSerialNumberByObject(issueObject, this.getDateSystem());
if (typeof issueSerialNumber !== 'number') {
return issueSerialNumber;
}
- const firstCouponSerialNumber = getDateSerialNumberByObject(firstCouponObject);
+ const firstCouponSerialNumber = getDateSerialNumberByObject(firstCouponObject, this.getDateSystem());
if (typeof firstCouponSerialNumber !== 'number') {
return firstCouponSerialNumber;
@@ -104,8 +104,8 @@ export class Oddfyield extends BaseFunction {
private _validDate(maturitySerialNumber: number, firstCouponSerialNumber: number, settlementSerialNumber: number, issueSerialNumber: number, frequencyValue: number): boolean {
return this._getDateCorrectOrder(maturitySerialNumber, firstCouponSerialNumber, settlementSerialNumber, issueSerialNumber)
- && validDaysBetweenIsWholeFrequencyByTwoDate(maturitySerialNumber, firstCouponSerialNumber, frequencyValue)
- && validCouppcdIsGte0ByTwoDate(issueSerialNumber, maturitySerialNumber, frequencyValue);
+ && validDaysBetweenIsWholeFrequencyByTwoDate(maturitySerialNumber, firstCouponSerialNumber, frequencyValue, this.getDateSystem())
+ && validCouppcdIsGte0ByTwoDate(issueSerialNumber, maturitySerialNumber, frequencyValue, this.getDateSystem());
}
private _getDateCorrectOrder(maturitySerialNumber: number, firstCouponSerialNumber: number, settlementSerialNumber: number, issueSerialNumber: number): boolean {
@@ -125,11 +125,12 @@ export class Oddfyield extends BaseFunction {
frequency: number,
basis: number
): BaseValueObject {
- const { days } = getTwoDateDaysByBasis(settlementSerialNumber, maturitySerialNumber, basis);
+ const dateSystem = this.getDateSystem();
+ const { days } = getTwoDateDaysByBasis(settlementSerialNumber, maturitySerialNumber, basis, dateSystem);
const guess = (rate * days * 100 - (pr - 100)) / ((pr - 100) * 0.25 * (1 + 2 * days) + days * 100);
function _iterF(yld: number): number {
- return pr - calculateOddFPrice(settlementSerialNumber, maturitySerialNumber, issueSerialNumber, firstCouponSerialNumber, rate, yld, redemption, frequency, basis);
+ return pr - calculateOddFPrice(settlementSerialNumber, maturitySerialNumber, issueSerialNumber, firstCouponSerialNumber, rate, yld, redemption, frequency, basis, dateSystem);
}
const result = getResultByGuessIterF(guess, (yld: number) => _iterF(yld));
diff --git a/packages/engine-formula/src/functions/financial/oddlprice/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/oddlprice/__tests__/index.spec.ts
index c766cdd977..2c48c1894e 100644
--- a/packages/engine-formula/src/functions/financial/oddlprice/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/oddlprice/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -207,5 +208,42 @@ describe('Test oddlprice function', () => {
const result = testFunction.calculate(settlement, maturity, lastInterest, rate, yld, redemption, frequency, basis);
expect(getObjectValue(result)).toBe(ErrorType.VALUE);
});
+
+ it('checks the serial-zero boundary in both date systems', () => {
+ const args = [
+ NumberValueObject.create(31),
+ NumberValueObject.create(366),
+ NumberValueObject.create(0),
+ NumberValueObject.create(0.08),
+ NumberValueObject.create(0.09),
+ NumberValueObject.create(100),
+ NumberValueObject.create(2),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBe(ErrorType.NUM);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(99.10292885021924, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
+ it('returns #NUM! for Excel serial 60 in the settlement date', () => {
+ const args = [
+ NumberValueObject.create(60),
+ NumberValueObject.create(366),
+ NumberValueObject.create(31),
+ NumberValueObject.create(0.08),
+ NumberValueObject.create(0.09),
+ NumberValueObject.create(100),
+ NumberValueObject.create(2),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBe(ErrorType.NUM);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/financial/oddlprice/index.ts b/packages/engine-formula/src/functions/financial/oddlprice/index.ts
index 8b1933219e..78c660375d 100644
--- a/packages/engine-formula/src/functions/financial/oddlprice/index.ts
+++ b/packages/engine-formula/src/functions/financial/oddlprice/index.ts
@@ -15,7 +15,8 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { excelDateSerial, excelSerialToDate, getDateSerialNumberByObject, getTwoDateDaysByBasis } from '../../../basics/date';
+import { DateSystem, excelDateSerial, excelSerialToDate } from '@univerjs/core';
+import { getDateSerialNumberByObject, getTwoDateDaysByBasis } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { calculateCoupdays, validCouppcdIsGte0ByTwoDate } from '../../../basics/financial';
import { checkVariantsErrorIsNullorArrayOrBoolean } from '../../../engine/utils/check-variant-error';
@@ -52,19 +53,19 @@ export class Oddlprice extends BaseFunction {
const [settlementObject, maturityObject, lastInterestObject, rateObject, yldObject, redemptionObject, frequencyObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
}
- const lastInterestSerialNumber = getDateSerialNumberByObject(lastInterestObject);
+ const lastInterestSerialNumber = getDateSerialNumberByObject(lastInterestObject, this.getDateSystem());
if (typeof lastInterestSerialNumber !== 'number') {
return lastInterestSerialNumber;
@@ -99,9 +100,13 @@ export class Oddlprice extends BaseFunction {
}
private _validDate(maturitySerialNumber: number, settlementSerialNumber: number, lastInterestSerialNumber: number, frequencyValue: number): boolean {
+ // These financial functions reject the fictitious 1900-02-29 settlement date even though
+ // the serial is preserved by the general date functions for Excel compatibility.
return Math.floor(maturitySerialNumber) > Math.floor(settlementSerialNumber)
&& Math.floor(settlementSerialNumber) > Math.floor(lastInterestSerialNumber)
- && validCouppcdIsGte0ByTwoDate(lastInterestSerialNumber, maturitySerialNumber, frequencyValue);
+ && !(this.getDateSystem() === DateSystem.Date1900 && Math.floor(settlementSerialNumber) === 60)
+ && !(this.getDateSystem() === DateSystem.Date1900 && lastInterestSerialNumber <= 0)
+ && validCouppcdIsGte0ByTwoDate(lastInterestSerialNumber, maturitySerialNumber, frequencyValue, this.getDateSystem());
}
private _getResult(
@@ -126,8 +131,8 @@ export class Oddlprice extends BaseFunction {
}
private _getCoupDate(maturitySerialNumber: number, lastInterestSerialNumber: number, frequency: number): number {
- const maturityDate = excelSerialToDate(maturitySerialNumber);
- const coupDate = excelSerialToDate(lastInterestSerialNumber);
+ const maturityDate = excelSerialToDate(maturitySerialNumber, this.getDateSystem());
+ const coupDate = excelSerialToDate(lastInterestSerialNumber, this.getDateSystem());
coupDate.setUTCFullYear(maturityDate.getUTCFullYear());
@@ -140,13 +145,13 @@ export class Oddlprice extends BaseFunction {
coupDate.setUTCMonth(coupDate.getUTCMonth() + 12 / frequency);
}
- return excelDateSerial(coupDate);
+ return excelDateSerial(coupDate, this.getDateSystem());
}
private _getFrac(startDateSerialNumber: number, endDateSerialNumber: number, coupDateSerialNumber: number, frequency: number, basis: number): number {
- const startDate = excelSerialToDate(startDateSerialNumber);
- const endDate = excelSerialToDate(endDateSerialNumber);
- const coupDate = excelSerialToDate(coupDateSerialNumber);
+ const startDate = excelSerialToDate(startDateSerialNumber, this.getDateSystem());
+ const endDate = excelSerialToDate(endDateSerialNumber, this.getDateSystem());
+ const coupDate = excelSerialToDate(coupDateSerialNumber, this.getDateSystem());
coupDate.setUTCFullYear(startDate.getUTCFullYear());
@@ -159,25 +164,25 @@ export class Oddlprice extends BaseFunction {
coupDate.setUTCMonth(coupDate.getUTCMonth() - 12 / frequency);
}
- let earlyCouponSerialNumber = excelDateSerial(coupDate);
+ let earlyCouponSerialNumber = excelDateSerial(coupDate, this.getDateSystem());
coupDate.setUTCMonth(coupDate.getUTCMonth() + 12 / frequency);
- let lateCouponSerialNumber = excelDateSerial(coupDate);
+ let lateCouponSerialNumber = excelDateSerial(coupDate, this.getDateSystem());
if (lateCouponSerialNumber >= endDateSerialNumber) {
- const { days } = getTwoDateDaysByBasis(startDateSerialNumber, endDateSerialNumber, basis);
- const coupdays = calculateCoupdays(earlyCouponSerialNumber, lateCouponSerialNumber, frequency, basis);
+ const { days } = getTwoDateDaysByBasis(startDateSerialNumber, endDateSerialNumber, basis, this.getDateSystem());
+ const coupdays = calculateCoupdays(earlyCouponSerialNumber, lateCouponSerialNumber, frequency, basis, this.getDateSystem());
return days / coupdays;
}
- const { days: daysF } = getTwoDateDaysByBasis(startDateSerialNumber, lateCouponSerialNumber, basis);
- const coupdaysF = calculateCoupdays(earlyCouponSerialNumber, lateCouponSerialNumber, frequency, basis);
+ const { days: daysF } = getTwoDateDaysByBasis(startDateSerialNumber, lateCouponSerialNumber, basis, this.getDateSystem());
+ const coupdaysF = calculateCoupdays(earlyCouponSerialNumber, lateCouponSerialNumber, frequency, basis, this.getDateSystem());
let result = daysF / coupdaysF;
- const earlyCoupon = excelSerialToDate(lateCouponSerialNumber);
- const lateCoupon = excelSerialToDate(lateCouponSerialNumber);
+ const earlyCoupon = excelSerialToDate(lateCouponSerialNumber, this.getDateSystem());
+ const lateCoupon = excelSerialToDate(lateCouponSerialNumber, this.getDateSystem());
lateCoupon.setUTCMonth(lateCoupon.getUTCMonth() + 12 / frequency);
// eslint-disable-next-line
@@ -187,11 +192,11 @@ export class Oddlprice extends BaseFunction {
result += 1;
}
- earlyCouponSerialNumber = excelDateSerial(earlyCoupon);
- lateCouponSerialNumber = excelDateSerial(lateCoupon);
+ earlyCouponSerialNumber = excelDateSerial(earlyCoupon, this.getDateSystem());
+ lateCouponSerialNumber = excelDateSerial(lateCoupon, this.getDateSystem());
- const { days: daysL } = getTwoDateDaysByBasis(earlyCouponSerialNumber, endDateSerialNumber, basis);
- const coupdaysL = calculateCoupdays(earlyCouponSerialNumber, lateCouponSerialNumber, frequency, basis);
+ const { days: daysL } = getTwoDateDaysByBasis(earlyCouponSerialNumber, endDateSerialNumber, basis, this.getDateSystem());
+ const coupdaysL = calculateCoupdays(earlyCouponSerialNumber, lateCouponSerialNumber, frequency, basis, this.getDateSystem());
result += daysL / coupdaysL;
diff --git a/packages/engine-formula/src/functions/financial/oddlyield/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/oddlyield/__tests__/index.spec.ts
index f1acb0e2f3..604dc26256 100644
--- a/packages/engine-formula/src/functions/financial/oddlyield/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/oddlyield/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -207,5 +208,42 @@ describe('Test oddlyield function', () => {
const result = testFunction.calculate(settlement, maturity, lastInterest, rate, pr, redemption, frequency, basis);
expect(getObjectValue(result)).toBe(ErrorType.VALUE);
});
+
+ it('checks the serial-zero boundary in both date systems', () => {
+ const args = [
+ NumberValueObject.create(31),
+ NumberValueObject.create(366),
+ NumberValueObject.create(0),
+ NumberValueObject.create(0.08),
+ NumberValueObject.create(84.5),
+ NumberValueObject.create(100),
+ NumberValueObject.create(2),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBe(ErrorType.NUM);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(0.29282175163617463, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
+ it('returns #NUM! for Excel serial 60 in the settlement date', () => {
+ const args = [
+ NumberValueObject.create(60),
+ NumberValueObject.create(366),
+ NumberValueObject.create(31),
+ NumberValueObject.create(0.08),
+ NumberValueObject.create(90),
+ NumberValueObject.create(100),
+ NumberValueObject.create(2),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBe(ErrorType.NUM);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/financial/oddlyield/index.ts b/packages/engine-formula/src/functions/financial/oddlyield/index.ts
index f4c06b4214..366dbd62c8 100644
--- a/packages/engine-formula/src/functions/financial/oddlyield/index.ts
+++ b/packages/engine-formula/src/functions/financial/oddlyield/index.ts
@@ -15,7 +15,8 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { excelDateSerial, excelSerialToDate, getDateSerialNumberByObject, getTwoDateDaysByBasis } from '../../../basics/date';
+import { DateSystem, excelDateSerial, excelSerialToDate } from '@univerjs/core';
+import { getDateSerialNumberByObject, getTwoDateDaysByBasis } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { calculateCoupdays, validCouppcdIsGte0ByTwoDate } from '../../../basics/financial';
import { checkVariantsErrorIsNullorArrayOrBoolean } from '../../../engine/utils/check-variant-error';
@@ -53,19 +54,19 @@ export class Oddlyield extends BaseFunction {
const [settlementObject, maturityObject, lastInterestObject, rateObject, prObject, redemptionObject, frequencyObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
}
- const lastInterestSerialNumber = getDateSerialNumberByObject(lastInterestObject);
+ const lastInterestSerialNumber = getDateSerialNumberByObject(lastInterestObject, this.getDateSystem());
if (typeof lastInterestSerialNumber !== 'number') {
return lastInterestSerialNumber;
@@ -99,9 +100,13 @@ export class Oddlyield extends BaseFunction {
}
private _validDate(maturitySerialNumber: number, settlementSerialNumber: number, lastInterestSerialNumber: number, frequencyValue: number): boolean {
+ // These financial functions reject the fictitious 1900-02-29 settlement date even though
+ // the serial is preserved by the general date functions for Excel compatibility.
return Math.floor(maturitySerialNumber) > Math.floor(settlementSerialNumber)
&& Math.floor(settlementSerialNumber) > Math.floor(lastInterestSerialNumber)
- && validCouppcdIsGte0ByTwoDate(lastInterestSerialNumber, maturitySerialNumber, frequencyValue);
+ && !(this.getDateSystem() === DateSystem.Date1900 && Math.floor(settlementSerialNumber) === 60)
+ && !(this.getDateSystem() === DateSystem.Date1900 && lastInterestSerialNumber <= 0)
+ && validCouppcdIsGte0ByTwoDate(lastInterestSerialNumber, maturitySerialNumber, frequencyValue, this.getDateSystem());
}
private _getResult(
@@ -126,8 +131,8 @@ export class Oddlyield extends BaseFunction {
}
private _getCoupDate(maturitySerialNumber: number, lastInterestSerialNumber: number, frequency: number): number {
- const maturityDate = excelSerialToDate(maturitySerialNumber);
- const coupDate = excelSerialToDate(lastInterestSerialNumber);
+ const maturityDate = excelSerialToDate(maturitySerialNumber, this.getDateSystem());
+ const coupDate = excelSerialToDate(lastInterestSerialNumber, this.getDateSystem());
coupDate.setUTCFullYear(maturityDate.getUTCFullYear());
@@ -140,13 +145,13 @@ export class Oddlyield extends BaseFunction {
coupDate.setUTCMonth(coupDate.getUTCMonth() + 12 / frequency);
}
- return excelDateSerial(coupDate);
+ return excelDateSerial(coupDate, this.getDateSystem());
}
private _getFrac(startDateSerialNumber: number, endDateSerialNumber: number, coupDateSerialNumber: number, frequency: number, basis: number): number {
- const startDate = excelSerialToDate(startDateSerialNumber);
- const endDate = excelSerialToDate(endDateSerialNumber);
- const coupDate = excelSerialToDate(coupDateSerialNumber);
+ const startDate = excelSerialToDate(startDateSerialNumber, this.getDateSystem());
+ const endDate = excelSerialToDate(endDateSerialNumber, this.getDateSystem());
+ const coupDate = excelSerialToDate(coupDateSerialNumber, this.getDateSystem());
coupDate.setUTCFullYear(startDate.getUTCFullYear());
@@ -159,25 +164,25 @@ export class Oddlyield extends BaseFunction {
coupDate.setUTCMonth(coupDate.getUTCMonth() - 12 / frequency);
}
- let earlyCouponSerialNumber = excelDateSerial(coupDate);
+ let earlyCouponSerialNumber = excelDateSerial(coupDate, this.getDateSystem());
coupDate.setUTCMonth(coupDate.getUTCMonth() + 12 / frequency);
- let lateCouponSerialNumber = excelDateSerial(coupDate);
+ let lateCouponSerialNumber = excelDateSerial(coupDate, this.getDateSystem());
if (lateCouponSerialNumber >= endDateSerialNumber) {
- const { days } = getTwoDateDaysByBasis(startDateSerialNumber, endDateSerialNumber, basis);
- const coupdays = calculateCoupdays(earlyCouponSerialNumber, lateCouponSerialNumber, frequency, basis);
+ const { days } = getTwoDateDaysByBasis(startDateSerialNumber, endDateSerialNumber, basis, this.getDateSystem());
+ const coupdays = calculateCoupdays(earlyCouponSerialNumber, lateCouponSerialNumber, frequency, basis, this.getDateSystem());
return days / coupdays;
}
- const { days: daysF } = getTwoDateDaysByBasis(startDateSerialNumber, lateCouponSerialNumber, basis);
- const coupdaysF = calculateCoupdays(earlyCouponSerialNumber, lateCouponSerialNumber, frequency, basis);
+ const { days: daysF } = getTwoDateDaysByBasis(startDateSerialNumber, lateCouponSerialNumber, basis, this.getDateSystem());
+ const coupdaysF = calculateCoupdays(earlyCouponSerialNumber, lateCouponSerialNumber, frequency, basis, this.getDateSystem());
let result = daysF / coupdaysF;
- const earlyCoupon = excelSerialToDate(lateCouponSerialNumber);
- const lateCoupon = excelSerialToDate(lateCouponSerialNumber);
+ const earlyCoupon = excelSerialToDate(lateCouponSerialNumber, this.getDateSystem());
+ const lateCoupon = excelSerialToDate(lateCouponSerialNumber, this.getDateSystem());
lateCoupon.setUTCMonth(lateCoupon.getUTCMonth() + 12 / frequency);
// eslint-disable-next-line
@@ -187,11 +192,11 @@ export class Oddlyield extends BaseFunction {
result += 1;
}
- earlyCouponSerialNumber = excelDateSerial(earlyCoupon);
- lateCouponSerialNumber = excelDateSerial(lateCoupon);
+ earlyCouponSerialNumber = excelDateSerial(earlyCoupon, this.getDateSystem());
+ lateCouponSerialNumber = excelDateSerial(lateCoupon, this.getDateSystem());
- const { days: daysL } = getTwoDateDaysByBasis(earlyCouponSerialNumber, endDateSerialNumber, basis);
- const coupdaysL = calculateCoupdays(earlyCouponSerialNumber, lateCouponSerialNumber, frequency, basis);
+ const { days: daysL } = getTwoDateDaysByBasis(earlyCouponSerialNumber, endDateSerialNumber, basis, this.getDateSystem());
+ const coupdaysL = calculateCoupdays(earlyCouponSerialNumber, lateCouponSerialNumber, frequency, basis, this.getDateSystem());
result += daysL / coupdaysL;
diff --git a/packages/engine-formula/src/functions/financial/price/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/price/__tests__/index.spec.ts
index a375d09727..c5e5df13f1 100644
--- a/packages/engine-formula/src/functions/financial/price/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/price/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -193,5 +194,24 @@ describe('Test price function', () => {
const result = testFunction.calculate(settlement, maturity, rate, yld, redemption, frequency, basis);
expect(getObjectValue(result)).toBe(ErrorType.VALUE);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const args = [
+ NumberValueObject.create(0),
+ NumberValueObject.create(366),
+ NumberValueObject.create(0.08),
+ NumberValueObject.create(0.09),
+ NumberValueObject.create(100),
+ NumberValueObject.create(2),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBe(ErrorType.NUM);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(99.0636661248598, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/financial/price/index.ts b/packages/engine-formula/src/functions/financial/price/index.ts
index 7ebf06b49c..6bf3532e20 100644
--- a/packages/engine-formula/src/functions/financial/price/index.ts
+++ b/packages/engine-formula/src/functions/financial/price/index.ts
@@ -15,6 +15,7 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { DateSystem } from '@univerjs/core';
import { getDateSerialNumberByObject } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { calculatePrice, validCouppcdIsGte0ByTwoDate } from '../../../basics/financial';
@@ -51,13 +52,13 @@ export class Price extends BaseFunction {
const [settlementObject, maturityObject, rateObject, yldObject, redemptionObject, frequencyObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
@@ -73,6 +74,7 @@ export class Price extends BaseFunction {
return ErrorValueObject.create(ErrorType.VALUE);
}
+ // Excel treats serial zero as an invalid settlement date in the 1900 date system.
if (
rateValue < 0 ||
yldValue < 0 ||
@@ -81,12 +83,13 @@ export class Price extends BaseFunction {
basisValue < 0 ||
basisValue > 4 ||
settlementSerialNumber >= maturitySerialNumber ||
- !validCouppcdIsGte0ByTwoDate(settlementSerialNumber, maturitySerialNumber, frequencyValue)
+ (this.getDateSystem() === DateSystem.Date1900 && settlementSerialNumber <= 0) ||
+ !validCouppcdIsGte0ByTwoDate(settlementSerialNumber, maturitySerialNumber, frequencyValue, this.getDateSystem())
) {
return ErrorValueObject.create(ErrorType.NUM);
}
- const result = calculatePrice(settlementSerialNumber, maturitySerialNumber, rateValue, yldValue, redemptionValue, frequencyValue, basisValue);
+ const result = calculatePrice(settlementSerialNumber, maturitySerialNumber, rateValue, yldValue, redemptionValue, frequencyValue, basisValue, this.getDateSystem());
return NumberValueObject.create(result);
}
diff --git a/packages/engine-formula/src/functions/financial/pricedisc/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/pricedisc/__tests__/index.spec.ts
index 247ebf0050..efa6760bb2 100644
--- a/packages/engine-formula/src/functions/financial/pricedisc/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/pricedisc/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -155,5 +156,22 @@ describe('Test pricedisc function', () => {
const result = testFunction.calculate(settlement, maturity, discount, redemption, basis);
expect(getObjectValue(result)).toBe(ErrorType.VALUE);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const args = [
+ NumberValueObject.create(0),
+ NumberValueObject.create(366),
+ NumberValueObject.create(0.1),
+ NumberValueObject.create(100),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(89.97260273972603, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(90, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/financial/pricedisc/index.ts b/packages/engine-formula/src/functions/financial/pricedisc/index.ts
index 8cd95b42ce..fa9961c16a 100644
--- a/packages/engine-formula/src/functions/financial/pricedisc/index.ts
+++ b/packages/engine-formula/src/functions/financial/pricedisc/index.ts
@@ -48,13 +48,13 @@ export class Pricedisc extends BaseFunction {
const [settlementObject, maturityObject, discountObject, redemptionObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
@@ -80,7 +80,7 @@ export class Pricedisc extends BaseFunction {
// B = number of days in year, depending on year basis.
// DSM = number of days from settlement to maturity.
- const { days: DSM, yearDays: B } = getTwoDateDaysByBasis(settlementSerialNumber, maturitySerialNumber, basisValue);
+ const { days: DSM, yearDays: B } = getTwoDateDaysByBasis(settlementSerialNumber, maturitySerialNumber, basisValue, this.getDateSystem());
const result = redemptionValue - discountValue * redemptionValue * DSM / B;
diff --git a/packages/engine-formula/src/functions/financial/pricemat/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/pricemat/__tests__/index.spec.ts
index 26d9ae5389..627461ac82 100644
--- a/packages/engine-formula/src/functions/financial/pricemat/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/pricemat/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -38,6 +39,23 @@ describe('Test pricemat function', () => {
expect(getObjectValue(result, true)).toBe(110.862780081706);
});
+ it('uses the configured date system for numeric serial dates', () => {
+ const args = [
+ NumberValueObject.create(1),
+ NumberValueObject.create(366),
+ NumberValueObject.create(0),
+ NumberValueObject.create(0.06),
+ NumberValueObject.create(0.08),
+ NumberValueObject.create(0),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(98.1469135802469, 10);
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(98.151680729917, 10);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Value is normal, but correct order is maturity > settlement > issue, otherwise return #NUM!', () => {
const settlement = StringValueObject.create('2018-11-11');
const maturity = StringValueObject.create('2021-3-1');
@@ -168,5 +186,23 @@ describe('Test pricemat function', () => {
const result = testFunction.calculate(settlement, maturity, issue, rate, yld, basis);
expect(getObjectValue(result)).toBe(ErrorType.VALUE);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const args = [
+ NumberValueObject.create(0),
+ NumberValueObject.create(366),
+ NumberValueObject.create(0),
+ NumberValueObject.create(100),
+ NumberValueObject.create(0.1),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBe(ErrorType.NUM);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBe(ErrorType.NUM);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/financial/pricemat/index.ts b/packages/engine-formula/src/functions/financial/pricemat/index.ts
index 27fba55d68..5dcd5e75cb 100644
--- a/packages/engine-formula/src/functions/financial/pricemat/index.ts
+++ b/packages/engine-formula/src/functions/financial/pricemat/index.ts
@@ -49,19 +49,19 @@ export class Pricemat extends BaseFunction {
const [settlementObject, maturityObject, issueObject, rateObject, yldObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
}
- const issueSerialNumber = getDateSerialNumberByObject(issueObject);
+ const issueSerialNumber = getDateSerialNumberByObject(issueObject, this.getDateSystem());
if (typeof issueSerialNumber !== 'number') {
return issueSerialNumber;
@@ -91,10 +91,10 @@ export class Pricemat extends BaseFunction {
// DSM = number of days from settlement to maturity.
// DIM = number of days from issue to maturity.
// A = number of days from issue to settlement.
- const B = getNormalYearDaysByBasis(settlementSerialNumber, basisValue);
- const { days: DSM } = getTwoDateDaysByBasis(settlementSerialNumber, maturitySerialNumber, basisValue);
- const { days: DIM } = getTwoDateDaysByBasis(issueSerialNumber, maturitySerialNumber, basisValue);
- const { days: A } = getTwoDateDaysByBasis(issueSerialNumber, settlementSerialNumber, basisValue);
+ const B = getNormalYearDaysByBasis(settlementSerialNumber, basisValue, this.getDateSystem());
+ const { days: DSM } = getTwoDateDaysByBasis(settlementSerialNumber, maturitySerialNumber, basisValue, this.getDateSystem());
+ const { days: DIM } = getTwoDateDaysByBasis(issueSerialNumber, maturitySerialNumber, basisValue, this.getDateSystem());
+ const { days: A } = getTwoDateDaysByBasis(issueSerialNumber, settlementSerialNumber, basisValue, this.getDateSystem());
const result = (100 + DIM / B * rateValue * 100) / (1 + DSM / B * yldValue) - (A / B * rateValue * 100);
diff --git a/packages/engine-formula/src/functions/financial/received/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/received/__tests__/index.spec.ts
index 3fb4e66551..c21e650e24 100644
--- a/packages/engine-formula/src/functions/financial/received/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/received/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -159,5 +160,22 @@ describe('Test received function', () => {
const result = testFunction.calculate(settlement, maturity, investment, discount, basis);
expect(getObjectValue(result)).toBe(ErrorType.VALUE);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const args = [
+ NumberValueObject.create(0),
+ NumberValueObject.create(366),
+ NumberValueObject.create(100),
+ NumberValueObject.create(0.1),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(111.14494518879415, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(111.11111111111111, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/financial/received/index.ts b/packages/engine-formula/src/functions/financial/received/index.ts
index 364e099010..11e1a26290 100644
--- a/packages/engine-formula/src/functions/financial/received/index.ts
+++ b/packages/engine-formula/src/functions/financial/received/index.ts
@@ -48,13 +48,13 @@ export class Received extends BaseFunction {
const [settlementObject, maturityObject, investmentObject, discountObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
@@ -80,7 +80,7 @@ export class Received extends BaseFunction {
// B = number of days in year, depending on year basis.
// DSM = number of days from settlement to maturity.
- const { days: DSM, yearDays: B } = getTwoDateDaysByBasis(settlementSerialNumber, maturitySerialNumber, basisValue);
+ const { days: DSM, yearDays: B } = getTwoDateDaysByBasis(settlementSerialNumber, maturitySerialNumber, basisValue, this.getDateSystem());
const result = investmentValue / (1 - (discountValue * DSM / B));
diff --git a/packages/engine-formula/src/functions/financial/tbilleq/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/tbilleq/__tests__/index.spec.ts
index 85ffbf3f45..79376a9e7f 100644
--- a/packages/engine-formula/src/functions/financial/tbilleq/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/tbilleq/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -39,6 +40,15 @@ describe('Test tbilleq function', () => {
expect(getObjectValue(result2, true)).toBe(0.0973043585198);
});
+ it('uses the configured date system for first-year serial dates', () => {
+ const args = [NumberValueObject.create(0), NumberValueObject.create(366), NumberValueObject.create(0.0914)] as const;
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args), true)).toBeCloseTo(0.0999453758814, 10);
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args), true)).toBeCloseTo(0.0999453758814, 10);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Settlement >= maturity', () => {
const settlement = StringValueObject.create('2018-3-31');
const maturity = StringValueObject.create('2008-6-1');
@@ -55,6 +65,13 @@ describe('Test tbilleq function', () => {
expect(getObjectValue(result)).toBe(ErrorType.NUM);
});
+ it('handles serial 60 at the 1900 leap-day boundary', () => {
+ const args = [NumberValueObject.create(60), NumberValueObject.create(366), NumberValueObject.create(0.0914)] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args), true)).toBeCloseTo(0.09851681907154934, 12);
+ });
+
it('Discount <= 0 || discount to result < 0 or NaN', () => {
const settlement = StringValueObject.create('2008-3-31');
const maturity = StringValueObject.create('2008-6-1');
diff --git a/packages/engine-formula/src/functions/financial/tbilleq/index.ts b/packages/engine-formula/src/functions/financial/tbilleq/index.ts
index 85a02b2025..1288967725 100644
--- a/packages/engine-formula/src/functions/financial/tbilleq/index.ts
+++ b/packages/engine-formula/src/functions/financial/tbilleq/index.ts
@@ -15,7 +15,8 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { excelSerialToDate, getDateSerialNumberByObject, getDaysInYear } from '../../../basics/date';
+import { DateSystem, excelSerialToDate } from '@univerjs/core';
+import { getDateSerialNumberByObject, getDaysInYear } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { checkVariantsErrorIsNullorArrayOrBoolean } from '../../../engine/utils/check-variant-error';
import { ErrorValueObject } from '../../../engine/value-object/base-value-object';
@@ -36,13 +37,13 @@ export class Tbilleq extends BaseFunction {
const [settlementObject, maturityObject, discountObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
@@ -64,8 +65,10 @@ export class Tbilleq extends BaseFunction {
// where DSM is the number of days between settlement and maturity computed according to the 360 days per year basis.
const DSM = Math.floor(maturitySerialNumber) - Math.floor(settlementSerialNumber);
- const date = excelSerialToDate(settlementSerialNumber);
- const year = date.getUTCFullYear();
+ const date = excelSerialToDate(settlementSerialNumber, this.getDateSystem());
+ // Native Date normalizes Excel's 1900 serial zero to 1899-12-31; retain Excel's 1900 leap-year boundary.
+ const isSerialZero = settlementSerialNumber === 0;
+ const year = this.getDateSystem() === DateSystem.Date1900 && isSerialZero ? 1900 : date.getUTCFullYear();
const yearDays = getDaysInYear(year);
// if maturity is more than one year after settlement, TBILLEQ returns the #NUM! error value.
@@ -78,7 +81,7 @@ export class Tbilleq extends BaseFunction {
if (DSM > 182) {
const tbillPrice = 100 * (1 - discountValue * DSM / 360);
- const fraction = DSM / 365;
+ const fraction = isSerialZero ? DSM / yearDays : DSM / 365;
result = (-fraction + Math.sqrt(fraction * fraction - (fraction * 2 - 1) * (1 - 100 / tbillPrice))) / (fraction - 0.5);
diff --git a/packages/engine-formula/src/functions/financial/tbillprice/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/tbillprice/__tests__/index.spec.ts
index 7b82306e23..15a161486f 100644
--- a/packages/engine-formula/src/functions/financial/tbillprice/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/tbillprice/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -35,6 +36,15 @@ describe('Test tbillprice function', () => {
expect(getObjectValue(result, true)).toBe(98.4258888889);
});
+ it('uses the configured date system for first-year serial dates', () => {
+ const args = [NumberValueObject.create(0), NumberValueObject.create(366), NumberValueObject.create(0.0914)] as const;
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args), true)).toBeCloseTo(90.7076666667, 10);
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args), true)).toBeCloseTo(90.7076666667, 10);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Settlement >= maturity', () => {
const settlement = StringValueObject.create('2018-3-31');
const maturity = StringValueObject.create('2008-6-1');
@@ -51,6 +61,13 @@ describe('Test tbillprice function', () => {
expect(getObjectValue(result)).toBe(ErrorType.NUM);
});
+ it('handles serial 60 at the 1900 leap-day boundary', () => {
+ const args = [NumberValueObject.create(60), NumberValueObject.create(366), NumberValueObject.create(0.0914)] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args), true)).toBeCloseTo(92.231, 12);
+ });
+
it('Discount <= 0 || discount to result < 0 or NaN', () => {
const settlement = StringValueObject.create('2008-3-31');
const maturity = StringValueObject.create('2008-6-1');
diff --git a/packages/engine-formula/src/functions/financial/tbillprice/index.ts b/packages/engine-formula/src/functions/financial/tbillprice/index.ts
index 48f3261f76..2260556264 100644
--- a/packages/engine-formula/src/functions/financial/tbillprice/index.ts
+++ b/packages/engine-formula/src/functions/financial/tbillprice/index.ts
@@ -15,7 +15,8 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { excelSerialToDate, getDateSerialNumberByObject, getDaysInYear } from '../../../basics/date';
+import { DateSystem, excelSerialToDate } from '@univerjs/core';
+import { getDateSerialNumberByObject, getDaysInYear } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { checkVariantsErrorIsNullorArrayOrBoolean } from '../../../engine/utils/check-variant-error';
import { getCurrencyFormat } from '../../../engine/utils/numfmt-kit';
@@ -39,13 +40,13 @@ export class Tbillprice extends BaseFunction {
const [settlementObject, maturityObject, discountObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
@@ -67,8 +68,11 @@ export class Tbillprice extends BaseFunction {
// where DSM is the number of days between settlement and maturity computed according to the 360 days per year basis.
const DSM = Math.floor(maturitySerialNumber) - Math.floor(settlementSerialNumber);
- const date = excelSerialToDate(settlementSerialNumber);
- const year = date.getUTCFullYear();
+ const date = excelSerialToDate(settlementSerialNumber, this.getDateSystem());
+ // Native Date normalizes Excel's 1900 serial zero to 1899-12-31; Excel keeps it in the 1900 leap-year boundary.
+ const year = this.getDateSystem() === DateSystem.Date1900 && settlementSerialNumber === 0
+ ? 1900
+ : date.getUTCFullYear();
const yearDays = getDaysInYear(year);
// if maturity is more than one year after settlement, TBILLPRICE returns the #NUM! error value.
diff --git a/packages/engine-formula/src/functions/financial/tbillyield/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/tbillyield/__tests__/index.spec.ts
index 79cc5d7a7e..385283663a 100644
--- a/packages/engine-formula/src/functions/financial/tbillyield/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/tbillyield/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -35,6 +36,15 @@ describe('Test tbillyield function', () => {
expect(getObjectValue(result, true)).toBe(0.0914169629253);
});
+ it('uses the configured date system for first-year serial dates', () => {
+ const args = [NumberValueObject.create(0), NumberValueObject.create(366), NumberValueObject.create(98.45)] as const;
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args), true)).toBeCloseTo(0.0154859336103, 10);
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args), true)).toBeCloseTo(0.0154859336103, 10);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Settlement >= maturity', () => {
const settlement = StringValueObject.create('2018-3-31');
const maturity = StringValueObject.create('2008-6-1');
@@ -51,6 +61,13 @@ describe('Test tbillyield function', () => {
expect(getObjectValue(result)).toBe(ErrorType.NUM);
});
+ it('handles serial 60 at the 1900 leap-day boundary', () => {
+ const args = [NumberValueObject.create(60), NumberValueObject.create(366), NumberValueObject.create(90)] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args), true)).toBeCloseTo(0.13071895424836602, 12);
+ });
+
it('pr <= 0', () => {
const settlement = StringValueObject.create('2008-3-31');
const maturity = StringValueObject.create('2008-6-1');
diff --git a/packages/engine-formula/src/functions/financial/tbillyield/index.ts b/packages/engine-formula/src/functions/financial/tbillyield/index.ts
index 3a16117e70..67acd5c9a9 100644
--- a/packages/engine-formula/src/functions/financial/tbillyield/index.ts
+++ b/packages/engine-formula/src/functions/financial/tbillyield/index.ts
@@ -15,7 +15,8 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
-import { excelSerialToDate, getDateSerialNumberByObject, getDaysInYear } from '../../../basics/date';
+import { DateSystem, excelSerialToDate } from '@univerjs/core';
+import { getDateSerialNumberByObject, getDaysInYear } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import { checkVariantsErrorIsNullorArrayOrBoolean } from '../../../engine/utils/check-variant-error';
import { ErrorValueObject } from '../../../engine/value-object/base-value-object';
@@ -36,13 +37,13 @@ export class Tbillyield extends BaseFunction {
const [settlementObject, maturityObject, prObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
@@ -64,8 +65,11 @@ export class Tbillyield extends BaseFunction {
// where DSM is the number of days between settlement and maturity computed according to the 360 days per year basis.
const DSM = Math.floor(maturitySerialNumber) - Math.floor(settlementSerialNumber);
- const date = excelSerialToDate(settlementSerialNumber);
- const year = date.getUTCFullYear();
+ const date = excelSerialToDate(settlementSerialNumber, this.getDateSystem());
+ // Native Date normalizes Excel's 1900 serial zero to 1899-12-31; Excel keeps it in the 1900 leap-year boundary.
+ const year = this.getDateSystem() === DateSystem.Date1900 && settlementSerialNumber === 0
+ ? 1900
+ : date.getUTCFullYear();
const yearDays = getDaysInYear(year);
// if maturity is more than one year after settlement, TBILLYIELD returns the #NUM! error value.
diff --git a/packages/engine-formula/src/functions/financial/yield/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/yield/__tests__/index.spec.ts
index 80cf89b213..01bc5e620f 100644
--- a/packages/engine-formula/src/functions/financial/yield/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/yield/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -202,5 +203,24 @@ describe('Test yield function', () => {
const result = testFunction.calculate(settlement, maturity, rate, pr, redemption, frequency, basis);
expect(getObjectValue(result)).toBe(ErrorType.VALUE);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const args = [
+ NumberValueObject.create(0),
+ NumberValueObject.create(366),
+ NumberValueObject.create(0.08),
+ NumberValueObject.create(90),
+ NumberValueObject.create(100),
+ NumberValueObject.create(2),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBe(ErrorType.NUM);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(0.19483918275741222, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/financial/yield/index.ts b/packages/engine-formula/src/functions/financial/yield/index.ts
index 4a50f8a28a..d551cd7bf5 100644
--- a/packages/engine-formula/src/functions/financial/yield/index.ts
+++ b/packages/engine-formula/src/functions/financial/yield/index.ts
@@ -15,6 +15,7 @@
*/
import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { DateSystem } from '@univerjs/core';
import { getDateSerialNumberByObject, getTwoDateDaysByBasis } from '../../../basics/date';
import { ErrorType } from '../../../basics/error-type';
import {
@@ -57,13 +58,13 @@ export class Yield extends BaseFunction {
const [settlementObject, maturityObject, rateObject, prObject, redemptionObject, frequencyObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
@@ -79,6 +80,7 @@ export class Yield extends BaseFunction {
return ErrorValueObject.create(ErrorType.VALUE);
}
+ // Excel treats serial zero as an invalid settlement date in the 1900 date system.
if (
rateValue < 0 ||
prValue <= 0 ||
@@ -87,7 +89,8 @@ export class Yield extends BaseFunction {
basisValue < 0 ||
basisValue > 4 ||
settlementSerialNumber >= maturitySerialNumber ||
- !validCouppcdIsGte0ByTwoDate(settlementSerialNumber, maturitySerialNumber, frequencyValue)
+ (this.getDateSystem() === DateSystem.Date1900 && settlementSerialNumber <= 0) ||
+ !validCouppcdIsGte0ByTwoDate(settlementSerialNumber, maturitySerialNumber, frequencyValue, this.getDateSystem())
) {
return ErrorValueObject.create(ErrorType.NUM);
}
@@ -106,29 +109,29 @@ export class Yield extends BaseFunction {
frequency: number,
basis: number
): number {
- const N = calculateCoupnum(settlementSerialNumber, maturitySerialNumber, frequency);
+ const N = calculateCoupnum(settlementSerialNumber, maturitySerialNumber, frequency, this.getDateSystem());
if (N > 1) {
const g_Eps = 1e-7;
let yld = rate || 0.01;
- let price = calculatePrice(settlementSerialNumber, maturitySerialNumber, rate, yld, redemption, frequency, basis);
+ let price = calculatePrice(settlementSerialNumber, maturitySerialNumber, rate, yld, redemption, frequency, basis, this.getDateSystem());
let eps = price - pr;
for (let i = 0; i < 100 && Math.abs(eps) > g_Eps; i++) {
- price = calculatePrice(settlementSerialNumber, maturitySerialNumber, rate, 1.01 * yld, redemption, frequency, basis);
+ price = calculatePrice(settlementSerialNumber, maturitySerialNumber, rate, 1.01 * yld, redemption, frequency, basis, this.getDateSystem());
yld += -eps / (price - pr - eps) * yld * 0.01;
- const priceN = calculatePrice(settlementSerialNumber, maturitySerialNumber, rate, yld, redemption, frequency, basis);
+ const priceN = calculatePrice(settlementSerialNumber, maturitySerialNumber, rate, yld, redemption, frequency, basis, this.getDateSystem());
eps = priceN - pr;
}
return yld;
}
- const A = calculateCoupdaybs(settlementSerialNumber, maturitySerialNumber, frequency, basis);
- const E = calculateCoupdays(settlementSerialNumber, maturitySerialNumber, frequency, basis);
- const { days: DSR } = getTwoDateDaysByBasis(settlementSerialNumber, maturitySerialNumber, basis);
+ const A = calculateCoupdaybs(settlementSerialNumber, maturitySerialNumber, frequency, basis, this.getDateSystem());
+ const E = calculateCoupdays(settlementSerialNumber, maturitySerialNumber, frequency, basis, this.getDateSystem());
+ const { days: DSR } = getTwoDateDaysByBasis(settlementSerialNumber, maturitySerialNumber, basis, this.getDateSystem());
const temp = pr / 100 + (A / E * rate / frequency);
const result = ((redemption / 100 + rate / frequency) - temp) / temp * frequency * E / DSR;
diff --git a/packages/engine-formula/src/functions/financial/yielddisc/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/yielddisc/__tests__/index.spec.ts
index ec0540f989..57ad001a7b 100644
--- a/packages/engine-formula/src/functions/financial/yielddisc/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/yielddisc/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -155,5 +156,22 @@ describe('Test yielddisc function', () => {
const result = testFunction.calculate(settlement, maturity, pr, redemption, basis);
expect(getObjectValue(result)).toBe(ErrorType.VALUE);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const args = [
+ NumberValueObject.create(0),
+ NumberValueObject.create(366),
+ NumberValueObject.create(90),
+ NumberValueObject.create(100),
+ NumberValueObject.create(1),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(0.11080752884031576, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(0.11111111111111116, 12);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/financial/yielddisc/index.ts b/packages/engine-formula/src/functions/financial/yielddisc/index.ts
index 4e162a27fb..a09c2b19ee 100644
--- a/packages/engine-formula/src/functions/financial/yielddisc/index.ts
+++ b/packages/engine-formula/src/functions/financial/yielddisc/index.ts
@@ -48,13 +48,13 @@ export class Yielddisc extends BaseFunction {
const [settlementObject, maturityObject, prObject, redemptionObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
@@ -80,7 +80,7 @@ export class Yielddisc extends BaseFunction {
// B = number of days in year, depending on year basis.
// DSM = number of days from settlement to maturity.
- const { days: DSM, yearDays: B } = getTwoDateDaysByBasis(settlementSerialNumber, maturitySerialNumber, basisValue);
+ const { days: DSM, yearDays: B } = getTwoDateDaysByBasis(settlementSerialNumber, maturitySerialNumber, basisValue, this.getDateSystem());
const result = ((redemptionValue / prValue) - 1) / (DSM / B);
diff --git a/packages/engine-formula/src/functions/financial/yieldmat/__tests__/index.spec.ts b/packages/engine-formula/src/functions/financial/yieldmat/__tests__/index.spec.ts
index 52344fe521..426d664aa2 100644
--- a/packages/engine-formula/src/functions/financial/yieldmat/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/financial/yieldmat/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -38,6 +39,23 @@ describe('Test yieldmat function', () => {
expect(getObjectValue(result, true)).toBe(0.080544639989);
});
+ it('uses the configured date system for numeric serial dates', () => {
+ const args = [
+ NumberValueObject.create(1),
+ NumberValueObject.create(366),
+ NumberValueObject.create(0),
+ NumberValueObject.create(0.06),
+ NumberValueObject.create(99),
+ NumberValueObject.create(0),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(0.0706951691634, 10);
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBeCloseTo(0.0707233009458, 10);
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
+
it('Value is normal, but correct order is maturity > settlement > issue, otherwise return #NUM!', () => {
const settlement = StringValueObject.create('2018-11-11');
const maturity = StringValueObject.create('2021-3-1');
@@ -168,5 +186,23 @@ describe('Test yieldmat function', () => {
const result = testFunction.calculate(settlement, maturity, issue, rate, pr, basis);
expect(getObjectValue(result)).toBe(ErrorType.VALUE);
});
+ it('checks the serial-zero boundary in both date systems', () => {
+ const args = [
+ NumberValueObject.create(0),
+ NumberValueObject.create(366),
+ NumberValueObject.create(0),
+ NumberValueObject.create(0.06),
+ NumberValueObject.create(99),
+ NumberValueObject.create(0),
+ ] as const;
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(testFunction.calculate(...args))).toBe(ErrorType.NUM);
+
+ testFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(testFunction.calculate(...args))).toBe(ErrorType.NUM);
+
+ testFunction.setDateSystem(DateSystem.Date1900);
+ });
});
});
diff --git a/packages/engine-formula/src/functions/financial/yieldmat/index.ts b/packages/engine-formula/src/functions/financial/yieldmat/index.ts
index 7ade921ba5..1e022baeb6 100644
--- a/packages/engine-formula/src/functions/financial/yieldmat/index.ts
+++ b/packages/engine-formula/src/functions/financial/yieldmat/index.ts
@@ -49,19 +49,19 @@ export class Yieldmat extends BaseFunction {
const [settlementObject, maturityObject, issueObject, rateObject, prObject, basisObject] = variants as BaseValueObject[];
- const settlementSerialNumber = getDateSerialNumberByObject(settlementObject);
+ const settlementSerialNumber = getDateSerialNumberByObject(settlementObject, this.getDateSystem());
if (typeof settlementSerialNumber !== 'number') {
return settlementSerialNumber;
}
- const maturitySerialNumber = getDateSerialNumberByObject(maturityObject);
+ const maturitySerialNumber = getDateSerialNumberByObject(maturityObject, this.getDateSystem());
if (typeof maturitySerialNumber !== 'number') {
return maturitySerialNumber;
}
- const issueSerialNumber = getDateSerialNumberByObject(issueObject);
+ const issueSerialNumber = getDateSerialNumberByObject(issueObject, this.getDateSystem());
if (typeof issueSerialNumber !== 'number') {
return issueSerialNumber;
@@ -91,10 +91,10 @@ export class Yieldmat extends BaseFunction {
// DSM = number of days from settlement to maturity.
// DIM = number of days from issue to maturity.
// A = number of days from issue to settlement.
- const B = getNormalYearDaysByBasis(settlementSerialNumber, basisValue);
- const { days: DSM } = getTwoDateDaysByBasis(settlementSerialNumber, maturitySerialNumber, basisValue);
- const { days: DIM } = getTwoDateDaysByBasis(issueSerialNumber, maturitySerialNumber, basisValue);
- const { days: A } = getTwoDateDaysByBasis(issueSerialNumber, settlementSerialNumber, basisValue);
+ const B = getNormalYearDaysByBasis(settlementSerialNumber, basisValue, this.getDateSystem());
+ const { days: DSM } = getTwoDateDaysByBasis(settlementSerialNumber, maturitySerialNumber, basisValue, this.getDateSystem());
+ const { days: DIM } = getTwoDateDaysByBasis(issueSerialNumber, maturitySerialNumber, basisValue, this.getDateSystem());
+ const { days: A } = getTwoDateDaysByBasis(issueSerialNumber, settlementSerialNumber, basisValue, this.getDateSystem());
const result = ((1 + DIM / B * rateValue) / (prValue / 100 + A / B * rateValue) - 1) / (DSM / B);
diff --git a/packages/engine-formula/src/functions/information/isdate/__tests__/index.spec.ts b/packages/engine-formula/src/functions/information/isdate/__tests__/index.spec.ts
index dafdf16f8d..537c34c738 100644
--- a/packages/engine-formula/src/functions/information/isdate/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/information/isdate/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem, LocaleType } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -53,6 +54,18 @@ describe('Test isdate function', () => {
expect(getObjectValue(result2)).toBe(false);
});
+ it('uses the date system without using the formula locale for parsing', () => {
+ const localizedFunction = new Isdate(FUNCTION_NAMES_INFORMATION.ISDATE);
+ localizedFunction.setLocale(LocaleType.FR_FR);
+
+ expect(getObjectValue(localizedFunction.calculate(StringValueObject.create('31/01/2024')))).toBe(false);
+
+ localizedFunction.setDateSystem(DateSystem.Date1900);
+ expect(getObjectValue(localizedFunction.calculate(StringValueObject.create('01/01/1900')))).toBe(true);
+ localizedFunction.setDateSystem(DateSystem.Date1904);
+ expect(getObjectValue(localizedFunction.calculate(StringValueObject.create('01/01/1900')))).toBe(false);
+ });
+
it('value is blank cell', () => {
const value = NullValueObject.create();
const result = testFunction.calculate(value);
diff --git a/packages/engine-formula/src/functions/information/isdate/index.ts b/packages/engine-formula/src/functions/information/isdate/index.ts
index e4b8cd18dd..cd94d584bb 100644
--- a/packages/engine-formula/src/functions/information/isdate/index.ts
+++ b/packages/engine-formula/src/functions/information/isdate/index.ts
@@ -49,7 +49,14 @@ export class Isdate extends BaseFunction {
return BooleanValueObject.create(isDate(_value.getPattern()));
}
- if (_value.isString() && (parseFormattedDate(`${_value.getValue()}`) || parseFormattedTime(`${_value.getValue()}`))) {
+ const options = { dateSystem: this.getDateSystem() };
+ if (
+ _value.isString() &&
+ (
+ parseFormattedDate(`${_value.getValue()}`, options) ||
+ parseFormattedTime(`${_value.getValue()}`, options)
+ )
+ ) {
return BooleanValueObject.create(true);
}
diff --git a/packages/engine-formula/src/functions/math/abs/__tests__/index.spec.ts b/packages/engine-formula/src/functions/math/abs/__tests__/index.spec.ts
index 4ef65ca462..ebfe0b650e 100644
--- a/packages/engine-formula/src/functions/math/abs/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/math/abs/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValue, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -38,6 +39,14 @@ describe('Test abs function', () => {
expect(result.getValue()).toBe(0.5);
});
+ it('uses the date system bound to a date string', () => {
+ const date1900 = StringValueObject.create('1904-1-1').withDateSystem(DateSystem.Date1900);
+ const date1904 = StringValueObject.create('1904-1-1').withDateSystem(DateSystem.Date1904);
+
+ expect(testFunction.calculate(date1900).getValue()).toBe(1462);
+ expect(testFunction.calculate(date1904).getValue()).toBe(0);
+ });
+
it('Value is normal string', () => {
const value = StringValueObject.create('test');
const result = testFunction.calculate(value);
diff --git a/packages/engine-formula/src/functions/math/sign/__tests__/index.spec.ts b/packages/engine-formula/src/functions/math/sign/__tests__/index.spec.ts
index a897b9c91f..77c42f2d81 100644
--- a/packages/engine-formula/src/functions/math/sign/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/math/sign/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -45,6 +46,13 @@ describe('Test sign function', () => {
expect(getObjectValue(result)).toStrictEqual(1);
});
+ it('uses the date system bound to a string value', () => {
+ const number = StringValueObject.create('1904-1-1').withDateSystem(DateSystem.Date1904);
+ const result = testFunction.calculate(number);
+
+ expect(getObjectValue(result)).toBe(0);
+ });
+
it('Value is normal string', () => {
const number = StringValueObject.create('test');
const result = testFunction.calculate(number);
diff --git a/packages/engine-formula/src/functions/math/sum/__tests__/index.spec.ts b/packages/engine-formula/src/functions/math/sum/__tests__/index.spec.ts
index c3fadcd5db..cfac6e9116 100644
--- a/packages/engine-formula/src/functions/math/sum/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/math/sum/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { stripErrorMargin } from '../../../../engine/utils/math-kit';
@@ -45,6 +46,14 @@ describe('Test sum function', () => {
const result = testFunction.calculate(var1, var2);
expect(result.getValue()).toBe(3);
});
+
+ it('uses the date system bound to a date string', () => {
+ const date1900 = StringValueObject.create('1904-1-1').withDateSystem(DateSystem.Date1900);
+ const date1904 = StringValueObject.create('1904-1-1').withDateSystem(DateSystem.Date1904);
+
+ expect(testFunction.calculate(date1900).getValue()).toBe(1462);
+ expect(testFunction.calculate(date1904).getValue()).toBe(0);
+ });
it('Var1 is number, var2 is boolean', () => {
const var1 = NumberValueObject.create(2);
diff --git a/packages/engine-formula/src/functions/text/text/__tests__/index.spec.ts b/packages/engine-formula/src/functions/text/text/__tests__/index.spec.ts
index bfd7a8ed2a..c85e856bc6 100644
--- a/packages/engine-formula/src/functions/text/text/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/text/text/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject } from '../../../../engine/value-object/array-value-object';
@@ -82,6 +83,22 @@ describe('Test text function', () => {
expect(getObjectValue(result)).toBe('Saturday-12-31');
});
+ it('formats date serials with the date system bound to the number', () => {
+ const text1 = NumberValueObject.create(0).withDateSystem(DateSystem.Date1904);
+ const formatText = StringValueObject.create('yyyy-mm-dd');
+ const result = testFunction.calculate(text1, formatText);
+
+ expect(getObjectValue(result)).toBe('1904-01-01');
+ });
+
+ it('parses date text with the date system bound to the string', () => {
+ const text1 = StringValueObject.create('1904-1-1').withDateSystem(DateSystem.Date1904);
+ const formatText = StringValueObject.create('yyyy-mm-dd');
+ const result = testFunction.calculate(text1, formatText);
+
+ expect(getObjectValue(result)).toBe('1904-01-01');
+ });
+
it('Text is array, format text is array', () => {
const text1 = new ArrayValueObject({
calculateValueList: transformToValueObject([[1, ' ', 1.23, true, false, null, 0, '100', '2.34', 'test', -3, ErrorType.NAME]]),
@@ -113,16 +130,16 @@ describe('Test text function', () => {
column: 0,
});
const result = testFunction.calculate(text1, formatText);
- // =TEXT(-3,"test") => t18990t, match Google Sheets
+ // Excel does not render negative serial dates in the 1900 date system.
expect(getObjectValue(result)).toStrictEqual([
['1', ' ', '1', true, false, '1', '1', '1', '1', 'test', '-1', ErrorType.NAME],
- ['1900-01-01', ' ', '1900-01-01', true, false, '1900-01-00', '1900-01-00', '1900-04-09', '1900-01-02', 'test', '1899-12-27', ErrorType.NAME],
+ ['1900-01-01', ' ', '1900-01-01', true, false, '1900-01-00', '1900-01-00', '1900-04-09', '1900-01-02', 'test', '######', ErrorType.NAME],
[ErrorType.VALUE, ErrorType.VALUE, ErrorType.VALUE, ErrorType.VALUE, ErrorType.VALUE, ErrorType.VALUE, ErrorType.VALUE, ErrorType.VALUE, ErrorType.VALUE, ErrorType.VALUE, ErrorType.VALUE, ErrorType.NAME],
[ErrorType.VALUE, ErrorType.VALUE, ErrorType.VALUE, ErrorType.VALUE, ErrorType.VALUE, ErrorType.VALUE, ErrorType.VALUE, ErrorType.VALUE, ErrorType.VALUE, ErrorType.VALUE, ErrorType.VALUE, ErrorType.NAME],
['', '', '', true, false, '', '', '', '', 'test', '-', ErrorType.NAME],
['1', ' ', '1', true, false, '0', '0', '100', '2', 'test', '-3', ErrorType.NAME],
['101', ' ', '101', true, false, '100', '100', '1100', '102', 'test', '-103', ErrorType.NAME],
- ['t19000t', ' ', 't190012t', true, false, 't19000t', 't19000t', 't19000t', 't190036t', 'test', 't18990t', ErrorType.NAME],
+ ['t19000t', ' ', 't190012t', true, false, 't19000t', 't19000t', 't19000t', 't190036t', 'test', '######', ErrorType.NAME],
['-3', ' ', '-3', true, false, '-3', '-3', '-3', '-3', 'test', '--3', ErrorType.NAME],
[ErrorType.NAME, ErrorType.NAME, ErrorType.NAME, ErrorType.NAME, ErrorType.NAME, ErrorType.NAME, ErrorType.NAME, ErrorType.NAME, ErrorType.NAME, ErrorType.NAME, ErrorType.NAME, ErrorType.NAME],
]);
diff --git a/packages/engine-formula/src/functions/text/text/index.ts b/packages/engine-formula/src/functions/text/text/index.ts
index 3b83da4c85..2af2438ede 100644
--- a/packages/engine-formula/src/functions/text/text/index.ts
+++ b/packages/engine-formula/src/functions/text/text/index.ts
@@ -88,7 +88,9 @@ export class Text extends BaseFunction {
} else {
// The text parameter needs to check if it can be converted to a number format. If convertible, format it as the converted number.
// The format text does not need this check and is processed directly as a string.
- const parsedValue = getNumfmtParseValueFilter(`${textValueNumber}`);
+ const parsedValue = getNumfmtParseValueFilter(`${textValueNumber}`, {
+ dateSystem: textValue.getDateSystem(),
+ });
if (parsedValue && parsedValue.v != null && typeof parsedValue.v === 'number') {
textValueNumber = parsedValue.v;
@@ -103,7 +105,11 @@ export class Text extends BaseFunction {
const formatTextValueString = `${formatTextValue.getValue()}`;
const normalizedFormatTextValueString = normalizeExcelWeekdayFormat(formatTextValueString);
- const previewText = getFormatPreview(normalizedFormatTextValueString, textValueNumber);
+ const previewText = getFormatPreview(
+ normalizedFormatTextValueString,
+ textValueNumber,
+ textValue.getDateSystem()
+ );
return StringValueObject.create(formatTextValueString === ' ' ? previewText.trimEnd() : previewText);
});
diff --git a/packages/engine-formula/src/functions/text/value/__tests__/index.spec.ts b/packages/engine-formula/src/functions/text/value/__tests__/index.spec.ts
index 228400698f..80514ad447 100644
--- a/packages/engine-formula/src/functions/text/value/__tests__/index.spec.ts
+++ b/packages/engine-formula/src/functions/text/value/__tests__/index.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
import { ErrorType } from '../../../../basics/error-type';
import { ArrayValueObject, transformToValueObject, ValueObjectFactory } from '../../../../engine/value-object/array-value-object';
@@ -83,5 +84,13 @@ describe('Test value function', () => {
const result4 = testFunction.calculate(text4);
expect(getObjectValue(result4)).toStrictEqual(41255);
});
+
+ it('uses the date system bound to date text', () => {
+ const date1900 = StringValueObject.create('1904-1-1').withDateSystem(DateSystem.Date1900);
+ const date1904 = StringValueObject.create('1904-1-1').withDateSystem(DateSystem.Date1904);
+
+ expect(getObjectValue(testFunction.calculate(date1900))).toBe(1462);
+ expect(getObjectValue(testFunction.calculate(date1904))).toBe(0);
+ });
});
});
diff --git a/packages/engine-formula/src/index.ts b/packages/engine-formula/src/index.ts
index 7cc922f9a5..72721e5091 100644
--- a/packages/engine-formula/src/index.ts
+++ b/packages/engine-formula/src/index.ts
@@ -46,7 +46,6 @@ export type {
export { BooleanValue } from './basics/common';
export { type IOtherFormulaData } from './basics/common';
export type { IExprTreeNode, ISuperTable, IUnitRowData } from './basics/common';
-export { excelDateSerial } from './basics/date';
export { isInDirtyRange } from './basics/dirty';
export { ERROR_TYPE_SET, ErrorType } from './basics/error-type';
export { type ISheetFormulaError } from './basics/error-type';
diff --git a/packages/engine-formula/src/services/__tests__/current-data.service.spec.ts b/packages/engine-formula/src/services/__tests__/current-data.service.spec.ts
index a95afde93a..7c654ae2d4 100644
--- a/packages/engine-formula/src/services/__tests__/current-data.service.spec.ts
+++ b/packages/engine-formula/src/services/__tests__/current-data.service.spec.ts
@@ -14,7 +14,15 @@
* limitations under the License.
*/
-import { Injector, IUniverInstanceService, LocaleService, ObjectMatrix, UniverInstanceType } from '@univerjs/core';
+import {
+ DateSystem,
+ Injector,
+ IUniverInstanceService,
+ LocaleService,
+ LocaleType,
+ ObjectMatrix,
+ UniverInstanceType,
+} from '@univerjs/core';
import { describe, expect, it, vi } from 'vitest';
import { FormulaDataModel } from '../../models/formula-data.model';
import { FormulaCurrentConfigService, IFormulaCurrentConfigService } from '../current-data.service';
@@ -160,7 +168,7 @@ describe('FormulaCurrentConfigService', () => {
});
it('should load sheet data from model when allUnitData is omitted and expose workbook info', () => {
- const { service, formulaDataModel, localeService } = createService();
+ const { service, workbookById, formulaDataModel, localeService } = createService();
formulaDataModel.getCalculateData.mockReturnValue({
allUnitData: {
@@ -205,8 +213,14 @@ describe('FormulaCurrentConfigService', () => {
sheetOrder: ['sheet-current'],
sheetNameMap: { 'sheet-current': 'Main' },
});
+ workbookById.set('unit-current', {
+ getSnapshot: () => ({ locale: LocaleType.FR_FR }),
+ });
expect(service.getLocale()).toBe('zhCN');
expect(localeService.getCurrentLocale).toHaveBeenCalled();
+ workbookById.set('date-1904', { getDateSystem: () => DateSystem.Date1904 });
+ expect(service.getDateSystem('date-1904')).toBe(DateSystem.Date1904);
+ expect(service.getDateSystem('missing')).toBe(DateSystem.Date1900);
});
it('should resolve sheet size, filtered rows and lightweight data loading', () => {
diff --git a/packages/engine-formula/src/services/current-data.service.ts b/packages/engine-formula/src/services/current-data.service.ts
index c3510c9bba..4c2673e6a0 100644
--- a/packages/engine-formula/src/services/current-data.service.ts
+++ b/packages/engine-formula/src/services/current-data.service.ts
@@ -36,6 +36,7 @@ import type {
} from '../basics/common';
import {
createIdentifier,
+ DateSystem,
Disposable,
Inject,
IUniverInstanceService,
@@ -125,6 +126,7 @@ export interface IFormulaCurrentConfigService {
getClearDependencyTreeCache(): IDirtyUnitSheetNameMap;
getLocale(): LocaleType;
+ getDateSystem(unitId?: string): DateSystem;
getSheetsInfo(): {
sheetOrder: string[];
@@ -316,6 +318,11 @@ export class FormulaCurrentConfigService extends Disposable implements IFormulaC
return this._localeService.getCurrentLocale();
}
+ getDateSystem(unitId = this._executeUnitId ?? undefined): DateSystem {
+ if (!unitId) return DateSystem.Date1900;
+ return this._univerInstanceService.getUnit<Workbook>(unitId, UniverInstanceType.UNIVER_SHEET)?.getDateSystem() ?? DateSystem.Date1900;
+ }
+
getSheetsInfo() {
const workbook = this._univerInstanceService.getCurrentUnitOfType<Workbook>(UniverInstanceType.UNIVER_SHEET);
if (!workbook) {
diff --git a/packages/sheets-conditional-formatting/src/models/calculate-unit-v2/__tests__/utils-extra.spec.ts b/packages/sheets-conditional-formatting/src/models/calculate-unit-v2/__tests__/utils-extra.spec.ts
index 89be5d6317..86197e16ec 100644
--- a/packages/sheets-conditional-formatting/src/models/calculate-unit-v2/__tests__/utils-extra.spec.ts
+++ b/packages/sheets-conditional-formatting/src/models/calculate-unit-v2/__tests__/utils-extra.spec.ts
@@ -31,7 +31,6 @@ import {
isFloatsEqual,
isNullable,
serialTimeToTimestamp,
- toYMD_1900,
} from '../utils';
describe('conditional formatting calculate utilities', () => {
@@ -48,10 +47,7 @@ describe('conditional formatting calculate utilities', () => {
});
it('converts spreadsheet serial dates and filters ranges to sheet bounds', () => {
- expect(toYMD_1900(0)).toEqual([1900, 1, 0]);
- expect(toYMD_1900(60)).toEqual([1900, 2, 29]);
- expect(toYMD_1900(59)).toEqual([1900, 2, 28]);
- expect(Number.isFinite(serialTimeToTimestamp(44927.5))).toBe(true);
+ expect(serialTimeToTimestamp(44927.5)).toBe(new Date(2023, 0, 1, 12).getTime());
expect(filterRange([
{ startRow: 0, startColumn: 0, endRow: 10, endColumn: 10 },
diff --git a/packages/sheets-conditional-formatting/src/models/calculate-unit-v2/highlight-cell-calculate-unit.ts b/packages/sheets-conditional-formatting/src/models/calculate-unit-v2/highlight-cell-calculate-unit.ts
index 7ed45b2cd2..9ab8c3d796 100644
--- a/packages/sheets-conditional-formatting/src/models/calculate-unit-v2/highlight-cell-calculate-unit.ts
+++ b/packages/sheets-conditional-formatting/src/models/calculate-unit-v2/highlight-cell-calculate-unit.ts
@@ -302,7 +302,7 @@ export class HighlightCellCalculateUnit extends BaseCalculateUnit<Nullable<IConf
if (isNullable(value) || Number.isNaN(Number(value)) || cellValue?.t !== CellValueType.NUMBER || !preComputingResult) {
return;
}
- const v = serialTimeToTimestamp(Number(value));
+ const v = serialTimeToTimestamp(Number(value), context.workbook.getDateSystem());
const { start, end } = preComputingResult.value!;
return v >= start && v <= end;
}
diff --git a/packages/sheets-conditional-formatting/src/models/calculate-unit-v2/utils.ts b/packages/sheets-conditional-formatting/src/models/calculate-unit-v2/utils.ts
index 5bd3072e66..bc49ffb015 100644
--- a/packages/sheets-conditional-formatting/src/models/calculate-unit-v2/utils.ts
+++ b/packages/sheets-conditional-formatting/src/models/calculate-unit-v2/utils.ts
@@ -17,14 +17,12 @@
import type { CellValue, ICellData, IObjectMatrixPrimitiveType, IRange, Nullable } from '@univerjs/core';
import type { IConditionFormattingRule, IValueConfig } from '../type';
import type { IContext } from './base-calculate-unit';
-import { BooleanNumber, CellValueType, ColorKit, dateKit, ObjectMatrix, Range } from '@univerjs/core';
+import { BooleanNumber, CellValueType, ColorKit, DateSystem, excelSerialToDateTime, ObjectMatrix, Range } from '@univerjs/core';
import { BooleanValue, FormulaResultStatus } from '@univerjs/engine-formula';
import { CFNumberOperator, CFValueType } from '../../base/const';
import { ConditionalFormattingFormulaService } from '../../services/conditional-formatting-formula.service';
import { ConditionalFormattingViewModel } from '../conditional-formatting-view-model';
-;
-
export function isFloatsEqual(a: number, b: number) {
return Math.abs(a - b) < Number.EPSILON;
}
@@ -40,54 +38,21 @@ export const getCellValue = (cell?: ICellData) => {
const dataStream = cell.p?.body?.dataStream.replace(/\r\n$/, '');
return !isNullable(v) ? v : !isNullable(dataStream) ? dataStream : null;
};
-const DAY_SIZE = 86400;
-
-export function toYMD_1900(ord: number, leap1900 = true) {
- if (leap1900 && ord >= 0) {
- if (ord === 0) {
- return [1900, 1, 0];
- }
- if (ord === 60) {
- return [1900, 2, 29];
- }
- if (ord < 60) {
- return [1900, (ord < 32 ? 1 : 2), ((ord - 1) % 31) + 1];
- }
- }
- let l = ord + 68569 + 2415019;
- const n = Math.floor((4 * l) / 146097);
- l = l - Math.floor((146097 * n + 3) / 4);
- const i = Math.floor((4000 * (l + 1)) / 1461001);
- l = l - Math.floor((1461 * i) / 4) + 31;
- const j = Math.floor((80 * l) / 2447);
- const nDay = l - Math.floor((2447 * j) / 80);
- l = Math.floor(j / 11);
- const nMonth = j + 2 - (12 * l);
- const nYear = 100 * (n - 49) + i + l;
- return [nYear | 0, nMonth | 0, nDay | 0];
-}
-export const serialTimeToTimestamp = (value: number) => {
- let date = (value | 0);
- const t = DAY_SIZE * (value - date);
- let time = Math.floor(t); // in seconds
- // date "epsilon" correction
- if ((t - time) > 0.9999) {
- time += 1;
- if (time === DAY_SIZE) {
- time = 0;
- date += 1;
- }
+export const serialTimeToTimestamp = (value: number, dateSystem = DateSystem.Date1900) => {
+ const utcDate = excelSerialToDateTime(value, dateSystem);
+ if (Number.isNaN(utcDate.getTime())) {
+ return Number.NaN;
}
- // serial date/time to gregorian calendar
- const x = (time < 0) ? DAY_SIZE + time : time;
- const [y, m, d] = toYMD_1900(value, true);
- const hh = Math.floor((x / 60) / 60) % 60;
- const mm = Math.floor(x / 60) % 60;
- const ss = Math.floor(x) % 60;
- // return it as a native date object
- const dt = dateKit(`${y}/${m}/${d} ${hh}:${mm}:${ss}`);
- const result = dt.valueOf();
- return result;
+ // Conditional-formatting date comparisons use local Date timestamps for compatibility with existing predicates.
+ return new Date(
+ utcDate.getUTCFullYear(),
+ utcDate.getUTCMonth(),
+ utcDate.getUTCDate(),
+ utcDate.getUTCHours(),
+ utcDate.getUTCMinutes(),
+ utcDate.getUTCSeconds(),
+ utcDate.getUTCMilliseconds()
+ ).getTime();
};
// eslint-disable-next-line max-lines-per-function
export const getValueByType = (value: IValueConfig, matrix: ObjectMatrix<number>, context: IContext & { cfId: string }) => {
diff --git a/packages/sheets-data-validation-ui/src/services/__tests__/dropdown-manager.service.spec.ts b/packages/sheets-data-validation-ui/src/services/__tests__/dropdown-manager.service.spec.ts
index c931dd0038..8df2d1ed58 100644
--- a/packages/sheets-data-validation-ui/src/services/__tests__/dropdown-manager.service.spec.ts
+++ b/packages/sheets-data-validation-ui/src/services/__tests__/dropdown-manager.service.spec.ts
@@ -23,6 +23,8 @@ import {
DataValidationErrorStyle,
DataValidationRenderMode,
dateKit,
+ DateSystem,
+ excelDateTimePartsToSerial,
ICommandService,
Inject,
Injector,
@@ -73,7 +75,7 @@ class TestSheetDataValidationModel {
rule: IRule | null = null;
getRuleByLocation(_unitId: string, _subUnitId: string, row: number, col: number): IRule | null {
- return col === 2 && row >= 1 && row <= 4 ? this.rule : null;
+ return col === 2 && row >= 1 && row <= 10 ? this.rule : null;
}
}
@@ -114,11 +116,12 @@ interface ITestBed {
executedCommands: ICommandInfo[];
}
-function createWorkbookData(): IWorkbookData {
+function createWorkbookData(dateSystem = DateSystem.Date1904): IWorkbookData {
return {
id: 'book-1',
appVersion: '3.0.0-alpha',
locale: LocaleType.EN_US,
+ dateSystem,
name: 'test',
sheetOrder: ['sheet-1'],
sheets: {
@@ -137,7 +140,22 @@ function createWorkbookData(): IWorkbookData {
2: { v: '#ff0000' },
},
4: {
- 2: { v: 45800 },
+ 2: { v: 1.5 },
+ },
+ 5: {
+ 2: { v: 0.5 },
+ },
+ 6: {
+ 2: { v: 2.5 },
+ },
+ 7: {
+ 2: { v: 60.25 + 0.456 / 86400 },
+ },
+ 8: {
+ 2: { v: 1.25, s: { n: { pattern: '[h]:mm:ss.000' } } },
+ },
+ 9: {
+ 2: { v: -1 },
},
},
},
@@ -146,7 +164,7 @@ function createWorkbookData(): IWorkbookData {
};
}
-function createTestBed(): ITestBed {
+function createTestBed(dateSystem = DateSystem.Date1904): ITestBed {
const univer = new Univer();
const injector = univer.__getInjector();
const executedCommands: ICommandInfo[] = [];
@@ -176,7 +194,7 @@ function createTestBed(): ITestBed {
}
univer.registerPlugin(TestPlugin);
- const workbook = univer.createUnit<IWorkbookData, Workbook>(UniverInstanceType.UNIVER_SHEET, createWorkbookData());
+ const workbook = univer.createUnit<IWorkbookData, Workbook>(UniverInstanceType.UNIVER_SHEET, createWorkbookData(dateSystem));
const commandService = injector.get(ICommandService);
[SetRangeValuesCommand.id, SetCellEditVisibleOperation.id, OpenValidationPanelOperation.id].forEach((id) => {
commandService.registerCommand({
@@ -354,8 +372,10 @@ describe('DataValidationDropdownManagerService', () => {
showTime: false,
patternType: 'date',
});
+ expect((dropdown.props as { defaultValue: ReturnType<typeof dateKit> }).defaultValue.format('YYYY-MM-DD HH:mm:ss')).toBe('1904-01-02 12:00:00');
await expect((dropdown.props as { onChange: (value: ReturnType<typeof dateKit>) => Promise<boolean> }).onChange(dateKit('2026-06-17'))).resolves.toBe(true);
expect(getSetRangeValue(testBed)).toEqual(expect.objectContaining({
+ v: excelDateTimePartsToSerial({ year: 2026, month: 6, day: 17, hours: 12, minutes: 0, seconds: 0, fractionalSecond: 0 }, { dateSystem: DateSystem.Date1904 }),
t: 2,
s: {
n: {
@@ -374,10 +394,14 @@ describe('DataValidationDropdownManagerService', () => {
validator: () => true,
});
- showDropdown(testBed, 4);
+ showDropdown(testBed, 5);
const timeDropdown = getDropdown(testBed);
expect(timeDropdown.props).toMatchObject({ patternType: 'time' });
- await expect((timeDropdown.props as { onChange: (value: ReturnType<typeof dateKit>) => Promise<boolean> }).onChange(dateKit('2026-06-17 12:30:00'))).resolves.toBe(true);
+ const defaultTime = (timeDropdown.props as { defaultValue: ReturnType<typeof dateKit> }).defaultValue;
+ expect(defaultTime.format('YYYY-MM-DD HH:mm:ss')).toBe('1904-01-01 12:00:00');
+ const changedTime = defaultTime.toDate();
+ changedTime.setHours(12, 30, 0, 0);
+ await expect((timeDropdown.props as { onChange: (value: ReturnType<typeof dateKit>) => Promise<boolean> }).onChange(dateKit(changedTime))).resolves.toBe(true);
expect(testBed.executedCommands.at(-2)?.params).toMatchObject({
value: expect.objectContaining({
s: {
@@ -389,6 +413,169 @@ describe('DataValidationDropdownManagerService', () => {
});
});
+ it('keeps an unchanged date value and closes cell editing when confirmed', async () => {
+ testBed = createTestBed();
+ setRule(testBed, {
+ uid: 'rule-date',
+ type: 'date',
+ errorStyle: DataValidationErrorStyle.STOP,
+ }, {
+ dropdownType: DataValidatorDropdownType.DATE,
+ validator: () => true,
+ });
+
+ showDropdown(testBed, 4);
+ const dropdown = getDropdown(testBed);
+ await expect((dropdown.props as { onChange: (value?: ReturnType<typeof dateKit>) => Promise<boolean> }).onChange()).resolves.toBe(true);
+
+ expect(testBed.executedCommands).not.toContainEqual(expect.objectContaining({ id: SetRangeValuesCommand.id }));
+ expect(testBed.executedCommands).toContainEqual(expect.objectContaining({ id: SetCellEditVisibleOperation.id }));
+ });
+
+ it('stores a date selected for an empty cell at midnight', async () => {
+ testBed = createTestBed();
+ setRule(testBed, {
+ uid: 'rule-date',
+ type: 'date',
+ errorStyle: DataValidationErrorStyle.STOP,
+ }, {
+ dropdownType: DataValidatorDropdownType.DATE,
+ validator: () => true,
+ });
+
+ showDropdown(testBed, 10);
+ const dropdown = getDropdown(testBed);
+ await expect((dropdown.props as { onChange: (value: ReturnType<typeof dateKit>) => Promise<boolean> }).onChange(
+ dateKit('2026-08-21 14:30:45')
+ )).resolves.toBe(true);
+
+ expect(getSetRangeValue(testBed)).toMatchObject({
+ v: excelDateTimePartsToSerial({
+ year: 2026,
+ month: 8,
+ day: 21,
+ hours: 0,
+ minutes: 0,
+ seconds: 0,
+ fractionalSecond: 0,
+ }, { dateSystem: DateSystem.Date1904 }),
+ });
+ });
+
+ it('saves a time selected for an empty cell using the 1904 date-system epoch', async () => {
+ testBed = createTestBed(DateSystem.Date1904);
+ setRule(testBed, {
+ uid: 'rule-time',
+ type: 'time',
+ errorStyle: DataValidationErrorStyle.STOP,
+ }, {
+ dropdownType: DataValidatorDropdownType.TIME,
+ validator: () => true,
+ });
+
+ showDropdown(testBed, 10);
+ const dropdown = getDropdown(testBed);
+ const defaultValue = (dropdown.props as { defaultValue: ReturnType<typeof dateKit> }).defaultValue;
+ expect(defaultValue.format('YYYY-MM-DD HH:mm:ss')).toBe('1904-01-01 00:00:00');
+
+ const changedTime = defaultValue.toDate();
+ changedTime.setHours(12, 30, 0, 0);
+ await expect((dropdown.props as { onChange: (value: ReturnType<typeof dateKit>, changeType: 'time') => Promise<boolean> }).onChange(dateKit(changedTime), 'time')).resolves.toBe(true);
+
+ expect(getSetRangeValue(testBed)).toMatchObject({ v: 12.5 / 24 });
+ });
+
+ it('preserves the original calendar date when editing a time value', async () => {
+ testBed = createTestBed();
+ setRule(testBed, {
+ uid: 'rule-time',
+ type: 'time',
+ errorStyle: DataValidationErrorStyle.STOP,
+ }, {
+ dropdownType: DataValidatorDropdownType.TIME,
+ validator: () => true,
+ });
+
+ showDropdown(testBed, 6);
+ const dropdown = getDropdown(testBed);
+ await expect((dropdown.props as { onChange: (value: ReturnType<typeof dateKit>) => Promise<boolean> }).onChange(dateKit('1900-01-01 12:30:00'))).resolves.toBe(true);
+ expect(getSetRangeValue(testBed)).toMatchObject({ v: 2 + 12.5 / 24 });
+ });
+
+ it('preserves serial 60 when only its datetime clock value changes', async () => {
+ testBed = createTestBed(DateSystem.Date1900);
+ setRule(testBed, {
+ uid: 'rule-datetime',
+ type: 'datetime',
+ errorStyle: DataValidationErrorStyle.STOP,
+ }, {
+ dropdownType: DataValidatorDropdownType.DATETIME,
+ validator: () => true,
+ });
+
+ showDropdown(testBed, 7);
+ const dropdown = getDropdown(testBed);
+ expect((dropdown.props as { defaultValue: ReturnType<typeof dateKit> }).defaultValue.format('YYYY-MM-DD HH:mm:ss')).toBe('1900-02-28 06:00:00');
+ expect(dropdown.props).toMatchObject({ exceptionalDateLabel: '1900-02-29 06:00:00' });
+ await expect((dropdown.props as { onChange: (value: ReturnType<typeof dateKit>, changeType: 'time') => Promise<boolean> }).onChange(dateKit('1900-02-28 12:30:00'), 'time')).resolves.toBe(true);
+ expect(getSetRangeValue(testBed)).toMatchObject({ v: 60 + 12.5 / 24 });
+ });
+
+ it('replaces serial 60 when the user selects a real calendar date', async () => {
+ testBed = createTestBed(DateSystem.Date1900);
+ setRule(testBed, {
+ uid: 'rule-datetime',
+ type: 'datetime',
+ errorStyle: DataValidationErrorStyle.STOP,
+ }, {
+ dropdownType: DataValidatorDropdownType.DATETIME,
+ validator: () => true,
+ });
+
+ showDropdown(testBed, 7);
+ const dropdown = getDropdown(testBed);
+ await expect((dropdown.props as { onChange: (value: ReturnType<typeof dateKit>, changeType: 'date') => Promise<boolean> }).onChange(dateKit('1900-02-28 06:00:00'), 'date')).resolves.toBe(true);
+ expect(getSetRangeValue(testBed)).toMatchObject({ v: 59.25 });
+ });
+
+ it('edits accumulated duration without wrapping at 24 hours', async () => {
+ testBed = createTestBed();
+ setRule(testBed, {
+ uid: 'rule-duration',
+ type: 'time',
+ errorStyle: DataValidationErrorStyle.STOP,
+ }, {
+ dropdownType: DataValidatorDropdownType.TIME,
+ validator: () => true,
+ });
+
+ showDropdown(testBed, 8);
+ const dropdown = getDropdown(testBed);
+ expect(dropdown.props).toMatchObject({ patternType: 'duration', durationValue: 1.25 });
+ await expect((dropdown.props as { onDurationChange: (value: number) => Promise<boolean> }).onDurationChange(1.5)).resolves.toBe(true);
+ expect(getSetRangeValue(testBed)).toMatchObject({
+ v: 1.5,
+ s: { n: { pattern: '[h]:mm:ss.000' } },
+ });
+ });
+
+ it('exposes an unsupported negative temporal serial instead of falling back to today', () => {
+ testBed = createTestBed(DateSystem.Date1900);
+ setRule(testBed, {
+ uid: 'rule-date',
+ type: 'date',
+ errorStyle: DataValidationErrorStyle.STOP,
+ }, {
+ dropdownType: DataValidatorDropdownType.DATE,
+ validator: () => true,
+ });
+
+ showDropdown(testBed, 9);
+
+ expect(getDropdown(testBed).props).toMatchObject({ unsupportedValue: -1 });
+ expect(getDropdown(testBed).props).not.toHaveProperty('defaultValue');
+ });
+
it('hides the active dropdown when selection leaves validation cells', () => {
testBed = createTestBed();
setRule(testBed, {
diff --git a/packages/sheets-data-validation-ui/src/services/dropdown-manager.service.ts b/packages/sheets-data-validation-ui/src/services/dropdown-manager.service.ts
index 40f7dda29f..a673a20508 100644
--- a/packages/sheets-data-validation-ui/src/services/dropdown-manager.service.ts
+++ b/packages/sheets-data-validation-ui/src/services/dropdown-manager.service.ts
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-import type { CellValue, DateKit, IDisposable, Nullable, Workbook } from '@univerjs/core';
+import type { CellValue, DateKit, IDisposable, IExcelDateTimeParts, Nullable, Workbook } from '@univerjs/core';
import type { ISetRangeValuesCommandParams, ISheetLocation } from '@univerjs/sheets';
import type { ListValidator } from '@univerjs/sheets-data-validation';
import type { IDropdownParam, IEditorBridgeServiceVisibleParam } from '@univerjs/sheets-ui';
import type { IUniverSheetsDataValidationUIConfig } from '../config/config';
-import { CellValueType, DataValidationErrorStyle, DataValidationRenderMode, dateKit, Disposable, DisposableCollection, ICommandService, IConfigService, Inject, Injector, IUniverInstanceService, numfmt, UniverInstanceType } from '@univerjs/core';
+import { CellValueType, DataValidationErrorStyle, DataValidationRenderMode, dateKit, DateSystem, Disposable, DisposableCollection, excelDateTimePartsToSerial, excelSerialToDateTimeParts, ICommandService, IConfigService, Inject, Injector, IUniverInstanceService, numfmt, UniverInstanceType } from '@univerjs/core';
import { DataValidatorDropdownType, DataValidatorRegistryService } from '@univerjs/data-validation';
import { DeviceInputEventType } from '@univerjs/engine-render';
import { serializeListOptions, SetRangeValuesCommand, SheetsSelectionsService } from '@univerjs/sheets';
@@ -46,16 +46,43 @@ export interface IDropdownComponentProps {
hideFn: () => void;
}
-const transformDate = (value: Nullable<CellValue>) => {
- if (value === undefined || value === null || typeof value === 'boolean') {
+type DatePatternType = 'datetime' | 'date' | 'time' | 'duration';
+type DateChangeType = 'date' | 'time';
+
+function getExceptionalDateLabel(parts: IExcelDateTimeParts | null, patternType: DatePatternType): string | undefined {
+ if (!parts || (parts.day !== 0 && !(parts.year === 1900 && parts.month === 2 && parts.day === 29))) {
+ return undefined;
+ }
+ const date = `${String(parts.year).padStart(4, '0')}-${String(parts.month).padStart(2, '0')}-${String(parts.day).padStart(2, '0')}`;
+ if (patternType === 'date') return date;
+ const time = `${String(parts.hours).padStart(2, '0')}:${String(parts.minutes).padStart(2, '0')}:${String(parts.seconds).padStart(2, '0')}`;
+ return `${date} ${time}`;
+}
+
+const transformDate = (value: Nullable<CellValue>, dateSystem: DateSystem, patternType: Exclude<DatePatternType, 'duration'>) => {
+ // A pure-time picker needs a native Date anchor that is valid in the workbook's date system.
+ const timeAnchorYear = dateSystem === DateSystem.Date1904 ? 1904 : 1900;
+ if (value === undefined || value === null) {
+ return patternType === 'time' ? dateKit(new Date(timeAnchorYear, 0, 1)) : undefined;
+ }
+ if (typeof value === 'boolean') {
return undefined;
}
- // If the value is an empty string, return the current date
- if (value === '') return dateKit();
+ if (value === '') return patternType === 'time' ? dateKit(new Date(timeAnchorYear, 0, 1)) : dateKit();
if (typeof value === 'number' || !Number.isNaN(+value)) {
- return dateKit(numfmt.format('yyyy-MM-dd HH:mm:ss', Number(value)));
+ const parts = excelSerialToDateTimeParts(Number(value), { dateSystem });
+ if (!parts) return undefined;
+ const year = patternType === 'time' ? timeAnchorYear : parts.year;
+ const month = patternType === 'time' ? 1 : parts.month;
+ // The picker needs a real Date anchor; the original pseudo-date is restored during save unless the date was changed.
+ const day = patternType === 'time'
+ ? 1
+ : parts.day === 0
+ ? 1
+ : parts.year === 1900 && parts.month === 2 && parts.day === 29 ? 28 : parts.day;
+ return dateKit(new Date(year, month - 1, day, parts.hours, parts.minutes, parts.seconds, Math.round(parts.fractionalSecond * 1000)));
}
const date = dateKit(value);
@@ -65,7 +92,11 @@ const transformDate = (value: Nullable<CellValue>) => {
return undefined;
};
-function getDefaultFormat(patternType: 'datetime' | 'date' | 'time', format: string) {
+function getDefaultFormat(patternType: DatePatternType, format: string) {
+ // Numfmt categorizes elapsed-time formats as time, so detect duration before comparing the general type.
+ if (patternType === 'duration' && numfmt.getFormatDateInfo(format).isDuration) {
+ return format;
+ }
const originPartternType = getPatternType(format);
if (patternType === originPartternType) {
return format;
@@ -78,6 +109,8 @@ function getDefaultFormat(patternType: 'datetime' | 'date' | 'time', format: str
return 'yyyy-MM-dd';
case 'time':
return 'HH:mm:ss';
+ case 'duration':
+ return '[h]:mm:ss';
}
}
@@ -166,29 +199,38 @@ export class DataValidationDropdownManagerService extends Disposable {
let popupDisposable: Nullable<IDisposable>;
- const handleSave = async (date: DateKit | undefined, targetPatternType: 'datetime' | 'date' | 'time') => {
- if (!date) {
- return true;
- }
- const newValue = date;
- const cellData = worksheet.getCell(row, col);
- const dateStr = newValue.format(targetPatternType === 'date' ? 'YYYY-MM-DD 00:00:00' : 'YYYY-MM-DD HH:mm:ss');
- const serialNum = numfmt.parseDate(dateStr)?.v as number;
- const serialTime = targetPatternType === 'time' ? (serialNum) % 1 : serialNum;
- const cellStyle = workbook.getStyles().getStyleByCell(cellData);
- const format = cellStyle?.n?.pattern ?? '';
+ const dateSystem = workbook.getDateSystem();
+ const originalValue = getCellValueOrigin(worksheet.getCellRaw(row, col));
+ const originalSerial = typeof originalValue === 'number'
+ ? originalValue
+ : typeof originalValue === 'string' && originalValue !== '' && !Number.isNaN(+originalValue) ? Number(originalValue) : null;
+ const originalParts = originalSerial == null ? null : excelSerialToDateTimeParts(originalSerial, { dateSystem });
+ const cellData = worksheet.getCell(row, col);
+ const cellStyle = workbook.getStyles().getStyleByCell(cellData);
+ const format = cellStyle?.n?.pattern ?? '';
+
+ const finishCellEditing = async () => {
+ await this._commandService.executeCommand(SetCellEditVisibleOperation.id, {
+ visible: false,
+ eventType: DeviceInputEventType.Keyboard,
+ unitId,
+ keycode: KeyCode.ESC,
+ } as IEditorBridgeServiceVisibleParam);
+ return true;
+ };
+ const handleSerialSave = async (serial: number, targetPatternType: DatePatternType, interceptValue: string) => {
if (
rule.errorStyle !== DataValidationErrorStyle.STOP ||
(await validator.validator({
- value: serialTime,
+ value: serial,
unitId,
subUnitId,
row,
column: col,
worksheet,
workbook,
- interceptValue: dateStr.replace('Z', '').replace('T', ' '),
+ interceptValue,
t: CellValueType.NUMBER,
}, rule))
) {
@@ -202,8 +244,8 @@ export class DataValidationDropdownManagerService extends Disposable {
endRow: row,
},
value: {
- v: serialTime,
- t: 2,
+ v: serial,
+ t: CellValueType.NUMBER,
p: null,
f: null,
si: null,
@@ -214,27 +256,76 @@ export class DataValidationDropdownManagerService extends Disposable {
},
},
});
- await this._commandService.executeCommand(SetCellEditVisibleOperation.id, {
- visible: false,
- eventType: DeviceInputEventType.Keyboard,
- unitId,
- keycode: KeyCode.ESC,
- } as IEditorBridgeServiceVisibleParam);
- return true;
- } else {
- if (this._injector.has(DataValidationRejectInputController)) {
- const rejectInputController = this._injector.get(DataValidationRejectInputController);
- rejectInputController.showReject(validator.getRuleFinalError(rule, { row, col, unitId, subUnitId }));
- }
- return false;
+ return finishCellEditing();
+ }
+
+ if (this._injector.has(DataValidationRejectInputController)) {
+ const rejectInputController = this._injector.get(DataValidationRejectInputController);
+ rejectInputController.showReject(validator.getRuleFinalError(rule, { row, col, unitId, subUnitId }));
+ }
+ return false;
+ };
+
+ const handleSave = async (date: DateKit | undefined, targetPatternType: Exclude<DatePatternType, 'duration'>, changeType?: DateChangeType) => {
+ if (!date) {
+ return finishCellEditing();
}
+ const nativeDate = date.toDate();
+ const selectedParts = {
+ year: nativeDate.getFullYear(),
+ month: nativeDate.getMonth() + 1,
+ day: nativeDate.getDate(),
+ hours: nativeDate.getHours(),
+ minutes: nativeDate.getMinutes(),
+ seconds: nativeDate.getSeconds(),
+ fractionalSecond: nativeDate.getMilliseconds() / 1000,
+ };
+ // Native Date uses the nearest real date for Excel's serial 0/60; a time-only change must restore the pseudo-day.
+ const isExceptionalDateAnchor = originalParts != null && (
+ (originalParts.day === 0 && selectedParts.year === 1900 && selectedParts.month === 1 && selectedParts.day === 1) ||
+ (originalParts.year === 1900 && originalParts.month === 2 && originalParts.day === 29 && selectedParts.year === 1900 && selectedParts.month === 2 && selectedParts.day === 28)
+ );
+ // An empty pure-date cell starts at midnight; only an existing serial can supply hidden time fields.
+ const timeParts = targetPatternType === 'date'
+ ? (originalParts ?? { hours: 0, minutes: 0, seconds: 0, fractionalSecond: 0 })
+ : selectedParts;
+ const dateParts = {
+ year: targetPatternType === 'time' && originalParts && (originalSerial ?? 0) >= 1 ? originalParts.year : selectedParts.year,
+ month: targetPatternType === 'time' && originalParts && (originalSerial ?? 0) >= 1 ? originalParts.month : selectedParts.month,
+ day: targetPatternType === 'time' && originalParts && (originalSerial ?? 0) >= 1
+ ? originalParts.day
+ : targetPatternType === 'datetime' && changeType === 'time' && isExceptionalDateAnchor ? originalParts!.day : selectedParts.day,
+ hours: timeParts.hours,
+ minutes: timeParts.minutes,
+ seconds: timeParts.seconds,
+ fractionalSecond: timeParts.fractionalSecond,
+ };
+ const serialNum = excelDateTimePartsToSerial(dateParts, { dateSystem });
+ if (serialNum == null) return false;
+ const serialTime = targetPatternType === 'time' && (originalSerial == null || originalSerial < 1)
+ ? serialNum - Math.floor(serialNum)
+ : serialNum;
+ const dateStr = date.format(targetPatternType === 'date' ? 'YYYY-MM-DD 00:00:00' : 'YYYY-MM-DD HH:mm:ss');
+ return handleSerialSave(serialTime, targetPatternType, dateStr.replace('Z', '').replace('T', ' '));
};
let dropdownParam: IDropdownParam;
+ // Keep an out-of-range serial editable as a number instead of coercing it through an invalid native Date.
+ const unsupportedValue = originalSerial != null && !originalParts ? originalSerial : undefined;
+ const serialProps = unsupportedValue == null
+ ? {}
+ : {
+ unsupportedValue,
+ onSerialChange: (newValue: number | undefined) => {
+ if (newValue == null || !excelSerialToDateTimeParts(newValue, { dateSystem })) {
+ return Promise.resolve(false);
+ }
+ return handleSerialSave(newValue, validator.dropdownType === DataValidatorDropdownType.DATE ? 'date' : validator.dropdownType === DataValidatorDropdownType.TIME ? 'time' : 'datetime', String(newValue));
+ },
+ };
switch (validator.dropdownType) {
case DataValidatorDropdownType.DATE: {
- const cellStr = getCellValueOrigin(worksheet.getCellRaw(row, col));
- const originDate = transformDate(cellStr);
+ const originDate = transformDate(originalValue, dateSystem, 'date');
const showTime = Boolean(rule.bizInfo?.showTime);
dropdownParam = {
@@ -242,39 +333,60 @@ export class DataValidationDropdownManagerService extends Disposable {
type: 'datepicker',
props: {
showTime,
- onChange: (newValue) => handleSave(newValue, showTime ? 'datetime' : 'date'),
- defaultValue: originDate,
+ onChange: (newValue, changeType) => handleSave(newValue, showTime ? 'datetime' : 'date', changeType),
+ ...(originDate ? { defaultValue: originDate } : {}),
+ exceptionalDateLabel: getExceptionalDateLabel(originalParts, showTime ? 'datetime' : 'date'),
patternType: 'date',
+ preserveDefaultValue: true,
+ ...serialProps,
},
};
break;
}
case DataValidatorDropdownType.TIME: {
- const cellStr = getCellValueOrigin(worksheet.getCellRaw(row, col));
- const originDate = transformDate(cellStr);
+ if (numfmt.getFormatDateInfo(format).isDuration) {
+ dropdownParam = {
+ location,
+ type: 'datepicker',
+ props: {
+ durationValue: originalSerial ?? undefined,
+ onDurationChange: (newValue) => newValue == null
+ ? finishCellEditing()
+ : handleSerialSave(newValue, 'duration', String(newValue)),
+ patternType: 'duration',
+ preserveDefaultValue: true,
+ },
+ };
+ break;
+ }
+ const originDate = transformDate(originalValue, dateSystem, 'time');
dropdownParam = {
location,
type: 'datepicker',
props: {
- onChange: (newValue) => handleSave(newValue, 'time'),
- defaultValue: originDate,
+ onChange: (newValue, changeType) => handleSave(newValue, 'time', changeType),
+ ...(originDate ? { defaultValue: originDate } : {}),
patternType: 'time',
+ preserveDefaultValue: true,
+ ...serialProps,
},
};
break;
}
case DataValidatorDropdownType.DATETIME: {
- const cellStr = getCellValueOrigin(worksheet.getCellRaw(row, col));
- const originDate = transformDate(cellStr);
+ const originDate = transformDate(originalValue, dateSystem, 'datetime');
dropdownParam = {
location,
type: 'datepicker',
props: {
- onChange: (newValue) => handleSave(newValue, 'datetime'),
- defaultValue: originDate,
+ onChange: (newValue, changeType) => handleSave(newValue, 'datetime', changeType),
+ ...(originDate ? { defaultValue: originDate } : {}),
+ exceptionalDateLabel: getExceptionalDateLabel(originalParts, 'datetime'),
patternType: 'datetime',
+ preserveDefaultValue: true,
+ ...serialProps,
},
};
break;
diff --git a/packages/sheets-data-validation/src/validators/__tests__/validators.spec.ts b/packages/sheets-data-validation/src/validators/__tests__/validators.spec.ts
index 198fb79e68..be8754fff6 100644
--- a/packages/sheets-data-validation/src/validators/__tests__/validators.spec.ts
+++ b/packages/sheets-data-validation/src/validators/__tests__/validators.spec.ts
@@ -15,7 +15,7 @@
*/
import type { Injector, LocaleService } from '@univerjs/core';
-import { CellValueType, DataValidationOperator, DataValidationType, WrapStrategy } from '@univerjs/core';
+import { CellValueType, DataValidationOperator, DataValidationType, DateSystem, LocaleType, WrapStrategy } from '@univerjs/core';
import { LexerTreeBuilder } from '@univerjs/engine-formula';
import { describe, expect, it, vi } from 'vitest';
import { DataValidationCustomFormulaService } from '../../services/dv-custom-formula.service';
@@ -45,6 +45,8 @@ function createContext() {
};
const univerInstanceService = {
getUnit: vi.fn(() => ({
+ getDateSystem: (): DateSystem => DateSystem.Date1900,
+ getSnapshot: () => ({ locale: LocaleType.EN_US }),
getSheetBySheetId: vi.fn(() => ({
getName: () => 'sheet-1',
})),
@@ -87,6 +89,7 @@ function createContext() {
listCacheService,
lexerTreeBuilder,
injector,
+ univerInstanceService,
};
}
@@ -146,7 +149,7 @@ describe('validators', () => {
});
it('covers date validation parsing, normalization, and messages', async () => {
- const { localeService, injector, customFormulaService, lexerTreeBuilder } = createContext();
+ const { localeService, injector, customFormulaService, lexerTreeBuilder, univerInstanceService } = createContext();
const date = new DateValidator(localeService, injector);
customFormulaService.getCellFormulaValue.mockResolvedValueOnce({ v: '2024-01-02' });
@@ -168,6 +171,14 @@ describe('validators', () => {
formula1: '2024-01-02',
formula2: '',
});
+ univerInstanceService.getUnit.mockReturnValue({
+ getDateSystem: (): DateSystem => DateSystem.Date1904,
+ getSnapshot: () => ({ locale: LocaleType.EN_US }),
+ getSheetBySheetId: vi.fn(() => ({
+ getName: () => 'sheet-1',
+ })),
+ });
+ expect(date.normalizeFormula({ formula1: '1', bizInfo: { showTime: false } } as never, 'u', 's').formula1).toBe('1904-01-02');
expect(date.transform({ value: '2024-01-02' } as never, {} as never, {} as never).value).toBeTypeOf('number');
expect(date.generateRuleName({ operator: DataValidationOperator.EQUAL, formula1: '2024-01-02' } as never)).toContain('sheets-data-validation.date.title');
expect(date.generateRuleErrorMessage({ operator: DataValidationOperator.EQUAL, formula1: '=A1', ranges: [{ startRow: 0, endRow: 0, startColumn: 0, endColumn: 0 }] } as never, { row: 0, col: 0 } as never)).toBe('sheets-data-validation.date.errorMsg.equal');
diff --git a/packages/sheets-data-validation/src/validators/date-validator.ts b/packages/sheets-data-validation/src/validators/date-validator.ts
index 9d6655f43e..29650db879 100644
--- a/packages/sheets-data-validation/src/validators/date-validator.ts
+++ b/packages/sheets-data-validation/src/validators/date-validator.ts
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-import type { CellValue, IDataValidationRule, IDataValidationRuleBase, ISheetDataValidationRule, Nullable } from '@univerjs/core';
+import type { CellValue, IDataValidationRule, IDataValidationRuleBase, ISheetDataValidationRule, Nullable, ParseOptions, Workbook } from '@univerjs/core';
import type { IFormulaResult, IFormulaValidResult, IValidatorCellInfo } from '@univerjs/data-validation';
import type { ISheetLocationBase } from '@univerjs/sheets';
import type { LocaleKey } from '../locale/types';
-import { DataValidationOperator, DataValidationType, dateKit, isFormulaString, numfmt, Tools } from '@univerjs/core';
+import { DataValidationOperator, DataValidationType, DateSystem, excelSerialToDateTimeParts, getNumfmtLocaleTag, isFormulaString, IUniverInstanceService, numfmt, Tools, UniverInstanceType } from '@univerjs/core';
import { LexerTreeBuilder } from '@univerjs/engine-formula';
import { DateOperatorErrorTitleMap, DateOperatorNameMap, DateOperatorTitleMap } from '../common/date-text-map';
import { DataValidationCustomFormulaService } from '../services/dv-custom-formula.service';
@@ -28,7 +28,7 @@ import { BaseSheetValidator } from './base-sheet-validator';
import { FORMULA1, FORMULA2 } from './const';
import { getTransformedFormula } from './util';
-const transformDate2SerialNumber = (value: Nullable<CellValue>) => {
+const transformDate2SerialNumber = (value: Nullable<CellValue>, options: ParseOptions = {}): number | undefined => {
if (value === undefined || value === null || typeof value === 'boolean') {
return undefined;
}
@@ -38,15 +38,13 @@ const transformDate2SerialNumber = (value: Nullable<CellValue>) => {
}
// transform date string to serial number
- const v = numfmt.parseDate(value)?.v as number | undefined;
- if (Tools.isDefine(v)) {
- return v;
- }
-
- // support like 2020-11-11 locale date
- return numfmt.parseDate(dateKit(value).format('YYYY-MM-DD HH:mm:ss'))?.v as number | undefined;
+ return numfmt.parseDate(value, options)?.v as number | undefined;
};
+function pad(value: number): string {
+ return String(value).padStart(2, '0');
+}
+
export class DateValidator extends BaseSheetValidator {
id: string = DataValidationType.DATE;
title: string = 'sheets-data-validation.date.title';
@@ -65,6 +63,16 @@ export class DateValidator extends BaseSheetValidator {
scopes: string | string[] = ['sheet'];
private readonly _customFormulaService = this.injector.get(DataValidationCustomFormulaService);
private readonly _lexerTreeBuilder = this.injector.get(LexerTreeBuilder);
+ private readonly _univerInstanceService = this.injector.get(IUniverInstanceService);
+
+ private _getParseOptions(unitId?: string, workbook?: Workbook): ParseOptions {
+ const targetWorkbook = workbook ?? (unitId
+ ? this._univerInstanceService.getUnit<Workbook>(unitId, UniverInstanceType.UNIVER_SHEET)
+ : undefined);
+ return targetWorkbook
+ ? { locale: getNumfmtLocaleTag(targetWorkbook.getSnapshot().locale), dateSystem: targetWorkbook.getDateSystem() }
+ : { dateSystem: DateSystem.Date1900 };
+ }
override async parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string, row: number, column: number): Promise<IFormulaResult<number | undefined>> {
const formulaResult1 = await this._customFormulaService.getCellFormulaValue(unitId, subUnitId, rule.uid, row, column);
@@ -74,28 +82,29 @@ export class DateValidator extends BaseSheetValidator {
const isFormulaValid = isLegalFormulaResult(String(formulaResult1?.v)) && isLegalFormulaResult(String(formulaResult2?.v));
return {
- formula1: transformDate2SerialNumber(isFormulaString(formula1) ? formulaResult1?.v : formula1),
- formula2: transformDate2SerialNumber(isFormulaString(formula2) ? formulaResult2?.v : formula2),
+ formula1: transformDate2SerialNumber(isFormulaString(formula1) ? formulaResult1?.v : formula1, this._getParseOptions(unitId)),
+ formula2: transformDate2SerialNumber(isFormulaString(formula2) ? formulaResult2?.v : formula2, this._getParseOptions(unitId)),
isFormulaValid,
};
}
override async isValidType(info: IValidatorCellInfo): Promise<boolean> {
const { interceptValue, value } = info;
+ const options = this._getParseOptions(info.unitId, info.workbook);
if (typeof value === 'number' && typeof interceptValue === 'string') {
- return Boolean(numfmt.parseDate(interceptValue));
+ return Boolean(numfmt.parseDate(interceptValue, options));
}
if (typeof interceptValue === 'string') {
- return Boolean(numfmt.parseDate(interceptValue));
+ return Boolean(numfmt.parseDate(interceptValue, options));
}
return false;
}
- private _validatorSingleFormula(formula: string | undefined) {
- return !Tools.isBlank(formula) && (isFormulaString(formula) || !Number.isNaN(+formula!) || Boolean(formula && numfmt.parseDate(formula)));
+ private _validatorSingleFormula(formula: string | undefined, options: ParseOptions) {
+ return !Tools.isBlank(formula) && (isFormulaString(formula) || !Number.isNaN(+formula!) || Boolean(formula && numfmt.parseDate(formula, options)));
}
override validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult {
@@ -106,11 +115,12 @@ export class DateValidator extends BaseSheetValidator {
};
}
- const formula1Success = this._validatorSingleFormula(rule.formula1);
+ const options = this._getParseOptions(unitId);
+ const formula1Success = this._validatorSingleFormula(rule.formula1, options);
const errorMsg = this.localeService.t<LocaleKey>('sheets-data-validation.validFail.date');
const isTwoFormula = TWO_FORMULA_OPERATOR_COUNT.includes(operator);
if (isTwoFormula) {
- const formula2Success = this._validatorSingleFormula(rule.formula2);
+ const formula2Success = this._validatorSingleFormula(rule.formula2, options);
return {
success: formula1Success && formula2Success,
formula1: formula1Success ? undefined : errorMsg,
@@ -124,24 +134,22 @@ export class DateValidator extends BaseSheetValidator {
};
}
- override normalizeFormula(rule: IDataValidationRule, _unitId: string, _subUnitId: string): { formula1: string | undefined; formula2: string | undefined } {
+ override normalizeFormula(rule: IDataValidationRule, unitId: string, _subUnitId: string): { formula1: string | undefined; formula2: string | undefined } {
const { formula1, formula2, bizInfo } = rule;
+ const options = this._getParseOptions(unitId);
const normlizeSingleFormula = (formula: string | undefined) => {
if (!formula) {
return formula;
}
- let date;
- if (!Number.isNaN(+formula)) {
- date = numfmt.dateFromSerial(+formula);
- } else {
- const res = numfmt.parseDate(formula)?.v as number;
- if (res === undefined || res === null) {
- return '';
- }
- date = numfmt.dateFromSerial(res);
+ const serial = !Number.isNaN(+formula) ? +formula : numfmt.parseDate(formula, options)?.v;
+ if (typeof serial !== 'number') {
+ return '';
}
+ const date = excelSerialToDateTimeParts(serial, { dateSystem: options.dateSystem ?? DateSystem.Date1900 });
+ if (!date) return '';
- return dateKit(`${date[0]}/${date[1]}/${date[2]} ${date[3]}:${date[4]}:${date[5]}`).format(bizInfo?.showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD');
+ const dateText = `${String(date.year).padStart(4, '0')}-${pad(date.month)}-${pad(date.day)}`;
+ return bizInfo?.showTime ? `${dateText} ${pad(date.hours)}:${pad(date.minutes)}:${pad(date.seconds)}` : dateText;
};
return {
@@ -155,7 +163,7 @@ export class DateValidator extends BaseSheetValidator {
return {
...cellInfo,
- value: transformDate2SerialNumber(value)!,
+ value: transformDate2SerialNumber(value, this._getParseOptions(cellInfo.unitId, cellInfo.workbook))!,
};
}
diff --git a/packages/sheets-numfmt-ui/src/controllers/__tests__/editor.controller.spec.ts b/packages/sheets-numfmt-ui/src/controllers/__tests__/editor.controller.spec.ts
index b6588f52a0..7cc8df68e8 100644
--- a/packages/sheets-numfmt-ui/src/controllers/__tests__/editor.controller.spec.ts
+++ b/packages/sheets-numfmt-ui/src/controllers/__tests__/editor.controller.spec.ts
@@ -20,13 +20,13 @@ import {
CellModeEnum,
CellValueType,
createInterceptorKey,
+ excelDateSerial,
ICommandService,
InterceptorManager,
IUniverInstanceService,
LocaleType,
UniverInstanceType,
} from '@univerjs/core';
-import { excelDateSerial } from '@univerjs/engine-formula';
import { SetNumfmtMutation, SheetInterceptorService } from '@univerjs/sheets';
import { SheetsNumfmtCellContentController } from '@univerjs/sheets-numfmt';
import { getMatrixPlainText, IEditorBridgeService } from '@univerjs/sheets-ui';
@@ -117,7 +117,7 @@ describe('test editor', () => {
},
refMap: {
1: {
- pattern: 'A/P h:mm:ss',
+ pattern: 'h:mm',
},
},
};
@@ -135,8 +135,8 @@ describe('test editor', () => {
};
const result = sheetInterceptorService.writeCellInterceptor.fetchThroughInterceptors(BEFORE_CELL_EDIT)(cellData, location);
- // The data format needs to be entered in the editor with data string, not with real values
- expect(result!.v).toEqual(cellData!.v);
+ expect(cellData!.v).toEqual('0:00');
+ expect(result!.v).toEqual('0:00:00');
});
it('before edit with percent', () => {
@@ -222,12 +222,12 @@ describe('test editor', () => {
subUnitId,
values: {
1: {
- ranges: [{ startRow: 0, endRow: 0, startColumn: 0, endColumn: 0 }],
+ ranges: [{ startRow: 0, endRow: 0, startColumn: 2, endColumn: 2 }],
},
},
refMap: {
1: {
- pattern: 'h:mm:ss',
+ pattern: 'h:mm',
},
},
};
@@ -240,12 +240,12 @@ describe('test editor', () => {
unitId,
subUnitId,
row: 0,
- col: 0,
+ col: 2,
origin: cellData,
};
const result = sheetInterceptorService.writeCellInterceptor.fetchThroughInterceptors(AFTER_CELL_EDIT)(cellData, location);
// The date-time drop is a numeric value, not a literal string
- expect(result?.v).toBe(0.5231712962962963);
+ expect(result?.v).toBe(2.523171296296296);
});
it('edit number will throw style in this editing', () => {
diff --git a/packages/sheets-numfmt-ui/src/controllers/numfmt.editor.controller.ts b/packages/sheets-numfmt-ui/src/controllers/numfmt.editor.controller.ts
index 4e71be7844..a8f6894264 100644
--- a/packages/sheets-numfmt-ui/src/controllers/numfmt.editor.controller.ts
+++ b/packages/sheets-numfmt-ui/src/controllers/numfmt.editor.controller.ts
@@ -48,8 +48,9 @@ import {
SheetInterceptorService,
transformCellsToRange,
} from '@univerjs/sheets';
-import { getPatternType } from '@univerjs/sheets-numfmt';
+import { getPatternType, SheetsNumfmtCellContentController } from '@univerjs/sheets-numfmt';
import { IEditorBridgeService } from '@univerjs/sheets-ui';
+import { parseTemporalEditorValue, serializeTemporalEditorValue } from '../utils/temporal-editor-value';
const createCollectEffectMutation = () => {
interface IConfig {
@@ -82,6 +83,7 @@ export class NumfmtEditorController extends Disposable {
@Inject(INumfmtService) private _numfmtService: INumfmtService,
@Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService,
@Inject(Injector) private _injector: Injector,
+ @Inject(SheetsNumfmtCellContentController) private _sheetsNumfmtCellContentController: SheetsNumfmtCellContentController,
@Optional(IEditorBridgeService) private _editorBridgeService?: IEditorBridgeService
) {
super();
@@ -112,6 +114,20 @@ export class NumfmtEditorController extends Disposable {
col
);
if (numfmtCell) {
+ const rawCell = context.worksheet.getCellRaw(row, col);
+ if (!rawCell?.f && rawCell?.t === CellValueType.NUMBER && isRealNum(rawCell.v)) {
+ // Excel completes omitted components in the active date/clock format without changing the stored numfmt.
+ const canonicalValue = serializeTemporalEditorValue({
+ serial: Number(rawCell.v),
+ pattern: numfmtCell.pattern,
+ locale: this._sheetsNumfmtCellContentController.getLocale(context.workbook),
+ dateSystem: context.workbook.getDateSystem(),
+ });
+ if (canonicalValue != null) {
+ return next && next({ ...rawCell, v: canonicalValue });
+ }
+ }
+
const type = getPatternType(numfmtCell.pattern);
switch (type) {
/**
@@ -192,7 +208,9 @@ export class NumfmtEditorController extends Disposable {
const body = value.p?.body;
const content = value?.p?.body?.dataStream ? value.p.body.dataStream.replace(/\r\n$/, '') : String(value.v);
- const numfmtInfo = getNumfmtParseValueFilter(content);
+ const locale = this._sheetsNumfmtCellContentController.getLocale(context.workbook);
+ const dateSystem = context.workbook.getDateSystem();
+ const numfmtInfo = getNumfmtParseValueFilter(content, { locale, dateSystem });
if (body) {
if (!canConvertRichTextToNumfmt(body)) {
@@ -207,6 +225,19 @@ export class NumfmtEditorController extends Disposable {
}
}
+ if (currentNumfmtValue?.pattern && originCell?.t === CellValueType.NUMBER && isRealNum(originCell.v)) {
+ const temporalValue = parseTemporalEditorValue({
+ content,
+ originalSerial: Number(originCell.v),
+ pattern: currentNumfmtValue.pattern,
+ locale,
+ dateSystem,
+ });
+ if (temporalValue != null) {
+ return next({ ...value, p: undefined, v: stripErrorMargin(temporalValue, 16), t: CellValueType.NUMBER });
+ }
+ }
+
if (numfmtInfo) {
// If the content is parsed to a number format or the origin cell has a number format, do not need judge whether it will lose precision.
// If the cell type is string or force string, do not need judge whether it will lose precision.
diff --git a/packages/sheets-numfmt-ui/src/utils/__tests__/temporal-editor-value.spec.ts b/packages/sheets-numfmt-ui/src/utils/__tests__/temporal-editor-value.spec.ts
new file mode 100644
index 0000000000..88d2e4e756
--- /dev/null
+++ b/packages/sheets-numfmt-ui/src/utils/__tests__/temporal-editor-value.spec.ts
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * 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 { DateSystem, excelDateTimePartsToSerial } from '@univerjs/core';
+import { describe, expect, it } from 'vitest';
+import { parseTemporalEditorValue, serializeTemporalEditorValue } from '../temporal-editor-value';
+
+const dateSystem = DateSystem.Date1900;
+
+function serial(year: number, month: number, day: number, hours = 0, minutes = 0, seconds = 0, fractionalSecond = 0) {
+ return excelDateTimePartsToSerial({ year, month, day, hours, minutes, seconds, fractionalSecond }, { dateSystem })!;
+}
+
+describe('temporal editor values', () => {
+ it('serializes the complete value for the active temporal category', () => {
+ expect(serializeTemporalEditorValue({ serial: serial(2025, 7, 1), pattern: 'mm-dd', locale: 'en', dateSystem })).toBe('2025-07-01');
+ expect(serializeTemporalEditorValue({ serial: serial(2025, 7, 1), pattern: 'dd/mm', locale: 'en', dateSystem })).toBe('01/07/2025');
+ expect(serializeTemporalEditorValue({ serial: serial(2025, 7, 1), pattern: 'yyyy-m-d', locale: 'zh-CN', dateSystem })).toBe('2025-7-1');
+ expect(serializeTemporalEditorValue({ serial: serial(2025, 7, 1), pattern: 'mm/dd', locale: 'en', dateSystem })).toBe('2025/07/01');
+ expect(serializeTemporalEditorValue({ serial: serial(2025, 7, 15, 12, 34, 56), pattern: 'yyyy-mm', locale: 'en', dateSystem })).toBe('2025-07-15');
+ expect(serializeTemporalEditorValue({ serial: serial(2025, 7, 15, 12, 34, 56), pattern: 'mm-dd h:mm', locale: 'en', dateSystem })).toBe('2025-07-15 12:34:56');
+ expect(serializeTemporalEditorValue({ serial: serial(2025, 7, 15, 12, 34, 56), pattern: 'mm/dd h:mm', locale: 'en', dateSystem })).toBe('2025/07/15 12:34:56');
+ expect(serializeTemporalEditorValue({ serial: serial(2025, 7, 15, 12, 34, 56), pattern: 'h:mm', locale: 'en', dateSystem })).toBe('12:34:56');
+ expect(serializeTemporalEditorValue({ serial: 0.5242683912037037, pattern: 'h:mm', locale: 'en', dateSystem })).toBe('12:34:57');
+ expect(serializeTemporalEditorValue({ serial: 1.25, pattern: '[h]:mm', locale: 'en', dateSystem })).toBe('30:00:00');
+ expect(serializeTemporalEditorValue({ serial: 0.5, pattern: 'h:mm AM/PM', locale: 'en', dateSystem })).toBe('12:00:00 PM');
+ });
+
+ it('preserves Excel date-system edge values', () => {
+ expect(serializeTemporalEditorValue({ serial: 0, pattern: 'mm/dd', locale: 'en', dateSystem })).toBe('1900/01/00');
+ expect(parseTemporalEditorValue({ content: '1900/01/00', originalSerial: 0, pattern: 'mm/dd', locale: 'en', dateSystem })).toBe(0);
+ expect(serializeTemporalEditorValue({ serial: 60, pattern: 'mm/dd', locale: 'en', dateSystem })).toBe('1900/02/29');
+ expect(serializeTemporalEditorValue({ serial: 0, pattern: 'mm/dd', locale: 'en', dateSystem: DateSystem.Date1904 })).toBe('1904/01/01');
+ });
+
+ it('edits negative elapsed durations without treating them as calendar dates', () => {
+ expect(serializeTemporalEditorValue({ serial: -1.5, pattern: '[h]:mm', locale: 'en', dateSystem })).toBe('-36:00:00');
+ expect(parseTemporalEditorValue({ content: '-36:00:00', originalSerial: -1.5, pattern: '[h]:mm', locale: 'en', dateSystem })).toBe(-1.5);
+ });
+
+ it('merges real edits with hidden original components', () => {
+ const original = serial(2025, 7, 15, 12, 34, 56, 0.789);
+
+ expect(parseTemporalEditorValue({ content: '08/20/2026', originalSerial: original, pattern: 'mm/dd', locale: 'en', dateSystem }))
+ .toBeCloseTo(serial(2026, 8, 20, 12, 34, 56, 0.789), 10);
+ expect(parseTemporalEditorValue({ content: '01:02:03.456', originalSerial: original, pattern: 'h:mm', locale: 'en', dateSystem }))
+ .toBeCloseTo(serial(2025, 7, 15, 1, 2, 3, 0.456), 10);
+ expect(parseTemporalEditorValue({ content: '24:00:00', originalSerial: original, pattern: 'h:mm', locale: 'en', dateSystem }))
+ .toBe(serial(2025, 7, 16));
+ expect(parseTemporalEditorValue({ content: '31:15:30.5', originalSerial: 1.25, pattern: '[h]:mm', locale: 'en', dateSystem }))
+ .toBeCloseTo((31 * 3600 + 15 * 60 + 30.5) / 86400, 12);
+ });
+});
diff --git a/packages/sheets-numfmt-ui/src/utils/temporal-editor-value.ts b/packages/sheets-numfmt-ui/src/utils/temporal-editor-value.ts
new file mode 100644
index 0000000000..43ba194892
--- /dev/null
+++ b/packages/sheets-numfmt-ui/src/utils/temporal-editor-value.ts
@@ -0,0 +1,141 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * 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 { DateSystem, INumfmtLocaleTag } from '@univerjs/core';
+import { excelSerialToDateTimeParts, numfmt } from '@univerjs/core';
+
+interface ITemporalEditorValueOptions {
+ serial: number;
+ pattern: string;
+ locale: INumfmtLocaleTag;
+ dateSystem: DateSystem;
+}
+
+interface IParseTemporalEditorValueOptions {
+ content: string;
+ originalSerial: number;
+ pattern: string;
+ locale: INumfmtLocaleTag;
+ dateSystem: DateSystem;
+}
+
+type TemporalType = 'date' | 'datetime' | 'duration' | 'time';
+
+function getTemporalType(pattern: string): TemporalType | null {
+ const dateInfo = numfmt.getFormatDateInfo(pattern);
+ if (dateInfo.isDuration) {
+ // Elapsed-time formats can exceed 24 hours and therefore cannot use calendar-time parsing.
+ return 'duration';
+ }
+
+ const type = numfmt.getFormatInfo(pattern).type;
+ return type === 'date' || type === 'datetime' || type === 'time' ? type : null;
+}
+
+function trimFraction(value: string, locale: INumfmtLocaleTag): string {
+ const decimal = numfmt.getLocale(locale)?.decimal ?? '.';
+ const decimalIndex = value.lastIndexOf(decimal);
+ if (decimalIndex < 0) {
+ return value;
+ }
+
+ const suffixStart = value.indexOf(' ', decimalIndex);
+ const end = suffixStart < 0 ? value.length : suffixStart;
+ let fractionEnd = end;
+ while (fractionEnd > decimalIndex + 1 && value[fractionEnd - 1] === '0') {
+ fractionEnd--;
+ }
+
+ return value.slice(0, fractionEnd) + value.slice(end);
+}
+
+function serializeDuration(serial: number, locale: INumfmtLocaleTag): string {
+ // Round once at the editor's millisecond precision so carries stay consistent across every component.
+ const totalMilliseconds = Math.round(Math.abs(serial) * 86400000);
+ const hours = Math.floor(totalMilliseconds / 3600000);
+ const minutes = Math.floor(totalMilliseconds / 60000) % 60;
+ const seconds = Math.floor(totalMilliseconds / 1000) % 60;
+ const milliseconds = totalMilliseconds % 1000;
+ const fraction = milliseconds
+ ? `${numfmt.getLocale(locale)?.decimal ?? '.'}${String(milliseconds).padStart(3, '0').replace(/0+$/, '')}`
+ : '';
+ return `${serial < 0 ? '-' : ''}${hours}:${String(minutes).padStart(2, '0')}:${String(seconds).padStart(2, '0')}${fraction}`;
+}
+
+export function serializeTemporalEditorValue(options: ITemporalEditorValueOptions): string | null {
+ const { serial, pattern, locale, dateSystem } = options;
+ const type = getTemporalType(pattern);
+ if (!type || !Number.isFinite(serial) || (serial < 0 && type !== 'duration')) {
+ return null;
+ }
+ if (type === 'duration') return serializeDuration(serial, locale);
+
+ const parts = excelSerialToDateTimeParts(serial, { dateSystem });
+ if (!parts) return null;
+ const hasFraction = Math.round(parts.fractionalSecond * 1000) > 0;
+ // This complete pattern is only for the editable text; the cell's persisted numfmt remains unchanged.
+ const canonicalPattern = numfmt.getDateTimeEditPattern(pattern, serial);
+ if (!canonicalPattern) return null;
+
+ const value = numfmt.format(canonicalPattern, serial, { locale, dateSystem, throws: false });
+ return hasFraction ? trimFraction(value, locale) : value;
+}
+
+function parseDuration(content: string, locale: INumfmtLocaleTag): number | null {
+ const decimal = numfmt.getLocale(locale)?.decimal ?? '.';
+ const normalized = decimal === '.' ? content : content.replace(decimal, '.');
+ const match = /^\s*([+-])?(\d+):([0-5]?\d):([0-5]?\d)(\.\d{1,10})?\s*$/.exec(normalized);
+ if (!match) {
+ return null;
+ }
+
+ const sign = match[1] === '-' ? -1 : 1;
+ const hours = Number(match[2]);
+ const minutes = Number(match[3]);
+ const seconds = Number(match[4]);
+ const fractionalSecond = Number(match[5] ?? 0);
+ return sign * (hours * 3600 + minutes * 60 + seconds + fractionalSecond) / 86400;
+}
+
+export function parseTemporalEditorValue(options: IParseTemporalEditorValueOptions): number | null {
+ const { content, originalSerial, pattern, locale, dateSystem } = options;
+ const type = getTemporalType(pattern);
+ if (!type || !Number.isFinite(originalSerial) || (originalSerial < 0 && type !== 'duration')) {
+ return null;
+ }
+
+ if (type === 'duration') {
+ return parseDuration(content, locale);
+ }
+
+ if (type === 'time') {
+ const parsed = numfmt.parseTime(content, { locale, dateSystem });
+ // A time-only edit must not discard a date component hidden by the cell format.
+ return parsed ? Math.floor(originalSerial) + Number(parsed.v) : null;
+ }
+
+ const parsed = numfmt.parseDate(content, { locale, dateSystem });
+ if (!parsed || typeof parsed.v !== 'number') {
+ return null;
+ }
+
+ if (type === 'date') {
+ // A date-only edit must not discard time and subsecond components hidden by the cell format.
+ return Math.floor(parsed.v) + (originalSerial - Math.floor(originalSerial));
+ }
+
+ return parsed.v;
+}
diff --git a/packages/sheets-numfmt/src/controllers/__tests__/numfmt-cell-content.controller.spec.ts b/packages/sheets-numfmt/src/controllers/__tests__/numfmt-cell-content.controller.spec.ts
index b6b42004e2..e9f1825391 100644
--- a/packages/sheets-numfmt/src/controllers/__tests__/numfmt-cell-content.controller.spec.ts
+++ b/packages/sheets-numfmt/src/controllers/__tests__/numfmt-cell-content.controller.spec.ts
@@ -18,6 +18,7 @@ import type { Dependency, IWorkbookData, Workbook, Worksheet } from '@univerjs/c
import {
cellToRange,
CellValueType,
+ DateSystem,
ICommandService,
IConfigService,
ILogService,
@@ -44,11 +45,16 @@ import { SHEETS_NUMFMT_PLUGIN_CONFIG_KEY } from '../../config/config';
import * as patternUtils from '../../utils/pattern';
import { SheetsNumfmtCellContentController } from '../numfmt-cell-content.controller';
-function createWorkbookData(): IWorkbookData {
+function createWorkbookData(
+ id = 'test',
+ locale = LocaleType.ZH_CN,
+ dateSystem = DateSystem.Date1900
+): IWorkbookData {
return {
- id: 'test',
+ id,
appVersion: '3.0.0-alpha',
- locale: LocaleType.ZH_CN,
+ locale,
+ dateSystem,
name: '',
sheetOrder: ['sheet1', 'sheet2'],
styles: {
@@ -75,6 +81,7 @@ function createWorkbookData(): IWorkbookData {
1: { v: '1234.5', t: CellValueType.STRING },
2: { v: -12.3, t: CellValueType.NUMBER },
3: { v: '20%', t: CellValueType.STRING, s: 'textStyle' },
+ 4: { v: 0, t: CellValueType.NUMBER },
},
},
},
@@ -287,6 +294,23 @@ describe('SheetsNumfmtCellContentController', () => {
expect(previewSpy).toHaveBeenCalledTimes(previewCallsAfterFirstRender + 2);
});
+ it('formats each workbook with its own locale and date system', () => {
+ const date1900Sheet = workbook.getSheetBySheetId('sheet1')!;
+ const date1904Workbook = univer.createUnit<IWorkbookData, Workbook>(
+ UniverInstanceType.UNIVER_SHEET,
+ createWorkbookData('date1904', LocaleType.FR_FR, DateSystem.Date1904)
+ );
+ const date1904Sheet = date1904Workbook.getSheetBySheetId('sheet1')!;
+ const previewSpy = vi.spyOn(patternUtils, 'getPatternPreviewIgnoreGeneral');
+
+ numfmtService.setValues('test', 'sheet1', [{ pattern: 'yyyy-mm-dd', ranges: [cellToRange(1, 4)] }]);
+ numfmtService.setValues('date1904', 'sheet1', [{ pattern: 'yyyy-mm-dd', ranges: [cellToRange(1, 4)] }]);
+
+ expect(getInterceptedCell(date1900Sheet, workbook, 1, 4, get)).toMatchObject({ v: '1900-01-00' });
+ expect(getInterceptedCell(date1904Sheet, date1904Workbook, 1, 4, get)).toMatchObject({ v: '1904-01-01' });
+ expect(previewSpy).toHaveBeenLastCalledWith('yyyy-mm-dd', 0, 'fr', DateSystem.Date1904);
+ });
+
it('applies and caches a legitimate empty number-format result', () => {
const worksheet = workbook.getSheetBySheetId('sheet1')!;
const previewSpy = vi.spyOn(patternUtils, 'getPatternPreviewIgnoreGeneral');
diff --git a/packages/sheets-numfmt/src/controllers/numfmt-cell-content.controller.ts b/packages/sheets-numfmt/src/controllers/numfmt-cell-content.controller.ts
index c328320e66..3c2e0a751c 100644
--- a/packages/sheets-numfmt/src/controllers/numfmt-cell-content.controller.ts
+++ b/packages/sheets-numfmt/src/controllers/numfmt-cell-content.controller.ts
@@ -20,6 +20,7 @@ import type { IUniverSheetsNumfmtConfig } from '../config/config';
import {
CellValueType,
Disposable,
+ getNumfmtLocaleTag,
getNumfmtParseValueFilter,
ICommandService,
IConfigService,
@@ -29,7 +30,6 @@ import {
isTextFormat,
IUniverInstanceService,
LocaleService,
- LocaleType,
ObjectMatrix,
Range,
ThemeService,
@@ -55,7 +55,7 @@ const TEXT_FORMAT_MARK = {
},
};
export class SheetsNumfmtCellContentController extends Disposable {
- private _locale$ = new BehaviorSubject<INumfmtLocaleTag>('en');
+ private _locale$ = new BehaviorSubject<INumfmtLocaleTag | null>(null);
public locale$ = this._locale$.asObservable();
constructor(
@IUniverInstanceService private readonly _instanceService: IUniverInstanceService,
@@ -71,52 +71,11 @@ export class SheetsNumfmtCellContentController extends Disposable {
}
public get locale(): INumfmtLocaleTag {
- const _locale = this._locale$.getValue();
- if (_locale) {
- return _locale;
- }
- const currentLocale = this._localeService.getCurrentLocale();
+ return this.getLocale();
+ }
- switch (currentLocale) {
- case LocaleType.FR_FR:
- return 'fr';
- case LocaleType.RU_RU:
- return 'ru';
- case LocaleType.VI_VN:
- return 'vi';
- case LocaleType.ZH_CN:
- return 'zh-CN';
- case LocaleType.KO_KR:
- return 'ko';
- case LocaleType.ZH_TW:
- return 'zh-TW';
- case LocaleType.ZH_HK:
- return 'zh-HK';
- case LocaleType.ES_ES:
- case LocaleType.CA_ES:
- return 'es';
- case LocaleType.SK_SK:
- return 'sk';
- case LocaleType.JA_JP:
- return 'ja';
- case LocaleType.PT_BR:
- return 'pt';
- case LocaleType.DE_DE:
- return 'de';
- case LocaleType.IT_IT:
- return 'it';
- case LocaleType.ID_ID:
- return 'id';
- case LocaleType.PL_PL:
- return 'pl';
- case LocaleType.AR_SA:
- return 'ar';
- case LocaleType.EN_US:
- case LocaleType.FA_IR:
- default: {
- return 'en';
- }
- }
+ public getLocale(workbook?: Workbook): INumfmtLocaleTag {
+ return this._locale$.getValue() ?? getNumfmtLocaleTag(workbook?.getSnapshot().locale ?? this._localeService.getCurrentLocale());
}
// eslint-disable-next-line max-lines-per-function
@@ -140,6 +99,8 @@ export class SheetsNumfmtCellContentController extends Disposable {
const unitId = location.unitId;
const sheetId = location.subUnitId;
+ const locale = this.getLocale(location.workbook);
+ const dateSystem = location.workbook.getDateSystem();
let numfmtValue;
if (cell?.s) {
@@ -168,7 +129,7 @@ export class SheetsNumfmtCellContentController extends Disposable {
!(
isTextFormat(numfmtValue?.pattern) &&
typeof cell.v === 'string' &&
- typeof getNumfmtParseValueFilter(cell.v)?.v === 'number'
+ typeof getNumfmtParseValueFilter(cell.v, { locale, dateSystem })?.v === 'number'
)
) {
return next(cell);
@@ -193,12 +154,13 @@ export class SheetsNumfmtCellContentController extends Disposable {
return next(cell);
}
+ const cacheParameters = `${unitId}_${sheetId}_${originCellValue.v}_${numfmtValue?.pattern}_${locale}_${dateSystem}`;
const cache = renderCache.getValue(location.row, location.col);
- if (cache && cache.parameters === `${originCellValue.v}_${numfmtValue?.pattern}`) {
+ if (cache && cache.parameters === cacheParameters) {
return next({ ...cell, ...cache.result });
}
- const info = getPatternPreviewIgnoreGeneral(numfmtValue?.pattern as string, Number(originCellValue.v), this.locale);
+ const info = getPatternPreviewIgnoreGeneral(numfmtValue?.pattern as string, Number(originCellValue.v), locale, dateSystem);
const numfmtRes = info.result;
const res: ICellDataForSheetInterceptor = { v: numfmtRes, t: CellValueType.NUMBER };
if (numfmtRes === '') {
@@ -214,7 +176,7 @@ export class SheetsNumfmtCellContentController extends Disposable {
renderCache.setValue(location.row, location.col, {
result: res,
- parameters: `${originCellValue.v}_${numfmtValue?.pattern}`,
+ parameters: cacheParameters,
});
Object.assign(cell, res);
return next(cell);
diff --git a/packages/sheets-numfmt/src/utils/pattern.ts b/packages/sheets-numfmt/src/utils/pattern.ts
index 06c5341689..bdca199e20 100644
--- a/packages/sheets-numfmt/src/utils/pattern.ts
+++ b/packages/sheets-numfmt/src/utils/pattern.ts
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import type { INumfmtLocaleTag } from '@univerjs/core';
+import type { DateSystem, INumfmtLocaleTag } from '@univerjs/core';
import type { FormatType } from '@univerjs/sheets';
import { DEFAULT_NUMBER_FORMAT, numfmt } from '@univerjs/core';
import { stripErrorMargin } from '@univerjs/engine-formula';
@@ -25,12 +25,17 @@ interface IPatternPreview {
color?: string;
}
-export const getPatternPreview = (pattern: string, value: number, locale: INumfmtLocaleTag = 'en'): IPatternPreview => {
+export const getPatternPreview = (
+ pattern: string,
+ value: number,
+ locale: INumfmtLocaleTag = 'en',
+ dateSystem?: DateSystem
+): IPatternPreview => {
// in the source code of numfmt, the formatColor function will read the the partitions[3]
try {
const formatColor = numfmt.formatColor(pattern, value);
const color = formatColor ? String(formatColor) : undefined;
- const result = numfmt.format(pattern, value, { locale, throws: false });
+ const result = numfmt.format(pattern, value, { locale, dateSystem, throws: false });
if (value < 0) {
// pay attention, controllers/ui.controller.ts
// in the pattern, the negative value color may be upper case one , so if we read a color with UpperCase, we should return the color with lower case for our theme system
@@ -51,11 +56,16 @@ export const getPatternPreview = (pattern: string, value: number, locale: INumfm
};
};
-export const getPatternPreviewIgnoreGeneral = (pattern: string, value: number, locale?: INumfmtLocaleTag): IPatternPreview => {
+export const getPatternPreviewIgnoreGeneral = (
+ pattern: string,
+ value: number,
+ locale?: INumfmtLocaleTag,
+ dateSystem?: DateSystem
+): IPatternPreview => {
if (pattern === DEFAULT_NUMBER_FORMAT) {
return {
result: String(stripErrorMargin(value)), // In Excel, the default General format also needs to handle numeric precision.
};
}
- return getPatternPreview(pattern, value, locale);
+ return getPatternPreview(pattern, value, locale, dateSystem);
};
diff --git a/packages/sheets-table/src/controllers/__tests__/table-filter.controller.spec.ts b/packages/sheets-table/src/controllers/__tests__/table-filter.controller.spec.ts
index 9af5ccfb72..3ce7c539fe 100644
--- a/packages/sheets-table/src/controllers/__tests__/table-filter.controller.spec.ts
+++ b/packages/sheets-table/src/controllers/__tests__/table-filter.controller.spec.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { DateSystem } from '@univerjs/core';
import { BehaviorSubject, Subject } from 'rxjs';
import { describe, expect, it, vi } from 'vitest';
import { TableFilterController } from '../table-filter.controller';
@@ -59,6 +60,7 @@ describe('TableFilterController', () => {
getActiveSheet: () => ({ getSheetId: () => 's1' }),
activeSheet$,
getSheetBySheetId: vi.fn(() => ({ id: 'sheet1' })),
+ getDateSystem: () => DateSystem.Date1904,
};
const workbookType$ = new Subject<any>();
@@ -81,7 +83,11 @@ describe('TableFilterController', () => {
tableFilterChanged$.next({ unitId: 'u1', subUnitId: 's1', tableId: 't1' });
- expect(mainFilter.doFilter).toHaveBeenCalledWith({ id: 'sheet1' }, { startRow: 1, endRow: 10, startColumn: 1, endColumn: 2 });
+ expect(mainFilter.doFilter).toHaveBeenCalledWith(
+ { id: 'sheet1' },
+ { startRow: 1, endRow: 10, startColumn: 1, endColumn: 2 },
+ DateSystem.Date1904
+ );
expect(zebraCrossingCacheController.updateZebraCrossingCache).toHaveBeenCalledWith('u1', 's1');
expect(rowFilteredHandler(false, { unitId: 'u1', subUnitId: 's1', row: 4 }, vi.fn(() => false))).toBe(true);
expect(rowFilteredHandler(false, { unitId: 'u1', subUnitId: 's2', row: 4 }, vi.fn(() => false))).toBe(false);
diff --git a/packages/sheets-table/src/controllers/table-filter.controller.ts b/packages/sheets-table/src/controllers/table-filter.controller.ts
index c0da7c23b1..ef233e507c 100644
--- a/packages/sheets-table/src/controllers/table-filter.controller.ts
+++ b/packages/sheets-table/src/controllers/table-filter.controller.ts
@@ -72,14 +72,15 @@ export class TableFilterController extends Disposable {
this.disposeWithMe(
this._tableManager.tableFilterChanged$.subscribe((event) => {
const { unitId, subUnitId, tableId } = event;
- const worksheet = this._univerInstanceService.getUnit<Workbook>(unitId)?.getSheetBySheetId(subUnitId);
+ const workbook = this._univerInstanceService.getUnit<Workbook>(unitId);
+ const worksheet = workbook?.getSheetBySheetId(subUnitId);
const table = this._tableManager.getTable(unitId, tableId);
if (!worksheet || !table) {
return;
}
const tableFilter = table.getTableFilters();
- tableFilter.doFilter(worksheet, table.getTableFilterRange());
+ tableFilter.doFilter(worksheet, table.getTableFilterRange(), workbook?.getDateSystem());
this._refreshTableFilteredOutRows(unitId, subUnitId);
diff --git a/packages/sheets-table/src/models/filter-util/__tests__/filter-util.spec.ts b/packages/sheets-table/src/models/filter-util/__tests__/filter-util.spec.ts
index c236fb5481..57ffc476e5 100644
--- a/packages/sheets-table/src/models/filter-util/__tests__/filter-util.spec.ts
+++ b/packages/sheets-table/src/models/filter-util/__tests__/filter-util.spec.ts
@@ -15,7 +15,7 @@
*/
import type { IWorkbookData, Workbook } from '@univerjs/core';
-import { CellValueType, LocaleType, Univer, UniverInstanceType } from '@univerjs/core';
+import { CellValueType, DateSystem, LocaleType, Univer, UniverInstanceType } from '@univerjs/core';
import { afterEach, describe, expect, it, vi } from 'vitest';
import {
TableColumnFilterTypeEnum,
@@ -104,6 +104,7 @@ function createWorkbookData(): IWorkbookData {
0: { v: '42', t: CellValueType.NUMBER },
1: { v: 44927, t: CellValueType.NUMBER },
2: { v: undefined },
+ 3: { v: 0, t: CellValueType.NUMBER },
},
},
},
@@ -169,6 +170,17 @@ describe('table filter utilities', () => {
expect(dateQ4(new Date(2024, 10, 1))).toBe(true);
});
+ it('preserves spreadsheet calendar components in western time zones', () => {
+ vi.stubEnv('TZ', 'America/Los_Angeles');
+ try {
+ const date = excelSerialToDateTime(0, DateSystem.Date1904);
+
+ expect([date.getFullYear(), date.getMonth(), date.getDate(), date.getHours()]).toEqual([1904, 0, 1, 0]);
+ } finally {
+ vi.unstubAllEnvs();
+ }
+ });
+
it('builds executable date predicates for fixed and relative date filters', () => {
const anchor = new Date(2024, 5, 12).getTime();
const onJuneTen = new Date(2024, 5, 10);
@@ -492,6 +504,10 @@ describe('table filter utilities', () => {
expect(getCellValueWithConditionType(worksheet, 0, 4, TableConditionTypeEnum.Number)).toBeNull();
expect(getCellValueWithConditionType(worksheet, 1, 2, TableConditionTypeEnum.String)).toBeUndefined();
expect(getCellValueWithConditionType(worksheet, 1, 1, TableConditionTypeEnum.Date)).toEqual(excelSerialToDateTime(44927));
+ const serialZeroDate = getCellValueWithConditionType(worksheet, 1, 3, TableConditionTypeEnum.Date, DateSystem.Date1904);
+ expect(serialZeroDate).toBeInstanceOf(Date);
+ expect(serialZeroDate).toEqual(new Date(1904, 0, 1));
+ expect(excelSerialToDateTime(0, DateSystem.Date1904)).toEqual(new Date(1904, 0, 1));
expect(getCellValueWithConditionType(worksheet, 9, 9, TableConditionTypeEnum.String)).toBeNull();
});
});
diff --git a/packages/sheets-table/src/models/filter-util/condition.ts b/packages/sheets-table/src/models/filter-util/condition.ts
index f309e70d98..12f8b098aa 100644
--- a/packages/sheets-table/src/models/filter-util/condition.ts
+++ b/packages/sheets-table/src/models/filter-util/condition.ts
@@ -17,7 +17,7 @@
import type { IDocumentData, Worksheet } from '@univerjs/core';
import type { TableStringCompareTypeEnum } from '../../types/enum';
import type { ICalculatedOptions, ITableConditionFilterItem, ITableDateFilterInfo, ITableNumberFilterInfo, ITableStringFilterInfo } from '../../types/type';
-import { CellValueType } from '@univerjs/core';
+import { CellValueType, DateSystem, excelSerialToDateTime } from '@univerjs/core';
import { TableConditionTypeEnum, TableDateCompareTypeEnum, TableNumberCompareTypeEnum } from '../../types/enum';
import { getDateFilterExecuteFunc } from './date-filter-util';
import { getNumberFilterExecuteFunc } from './number-filter-util';
@@ -77,12 +77,18 @@ export function getConditionExecuteFunc(filter: ITableConditionFilterItem, calcu
}
}
-export function getCellValueWithConditionType(sheet: Worksheet, row: number, col: number, conditionType: TableConditionTypeEnum) {
+export function getCellValueWithConditionType(
+ sheet: Worksheet,
+ row: number,
+ col: number,
+ conditionType: TableConditionTypeEnum,
+ dateSystem = DateSystem.Date1900
+) {
switch (conditionType) {
case TableConditionTypeEnum.Date:
{
const dateNumber = getNumberCellValue(sheet, row, col);
- return dateNumber ? excelSerialToDateTime(dateNumber) : null;
+ return dateNumber == null ? null : excelSerialToDateTimeLocal(dateNumber, dateSystem);
}
case TableConditionTypeEnum.Number:
return getNumberCellValue(sheet, row, col);
@@ -135,21 +141,21 @@ function getNumberCellValue(sheet: Worksheet, row: number, col: number) {
return Number(v);
}
-export function excelSerialToDateTime(serial: number): Date {
- const baseDate = new Date(Date.UTC(1900, 0, 1, 0, 0, 0)); // January 1, 1900, UTC
- const leapDayDate = new Date(Date.UTC(1900, 1, 28, 0, 0, 0)); // February 28, 1900, UTC
-
- let dayDifference = serial - 1; // Adjust for Excel serial number starting from 1
-
- // If the serial number corresponds to a date later than February 28, 1900, adjust the day difference
- if (dayDifference > (leapDayDate.getTime() - baseDate.getTime()) / (1000 * 3600 * 24)) {
- dayDifference -= 1;
- }
-
- if (dayDifference < 0) {
- dayDifference = serial;
+function excelSerialToDateTimeLocal(serial: number, dateSystem = DateSystem.Date1900): Date {
+ const utcDate = excelSerialToDateTime(serial, dateSystem);
+ if (Number.isNaN(utcDate.getTime())) {
+ return utcDate;
}
-
- const resultDate = new Date(baseDate.getTime() + dayDifference * (1000 * 3600 * 24));
- return resultDate;
+ // Table date predicates use local Date components; keep the spreadsheet fields stable across host time zones.
+ return new Date(
+ utcDate.getUTCFullYear(),
+ utcDate.getUTCMonth(),
+ utcDate.getUTCDate(),
+ utcDate.getUTCHours(),
+ utcDate.getUTCMinutes(),
+ utcDate.getUTCSeconds(),
+ utcDate.getUTCMilliseconds()
+ );
}
+
+export { excelSerialToDateTimeLocal as excelSerialToDateTime };
diff --git a/packages/sheets-table/src/models/table-filter.ts b/packages/sheets-table/src/models/table-filter.ts
index dfb99d60a5..d79510bbab 100644
--- a/packages/sheets-table/src/models/table-filter.ts
+++ b/packages/sheets-table/src/models/table-filter.ts
@@ -17,6 +17,7 @@
import type { ICellData, Nullable, Worksheet } from '@univerjs/core';
import type { SheetsTableButtonStateEnum } from '../types/enum';
import type { ICalculatedOptions, ITableFilterItem, ITableFilterJSON, ITableRange } from '../types/type';
+import { DateSystem } from '@univerjs/core';
import { TABLE_FILTER_EMPTY_VALUE } from '../const';
import { SheetsTableSortStateEnum, TableColumnFilterTypeEnum, TableConditionTypeEnum } from '../types/enum';
import { getTableFilterState, isConditionFilter } from '../util';
@@ -68,20 +69,20 @@ export class TableFilters {
return this._filterOutRows;
}
- doFilter(sheet: Worksheet, range: ITableRange) {
+ doFilter(sheet: Worksheet, range: ITableRange, dateSystem = DateSystem.Date1900) {
const filterOutRows = new Set<number>();
const tableColumnFilterList = this._tableColumnFilterList;
for (let i = 0; i < tableColumnFilterList.length; i++) {
const filter = tableColumnFilterList[i];
if (filter) {
- this.doColumnFilter(sheet, range, i, filterOutRows);
+ this.doColumnFilter(sheet, range, i, filterOutRows, dateSystem);
}
}
this._filterOutRows = filterOutRows;
return filterOutRows;
}
- doColumnFilter(sheet: Worksheet, range: ITableRange, columnIndex: number, filterOutRows: Set<number>) {
+ doColumnFilter(sheet: Worksheet, range: ITableRange, columnIndex: number, filterOutRows: Set<number>, dateSystem = DateSystem.Date1900) {
const filter = this._tableColumnFilterList[columnIndex];
if (filter && sheet) {
const { startRow, endRow, startColumn } = range;
@@ -90,10 +91,10 @@ export class TableFilters {
for (let row = startRow; row <= endRow; row++) {
// const cellValue = sheet.getCell(row, column);
const conditionType = isConditionFilter(filter) ? filter.filterInfo.conditionType : TableConditionTypeEnum.String;
- const cellValue = getCellValueWithConditionType(sheet, row, column, conditionType);
+ const cellValue = getCellValueWithConditionType(sheet, row, column, conditionType, dateSystem);
if (cellValue === null && !executeFunc(cellValue)) {
filterOutRows.add(row);
- } else if (!executeFunc(getCellValueWithConditionType(sheet, row, column, conditionType))) {
+ } else if (!executeFunc(getCellValueWithConditionType(sheet, row, column, conditionType, dateSystem))) {
filterOutRows.add(row);
}
}
diff --git a/packages/sheets-table/src/models/table-manager.ts b/packages/sheets-table/src/models/table-manager.ts
index 5e05e365bd..d50be8ee27 100644
--- a/packages/sheets-table/src/models/table-manager.ts
+++ b/packages/sheets-table/src/models/table-manager.ts
@@ -124,8 +124,9 @@ export class TableManager extends Disposable {
});
if (options?.filters) {
- const worksheet = this._univerInstanceService.getUnit<Workbook>(unitId)?.getSheetBySheetId(subUnitId);
- table.getTableFilters().doFilter(worksheet!, range);
+ const workbook = this._univerInstanceService.getUnit<Workbook>(unitId);
+ const worksheet = workbook?.getSheetBySheetId(subUnitId);
+ table.getTableFilters().doFilter(worksheet!, range, workbook?.getDateSystem());
this._tableFilterChanged$.next({
unitId,
subUnitId,
@@ -464,7 +465,7 @@ export class TableManager extends Disposable {
if (table.filters) {
const tableFilter = tableInstance.getTableFilters();
tableFilter.fromJSON(table.filters);
- tableFilter.doFilter(sheet, tableInstance.getTableFilterRange());
+ tableFilter.doFilter(sheet, tableInstance.getTableFilterRange(), target.workbook.getDateSystem());
}
tableInstance.setSubunitId(subUnitId);
unitMap.set(table.id, tableInstance);
diff --git a/packages/sheets-ui/src/controllers/clipboard/clipboard.controller.ts b/packages/sheets-ui/src/controllers/clipboard/clipboard.controller.ts
index 580f61a752..b1fbc2ea32 100644
--- a/packages/sheets-ui/src/controllers/clipboard/clipboard.controller.ts
+++ b/packages/sheets-ui/src/controllers/clipboard/clipboard.controller.ts
@@ -47,6 +47,7 @@ import {
DEFAULT_WORKSHEET_COLUMN_WIDTH_KEY,
DOCS_NORMAL_EDITOR_UNIT_ID_KEY,
extractPureTextFromCell,
+ getNumfmtLocaleTag,
getNumfmtParseValueFilter,
handleStyleToString,
ICommandService,
@@ -539,6 +540,10 @@ export class SheetClipboardController extends RxDisposable {
private _onPastePlainText(pasteTo: ISheetDiscreteRangeLocation, text: string, payload: ICopyPastePayload) {
const { range, unitId, subUnitId } = pasteTo;
+ const workbook = this._instanceService.getUnit<Workbook>(unitId, UniverInstanceType.UNIVER_SHEET);
+ const parseOptions = workbook
+ ? { locale: getNumfmtLocaleTag(workbook.getSnapshot().locale), dateSystem: workbook.getDateSystem() }
+ : undefined;
let cellValue: IObjectMatrixPrimitiveType<ICellData>;
if (/\r|\n/.test(text) || Tools.isLegalUrl(text)) {
const body = generateBody(text);
@@ -564,7 +569,7 @@ export class SheetClipboardController extends RxDisposable {
},
};
} else {
- const pattern = getNumfmtParseValueFilter(text);
+ const pattern = getNumfmtParseValueFilter(text, parseOptions);
if (pattern?.z) {
cellValue = {
[range.rows[0]]: {
diff --git a/packages/sheets-ui/src/controllers/clipboard/utils.ts b/packages/sheets-ui/src/controllers/clipboard/utils.ts
index 5261238fbe..840d281005 100644
--- a/packages/sheets-ui/src/controllers/clipboard/utils.ts
+++ b/packages/sheets-ui/src/controllers/clipboard/utils.ts
@@ -31,6 +31,7 @@ import {
createSectionId,
CustomRangeType,
generateRandomId,
+ getNumfmtLocaleTag,
getNumfmtParseValueFilter,
isTextFormat,
IUniverInstanceService,
@@ -158,7 +159,8 @@ export function getMoveRangeMutations(
function getExternalPasteNumberFormatResult(
value: ICellData['v'],
- currentCellStyle: Nullable<IStyleData> | undefined
+ currentCellStyle: Nullable<IStyleData> | undefined,
+ parseOptions?: Parameters<typeof getNumfmtParseValueFilter>[1]
): IExternalPasteNumberFormatResult {
if (isTextFormat(currentCellStyle?.n?.pattern)) {
return {
@@ -168,7 +170,7 @@ function getExternalPasteNumberFormatResult(
}
const content = String(value).trim();
- const numfmtValue = getNumfmtParseValueFilter(content);
+ const numfmtValue = getNumfmtParseValueFilter(content, parseOptions);
const result: IExternalPasteNumberFormatResult = {};
if (numfmtValue?.v !== undefined && typeof numfmtValue.v === 'number') {
@@ -201,6 +203,9 @@ export function getSetCellDataMutations(
const { unitId, subUnitId, range } = pasteTo;
const target = getSheetCommandTarget(accessor.get(IUniverInstanceService), { unitId, subUnitId });
const worksheet = target?.worksheet;
+ const parseOptions = target
+ ? { locale: getNumfmtLocaleTag(target.workbook.getSnapshot().locale), dateSystem: target.workbook.getDateSystem() }
+ : undefined;
const { mapFunc } = virtualizeDiscreteRanges([range]);
const cellValueMatrix = new ObjectMatrix<ICellData>();
@@ -238,7 +243,7 @@ export function getSetCellDataMutations(
* 2. If the above case does not apply, parse the value to check whether it has a number format.
*/
const currentCellStyle = worksheet?.getCellStyle(row, col);
- const numfmtResult = getExternalPasteNumberFormatResult(value.v, currentCellStyle);
+ const numfmtResult = getExternalPasteNumberFormatResult(value.v, currentCellStyle, parseOptions);
if (numfmtResult.n) {
newStyle.n = numfmtResult.n;
@@ -291,6 +296,9 @@ export function getSetCellValueMutations(
const { unitId, subUnitId, range } = pasteTo;
const target = getSheetCommandTarget(accessor.get(IUniverInstanceService), { unitId, subUnitId });
const worksheet = target?.worksheet;
+ const parseOptions = target
+ ? { locale: getNumfmtLocaleTag(target.workbook.getSnapshot().locale), dateSystem: target.workbook.getDateSystem() }
+ : undefined;
const { mapFunc } = virtualizeDiscreteRanges([range]);
const cellValueMatrix = new ObjectMatrix<ICellData>();
@@ -318,7 +326,7 @@ export function getSetCellValueMutations(
* 2. If the above case does not apply, parse the value to check whether it has a number format.
*/
const currentCellStyle = worksheet?.getCellStyle(row, col);
- const numfmtResult = getExternalPasteNumberFormatResult(value.v, currentCellStyle);
+ const numfmtResult = getExternalPasteNumberFormatResult(value.v, currentCellStyle, parseOptions);
if (numfmtResult.t !== undefined) {
cellValue.t = numfmtResult.t;
@@ -365,6 +373,9 @@ export function getSetCellStyleMutations(
const { unitId, subUnitId, range } = pasteTo;
const target = getSheetCommandTarget(accessor.get(IUniverInstanceService), { unitId, subUnitId });
const worksheet = target?.worksheet;
+ const parseOptions = target
+ ? { locale: getNumfmtLocaleTag(target.workbook.getSnapshot().locale), dateSystem: target.workbook.getDateSystem() }
+ : undefined;
const { mapFunc } = virtualizeDiscreteRanges([range]);
const cellValueMatrix = new ObjectMatrix<ICellData>();
@@ -391,7 +402,7 @@ export function getSetCellStyleMutations(
* 2. If the above case does not apply, parse the value to check whether it has a number format.
*/
const currentCellStyle = worksheet?.getCellStyle(row, col);
- const numfmtResult = getExternalPasteNumberFormatResult(value.v, currentCellStyle);
+ const numfmtResult = getExternalPasteNumberFormatResult(value.v, currentCellStyle, parseOptions);
if (numfmtResult.n) {
newStyle.n = numfmtResult.n;
diff --git a/packages/sheets-ui/src/controllers/editor/__tests__/editing-render-business.spec.ts b/packages/sheets-ui/src/controllers/editor/__tests__/editing-render-business.spec.ts
index 4224e83b11..b30bbb1688 100644
--- a/packages/sheets-ui/src/controllers/editor/__tests__/editing-render-business.spec.ts
+++ b/packages/sheets-ui/src/controllers/editor/__tests__/editing-render-business.spec.ts
@@ -162,7 +162,7 @@ function createController(initialDataStream = 'new value\r\n', isPercentFormat =
})),
getCurrentEditorId: vi.fn(() => DOCS_NORMAL_EDITOR_UNIT_ID_KEY),
isVisible: vi.fn(() => ({ visible: true, eventType: DeviceInputEventType.Keyboard, unitId: 'unit-1' })),
- getEditorDirty: vi.fn(() => false),
+ getEditorDirty: vi.fn(() => true),
isForceKeepVisible: vi.fn(() => false),
disableForceKeepVisible: vi.fn(),
refreshEditCellPosition: vi.fn(),
@@ -239,6 +239,21 @@ function createController(initialDataStream = 'new value\r\n', isPercentFormat =
}
describe('EditingRenderController business methods', () => {
+ it('bypasses parsing, interceptors, and commands when the editor is clean', async () => {
+ const { controller, worksheet } = createController();
+ controller._editorBridgeService.getEditorDirty.mockReturnValue(false);
+
+ const result = await controller._submitEdit({
+ body: { dataStream: 'canonical display value\r\n' },
+ documentStyle: {},
+ });
+
+ expect(result).toBe(true);
+ expect(worksheet.getCellRaw).not.toHaveBeenCalled();
+ expect(controller._sheetInterceptorService.onWriteCell).not.toHaveBeenCalled();
+ expect(controller._commandService.syncExecuteCommand).not.toHaveBeenCalled();
+ });
+
it('reuses an empty cell style for the next editor input', () => {
const { controller, documentModel } = createController();
documentModel.getBody.mockReturnValue({
@@ -466,6 +481,7 @@ describe('EditingRenderController business methods', () => {
it('overtypes the original percent value on initial digit input', () => {
const { controller } = createController('25%\r\n', true);
+ controller._editorBridgeService.getEditorDirty.mockReturnValue(false);
const beforeCommandListeners: Array<(command: { id: string; params: unknown }) => void> = [];
controller._editorBridgeService.isVisible.mockReturnValue({
visible: true,
diff --git a/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts b/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts
index d6e6a6fda7..b9d24b3301 100644
--- a/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts
@@ -757,6 +757,10 @@ export class EditingRenderController extends Disposable {
if (editCellState == null) {
return true;
}
+ // The editor may display an expanded date/time value; do not write that intercepted text back unless it was edited.
+ if (!this._editorBridgeService.getEditorDirty()) {
+ return true;
+ }
const { unitId, sheetId, row, column } = editCellState;
const workbook = this._univerInstanceService.getUnit<Workbook>(unitId, UniverInstanceType.UNIVER_SHEET);
diff --git a/packages/sheets-ui/src/services/clipboard/clipboard.service.ts b/packages/sheets-ui/src/services/clipboard/clipboard.service.ts
index 4b9998b6f8..4f62aadfc7 100644
--- a/packages/sheets-ui/src/services/clipboard/clipboard.service.ts
+++ b/packages/sheets-ui/src/services/clipboard/clipboard.service.ts
@@ -54,6 +54,7 @@ import {
extractPureTextFromCell,
generateRandomId,
getEmptyCell,
+ getNumfmtLocaleTag,
ICommandService,
ILogService,
Inject,
@@ -252,6 +253,12 @@ export class SheetClipboardService extends Disposable implements ISheetClipboard
this._univerInstanceService,
this._renderManagerService
)?.getCurrentParam(),
+ getNumfmtParseOptions: () => {
+ const workbook = this._univerInstanceService.getCurrentUnitOfType<Workbook>(UniverInstanceType.UNIVER_SHEET);
+ return workbook
+ ? { locale: getNumfmtLocaleTag(workbook.getSnapshot().locale), dateSystem: workbook.getDateSystem() }
+ : undefined;
+ },
});
this._usmToHtml = new USMToHtmlService();
diff --git a/packages/sheets-ui/src/services/clipboard/html-to-usm/converter.ts b/packages/sheets-ui/src/services/clipboard/html-to-usm/converter.ts
index c49a652b2e..c7460f0b37 100644
--- a/packages/sheets-ui/src/services/clipboard/html-to-usm/converter.ts
+++ b/packages/sheets-ui/src/services/clipboard/html-to-usm/converter.ts
@@ -79,6 +79,7 @@ function matchFilter(node: HTMLElement, filter: IStyleRule['filter']) {
interface IHtmlToUSMServiceProps {
getCurrentSkeleton: () => Nullable<ISheetSkeletonManagerParam>;
+ getNumfmtParseOptions?: () => Parameters<typeof getNumfmtParseValueFilter>[1];
}
export class HtmlToUSMService {
@@ -114,13 +115,18 @@ export class HtmlToUSMService {
private _msoNumfmtMap = new Map<string, string>();
private _getCurrentSkeleton: () => Nullable<ISheetSkeletonManagerParam>;
+ private _getNumfmtParseOptions?: () => Parameters<typeof getNumfmtParseValueFilter>[1];
+ private _numfmtParseOptions?: Parameters<typeof getNumfmtParseValueFilter>[1];
constructor(props: IHtmlToUSMServiceProps) {
this._getCurrentSkeleton = props.getCurrentSkeleton;
+ this._getNumfmtParseOptions = props.getNumfmtParseOptions;
}
// eslint-disable-next-line max-lines-per-function
convert(html: string): IUniverSheetCopyDataModel {
+ // This service outlives the active workbook, so resolve locale and date system for every paste operation.
+ this._numfmtParseOptions = this._getNumfmtParseOptions?.();
const pastePlugin = HtmlToUSMService._pluginList.find((plugin) => plugin.checkPasteType(html));
if (pastePlugin) {
this._styleRules = [...pastePlugin.stylesRules];
@@ -509,13 +515,13 @@ export class HtmlToUSMService {
cellText = cleanMsoSpaceRun(cellText);
}
- const parseData = getNumfmtParseValueFilter(cellText);
+ const parseData = getNumfmtParseValueFilter(cellText, this._numfmtParseOptions);
if (
typeof parseData?.v === 'number' &&
(
parseData.z === pattern ||
- numfmt.format(pattern, parseData.v) === cellText
+ numfmt.format(pattern, parseData.v, this._numfmtParseOptions) === cellText
)
) {
cellText = parseData.v.toString();
@@ -526,7 +532,7 @@ export class HtmlToUSMService {
} else if (!parseData) {
const extractedNumber = extractNumber(cellText);
- if (extractedNumber !== null && !Number.isNaN(extractedNumber) && numfmt.format(pattern, extractedNumber) === cellText) {
+ if (extractedNumber !== null && !Number.isNaN(extractedNumber) && numfmt.format(pattern, extractedNumber, this._numfmtParseOptions) === cellText) {
cellText = extractedNumber.toString();
numfmtPattern = pattern;
}
@@ -630,7 +636,7 @@ export class HtmlToUSMService {
*/
if (cellHtml.includes('mso-spacerun:yes')) {
const cellText = cleanMsoSpaceRun(cellHtml);
- const parseInfo = getNumfmtParseValueFilter(cellText);
+ const parseInfo = getNumfmtParseValueFilter(cellText, this._numfmtParseOptions);
if (parseInfo && parseInfo.z && typeof parseInfo.v === 'number') {
return {
diff --git a/packages/sheets-ui/src/views/dropdown/DateDropdown.tsx b/packages/sheets-ui/src/views/dropdown/DateDropdown.tsx
index e24fefe20b..b9e9b1e719 100644
--- a/packages/sheets-ui/src/views/dropdown/DateDropdown.tsx
+++ b/packages/sheets-ui/src/views/dropdown/DateDropdown.tsx
@@ -19,15 +19,42 @@ import type { IPopupWithExtraProps } from '@univerjs/ui';
import type { LocaleKey } from '../../locale/types';
import type { IBaseDropdownProps } from './type';
import { dateKit, LocaleService } from '@univerjs/core';
-import { borderTopClassName, Button, Calendar, clsx, TimeInput } from '@univerjs/design';
+import { borderTopClassName, Button, Calendar, clsx, Input, TimeInput } from '@univerjs/design';
import { useDependency } from '@univerjs/ui';
-import { useMemo, useState } from 'react';
+import { useState } from 'react';
export interface IDateDropdownProps {
defaultValue?: DateKit;
- onChange?: (value: DateKit | undefined) => boolean | Promise<boolean>;
- patternType?: 'datetime' | 'date' | 'time';
+ onChange?: (value: DateKit | undefined, changeType?: 'date' | 'time') => boolean | Promise<boolean>;
+ durationValue?: number;
+ onDurationChange?: (value: number | undefined) => boolean | Promise<boolean>;
+ /** A calendar serial that cannot be represented by the configured Excel date system. */
+ unsupportedValue?: number;
+ onSerialChange?: (value: number | undefined) => boolean | Promise<boolean>;
+ exceptionalDateLabel?: string;
+ patternType?: 'datetime' | 'date' | 'time' | 'duration';
showTime?: boolean;
+ /** Keep the original serial when the picker is opened and confirmed without an actual selection change. */
+ preserveDefaultValue?: boolean;
+}
+
+export function formatDuration(value: number | undefined): string {
+ if (value == null || !Number.isFinite(value)) return '';
+ const sign = value < 0 ? '-' : '';
+ const totalMilliseconds = Math.round(Math.abs(value) * 24 * 60 * 60 * 1000);
+ const hours = Math.floor(totalMilliseconds / 3_600_000);
+ const minutes = Math.floor(totalMilliseconds / 60_000) % 60;
+ const seconds = Math.floor(totalMilliseconds / 1000) % 60;
+ const milliseconds = totalMilliseconds % 1000;
+ return `${sign}${hours}:${String(minutes).padStart(2, '0')}:${String(seconds).padStart(2, '0')}${milliseconds ? `.${String(milliseconds).padStart(3, '0')}` : ''}`;
+}
+
+export function parseDuration(value: string): number | null {
+ const match = value.trim().match(/^([+-])?(\d+):([0-5]\d):([0-5]\d)(?:\.(\d{1,3}))?$/);
+ if (!match) return null;
+ const [, sign, hours, minutes, seconds, milliseconds = ''] = match;
+ const totalSeconds = Number(hours) * 3600 + Number(minutes) * 60 + Number(seconds) + Number(milliseconds.padEnd(3, '0')) / 1000;
+ return (sign === '-' ? -1 : 1) * totalSeconds / 86400;
}
export function DateDropdown(props: {
@@ -35,20 +62,94 @@ export function DateDropdown(props: {
}) {
const { popup } = props;
const { extraProps } = popup;
- const { hideFn, patternType, defaultValue, onChange, showTime } = extraProps;
+ const { hideFn, patternType, defaultValue, durationValue, unsupportedValue, onChange, onDurationChange, onSerialChange, exceptionalDateLabel, preserveDefaultValue, showTime } = extraProps;
const [localDate, setLocalDate] = useState<DateKit | undefined>(defaultValue);
- const defaultDate = useMemo(() => patternType !== 'time' ? dateKit() : dateKit('1900-01-01 00:00:00'), []);
+ const [durationText, setDurationText] = useState(() => formatDuration(durationValue));
+ const [serialText, setSerialText] = useState(() => unsupportedValue == null ? '' : String(unsupportedValue));
+ const [isDirty, setIsDirty] = useState(false);
+ const [changeType, setChangeType] = useState<'date' | 'time'>();
+ const [defaultDate] = useState(() => patternType !== 'time' ? dateKit() : dateKit('1900-01-01 00:00:00'));
const date = localDate && localDate.isValid() ? localDate : defaultDate;
const localeService = useDependency(LocaleService);
+ const durationSerial = parseDuration(durationText);
+ const parsedSerial = Number(serialText);
+ const serialValue = serialText.trim() !== '' && Number.isFinite(parsedSerial) && parsedSerial >= 0 ? parsedSerial : null;
+ const shouldPreserveDefaultValue = preserveDefaultValue && !isDirty && (
+ patternType === 'duration' ? durationValue != null : defaultValue != null
+ );
const handleSave = async () => {
+ if (unsupportedValue != null) {
+ if (!isDirty || serialValue == null) return;
+ const result = await onSerialChange?.(serialValue);
+ if (result) hideFn();
+ return;
+ }
+ if (patternType === 'duration') {
+ if (durationSerial == null) return;
+ const result = await onDurationChange?.(shouldPreserveDefaultValue ? undefined : durationSerial);
+ if (result) hideFn();
+ return;
+ }
if (!date) return;
- const result = await onChange?.(date);
+ const result = await onChange?.(shouldPreserveDefaultValue ? undefined : date, changeType);
if (result) {
hideFn();
}
};
+ function renderPicker() {
+ if (unsupportedValue != null) {
+ return (
+ <Input
+ value={serialText}
+ onChange={(value) => {
+ setSerialText(value);
+ setIsDirty(true);
+ }}
+ />
+ );
+ }
+
+ if (patternType === 'duration') {
+ return (
+ <Input
+ value={durationText}
+ onChange={(value) => {
+ setDurationText(value);
+ setIsDirty(true);
+ }}
+ />
+ );
+ }
+
+ if (patternType === 'time') {
+ return (
+ <TimeInput
+ value={date.toDate()}
+ onValueChange={(newValue) => {
+ setLocalDate(dateKit(newValue));
+ setIsDirty(true);
+ setChangeType('time');
+ }}
+ />
+ );
+ }
+
+ return (
+ <Calendar
+ value={date.toDate()}
+ showSelection={!exceptionalDateLabel}
+ showTime={showTime ?? patternType === 'datetime'}
+ onValueChange={(newValue, nextChangeType) => {
+ setLocalDate(dateKit(newValue));
+ setIsDirty(true);
+ setChangeType(nextChangeType);
+ }}
+ />
+ );
+ }
+
return (
<div
className={`
@@ -56,24 +157,12 @@ export function DateDropdown(props: {
dark:!univer-bg-gray-1000
`}
>
- {patternType === 'time'
- ? (
- <TimeInput
- value={date.toDate()}
- onValueChange={(newValue) => {
- setLocalDate(dateKit(newValue));
- }}
- />
- )
- : (
- <Calendar
- value={date.toDate()}
- showTime={showTime ?? patternType === 'datetime'}
- onValueChange={(newValue) => {
- setLocalDate(dateKit(newValue));
- }}
- />
- )}
+ {renderPicker()}
+ {exceptionalDateLabel && unsupportedValue == null && (
+ <div className="univer-px-2 univer-pb-2 univer-text-center univer-text-sm">
+ {exceptionalDateLabel}
+ </div>
+ )}
<footer
className={clsx('univer-mt-2 univer-flex univer-justify-end univer-pt-2', borderTopClassName)}
@@ -82,7 +171,9 @@ export function DateDropdown(props: {
size="small"
variant="primary"
onClick={handleSave}
- disabled={!date || !date.isValid()}
+ disabled={unsupportedValue != null
+ ? !isDirty || serialValue == null
+ : patternType === 'duration' ? durationSerial == null : !date || !date.isValid()}
>
{localeService.t<LocaleKey>('sheets-ui.data-validation.alert.ok')}
</Button>
diff --git a/packages/sheets-ui/src/views/dropdown/__tests__/DateDropdown.spec.tsx b/packages/sheets-ui/src/views/dropdown/__tests__/DateDropdown.spec.tsx
new file mode 100644
index 0000000000..0a47067954
--- /dev/null
+++ b/packages/sheets-ui/src/views/dropdown/__tests__/DateDropdown.spec.tsx
@@ -0,0 +1,70 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * 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 { ReactElement } from 'react';
+import { describe, expect, it, vi } from 'vitest';
+import { DateDropdown, formatDuration, parseDuration } from '../DateDropdown';
+
+vi.mock('@univerjs/ui', async (importOriginal) => ({
+ ...await importOriginal<typeof import('@univerjs/ui')>(),
+ useDependency: () => ({ t: () => 'OK' }),
+}));
+
+vi.mock('react', async (importOriginal) => ({
+ ...await importOriginal<typeof import('react')>(),
+ useState: <T,>(initialValue: T | (() => T)) => [
+ typeof initialValue === 'function' ? (initialValue as () => T)() : initialValue,
+ vi.fn(),
+ ],
+}));
+
+describe('DateDropdown confirmation', () => {
+ it('submits the displayed date when an empty cell is confirmed without a selection change', async () => {
+ const onChange = vi.fn().mockResolvedValue(true);
+ const dropdown = DateDropdown({
+ popup: {
+ extraProps: {
+ hideFn: vi.fn(),
+ onChange,
+ patternType: 'date',
+ preserveDefaultValue: true,
+ },
+ } as never,
+ }) as ReactElement<{ children: ReactElement[] }>;
+ const footer = dropdown.props.children[dropdown.props.children.length - 1] as ReactElement<{
+ children: ReactElement<{ onClick: () => Promise<void> }>;
+ }>;
+
+ await footer.props.children.props.onClick();
+
+ expect(onChange).toHaveBeenCalledTimes(1);
+ expect(onChange.mock.calls[0][0]).toBeDefined();
+ });
+});
+
+describe('DateDropdown duration conversion', () => {
+ it('keeps accumulated hours and milliseconds without wrapping at 24 hours', () => {
+ expect(formatDuration(1.25)).toBe('30:00:00');
+ expect(formatDuration(-1.5)).toBe('-36:00:00');
+ expect(parseDuration('36:00:00')).toBe(1.5);
+ expect(parseDuration('12:34:56.789')).toBeCloseTo((12 * 3600 + 34 * 60 + 56.789) / 86400);
+ });
+
+ it('rejects invalid duration text', () => {
+ expect(parseDuration('24:60:00')).toBeNull();
+ expect(parseDuration('12:34')).toBeNull();
+ });
+});
diff --git a/packages/sheets/src/commands/commands/__tests__/simple-command-handlers.spec.ts b/packages/sheets/src/commands/commands/__tests__/simple-command-handlers.spec.ts
index 53baf9704f..efa5bc9d39 100644
--- a/packages/sheets/src/commands/commands/__tests__/simple-command-handlers.spec.ts
+++ b/packages/sheets/src/commands/commands/__tests__/simple-command-handlers.spec.ts
@@ -17,9 +17,11 @@
import type { IAccessor } from '@univerjs/core';
import {
CellValueType,
+ DateSystem,
ICommandService,
IUndoRedoService,
IUniverInstanceService,
+ LocaleType,
ObjectMatrix,
PresetListType,
} from '@univerjs/core';
@@ -73,6 +75,8 @@ function createWorkbook(worksheet: unknown) {
getSheetBySheetId: (subUnitId: string) => subUnitId === 'sheet-1' ? worksheet : null,
getActiveSheet: () => worksheet,
getStyles: createStyles,
+ getSnapshot: () => ({ locale: LocaleType.EN_US }),
+ getDateSystem: () => DateSystem.Date1904,
};
}
@@ -435,6 +439,7 @@ describe('TextToNumberCommand', () => {
1: { v: '003', t: CellValueType.NUMBER, s: 'text-style' },
2: { v: 'abc', t: CellValueType.STRING },
3: { v: '20%', t: CellValueType.FORCE_STRING },
+ 4: { v: '01/02/1904', t: CellValueType.STRING },
},
});
const worksheet = {
@@ -456,7 +461,7 @@ describe('TextToNumberCommand', () => {
expect(TextToNumberCommand.handler(accessor, {
unitId: 'unit-1',
subUnitId: 'sheet-1',
- ranges: [{ startRow: 0, endRow: 0, startColumn: 0, endColumn: 3 }],
+ ranges: [{ startRow: 0, endRow: 0, startColumn: 0, endColumn: 4 }],
})).toBe(true);
expect(executed.map((call) => call.id)).toEqual([SetRangeValuesMutation.id, SetNumfmtMutation.id, RemoveNumfmtMutation.id]);
expect(executed[0].params).toMatchObject({
@@ -467,6 +472,7 @@ describe('TextToNumberCommand', () => {
0: { v: 42, t: CellValueType.NUMBER },
1: { v: 3, t: CellValueType.NUMBER },
3: { v: 0.2, t: CellValueType.NUMBER },
+ 4: { v: 1, t: CellValueType.NUMBER },
},
},
});
diff --git a/packages/sheets/src/commands/commands/text-to-number.command.ts b/packages/sheets/src/commands/commands/text-to-number.command.ts
index 2b9c921e80..f754343ef8 100644
--- a/packages/sheets/src/commands/commands/text-to-number.command.ts
+++ b/packages/sheets/src/commands/commands/text-to-number.command.ts
@@ -21,6 +21,7 @@ import type { ISheetCommandSharedParams } from '../utils/interface';
import {
CellValueType,
CommandType,
+ getNumfmtLocaleTag,
getNumfmtParseValueFilter,
ICommandService,
isRealNum,
@@ -65,7 +66,11 @@ export const TextToNumberCommand: ICommand = {
const commandService = accessor.get(ICommandService);
const undoRedoService = accessor.get(IUndoRedoService);
- const { worksheet, unitId, subUnitId } = target;
+ const { workbook, worksheet, unitId, subUnitId } = target;
+ const parseOptions = {
+ locale: getNumfmtLocaleTag(workbook.getSnapshot().locale),
+ dateSystem: workbook.getDateSystem(),
+ };
const newCellValue = new ObjectMatrix<ICellData>();
const setNumfmtCells: ISetCellsNumfmt = [];
@@ -80,7 +85,7 @@ export const TextToNumberCommand: ICommand = {
const cell = worksheet.getCellRaw(r, c);
const pattern = typeof cell?.s === 'string' ? worksheet.getStyleDataByHash(cell.s)?.n?.pattern : cell?.s?.n?.pattern;
- const parsedValue = typeof cell?.v === 'string' ? getNumfmtParseValueFilter(cell.v) : null;
+ const parsedValue = typeof cell?.v === 'string' ? getNumfmtParseValueFilter(cell.v, parseOptions) : null;
const numberValue = isRealNum(cell?.v)
? Number(cell?.v)
: typeof parsedValue?.v === 'number' ? parsedValue.v : null;