Skip to content

Commit 4f1f733

Browse files
author
guqiankun.gqk
committed
chore: 修复引用问题
1 parent bc62227 commit 4f1f733

4 files changed

Lines changed: 13 additions & 15 deletions

File tree

packages/alex/src/api/renderApp.tsx

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@ import { REPORT_NAME, RuntimeConfig } from '@alipay/alex-core';
55
import { createApp } from './createApp';
66
import { Root } from '../core/Root';
77
import { RootProps, LandingProps } from '../core/types';
8-
import { setSingleInjector, singleInjector, useConstant, isRendered, setRendered } from '../core/hooks';
8+
import {
9+
setSingleInjector,
10+
singleInjector,
11+
useConstant,
12+
isRendered,
13+
setRendered,
14+
setSingleApp,
15+
singleApp,
16+
} from '../core/hooks';
917
import { IConfig, IAppInstance } from './types';
1018
import styles from '../core/style.module.less';
1119

@@ -126,13 +134,14 @@ export const AppRenderer2: React.FC<IAppRendererProps> = ({ onLoad, Landing, ...
126134
createApp({
127135
...opts,
128136
// @ts-ignore
129-
// injector: singleInjector,
137+
injector: singleInjector,
130138
})
131139
);
140+
132141
const themeType = useConstant(() => app.currentThemeType);
133142
const appElementRef = useRef<React.ReactElement | null>(null);
134-
// setSingleInjector(app.injector);
135-
143+
setSingleInjector(app.injector);
144+
setSingleApp(app);
136145
// 确保回调始终为最新
137146
// TODO: 用 PropsService
138147
const runtimeConfig: RuntimeConfig = app.injector.get(RuntimeConfig);

packages/core/src/client/override/monacoContextKeyService.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { StandaloneKeybindingServiceProxy } from './monacoOverride/standaloneKey
99
import { ICommandServiceToken } from '@opensumi/ide-monaco/lib/browser/contrib/command';
1010
import { MonacoCodeService } from './monacoOverride/codeEditorService';
1111
import { MonacoCommandService } from '@opensumi/ide-editor/lib/browser/monaco-contrib/command/command.service';
12-
import { isRendered } from '@alipay/alex/lib/core/hooks';
1312
// import { MonacoCodeService, monacoCodeServiceProxy } from './codeEditorService';
1413

1514
export const IMonacoOverrideService = Symbol('IMonacoOverrideService');
@@ -23,10 +22,6 @@ export class MonacoOverrideService implements MonacoContribution {
2322
monacoCodeService: MonacoCodeService;
2423

2524
registerOverrideService(registry: MonacoOverrideServiceRegistry) {
26-
// TODO hack 逻辑
27-
if(isRendered){
28-
return
29-
}
3025

3126
// TODO opensumi ServiceNames
3227
registry.registerOverrideService(

packages/core/src/server/core/fs-launch.contribution.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { IServerApp, RuntimeConfig, RootFS, AppConfig } from '../../common/types
55
import { LaunchContribution } from './app';
66
import { FileSystemContribution } from './base';
77
import { BrowserFS } from '../node';
8-
import { setSingleInjector, singleInjector } from '@alipay/alex/lib/core/hooks';
98

109
@Domain(LaunchContribution)
1110
export class FileSystemLaunchContribution implements LaunchContribution {

packages/sql-service/src/contribution/sql-service.contribution.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import {
3838
IEditorDocumentModelService,
3939
} from '@opensumi/ide-editor/lib/browser';
4040
import { PreferenceService } from '@opensumi/ide-core-browser';
41-
import { isRendered } from '@alipay/alex/lib/core/hooks';
4241

4342
@Injectable()
4443
@Domain(ClientAppContribution, BrowserEditorContribution)
@@ -113,10 +112,6 @@ export class SqlServiceContribution
113112
}
114113

115114
onDidStart(app: IClientApp): MaybePromise<void> {
116-
// TODO hack 逻辑
117-
// if (isRendered) {
118-
// return;
119-
// }
120115
this.registerLanguage(supportLanguage.ODPSSQL);
121116
const editorMap = new Map<string, CustomEditorInstance>();
122117

0 commit comments

Comments
 (0)