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.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(conditional-formatting): fix type (#4181)
Gpound.liu9db1edf03390
diff --git a/packages/facade/src/apis/__tests__/create-test-bed.ts b/packages/facade/src/apis/__tests__/create-test-bed.tsindex 31949a7526..189d200806 100644--- a/packages/facade/src/apis/__tests__/create-test-bed.ts+++ b/packages/facade/src/apis/__tests__/create-test-bed.ts@@ -45,7 +45,7 @@ import {WorksheetProtectionPointModel,WorksheetProtectionRuleModel,} from '@univerjs/sheets';-import { ConditionalFormattingFormulaService, ConditionalFormattingRuleModel, ConditionalFormattingService, ConditionalFormattingViewModelV2 } from '@univerjs/sheets-conditional-formatting';+import { ConditionalFormattingFormulaService, ConditionalFormattingRuleModel, ConditionalFormattingService, ConditionalFormattingViewModel } from '@univerjs/sheets-conditional-formatting';import { DataValidationCacheService, DataValidationCustomFormulaService, DataValidationFormulaService, SheetDataValidationModel, SheetsDataValidationValidatorService } from '@univerjs/sheets-data-validation';import { UniverSheetsFilterPlugin } from '@univerjs/sheets-filter';import {@@ -182,7 +182,7 @@ export function createFacadeTestBed(workbookData?: IWorkbookData, dependencies?:[ConditionalFormattingService],[ConditionalFormattingFormulaService],[ConditionalFormattingRuleModel],- [ConditionalFormattingViewModelV2],+ [ConditionalFormattingViewModel],// data validation[DataValidationCacheService],diff --git a/packages/facade/src/apis/sheets/__tests__/create-worksheet-test-bed.ts b/packages/facade/src/apis/sheets/__tests__/create-worksheet-test-bed.tsindex 81bb4d061e..2fd756ddeb 100644--- a/packages/facade/src/apis/sheets/__tests__/create-worksheet-test-bed.ts+++ b/packages/facade/src/apis/sheets/__tests__/create-worksheet-test-bed.ts@@ -45,7 +45,7 @@ import {WorksheetProtectionPointModel,WorksheetProtectionRuleModel,} from '@univerjs/sheets';-import { ConditionalFormattingFormulaService, ConditionalFormattingRuleModel, ConditionalFormattingService, ConditionalFormattingViewModelV2 } from '@univerjs/sheets-conditional-formatting';+import { ConditionalFormattingFormulaService, ConditionalFormattingRuleModel, ConditionalFormattingService, ConditionalFormattingViewModel } from '@univerjs/sheets-conditional-formatting';import { DataValidationCacheService, DataValidationCustomFormulaService, DataValidationFormulaService, SheetDataValidationModel, SheetsDataValidationValidatorService } from '@univerjs/sheets-data-validation';import { UniverSheetsFilterPlugin } from '@univerjs/sheets-filter';@@ -179,7 +179,7 @@ export function createWorksheetTestBed(workbookData?: IWorkbookData, dependencie[ConditionalFormattingService],[ConditionalFormattingFormulaService],[ConditionalFormattingRuleModel],- [ConditionalFormattingViewModelV2],+ [ConditionalFormattingViewModel],// data validation[DataValidationCacheService],diff --git a/packages/sheets-conditional-formatting-ui/src/controllers/cf.auto-fill.controller.ts b/packages/sheets-conditional-formatting-ui/src/controllers/cf.auto-fill.controller.tsindex c0222ce5a2..6a522eb0a1 100644--- a/packages/sheets-conditional-formatting-ui/src/controllers/cf.auto-fill.controller.ts+++ b/packages/sheets-conditional-formatting-ui/src/controllers/cf.auto-fill.controller.ts@@ -19,7 +19,7 @@ import type { IDeleteConditionalRuleMutationParams, ISetConditionalRuleMutationPimport type { IDiscreteRange, ISheetAutoFillHook } from '@univerjs/sheets-ui';import { Disposable, Inject, Injector, IUniverInstanceService, ObjectMatrix, Range, Rectangle, UniverInstanceType } from '@univerjs/core';import { createTopMatrixFromMatrix, findAllRectangle } from '@univerjs/sheets';-import { ConditionalFormattingRuleModel, ConditionalFormattingViewModelV2, DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory, SetConditionalRuleMutation, setConditionalRuleMutationUndoFactory, SHEET_CONDITIONAL_FORMATTING_PLUGIN } from '@univerjs/sheets-conditional-formatting';+import { ConditionalFormattingRuleModel, ConditionalFormattingViewModel, DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory, SetConditionalRuleMutation, setConditionalRuleMutationUndoFactory, SHEET_CONDITIONAL_FORMATTING_PLUGIN } from '@univerjs/sheets-conditional-formatting';import { APPLY_TYPE, getAutoFillRepeatRange, IAutoFillService, virtualizeDiscreteRanges } from '@univerjs/sheets-ui';export class ConditionalFormattingAutoFillController extends Disposable {@@ -28,7 +28,7 @@ export class ConditionalFormattingAutoFillController extends Disposable {@Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService,@Inject(IAutoFillService) private _autoFillService: IAutoFillService,@Inject(ConditionalFormattingRuleModel) private _conditionalFormattingRuleModel: ConditionalFormattingRuleModel,- @Inject(ConditionalFormattingViewModelV2) private _conditionalFormattingViewModel: ConditionalFormattingViewModelV2+ @Inject(ConditionalFormattingViewModel) private _conditionalFormattingViewModel: ConditionalFormattingViewModel) {super();diff --git a/packages/sheets-conditional-formatting-ui/src/controllers/cf.copy-paste.controller.ts b/packages/sheets-conditional-formatting-ui/src/controllers/cf.copy-paste.controller.tsindex b5c78c6656..ef759c0963 100644--- a/packages/sheets-conditional-formatting-ui/src/controllers/cf.copy-paste.controller.ts+++ b/packages/sheets-conditional-formatting-ui/src/controllers/cf.copy-paste.controller.ts@@ -31,7 +31,7 @@ import {import {createTopMatrixFromMatrix, findAllRectangle,} from '@univerjs/sheets';-import { AddConditionalRuleMutation, AddConditionalRuleMutationUndoFactory, ConditionalFormattingRuleModel, ConditionalFormattingViewModelV2, DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory, SetConditionalRuleMutation, setConditionalRuleMutationUndoFactory, SHEET_CONDITIONAL_FORMATTING_PLUGIN } from '@univerjs/sheets-conditional-formatting';+import { AddConditionalRuleMutation, AddConditionalRuleMutationUndoFactory, ConditionalFormattingRuleModel, ConditionalFormattingViewModel, DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory, SetConditionalRuleMutation, setConditionalRuleMutationUndoFactory, SHEET_CONDITIONAL_FORMATTING_PLUGIN } from '@univerjs/sheets-conditional-formatting';import { COPY_TYPE, getRepeatRange, ISheetClipboardService, PREDEFINED_HOOK_NAME, rangeToDiscreteRange, virtualizeDiscreteRanges } from '@univerjs/sheets-ui';export class ConditionalFormattingCopyPasteController extends Disposable {@@ -48,7 +48,7 @@ export class ConditionalFormattingCopyPasteController extends Disposable {@Inject(ISheetClipboardService) private _sheetClipboardService: ISheetClipboardService,@Inject(ConditionalFormattingRuleModel) private _conditionalFormattingRuleModel: ConditionalFormattingRuleModel,@Inject(Injector) private _injector: Injector,- @Inject(ConditionalFormattingViewModelV2) private _conditionalFormattingViewModel: ConditionalFormattingViewModelV2,+ @Inject(ConditionalFormattingViewModel) private _conditionalFormattingViewModel: ConditionalFormattingViewModel,@Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService) {diff --git a/packages/sheets-conditional-formatting-ui/src/controllers/cf.painter.controller.ts b/packages/sheets-conditional-formatting-ui/src/controllers/cf.painter.controller.tsindex ad1c9553b4..9fe00ebe63 100644--- a/packages/sheets-conditional-formatting-ui/src/controllers/cf.painter.controller.ts+++ b/packages/sheets-conditional-formatting-ui/src/controllers/cf.painter.controller.ts@@ -19,7 +19,7 @@ import type { IAddConditionalRuleMutationParams, IDeleteConditionalRuleMutationPimport type { IFormatPainterHook } from '@univerjs/sheets-ui';import { Disposable, Inject, Injector, IUniverInstanceService, ObjectMatrix, Range, Rectangle, Tools, UniverInstanceType } from '@univerjs/core';import { createTopMatrixFromMatrix, findAllRectangle, SheetsSelectionsService } from '@univerjs/sheets';-import { AddConditionalRuleMutation, AddConditionalRuleMutationUndoFactory, ConditionalFormattingRuleModel, ConditionalFormattingViewModelV2, DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory, SetConditionalRuleMutation, setConditionalRuleMutationUndoFactory, SHEET_CONDITIONAL_FORMATTING_PLUGIN } from '@univerjs/sheets-conditional-formatting';+import { AddConditionalRuleMutation, AddConditionalRuleMutationUndoFactory, ConditionalFormattingRuleModel, ConditionalFormattingViewModel, DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory, SetConditionalRuleMutation, setConditionalRuleMutationUndoFactory, SHEET_CONDITIONAL_FORMATTING_PLUGIN } from '@univerjs/sheets-conditional-formatting';import { FormatPainterStatus, IFormatPainterService } from '@univerjs/sheets-ui';const repeatByRange = (sourceRange: IRange, targetRange: IRange) => {@@ -82,7 +82,7 @@ export class ConditionalFormattingPainterController extends Disposable {@Inject(SheetsSelectionsService) private _sheetsSelectionsService: SheetsSelectionsService,@Inject(ConditionalFormattingRuleModel) private _conditionalFormattingRuleModel: ConditionalFormattingRuleModel,- @Inject(ConditionalFormattingViewModelV2) private _conditionalFormattingViewModel: ConditionalFormattingViewModelV2+ @Inject(ConditionalFormattingViewModel) private _conditionalFormattingViewModel: ConditionalFormattingViewModel) {super();diff --git a/packages/sheets-conditional-formatting-ui/src/controllers/cf.render.controller.ts b/packages/sheets-conditional-formatting-ui/src/controllers/cf.render.controller.tsindex 698587e36a..f9e05f9d33 100644--- a/packages/sheets-conditional-formatting-ui/src/controllers/cf.render.controller.ts+++ b/packages/sheets-conditional-formatting-ui/src/controllers/cf.render.controller.ts@@ -19,7 +19,7 @@ import type { IConditionalFormattingCellData, IConditionFormattingRule } from '@import { Disposable, Inject, InterceptorEffectEnum, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';import { IRenderManagerService } from '@univerjs/engine-render';import { INTERCEPTOR_POINT, SheetInterceptorService } from '@univerjs/sheets';-import { ConditionalFormattingRuleModel, ConditionalFormattingService, ConditionalFormattingViewModelV2, DEFAULT_PADDING, DEFAULT_WIDTH } from '@univerjs/sheets-conditional-formatting';+import { ConditionalFormattingRuleModel, ConditionalFormattingService, ConditionalFormattingViewModel, DEFAULT_PADDING, DEFAULT_WIDTH } from '@univerjs/sheets-conditional-formatting';import { SheetSkeletonManagerService } from '@univerjs/sheets-ui';import { merge } from 'rxjs';import { bufferTime, filter } from 'rxjs/operators';@@ -34,7 +34,7 @@ export class SheetsCfRenderController extends Disposable {@Inject(ConditionalFormattingService) private _conditionalFormattingService: ConditionalFormattingService,@Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService,@Inject(IRenderManagerService) private _renderManagerService: IRenderManagerService,- @Inject(ConditionalFormattingViewModelV2) private _conditionalFormattingViewModel: ConditionalFormattingViewModelV2,+ @Inject(ConditionalFormattingViewModel) private _conditionalFormattingViewModel: ConditionalFormattingViewModel,@Inject(ConditionalFormattingRuleModel) private _conditionalFormattingRuleModel: ConditionalFormattingRuleModel) {super();diff --git a/packages/sheets-conditional-formatting-ui/src/controllers/cf.viewport.controller.ts b/packages/sheets-conditional-formatting-ui/src/controllers/cf.viewport.controller.tsindex f7cd77a0dd..33fbb14e13 100644--- a/packages/sheets-conditional-formatting-ui/src/controllers/cf.viewport.controller.ts+++ b/packages/sheets-conditional-formatting-ui/src/controllers/cf.viewport.controller.ts@@ -17,12 +17,12 @@import type { Workbook } from '@univerjs/core';import { Disposable, Inject, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';import { IRenderManagerService } from '@univerjs/engine-render';-import { CONDITIONAL_FORMATTING_VIEWPORT_CACHE_LENGTH, ConditionalFormattingViewModelV2 } from '@univerjs/sheets-conditional-formatting';+import { CONDITIONAL_FORMATTING_VIEWPORT_CACHE_LENGTH, ConditionalFormattingViewModel } from '@univerjs/sheets-conditional-formatting';import { SheetSkeletonManagerService } from '@univerjs/sheets-ui';export class ConditionalFormattingViewportController extends Disposable {constructor(- @Inject(ConditionalFormattingViewModelV2) private _conditionalFormattingViewModel: ConditionalFormattingViewModelV2,+ @Inject(ConditionalFormattingViewModel) private _conditionalFormattingViewModel: ConditionalFormattingViewModel,@IUniverInstanceService private _univerInstanceService: IUniverInstanceService,@IRenderManagerService private _renderManagerService: IRenderManagerService) {super();diff --git a/packages/sheets-conditional-formatting/src/index.ts b/packages/sheets-conditional-formatting/src/index.tsindex cfdee4e0f8..532aa08316 100644--- a/packages/sheets-conditional-formatting/src/index.ts+++ b/packages/sheets-conditional-formatting/src/index.ts@@ -16,7 +16,7 @@export * from './base/const';export * from './models/conditional-formatting-rule-model';-export * from './models/conditional-formatting-view-model-v2';+export * from './models/conditional-formatting-view-model';export * from './models/icon-map';export * from './models/type';export { UniverSheetsConditionalFormattingPlugin } from './plugin';diff --git a/packages/sheets-conditional-formatting/src/models/calculate-unit-v2/__test__/test.util.ts b/packages/sheets-conditional-formatting/src/models/calculate-unit-v2/__test__/test.util.tsindex 576a77039b..cefaa2d377 100644--- a/packages/sheets-conditional-formatting/src/models/calculate-unit-v2/__test__/test.util.ts+++ b/packages/sheets-conditional-formatting/src/models/calculate-unit-v2/__test__/test.util.ts@@ -27,10 +27,10 @@ import { MoveConditionalRuleMutation } from '../../../commands/mutations/move-coimport { SetConditionalRuleMutation } from '../../../commands/mutations/set-conditional-rule.mutation';import { ConditionalFormattingRuleModel } from '../../../models/conditional-formatting-rule-model';-import { ConditionalFormattingViewModelV2 } from '../../../models/conditional-formatting-view-model-v2';-import { ConditionalFormattingFormulaService } from '../../../services/conditional-formatting-formula.service';+import { ConditionalFormattingService } from '../../../services/conditional-formatting.service';+import { ConditionalFormattingViewModel } from '../../conditional-formatting-view-model';const TEST_WORKBOOK_DATA_DEMO: () => IWorkbookData = () => ({id: 'test',@@ -76,7 +76,7 @@ export const createTestBed = (dependencies?: Dependency[]) => {this._injector.add([ConditionalFormattingService]);this._injector.add([ConditionalFormattingFormulaService]);this._injector.add([ConditionalFormattingRuleModel]);- this._injector.add([ConditionalFormattingViewModelV2]);+ this._injector.add([ConditionalFormattingViewModel]);this._injector.add([IActiveDirtyManagerService, { useFactory: () => ({ register: () => { /* empty */ } } as any) }]);}@@ -110,7 +110,7 @@ export const createTestBed = (dependencies?: Dependency[]) => {univerInstanceService.setCurrentUnitForType(unitId);const getConditionalFormattingRuleModel = () => injector.get(ConditionalFormattingRuleModel);- const getConditionalFormattingViewModel = () => injector.get(ConditionalFormattingViewModelV2);+ const getConditionalFormattingViewModel = () => injector.get(ConditionalFormattingViewModel);const getConditionalFormattingService = () => injector.get(ConditionalFormattingService);return {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.tsindex 644c8c0c60..b2cd0160c4 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@@ -20,8 +20,8 @@ import type { IContext } from './base-calculate-unit';import { BooleanNumber, CellValueType, ColorKit, dayjs, ObjectMatrix, Range } from '@univerjs/core';import { BooleanValue } from '@univerjs/engine-formula';import { CFNumberOperator, CFValueType } from '../../base/const';-import { ConditionalFormattingViewModelV2 } from '../../models/conditional-formatting-view-model-v2';import { ConditionalFormattingFormulaService, FormulaResultStatus } 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;@@ -173,7 +173,7 @@ export const getValueByType = (value: IValueConfig, matrix: ObjectMatrix<number>export const getCacheStyleMatrix = <S = any>(unitId: string, subUnitId: string, rule: IConditionFormattingRule, context: IContext) => {const { accessor } = context;- const conditionalFormattingViewModel = accessor.get(ConditionalFormattingViewModelV2);+ const conditionalFormattingViewModel = accessor.get(ConditionalFormattingViewModel);const matrix = new ObjectMatrix<S>();rule.ranges.forEach((range) => {Range.foreach(range, (row, col) => {diff --git a/packages/sheets-conditional-formatting/src/models/conditional-formatting-view-model-v2.ts b/packages/sheets-conditional-formatting/src/models/conditional-formatting-view-model.tssimilarity index 99%rename from packages/sheets-conditional-formatting/src/models/conditional-formatting-view-model-v2.tsrename to packages/sheets-conditional-formatting/src/models/conditional-formatting-view-model.tsindex 9cfa4b4572..a751baf9e9 100644--- a/packages/sheets-conditional-formatting/src/models/conditional-formatting-view-model-v2.ts+++ b/packages/sheets-conditional-formatting/src/models/conditional-formatting-view-model.ts@@ -30,7 +30,7 @@ import { ConditionalFormattingRuleModel } from './conditional-formatting-rule-mo// The default is a 50-row,20-column viewable area.export const CONDITIONAL_FORMATTING_VIEWPORT_CACHE_LENGTH = 50 * 20 * 3 * 3;-export class ConditionalFormattingViewModelV2 extends Disposable {+export class ConditionalFormattingViewModel extends Disposable {// Map<unitID ,<sheetId ,ObjectMatrix>>private _calculateUnitManagers: Map<string, Map<string, Map<string, BaseCalculateUnit>>> = new Map();private _rTreeManager: RTree = new RTree();@@ -43,7 +43,7 @@ export class ConditionalFormattingViewModelV2 extends Disposable {private _markDirty$ = new Subject<{ cfId: string; unitId: string; subUnitId: string; isImmediately?: boolean }>();/*** The rendering layer listens to this variable to determine whether a reRender is necessary.- * @memberof ConditionalFormattingViewModelV2+ * @memberof ConditionalFormattingViewModel*/public markDirty$ = this._markDirty$.asObservable();constructor(diff --git a/packages/sheets-conditional-formatting/src/plugin.ts b/packages/sheets-conditional-formatting/src/plugin.tsindex 04372deee2..82f0bc726a 100644--- a/packages/sheets-conditional-formatting/src/plugin.ts+++ b/packages/sheets-conditional-formatting/src/plugin.ts@@ -28,9 +28,9 @@ import {PLUGIN_CONFIG_KEY,} from './controllers/config.schema';import { ConditionalFormattingRuleModel } from './models/conditional-formatting-rule-model';-import { ConditionalFormattingViewModelV2 } from './models/conditional-formatting-view-model-v2';-import { ConditionalFormattingService } from './services/conditional-formatting.service';+import { ConditionalFormattingViewModel } from './models/conditional-formatting-view-model';import { ConditionalFormattingFormulaService } from './services/conditional-formatting-formula.service';+import { ConditionalFormattingService } from './services/conditional-formatting.service';export class UniverSheetsConditionalFormattingPlugin extends Plugin {static override pluginName = SHEET_CONDITIONAL_FORMATTING_PLUGIN;@@ -52,7 +52,7 @@ export class UniverSheetsConditionalFormattingPlugin extends Plugin {[ConditionalFormattingService],[ConditionalFormattingFormulaService],[ConditionalFormattingRuleModel],- [ConditionalFormattingViewModelV2],+ [ConditionalFormattingViewModel],] as Dependency[]).forEach((dependency) => {this._injector.add(dependency);});@@ -70,6 +70,6 @@ export class UniverSheetsConditionalFormattingPlugin extends Plugin {override onStarting(): void {this._injector.get(ConditionalFormattingService);- touchDependencies(this._injector, [[ConditionalFormattingService], [ConditionalFormattingViewModelV2]]);+ touchDependencies(this._injector, [[ConditionalFormattingService], [ConditionalFormattingViewModel]]);}}diff --git a/packages/sheets-conditional-formatting/src/services/conditional-formatting.service.ts b/packages/sheets-conditional-formatting/src/services/conditional-formatting.service.tsindex 6bc875d65d..7d179691bf 100644--- a/packages/sheets-conditional-formatting/src/services/conditional-formatting.service.ts+++ b/packages/sheets-conditional-formatting/src/services/conditional-formatting.service.ts@@ -24,11 +24,11 @@ import { InsertColMutation, InsertRowMutation, MoveColsMutation, MoveRangeMutatiimport { CFRuleType, SHEET_CONDITIONAL_FORMATTING_PLUGIN } from '../base/const';import { DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory } from '../commands/mutations/delete-conditional-rule.mutation';import { ConditionalFormattingRuleModel } from '../models/conditional-formatting-rule-model';-import { ConditionalFormattingViewModelV2 } from '../models/conditional-formatting-view-model-v2';+import { ConditionalFormattingViewModel } from '../models/conditional-formatting-view-model';export class ConditionalFormattingService extends Disposable {get _conditionalFormattingViewModelV2() {- return this._injector.get(ConditionalFormattingViewModelV2);+ return this._injector.get(ConditionalFormattingViewModel);}constructor(