Skip to content

Commit 4b123dc

Browse files
author
weimin2.zhou
committed
fix: codefuse ide support web ide
1 parent d7142f9 commit 4b123dc

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

packages/core-browser/src/common/common.contribution.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ export class ClientCommonContribution
6060

6161
constructor() {
6262
const overridePropertiesDefault = {
63-
'application.supportsOpenFolder': !!this.appConfig.isElectronRenderer && !this.appConfig.isRemote,
64-
'application.supportsOpenWorkspace': !!this.appConfig.isElectronRenderer && !this.appConfig.isRemote,
63+
'application.supportsOpenFolder': !this.appConfig.isRemote,
64+
'application.supportsOpenWorkspace': !this.appConfig.isRemote,
6565
'debug.toolbar.top': this.appConfig.isElectronRenderer ? 0 : this.layoutViewSize.menubarHeight,
6666
};
6767
const keys = Object.keys(this.schema.properties);

packages/core-browser/src/keybinding/keybinding.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { ContextKeyExpression } from '@opensumi/monaco-editor-core/esm/vs/platfo
1717
import { IContextKeyService } from '../context-key';
1818
import { KeyboardLayoutService } from '../keyboard/keyboard-layout-service';
1919
import { Key, KeyCode, KeySequence, SpecialCases } from '../keyboard/keys';
20+
import { AppConfig } from '../react-providers/config-provider';
2021
import { IStatusBarService, StatusBarAlignment } from '../services';
2122

2223
export enum KeybindingScope {
@@ -230,6 +231,9 @@ export class KeybindingRegistryImpl implements KeybindingRegistry, KeybindingSer
230231
@Autowired(IStatusBarService)
231232
protected readonly statusBar: IStatusBarService;
232233

234+
@Autowired(AppConfig)
235+
private readonly appConfig: AppConfig;
236+
233237
public async initialize(): Promise<void> {
234238
await this.keyboardLayoutService.initialize();
235239
this.keyboardLayoutService.onKeyboardLayoutChanged(() => {
@@ -884,6 +888,10 @@ export class KeybindingRegistryImpl implements KeybindingRegistry, KeybindingSer
884888
return false;
885889
}
886890
for (const binding of bindings) {
891+
// 在web下electron绑定的浏览器基础快捷键无法使用,这里跳过,直接使用浏览器的快捷键
892+
if (!this.appConfig.isElectronRenderer && binding.command.startsWith('electron.')) {
893+
continue;
894+
}
887895
if (this.isEnabled(binding, event)) {
888896
if (this.isPseudoCommand(binding.command)) {
889897
// 让事件冒泡

0 commit comments

Comments
 (0)