diff --git a/packages/engine-formula/src/index.ts b/packages/engine-formula/src/index.ts index 0ad89233730..b352c338688 100644 --- a/packages/engine-formula/src/index.ts +++ b/packages/engine-formula/src/index.ts @@ -85,6 +85,7 @@ export { export { generateStringWithSequence, type ISequenceNode, sequenceNodeType } from './engine/utils/sequence'; export { ArrayValueObject, ValueObjectFactory } from './engine/value-object/array-value-object'; export { BaseValueObject, ErrorValueObject } from './engine/value-object/base-value-object'; +export { BooleanValue } from './basics/common'; export type { PrimitiveValueType } from './engine/value-object/primitive-object'; export { NumberValueObject } from './engine/value-object/primitive-object'; export { BooleanValueObject } from './engine/value-object/primitive-object'; diff --git a/packages/sheets-conditional-format/src/services/calculate-unit/utils.ts b/packages/sheets-conditional-format/src/services/calculate-unit/utils.ts index 336d19b5ab5..4357221fd0f 100644 --- a/packages/sheets-conditional-format/src/services/calculate-unit/utils.ts +++ b/packages/sheets-conditional-format/src/services/calculate-unit/utils.ts @@ -15,7 +15,8 @@ */ import type { ICellData } from '@univerjs/core'; -import { ColorKit, ObjectMatrix, Range } from '@univerjs/core'; +import { BooleanNumber, CellValueType, ColorKit, ObjectMatrix, Range } from '@univerjs/core'; +import { BooleanValue } from '@univerjs/engine-formula'; import type { IConditionFormatRule, IValueConfig } from '../../models/type'; import { NumberOperator, ValueType } from '../../base/const'; import { ConditionalFormatFormulaService, FormulaResultStatus } from '../conditional-format-formula.service'; @@ -30,6 +31,9 @@ export const getCellValue = (cell?: ICellData) => { if (!cell) { return null; } + if (cell.t === CellValueType.BOOLEAN) { + return cell.v === BooleanNumber.TRUE ? BooleanValue.TRUE : BooleanValue.FALSE; + } const v = cell.v; const dataStream = cell.p?.body?.dataStream.replace(/\r\n$/, ''); return !isNullable(v) ? v : !isNullable(dataStream) ? dataStream : null;