Commit3608424

authored

fix: fix resource unload (#6000)

1 parent6d4ee03 commit3608424Copy full SHA for 3608424

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -98,13 +98,13 @@ export class ResourceLoaderService extends Disposable implements IResourceLoader`
`98`	`98`
`99`	`99`	`this.disposeWithMe(`
`100`	`100`	`this._univerInstanceService.getTypeOfUnitDisposed$<Workbook>(UniverInstanceType.UNIVER_SHEET).subscribe((workbook)=>{`
`101`		`-this._resourceManagerService.unloadResources(workbook.getUnitId());`
	`101`	`+this._resourceManagerService.unloadResources(workbook.getUnitId(),UniverInstanceType.UNIVER_SHEET);`
`102`	`102`	`})`
`103`	`103`	`);`
`104`	`104`
`105`	`105`	`this.disposeWithMe(`
`106`	`106`	`this._univerInstanceService.getTypeOfUnitDisposed$<DocumentDataModel>(UniverInstanceType.UNIVER_DOC).subscribe((doc)=>{`
`107`		`-this._resourceManagerService.unloadResources(doc.getUnitId());`
	`107`	`+this._resourceManagerService.unloadResources(doc.getUnitId(),UniverInstanceType.UNIVER_DOC);`
`108`	`108`	`})`
`109`	`109`	`);`
`110`	`110`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,8 @@ export class ResourceManagerService extends Disposable implements IResourceManag`
`94`	`94`	`});`
`95`	`95`	`}`
`96`	`96`
`97`		`-publicunloadResources(unitId:string){`
`98`		`-this.getAllResourceHooks().forEach((hook)=>{`
	`97`	`+publicunloadResources(unitId:string,type:UniverInstanceType){`
	`98`	`+this.getAllResourceHooks().filter((hook)=>hook.businesses.includes(type)).forEach((hook)=>{`
`99`	`99`	`hook.onUnLoad(unitId);`
`100`	`100`	`});`
`101`	`101`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ export interface IResourceManagerService {`
`46`	`46`	`getResources(unitId:string,type:UniverInstanceType):IResources;`
`47`	`47`	`getResourcesByType:(unitId:string,type:UniverInstanceType)=>IResources;`
`48`	`48`	`loadResources:(unitId:string,resources?:IResources)=>void;`
`49`		`-unloadResources(unitId:string):void;`
	`49`	`+unloadResources(unitId:string,type:UniverInstanceType):void;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`exportconstIResourceManagerService=createIdentifier<IResourceManagerService>('core.resource-manager.service');`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import type {`
`28`	`28`	`importtype{IDeleteConditionalRuleMutationParams}from'../commands/mutations/delete-conditional-rule.mutation';`
`29`	`29`	`importtype{IConditionFormattingRule,IHighlightCell,IRuleModelJson}from'../models/type';`
`30`	`30`	`importtype{IDataBarCellData,IDataBarRenderParams,IIconSetCellData,IIconSetRenderParams}from'../render/type';`
`31`		`-import{Disposable,ICommandService,Inject,Injector,IResourceManagerService,IUniverInstanceService,merge,ObjectMatrix,Rectangle,UniverInstanceType}from'@univerjs/core';`
	`31`	`+import{Disposable,ICommandService,Inject,Injector,IResourceManagerService,isInternalEditorID,IUniverInstanceService,merge,ObjectMatrix,Rectangle,UniverInstanceType}from'@univerjs/core';`
`32`	`32`	`import{`
`33`	`33`	`InsertColMutation,`
`34`	`34`	`InsertRowMutation,`
`@@ -138,6 +138,7 @@ export class ConditionalFormattingService extends Disposable {`
`138`	`138`	`parseJson:(json)=>parseJson(json),`
`139`	`139`	`onUnLoad:(unitID)=>{`
`140`	`140`	`this._conditionalFormattingRuleModel.deleteUnitId(unitID);`
	`141`	`+if(isInternalEditorID(unitID))return;`
`141`	`142`	`this._conditionalFormattingViewModelV2.dispose();`
`142`	`143`	`},`
`143`	`144`	`onLoad:(unitID,value)=>{`

Comments

(0)