fix: 0.5.1 (#294)

* feat: modal tips when delete mock

* fix: Fixes #293

* fix: curl import error and style error

* fix: variable query multiple times

---------

Co-authored-by: scarqin <[email protected]>

Author: yZaio

package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcat",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "main": "out/app/electron-main/main.js",
   "description": "A lightweight, extensible API tool",
   "homepage": "https://github.com/Postcatlab/postcat.git",

src/browser/locale/messages.xlf

@@ -339,8 +339,7 @@ export class TabOperateService {
   getCurrentTab() {
     return this.getTabByIndex(this.selectedIndex);
   }
-  closeTabByOperate(action: string | TabOperate) {
-    const currentTabID = this.tabStorage.tabOrder[this.selectedIndex];
+  closeTabByOperate(action: string | TabOperate, currentTabID = this.tabStorage.tabOrder[this.selectedIndex]) {
     let tabsObj = {
       //Close tab has hasChanged tab
       needTips: false,

src/browser/locale/messages.zh.xlf

@@ -6,7 +6,25 @@
   (nzSelectChange)="selectChange($event)"
   [nzTabBarExtraContent]="extraTemplate"
 >
-  <eo-ng-tab *ngFor="let uuid of tabStorage.tabOrder; let i = index" [nzTitle]="titleTemplate">
+  <eo-ng-tab
+    *ngFor="let uuid of tabStorage.tabOrder; let i = index"
+    (nzContextmenu)="contextMenu($event, menu, uuid)"
+    [nzTitle]="titleTemplate"
+  >
+    <eo-ng-dropdown-menu #menu="nzDropdownMenu">
+      <ul nz-menu>
+        <li nz-menu-item (click)="closeTabByOperate('closeOther', uuid)" [nzDisabled]="tabStorage.tabOrder.length === 1" i18n>
+          Close Other Tags (excluding current tabs)
+        </li>
+        <li nz-menu-item (click)="closeTabByOperate('closeAll', uuid)" i18n>Close All Tabs</li>
+        <li nz-menu-item (click)="closeTabByOperate('closeLeft', uuid)" [nzDisabled]="checkIsFirstTab(uuid)" i18n>
+          Close Tabs To the Left
+        </li>
+        <li nz-menu-item [nzDisabled]="checkIsLastTab(uuid)" (click)="closeTabByOperate('closeRight', uuid)" i18n>
+          Close Tabs to the Right
+        </li>
+      </ul>
+    </eo-ng-dropdown-menu>
     <ng-template #titleTemplate>
       <div
         (dblclick)="doubleClickTab($event, uuid)"

src/browser/src/app/components/eo-ui/tab/tab-operate.service.ts

@@ -1,7 +1,7 @@
 import { KeyValue } from '@angular/common';
 import { Component, OnInit, OnDestroy, Input, Output, EventEmitter, TemplateRef } from '@angular/core';
 import { NavigationEnd, Router } from '@angular/router';
-import { NzDropdownMenuComponent } from 'ng-zorro-antd/dropdown';
+import { NzContextMenuService, NzDropdownMenuComponent } from 'ng-zorro-antd/dropdown';
 import { NzTabsCanDeactivateFn } from 'ng-zorro-antd/tabs';
 import { TabOperateService } from 'pc/browser/src/app/components/eo-ui/tab/tab-operate.service';
 import { TabStorageService } from 'pc/browser/src/app/components/eo-ui/tab/tab-storage.service';
@@ -35,8 +35,12 @@ export class EoTabComponent implements OnInit, OnDestroy {
     private modal: ModalService,
     private router: Router,
     public store: StoreService,
-    private trace: TraceService
+    private trace: TraceService,
+    private nzContextMenuService: NzContextMenuService
   ) {}
+  contextMenu($event: MouseEvent, menu: NzDropdownMenuComponent, tabID): void {
+    this.nzContextMenuService.create($event, menu);
+  }
   ngOnInit(): void {
     this.watchRouterChange();
     this.watchPageLeave();
@@ -49,6 +53,7 @@ export class EoTabComponent implements OnInit, OnDestroy {
       handleDataBeforeGetCache: this.handleDataBeforeGetCache
     });
   }
+
   async newTab(key = undefined) {
     if (this.checkTabCanLeave && !(await this.checkTabCanLeave())) {
       return false;
@@ -200,13 +205,19 @@ export class EoTabComponent implements OnInit, OnDestroy {
       handleDataBeforeCache: this.handleDataBeforeCache
     });
   }
+  checkIsFirstTab(uuid) {
+    return this.tabStorage.tabOrder.findIndex(val => val === uuid) === 0;
+  }
+  checkIsLastTab(uuid) {
+    return this.tabStorage.tabOrder.length - 1 === this.tabStorage.tabOrder.findIndex(val => val === uuid);
+  }
   /**
    * Tab  Close Operate
    *
    * @param action
    */
-  closeTabByOperate(action: TabOperate | string) {
-    this.tabOperate.closeTabByOperate(action);
+  closeTabByOperate(action: TabOperate | string, uuid?) {
+    this.tabOperate.closeTabByOperate(action, uuid);
   }
   private watchRouterChange() {
     this.routerSubscribe = this.router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe((res: NavigationEnd) => {

src/browser/src/app/components/eo-ui/tab/tab.component.html

@@ -68,7 +68,16 @@ export class ThemeService {
 
   queryExtensionThemes() {
     const extensions = this.themeExtension.getExtensionThemes(this.coreThemes);
-    this.themes.push(...extensions);
+    extensions.forEach(val => {
+      const index = this.themes.findIndex(val1 => val1.id === val.id);
+      //Not exsit
+      if (index === -1) {
+        this.themes.push(val);
+        return;
+      }
+      //Has exist
+      this.themes.splice(index, 1, val);
+    });
   }
   changeEditorTheme(currentTheme = StorageUtil.get('pc_theme')) {
     const editorTheme = this.getEditorTheme(currentTheme);

src/browser/src/app/components/eo-ui/tab/tab.component.ts

@@ -9,7 +9,7 @@ import { SettingService } from 'pc/browser/src/app/components/system-setting/set
       class="sticky top-0 py-[12px] border-solid border-0 border-b-[1px] z-10 mb-[3px]"
       style="border-color: var(--border-color); background-color: var(--background-color); border-bottom: 1px solid var(--system-border-color);"
     >
-      <button eo-ng-button nzType="primary" (click)="handleSave()">Save</button>
+      <button eo-ng-button nzType="primary" i18n (click)="handleSave()">Save</button>
     </div>
 
     <eo-schema-form [model]="localSettings" [configuration]="configuration" />
@@ -31,6 +31,6 @@ export class ExtensionSettingComponent implements OnInit {
   }
   handleSave = () => {
     this.settingService.saveSetting(this.localSettings);
-    this.feedback.success($localize`Save Success`);
+    this.feedback.success($localize`Saved successfully`);
   };
 }

src/browser/src/app/core/services/theme/theme.service.ts

@@ -64,7 +64,7 @@
     <ng-template #nzTreeTemplate let-node let-origin="origin">
       <div class="h-full" [style.--tree-level]="node.level" apiGroupTree [node]="node">
         <div class="flex items-center justify-between tree-node" [ngSwitch]="origin.module">
-          <div class="flex items-center" [style.width]="'calc(100% - 30px)'">
+          <div class="flex items-center" (contextmenu)="contextMenu($event, groupMenu)" [style.width]="'calc(100% - 30px)'">
             <!-- Folder -->
             <ng-container *ngSwitchDefault>
               <eo-iconpark-icon
@@ -91,6 +91,15 @@
               <span class="text-[12px] truncate">{{ origin.title }}</span>
             </ng-container>
           </div>
+          <eo-ng-dropdown-menu #groupMenu="nzDropdownMenu">
+            <ul nz-menu>
+              <ng-container *ngFor="let item of operateByModule[origin.module || groupModuleName].list">
+                <li nz-menu-item (click)="item.click(origin)">
+                  {{ item.title }}
+                </li>
+              </ng-container>
+            </ul>
+          </eo-ng-dropdown-menu>
           <span
             class="flex tree-node-operate"
             *ngIf="isEdit&&(!operateByModule[origin.module || groupModuleName].showFn||operateByModule[origin.module || groupModuleName].showFn?.(origin))"
@@ -99,15 +108,6 @@
             <button eo-ng-button nzType="text" class="tree-item-btn" nzTrigger="click" eo-ng-dropdown [nzDropdownMenu]="groupMenu">
               <eo-iconpark-icon name="more" size="16px"></eo-iconpark-icon>
             </button>
-            <eo-ng-dropdown-menu #groupMenu="nzDropdownMenu">
-              <ul nz-menu>
-                <ng-container *ngFor="let item of operateByModule[origin.module || groupModuleName].list">
-                  <li nz-menu-item (click)="item.click(origin)">
-                    {{ item.title }}
-                  </li>
-                </ng-container>
-              </ul>
-            </eo-ng-dropdown-menu>
           </span>
         </div>
       </div>

src/browser/src/app/pages/components/extension/detail/components/extensions-settings.component.ts

@@ -2,6 +2,7 @@ import { Component, Inject, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { EoNgFeedbackMessageService } from 'eo-ng-feedback';
 import { action, autorun, reaction, toJS } from 'mobx';
+import { NzContextMenuService, NzDropdownMenuComponent } from 'ng-zorro-antd/dropdown';
 import { NzTreeComponent, NzFormatEmitEvent, NzTreeNodeOptions, NzTreeNode, NzFormatBeforeDropEvent } from 'ng-zorro-antd/tree';
 import { PageUniqueName } from 'pc/browser/src/app/pages/workspace/project/api/api-tab.service';
 import { ApiGroupService } from 'pc/browser/src/app/pages/workspace/project/api/components/group/api-group.service';
@@ -93,11 +94,14 @@ export class ApiGroupTreeComponent implements OnInit, OnDestroy {
     private feedback: EoNgFeedbackMessageService,
     private router: Router,
     private route: ActivatedRoute,
+    private nzContextMenuService: NzContextMenuService,
     @Inject(BASIC_TABS_INFO) public tabsConfig: TabsConfig
   ) {
     this.operateByModule = this.getGroupOperate();
   }
-
+  contextMenu($event: MouseEvent, menu: NzDropdownMenuComponent): void {
+    this.nzContextMenuService.create($event, menu);
+  }
   searchFunc = (node: NzTreeNodeOptions) => {
     const { title } = node;
     const uri = node.relationInfo?.uri;