fix: initial tab is not displayed

Postcatlab · May 21, 2022 · d2e11bc · d2e11bc
1 parent 2512c1c
commit d2e11bc
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 29 deletions.
diff --git a/src/app/electron-main/main.ts b/src/app/electron-main/main.ts
@@ -35,7 +35,7 @@ function createWindow(): BrowserWindow {
     width: Math.round(size.width * 0.8),
     height: Math.round(size.height * 0.8),
     useContentSize: true, // 这个要设置，不然计算显示区域尺寸不准
-    // frame: os.type() === 'Darwin' ? true : false, //mac use default frame
+    frame: os.type() === 'Darwin' ? true : false, //mac use default frame
     webPreferences: {
       webSecurity: false,
       preload: path.join(__dirname, '../../', 'platform', 'electron-browser', 'preload.js'),
@@ -56,11 +56,12 @@ function createWindow(): BrowserWindow {
       processEnv === 'development'
         ? 'http://localhost:4200'
         : `file://${path.join(__dirname, '../../workbench/browser/dist/index.html')}`;
-    console.log('loadPage', file);
     win.loadURL(file);
-    win.webContents.openDevTools({
-      mode: 'undocked',
-    });
+    if (['serve'].includes(processEnv)) {
+      win.webContents.openDevTools({
+        mode: 'undocked',
+      });
+    }
     UnitWorkerModule.setup({
       view: win,
     });

diff --git a/src/platform/browser/IndexedDB/lib/index.ts b/src/platform/browser/IndexedDB/lib/index.ts
@@ -11,7 +11,6 @@ export class Storage extends Dexie implements StorageInterface {
   apiTestHistory!: Table<ApiTestHistory, number | string>;
 
   constructor() {
-    console.log('eoapi indexedDB storage start');
     super('eoapi_core');
     this.version(1).stores({
       project: '++uuid, name',

diff --git a/src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.html b/src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.html
@@ -30,7 +30,7 @@
   </nz-input-group>
 </header>
 <!-- Fixed Group -->
-<div class="group_container fixed_group_tree pt10" *ngIf="electron.isElectron">
+<!-- <div class="group_container fixed_group_tree pt10" *ngIf="electron.isElectron">
   <nz-tree
     [nzData]="fixedTreeNode"
     [nzSelectedKeys]="nzSelectedKeys"
@@ -46,7 +46,7 @@
       </div>
     </div>
   </ng-template>
-</div>
+</div> -->
 <div class="bbd" *ngIf="electron.isElectron"></div>
 <!-- Custom Group -->
 <div class="group_container group_tree pt10">

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
@@ -62,7 +62,7 @@ export class ApiGroupTreeComponent implements OnInit, OnDestroy {
       isFixed: true,
     },
   ];
-  nzSelectedKeys: number[] = [];
+  nzSelectedKeys: string[] = [];
   private destroy$: Subject<void> = new Subject<void>();
   constructor(
     private router: Router,
@@ -90,7 +90,6 @@ export class ApiGroupTreeComponent implements OnInit, OnDestroy {
     listToTree(this.treeItems, this.treeNodes, '0');
     setTimeout(() => {
       this.expandGroup();
-      this.setSelectedKeys();
     }, 0);
   }
   /**
@@ -137,6 +136,7 @@ export class ApiGroupTreeComponent implements OnInit, OnDestroy {
           });
         });
         this.apiDataItems = apiItems;
+        this.messageService.send({ type: 'loadApi', data: this.apiDataItems });
         this.generateGroupTreeData();
         this.restoreExpandStatus();
       }

diff --git a/src/workbench/browser/src/app/pages/api/tab/api-tab.service.ts b/src/workbench/browser/src/app/pages/api/tab/api-tab.service.ts
@@ -20,7 +20,6 @@ export class ApiTabService {
     return this.currentTab.uuid;
   }
   constructor() {
-    console.log('init api tab service');
     this.saveTabData$.subscribe((inData) => {
       this.addData(inData);
     });

diff --git a/src/workbench/browser/src/app/pages/extension/list/extension-list.component.ts b/src/workbench/browser/src/app/pages/extension/list/extension-list.component.ts
@@ -32,7 +32,6 @@ export class ExtensionListComponent implements OnInit {
     this.type = this.route.snapshot.queryParams.type;
   }
   async ngOnInit() {
-    this.renderList = await this.searchPlugin();
     this.watchSearchConditionChange();
   }
   async searchPlugin(keyword = '') {

diff --git a/src/workbench/browser/src/app/shared/components/navbar/navbar.component.ts b/src/workbench/browser/src/app/shared/components/navbar/navbar.component.ts
@@ -22,29 +22,59 @@ export class NavbarComponent implements OnInit {
     },
     {
       id: 'mac',
-      name: 'macOS 客户端',
+      name: 'macOS(Intel) 客户端',
       icon: 'mac',
       suffix: 'dmg',
       link: '',
     },
+    {
+      id: 'mac',
+      name: 'macOS(M1) 客户端',
+      icon: 'mac',
+      suffix: 'arm64.dmg',
+      link: '',
+    },
   ];
 
   constructor(private electron: ElectronService) {
     this.isElectron = this.electron.isElectron;
     this.getInstaller();
   }
+  private findLinkInSingleAssets(assets, item) {
+    let result = '';
+    let assetIndex = assets.findIndex(
+      (asset) =>
+        new RegExp(`${item.suffix}$`,'g').test(asset.browser_download_url)&&
+        (!item.keyword || asset.browser_download_url.includes(item.keyword))
+    );
+    if (assetIndex === -1) {
+      return result;
+    }
+    result = assets[assetIndex].browser_download_url;
+    assets.splice(assetIndex, 1);
+    return result;
+  }
+  private findLink(allAssets, item) {
+    let result = '';
+    allAssets.some((assets) => {
+      result = this.findLinkInSingleAssets(assets, item);
+      return result;
+    });
+    return result;
+  }
   getInstaller() {
     fetch('https://api.github.com/repos/eolinker/eoapi/releases')
       .then((response) => response.json())
       .then((data) => {
-        this.resourceInfo.forEach((item) => {
-          let assetItem = data[0].assets.find(
-            (asset) =>
-              asset.browser_download_url.slice(-item.suffix.length) === item.suffix &&
-              (!item.keyword || asset.browser_download_url.includes(item.keyword))
-          );
-          item.link = assetItem.browser_download_url;
-        });
+        [...this.resourceInfo]
+          .sort((a1, a2) => a2.suffix.length - a1.suffix.length)
+          .forEach((item) => {
+            item.link = this.findLink(
+              data.map((val) => val.assets),
+              item
+            );
+          });
+          console.log(this.resourceInfo)
       });
   }
   minimize() {

diff --git a/src/workbench/browser/src/app/shared/components/setting/setting.component.ts b/src/workbench/browser/src/app/shared/components/setting/setting.component.ts
@@ -162,8 +162,6 @@ export class SettingComponent implements OnInit {
     // const featureList = window.eo.getFeature('configuration');
     const modules = window.eo.getModules();
     const extensitonConfigurations = [...modules.values()].filter((n) => n.contributes?.configuration);
-    console.log('localSettings', this.localSettings);
-    console.log('extensitonConfigurations', extensitonConfigurations);
     const controls = {};
     // 所有设置
     const allSettings = cloneDeep([
@@ -246,11 +244,6 @@ export class SettingComponent implements OnInit {
       }
       return prev.concat(treeItem);
     }, []);
-    console.log('treeData', treeData);
-    console.log('setings', this.settings);
-    console.log('nestedSettings', this.nestedSettings);
-    console.log('controls', controls);
-
     this.dataSource.setData(treeData);
     this.treeControl.expandAll();
     this.validateForm = this.fb.group(controls);

diff --git a/src/workbench/browser/src/assets/theme/antd.less b/src/workbench/browser/src/assets/theme/antd.less
@@ -8,7 +8,7 @@
 @border-radius-base: 3px;
 @primary-color: @theme-color;
 @success-color: @theme-color;
-@link-color:rgba (0, 0, 0, 0.8);
+@link-color:rgba(0, 0, 0, 0.8);
 @processing-color: @theme-color;
 @tree-title-height: 30px;
 body {