Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: disposing unit should not emit error #2529

Merged
merged 13 commits into from
Jun 15, 2024
Merged

ci: disposing unit should not emit error #2529

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9b6d6f5
ci: should throw no error on disposing unit
wzhudev Jun 15, 2024
47c2ce0
ci: trigger error
wzhudev Jun 15, 2024
0dbb76a
chore: fix code style
wzhudev Jun 15, 2024
1d8ef9f
fix: change logic of permission menu
ybzky Jun 15, 2024
bdc7010
fix: fix init value
ybzky Jun 15, 2024
2508e75
chore: change export
ybzky Jun 15, 2024
2d98c60
fix: bugfix
ybzky Jun 15, 2024
dc6b0a9
fix: fix disposing sequence
wzhudev Jun 15, 2024
29fe779
chore: remove redundant code
wzhudev Jun 15, 2024
f5ee3ad
fix: clear sheet permission when dispose unit
ybzky Jun 15, 2024
f88d0dc
fix: fix time sequence error
wzhudev Jun 15, 2024
f9a6163
fix: clear permission point when dispose unit
ybzky Jun 15, 2024
3a50452
fix: fix test
ybzky Jun 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: remove redundant code
  • Loading branch information
@wzhudev @ybzky
wzhudev authored and ybzky committed Jun 15, 2024
commit 29fe77923094500f6f8cec02c5a7272ab71a23e0
4 changes: 0 additions & 4 deletions packages/sheets/src/controllers/calculate-result-apply.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ export class CalculateResultApplyController extends Disposable {
}

private _initialize(): void {
this._commandExecutedListener();
}

private _commandExecutedListener() {
this.disposeWithMe(
this._commandService.onCommandExecuted((command: ICommandInfo) => {
if (command.id !== SetFormulaCalculationResultMutation.id) {
Expand Down
5 changes: 0 additions & 5 deletions packages/sheets/src/controllers/defined-name-data.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@

import {
Disposable,
ICommandService,
IResourceManagerService,
IUniverInstanceService,
LifecycleStages,
OnLifecycle,
UniverInstanceType } from '@univerjs/core';
Expand All @@ -30,11 +28,8 @@ const SHEET_DEFINED_NAME_PLUGIN = 'SHEET_DEFINED_NAME_PLUGIN';
@OnLifecycle(LifecycleStages.Ready, DefinedNameDataController)
export class DefinedNameDataController extends Disposable {
constructor(
@ICommandService private readonly _commandService: ICommandService,
@IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,
@IDefinedNamesService private readonly _definedNamesService: IDefinedNamesService,
@IResourceManagerService private _resourceManagerService: IResourceManagerService

) {
super();

Expand Down
105 changes: 0 additions & 105 deletions packages/sheets/src/controllers/feature-calculation.controller.ts
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions packages/sheets/src/sheets-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import { Inject, Injector } from '@wendellhu/redi';
import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula';
import { BasicWorksheetController } from './controllers/basic-worksheet.controller';
import { CalculateResultApplyController } from './controllers/calculate-result-apply.controller';
import { FeatureCalculationController } from './controllers/feature-calculation.controller';
import { MergeCellController } from './controllers/merge-cell.controller';
import { BorderStyleManagerService } from './services/border-style-manager.service';
import { NumfmtService } from './services/numfmt/numfmt.service';
Expand Down Expand Up @@ -114,8 +113,7 @@ export class UniverSheetsPlugin extends Plugin {
if (!this._config?.notExecuteFormula) {
// Should execute formula.
dependencies.push(
[CalculateResultApplyController],
[FeatureCalculationController]
[CalculateResultApplyController]
);
}

Expand Down