diff --git a/.gitignore b/.gitignore index fa7b73019..ee1de0bcc 100644 --- a/.gitignore +++ b/.gitignore @@ -28,13 +28,6 @@ node_modules .settings/ *.sublime-workspace -# IDE - VSCode -.vscode/* -.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json - # misc /connect.lock /coverage diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..44a73ec3a --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,7 @@ +{ + "eslint.workingDirectories": [ + { + "mode": "auto" + } + ] +} diff --git a/src/app/electron-main/appView.ts b/src/app/electron-main/appView.ts index 085890b66..b2c91849a 100644 --- a/src/app/electron-main/appView.ts +++ b/src/app/electron-main/appView.ts @@ -27,7 +27,7 @@ export class AppViews { if (main_node.module && typeof main_node.module === 'object') { const _fun = main_node.module; _fun.setup({ - appView: this.view + appView: this.view, }); } } @@ -47,13 +47,19 @@ export class AppViews { this.view = undefined; this.mainModuleID = undefined; } - + rebuildBounds(sideWidth?: number) { if (!this.view) { return; } const windBounds = this.win.getContentBounds(); - const _bounds: ViewBounds = getViewBounds(ViewZone.main, windBounds.width, windBounds.height, this.sidePosition, sideWidth); + const _bounds: ViewBounds = getViewBounds( + ViewZone.main, + windBounds.width, + windBounds.height, + this.sidePosition, + sideWidth + ); this.view.setBounds(_bounds); } diff --git a/src/app/electron-main/coreView.ts b/src/app/electron-main/coreView.ts index e1422b065..e0c9d20d6 100644 --- a/src/app/electron-main/coreView.ts +++ b/src/app/electron-main/coreView.ts @@ -9,7 +9,7 @@ export class CoreViews { constructor(private win: BrowserWindow) { this.triggleEvent = this.triggleEvent.bind(this); } - + rebuildBounds() { if (!this.view) { return; @@ -65,7 +65,7 @@ export class CoreViews { * @param window */ remove() { - if(!this.view) return; + if (!this.view) return; this.win.removeBrowserView(this.view); this.view.webContents.closeDevTools(); ipcMain.removeListener('message', this.triggleEvent); diff --git a/src/app/electron-main/main.ts b/src/app/electron-main/main.ts index d0f5a764a..d8d2bccbb 100644 --- a/src/app/electron-main/main.ts +++ b/src/app/electron-main/main.ts @@ -43,7 +43,7 @@ function createWindow(): BrowserWindow { contextIsolation: false, // false if you want to run e2e test with Spectron }, }); - if (['serve'].includes(processEnv) ) { + if (['serve'].includes(processEnv)) { require('electron-reload')(__dirname, { electron: require(path.join(__dirname, '../node_modules/electron')), }); @@ -59,7 +59,7 @@ function createWindow(): BrowserWindow { mode: 'undocked', }); UnitWorkerModule.setup({ - view:win + view: win, }); }; win.webContents.on('did-fail-load', () => { diff --git a/src/platform/electron-browser/preload.ts b/src/platform/electron-browser/preload.ts index 98987d462..b0587441b 100644 --- a/src/platform/electron-browser/preload.ts +++ b/src/platform/electron-browser/preload.ts @@ -11,7 +11,7 @@ ipcRenderer.on('storageCallback', (event, result) => { storageCallback.get(result.callback)(result); storageCallback.delete(result.callback); } catch (e) { - storageCallback.delete(result.callback); + storageCallback.delete(result.callback); } } }); @@ -30,7 +30,7 @@ window.eo.getModules = () => { }; // 获取某个模块 window.eo.getModule = (moduleID) => { - return ipcRenderer.sendSync('eo-sync', { action: 'getModule', data: { moduleID: moduleID} }); + return ipcRenderer.sendSync('eo-sync', { action: 'getModule', data: { moduleID: moduleID } }); }; // 获取App应用列表 window.eo.getAppModuleList = () => {