fix(sheet): active dirty dependency ui (#1728)

* fix(sheet): active dirty dependency ui * fix(sheet): type error
dream-num · Mar 29, 2024 · d8c9e4b · d8c9e4b
1 parent 893b810
commit d8c9e4b
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 19 deletions.
diff --git a/packages/engine-formula/src/index.ts b/packages/engine-formula/src/index.ts
@@ -142,3 +142,5 @@ export { matchRefDrawToken } from './basics/match-token';
 export { IDefinedNamesService, DefinedNamesService } from './services/defined-names.service';
 export { IFormulaRuntimeService, FormulaRuntimeService } from './services/runtime.service';
 export { IFormulaCurrentConfigService, FormulaCurrentConfigService } from './services/current-data.service';
+
+export { IActiveDirtyManagerService } from './services/active-dirty-manager.service';
diff --git a/packages/engine-formula/src/plugin.ts b/packages/engine-formula/src/plugin.ts
@@ -54,6 +54,7 @@ import { FunctionService, IFunctionService } from './services/function.service';
 import { IOtherFormulaManagerService, OtherFormulaManagerService } from './services/other-formula-manager.service';
 import { FormulaRuntimeService, IFormulaRuntimeService } from './services/runtime.service';
 import { ISuperTableService, SuperTableService } from './services/super-table.service';
+import { ActiveDirtyManagerService, IActiveDirtyManagerService } from './services/active-dirty-manager.service';
 
 const PLUGIN_NAME = 'base-formula-engine';
 
@@ -81,6 +82,7 @@ export class UniverFormulaEnginePlugin extends Plugin {
             [IFunctionService, { useClass: FunctionService }],
             [IFeatureCalculationManagerService, { useClass: FeatureCalculationManagerService }],
             [IDefinedNamesService, { useClass: DefinedNamesService }],
+            [IActiveDirtyManagerService, { useClass: ActiveDirtyManagerService }],
 
             // Models
             [FormulaDataModel],

diff --git a/.../services/active-dirty-manager.service.ts → .../services/active-dirty-manager.service.ts b/.../services/active-dirty-manager.service.ts → .../services/active-dirty-manager.service.ts
diff --git a/packages/sheets-conditional-formatting/package.json b/packages/sheets-conditional-formatting/package.json
@@ -72,7 +72,6 @@
         "@univerjs/engine-formula": "workspace:*",
         "@univerjs/engine-render": "workspace:*",
         "@univerjs/sheets": "workspace:*",
-        "@univerjs/sheets-formula": "workspace:*",
         "@univerjs/sheets-ui": "workspace:*",
         "@univerjs/ui": "workspace:*",
         "@wendellhu/redi": "0.13.0",
@@ -100,7 +99,6 @@
         "@univerjs/icons-svg": "^0.1.42",
         "@univerjs/shared": "workspace:*",
         "@univerjs/sheets": "workspace:*",
-        "@univerjs/sheets-formula": "workspace:*",
         "@univerjs/sheets-ui": "workspace:*",
         "@univerjs/ui": "workspace:*",
         "@wendellhu/redi": "^0.13.0",

diff --git a/packages/sheets-conditional-formatting/src/services/__test__/test.util.ts b/packages/sheets-conditional-formatting/src/services/__test__/test.util.ts
@@ -19,10 +19,10 @@ import { ICommandService, IUniverInstanceService, LocaleType, Plugin, PluginType
 import {
     SheetInterceptorService,
 } from '@univerjs/sheets';
-import { IActiveDirtyManagerService } from '@univerjs/sheets-formula';
 
 import type { Dependency } from '@wendellhu/redi';
 import { Inject, Injector } from '@wendellhu/redi';
+import { IActiveDirtyManagerService } from '@univerjs/engine-formula';
 import { ConditionalFormattingService } from '../conditional-formatting.service';
 import { ConditionalFormattingFormulaService } from '../conditional-formatting-formula.service';
 import { SheetsConditionalFormattingPlugin } from '../../plugin';

diff --git a/...ages/sheets-conditional-formatting/src/services/conditional-formatting-formula.service.ts b/...ages/sheets-conditional-formatting/src/services/conditional-formatting-formula.service.ts
@@ -18,10 +18,10 @@ import type { ICellData, Nullable, ObjectMatrix } from '@univerjs/core';
 import { Disposable, ICommandService, RefAlias, toDisposable, Tools } from '@univerjs/core';
 import { Inject, Injector } from '@wendellhu/redi';
 import type { IRemoveOtherFormulaMutationParams, ISetFormulaCalculationResultMutation, ISetOtherFormulaMutationParams } from '@univerjs/engine-formula';
-import { IActiveDirtyManagerService } from '@univerjs/sheets-formula';
-import { RemoveOtherFormulaMutation,
+import { IActiveDirtyManagerService, RemoveOtherFormulaMutation,
     SetFormulaCalculationResultMutation,
     SetOtherFormulaMutation } from '@univerjs/engine-formula';
+
 import { Subject } from 'rxjs';
 import { bufferTime, filter, map } from 'rxjs/operators';
 import type { IConditionalFormattingFormulaMarkDirtyParams } from '../commands/mutations/formula-mark-dirty.mutation';

diff --git a/packages/sheets-formula/src/controllers/active-dirty.controller.ts b/packages/sheets-formula/src/controllers/active-dirty.controller.ts
@@ -24,7 +24,7 @@ import {
     OnLifecycle,
 } from '@univerjs/core';
 import type { IDirtyUnitSheetNameMap } from '@univerjs/engine-formula';
-import { FormulaDataModel } from '@univerjs/engine-formula';
+import { FormulaDataModel, IActiveDirtyManagerService } from '@univerjs/engine-formula';
 import type {
     IDeleteRangeMutationParams,
     IInsertSheetMutationParams,
@@ -49,8 +49,6 @@ import {
 } from '@univerjs/sheets';
 import { Inject } from '@wendellhu/redi';
 
-import { IActiveDirtyManagerService } from '../services/active-dirty-manager.service';
-
 @OnLifecycle(LifecycleStages.Ready, ActiveDirtyController)
 export class ActiveDirtyController extends Disposable {
     constructor(

diff --git a/packages/sheets-formula/src/controllers/trigger-calculation.controller.ts b/packages/sheets-formula/src/controllers/trigger-calculation.controller.ts
@@ -21,14 +21,13 @@ import type {
     IDirtyUnitOtherFormulaMap,
     IDirtyUnitSheetNameMap,
     INumfmtItemMap,
-    ISetFormulaCalculationNotificationMutation,
-} from '@univerjs/engine-formula';
+    ISetFormulaCalculationNotificationMutation } from '@univerjs/engine-formula';
 import {
     FormulaDataModel,
     FormulaExecutedStateType,
+    IActiveDirtyManagerService,
     SetFormulaCalculationNotificationMutation,
-    SetFormulaCalculationStartMutation,
-} from '@univerjs/engine-formula';
+    SetFormulaCalculationStartMutation } from '@univerjs/engine-formula';
 import type { ISetRangeValuesMutationParams } from '@univerjs/sheets';
 import {
     ClearSelectionFormatCommand,
@@ -39,7 +38,6 @@ import {
 } from '@univerjs/sheets';
 
 import { Inject } from '@wendellhu/redi';
-import { IActiveDirtyManagerService } from '../services/active-dirty-manager.service';
 
 @OnLifecycle(LifecycleStages.Ready, TriggerCalculationController)
 export class TriggerCalculationController extends Disposable {

diff --git a/packages/sheets-formula/src/formula-ui-plugin.ts b/packages/sheets-formula/src/formula-ui-plugin.ts
@@ -30,7 +30,7 @@ import { PromptController } from './controllers/prompt.controller';
 import { TriggerCalculationController } from './controllers/trigger-calculation.controller';
 import { UpdateFormulaController } from './controllers/update-formula.controller';
 import { zhCN } from './locale';
-import { ActiveDirtyManagerService, IActiveDirtyManagerService } from './services/active-dirty-manager.service';
+
 import { DescriptionService, IDescriptionService } from './services/description.service';
 import {
     FormulaCustomFunctionService,
@@ -74,7 +74,7 @@ export class UniverSheetsFormulaPlugin extends Plugin {
                 },
             ],
             [IFormulaCustomFunctionService, { useClass: FormulaCustomFunctionService }],
-            [IActiveDirtyManagerService, { useClass: ActiveDirtyManagerService }],
+
             [IRegisterFunctionService, { useClass: RegisterFunctionService }],
 
             // controllers

diff --git a/packages/sheets-formula/src/index.ts b/packages/sheets-formula/src/index.ts
@@ -22,7 +22,6 @@ export {
     FormulaCustomFunctionService,
     IFormulaCustomFunctionService,
 } from './services/formula-custom-function.service';
-export { IActiveDirtyManagerService, type IDirtyConversionManagerParams } from './services/active-dirty-manager.service';
 export type { IRegisterFunctionParams, IUnregisterFunctionParams } from './services/register-function.service';
 export { RegisterFunctionService } from './services/register-function.service';
 export { IRegisterFunctionService } from './services/register-function.service';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml