diff --git a/README.md b/README.md index 333a3a860..99ea40990 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ npm install -g @angular/cli | 命令 | 描述 | | ------------------------ | ------------------------ | -| `npm run electron:build` | 各系统打包 Electron 应用 | +| `npm run build` | 各系统打包 Electron 应用 | ### 运行测试 diff --git a/src/app/electron-main/main.ts b/src/app/electron-main/main.ts index cba557e1a..c40f55433 100644 --- a/src/app/electron-main/main.ts +++ b/src/app/electron-main/main.ts @@ -40,16 +40,10 @@ function createWindow(): BrowserWindow { webSecurity: false, preload: path.join(__dirname, '../../', 'platform', 'electron-browser', 'preload.js'), nodeIntegration: true, - allowRunningInsecureContent: processEnv === 'serve' ? true : false, + allowRunningInsecureContent: processEnv === 'development' ? true : false, contextIsolation: false, // false if you want to run e2e test with Spectron }, }); - // main - if (['serve'].includes(processEnv)) { - require('electron-reload')(__dirname, { - electron: require(path.join(__dirname, '../node_modules/electron')), - }); - } proxyOpenExternal(win); let loadPage = () => { const file: string = @@ -57,7 +51,8 @@ function createWindow(): BrowserWindow { ? 'http://localhost:4200' : `file://${path.join(__dirname, '../../workbench/browser/dist/index.html')}`; win.loadURL(file); - if (['serve'].includes(processEnv)) { + console.log('processEnv', processEnv); + if (['development'].includes(processEnv)) { win.webContents.openDevTools({ mode: 'undocked', }); diff --git a/src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.ts b/src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.ts index 34b30bba7..6b40cde85 100644 --- a/src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.ts +++ b/src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.ts @@ -62,7 +62,7 @@ export class ApiGroupTreeComponent implements OnInit, OnDestroy { isFixed: true, }, ]; - nzSelectedKeys: string[] = []; + nzSelectedKeys: number[] = []; private destroy$: Subject = new Subject(); constructor( private router: Router, @@ -137,6 +137,7 @@ export class ApiGroupTreeComponent implements OnInit, OnDestroy { }); this.apiDataItems = apiItems; this.messageService.send({ type: 'loadApi', data: this.apiDataItems }); + this.setSelectedKeys(); this.generateGroupTreeData(); this.restoreExpandStatus(); } @@ -337,6 +338,7 @@ export class ApiGroupTreeComponent implements OnInit, OnDestroy { } private setSelectedKeys() { + console.log('setSelectedKeys',this.route.snapshot.queryParams.uuid,this.nzSelectedKeys) if (this.route.snapshot.queryParams.uuid) { this.nzSelectedKeys = [this.route.snapshot.queryParams.uuid]; } else { diff --git a/wiki/README.en.md b/wiki/README.en.md index 2dbd7b44d..ef7141578 100644 --- a/wiki/README.en.md +++ b/wiki/README.en.md @@ -77,7 +77,7 @@ npm install -g @angular/cli | Command | Description | | ------------------------ | ------------------------------------------------- | -| `npm run electron:build` | Packaging Electron applications for each platform | +| `npm run build` | Packaging Electron applications for each platform | ### Running the tests