fix: reflesh tab no reflesh data

Postcatlab · Jan 18, 2022 · 27eff5e · 27eff5e
1 parent 86dc5f7
commit 27eff5e
Show file tree

Hide file tree

Showing 48 changed files with 326 additions and 478 deletions.
diff --git a/app/request/libs/apiUtil.js b/app/request/libs/apiUtil.js
@@ -1,6 +1,6 @@
 /**
  * @name 返回通用方法
- * @author 广州银云信息科技有限公司
+ * @author EOAPI
  */
 let _LIB_WORKER_THREAD = require('./exec_worker_thread');
 let CryptoJS = require('crypto-js');

diff --git a/app/request/libs/common.js b/app/request/libs/common.js
@@ -1,6 +1,6 @@
 /**
  * @name 通用方法
- * @author 广州银云信息科技有限公司
+ * @author EOAPI
  */
 'use strict';
 let _LibsDataConstructor = new (require('./data_constructor').core)();

diff --git a/app/request/libs/data_constructor.js b/app/request/libs/data_constructor.js
@@ -2,7 +2,7 @@
     'use strict';
     /**
      * @name 信息构造器类
-     * @author 广州银云信息科技有限公司
+     * @author EOAPI
      */
     class main {
         constructor() {

diff --git a/app/request/libs/http.package.js b/app/request/libs/http.package.js
@@ -25,7 +25,7 @@
          */
         setDefaultRequestHeader(inputHeaderObj = {}, inputOptions = {}) {
             let TMP_DEAFULT_HEADER_OBJ = {
-                "User-Agent": "Eolink",
+                "User-Agent": "Eoapi",
                 "Accept":"*/*"
             };
             if (inputOptions.sendNocacheToken) {

diff --git a/app/request/libs/vm2/lib/contextify.js b/app/request/libs/vm2/lib/contextify.js
@@ -801,7 +801,7 @@ BufferMock.allocUnsafeSlow = function allocUnsafeSlow(size) {
 };
 /**
  * start
- * @author 广州银云信息科技有限公司
+ * @author EOAPI
  * @desc Buffer默认取原始的Buffer，不做安全过滤，不能随意更改，会导致脚本步骤crypto执行错误
  */
 const LocalBuffer = global.Buffer = Contextify.readonly(host.Buffer, BufferMock);

diff --git a/build/SetupScripts/nim/license.txt b/build/SetupScripts/nim/license.txt
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -15,7 +15,10 @@ import { EnvState } from './shared/store/env.state';
 
 // NG1 Upgrade
 import { UpgradeModule } from '@angular/upgrade/static';
+
+//Storage Module
 import { StorageSetting } from './modules/storage/storage.config';
+import { demoApi } from './storageSetting.model';
 
 import { NzModalModule } from 'ng-zorro-antd/modal';
 
@@ -36,6 +39,10 @@ const storageSetting: StorageSetting = {
       name: 'project',
       items: [{ uuid: 1, name: 'Default' }],
     },
+    {
+      name: 'apiData',
+      items: demoApi,
+    },
   ],
 };
 

diff --git a/src/app/eoui/editor/eo-editor/eo-editor.component.ts b/src/app/eoui/editor/eo-editor/eo-editor.component.ts
@@ -155,14 +155,12 @@ export class EoEditorComponent implements AfterViewInit, OnChanges {
       }
       case 'newTab':
         {
-          if (this.code) {
-            const tmpNewWin = window.open();
-            const value = session.getValue();
-            const code = this.formatCode(value, this.editorType);
-            tmpNewWin.document.open();
-            tmpNewWin.document.write(code);
-            tmpNewWin.document.close();
-          }
+          const tmpNewWin = window.open();
+          const value = session.getValue();
+          const code = this.formatCode(value, this.editorType);
+          tmpNewWin.document.open();
+          tmpNewWin.document.write(code);
+          tmpNewWin.document.close();
         }
         break;
       case 'download':

diff --git a/src/app/pages/api/api.component.html b/src/app/pages/api/api.component.html
@@ -20,7 +20,7 @@
             <eo-env></eo-env>
           </div>
         </div>
-        <div class="flex-1 overflow-auto content-box {{ this.id ? 'has_tab_page' : '' }}">
+        <div class="content_container {{ this.id ? 'has_tab_page' : '' }}">
           <nz-tabset class="inside_page_tab" *ngIf="this.id" nzLinkRouter>
             <nz-tab>
               <a *nzTabLink nz-tab-link [routerLink]="['detail']" queryParamsHandling="merge"> 文档 </a>

diff --git a/src/app/pages/api/api.component.scss b/src/app/pages/api/api.component.scss
@@ -63,6 +63,7 @@ nz-tree {
     background-color: #f0f0f0;
     padding: 5px 10px 0 15px;
     display: flex;
+    margin-bottom: -1px;
     align-items: center;
     justify-content: space-between;
     .ant-tabs-top {
@@ -106,11 +107,15 @@ nz-tree {
       height: 36px;
     }
   }
-  .inside_page_tab {
-    .ant-tabs-nav {
-      padding-left: 20px;
+  .content_container {
+    border-top: 1px solid var(--BORDER);
+    .inside_page_tab {
+      .ant-tabs-nav {
+        padding-left: 20px;
+      }
     }
   }
+
   eo-api {
     router-outlet + * {
       display: block;

diff --git a/src/app/pages/api/api.component.ts b/src/app/pages/api/api.component.ts
@@ -1,21 +1,20 @@
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { Router, ActivatedRoute, NavigationEnd } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 
 import { NzFormatEmitEvent, NzTreeNode } from 'ng-zorro-antd/tree';
 import { Message, MessageService } from '../../shared/services/message';
 import { ApiTabComponent } from './tab/api-tab.component';
-
 import { GroupService } from '../../shared/services/group/group.service';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { ApiDataService } from '../../shared/services/api-data/api-data.service';
+import { listToTree } from '../../utils/tree';
 
 import { GroupApiDataModel, GroupTreeItem } from '../../shared/models';
 import { ApiData } from '../../shared/services/api-data/api-data.model';
-import { listToTree } from '../../utils/tree';
-
-import { of, Subject } from 'rxjs';
-import { filter, switchMap, takeUntil } from 'rxjs/operators';
 import { Group } from '../../shared/services/group/group.model';
+
+import {  Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
 @Component({
   selector: 'eo-api',
   templateUrl: './api.component.html',
@@ -79,6 +78,9 @@ export class ApiComponent implements OnInit, OnDestroy {
     this.groupByID = {};
     this.apiDataItems = {};
     this.treeItems = [];
+    this.getGroups();
+  }
+  getGroups() {
     this.groupService.loadAllByProjectID(this.projectID).subscribe((items: Array<Group>) => {
       items.forEach((item) => {
         delete item.updatedAt;
@@ -91,21 +93,25 @@ export class ApiComponent implements OnInit, OnDestroy {
           isLeaf: false,
         });
       });
-      this.apiDataService.loadAllByProjectID(this.projectID).subscribe((items: Array<ApiData>) => {
-        items.forEach((item) => {
-          delete item.updatedAt;
-          this.apiDataItems[item.uuid] = item;
-          this.treeItems.push({
-            title: item.name,
-            key: item.uuid,
-            weight: item.weight || 0,
-            parentID: item.groupID || 0,
-            method: item.method,
-            isLeaf: true,
-          });
+      this.getApis();
+    });
+  }
+  getApis() {
+    this.apiDataService.loadAllByProjectID(this.projectID).subscribe((items: Array<ApiData>) => {
+      items.forEach((item) => {
+        delete item.updatedAt;
+        this.apiDataItems[item.uuid] = item;
+        this.treeItems.push({
+          title: item.name,
+          key: item.uuid,
+          weight: item.weight || 0,
+          parentID: item.groupID || 0,
+          method: item.method,
+          isLeaf: true,
         });
-        this.generateGroupTreeData();
       });
+      this.generateGroupTreeData();
+      this.apiTabComponent.initTab();
     });
   }
   /**
@@ -203,9 +209,9 @@ export class ApiComponent implements OnInit, OnDestroy {
    * Generate group tree nodes.
    */
   generateGroupTreeData(): void {
-    this.apiTabComponent.initTab();
     this.treeItems.sort((a, b) => a.weight - b.weight);
     this.treeNodes = [];
+    console.log('generateGroupTreeData=>',this.treeItems)
     listToTree(this.treeItems, this.treeNodes, 0);
   }
 
@@ -317,21 +323,17 @@ export class ApiComponent implements OnInit, OnDestroy {
     this.getChildrenFromTree(this.treeItems, data, group.uuid);
     if (data.group.length > 0 && data.api.length > 0) {
       this.groupService.bulkRemove(data.group).subscribe((result) => {
-        console.log(result);
         this.apiDataService.bulkRemove(data.api).subscribe((result) => {
-          console.log(result);
           this.buildGroupTreeData();
           this.messageService.send({ type: 'apiBatchDelete', data: { uuids: data.api } });
         });
       });
     } else if (data.group.length > 0) {
       this.groupService.bulkRemove(data.group).subscribe((result) => {
-        console.log(result);
         this.buildGroupTreeData();
       });
     } else if (data.api.length > 0) {
       this.apiDataService.bulkRemove(data.api).subscribe((result) => {
-        console.log(result);
         this.buildGroupTreeData();
         this.messageService.send({ type: 'apiBatchDelete', data: { uuids: data.api } });
       });

diff --git a/src/app/pages/api/demo.json b/src/app/pages/api/demo.json
@@ -0,0 +1 @@
+
diff --git a/src/app/pages/api/detail/api-detail.component.html b/src/app/pages/api/detail/api-detail.component.html
@@ -20,7 +20,7 @@
   <div *ngIf="apiInfo.requestBody && apiInfo.requestBody.length">
     <div class="api_line">
       Body 请求参数<nz-tag class="ml10" nzColor="default">{{ CONST.BODY_TYPE[apiInfo.requestBodyType] }}</nz-tag>
-      <nz-tag nzColor="default">最外层结构为：{{ CONST.JSON_ROOT_TYPE[apiInfo.requestBodyJsonType] }}</nz-tag>
+      <nz-tag *ngIf="apiInfo.requestBodyType==='json'" nzColor="default">最外层结构为：{{ CONST.JSON_ROOT_TYPE[apiInfo.requestBodyJsonType] }}</nz-tag>
     </div>
     <eo-api-detail-body
       [bodyType]="apiInfo.requestBodyType"

diff --git a/src/app/pages/api/detail/api-detail.component.ts b/src/app/pages/api/detail/api-detail.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
 import { ApiData } from '../../../shared/services/api-data/api-data.model';
-import { ApiBodyType, JsonRootType } from '../../../shared/services/api-data/api-body-type';
+import { ApiBodyType, JsonRootType } from '../../../shared/services/api-data/api-data.model';
 
 import { ApiDataService } from '../../../shared/services/api-data/api-data.service';
 import { treeToListHasLevel } from '../../../utils/tree';
@@ -30,7 +30,6 @@ export class ApiDetailComponent implements OnInit {
     JSON_ROOT_TYPE: reverseObj(JsonRootType)
   };
   constructor(private apiService: ApiDataService, private route: ActivatedRoute) {
-    console.log(this.CONST.BODY_TYPE);
   }
   ngOnInit(): void {
     this.route.queryParams.subscribe((params) => {
@@ -49,7 +48,6 @@ export class ApiDetailComponent implements OnInit {
         }
       });
       this.apiInfo = result;
-      console.log(this.apiInfo);
     });
   }
 }
diff --git a/src/app/pages/api/detail/body/api-detail-body.component.ts b/src/app/pages/api/detail/body/api-detail-body.component.ts
@@ -8,7 +8,7 @@ import {
 
 import { Subject } from 'rxjs';
 import { ApiEditBody } from '../../../../shared/services/api-data/api-edit-params.model';
-import { ApiBodyType, JsonRootType } from '../../../../shared/services/api-data/api-body-type';
+import { ApiBodyType, JsonRootType } from '../../../../shared/services/api-data/api-data.model';
 import { ApiDetailService } from '../api-detail.service';
 @Component({
   selector: 'eo-api-detail-body',

diff --git a/src/app/pages/api/edit/api-edit.component.html b/src/app/pages/api/edit/api-edit.component.html
@@ -1,6 +1,6 @@
 <div class="p15">
   <form nz-form [nzLayout]="'vertical'" [formGroup]="validateForm">
-    <button type="button" class="eo_theme_btn_success" (click)="saveApi()">保存</button>
+    <button type="button" nz-button nztype="primary" class="eo_theme_btn_success" (click)="saveApi()">保存</button>
     <nz-divider></nz-divider>
     <nz-form-label nzFor="uri">API Path</nz-form-label>
     <nz-input-group nzCompact>

diff --git a/src/app/pages/api/edit/api-edit.component.ts b/src/app/pages/api/edit/api-edit.component.ts
@@ -53,7 +53,7 @@ export class ApiEditComponent implements OnInit, OnDestroy {
       const treeItems: any = [
         {
           title: '根目录',
-          //actually is 0,but 0 will hidden,so use -1 replace 0
+          //!actually is 0,but 0 will hidden in nz component,so use -1 replace 0
           key: '-1',
           weight: 0,
           parentID: '0',

diff --git a/src/app/pages/api/edit/api-edit.module.ts b/src/app/pages/api/edit/api-edit.module.ts
@@ -19,6 +19,7 @@ import { NzIconModule } from 'ng-zorro-antd/icon';
 import { NzTabsModule } from 'ng-zorro-antd/tabs';
 import { NzRadioModule } from 'ng-zorro-antd/radio';
 import { NzDividerModule } from 'ng-zorro-antd/divider';
+import { NzAffixModule } from 'ng-zorro-antd/affix';
 
 import { ApiEditComponent } from './api-edit.component';
 import { ApiEditHeaderComponent } from './header/api-edit-header.component';
@@ -42,6 +43,7 @@ const NZ_COMPONETS = [
   NzTabsModule,
   NzRadioModule,
   NzDividerModule,
+  NzAffixModule
 ];
 const COMPONENTS = [
   ApiEditComponent,

diff --git a/src/app/pages/api/edit/body/api-edit-body.component.ts b/src/app/pages/api/edit/body/api-edit-body.component.ts
@@ -17,7 +17,7 @@ import {
   ApiParamsTypeJsonOrXml,
 } from '../../../../shared/services/api-data/api-edit-params.model';
 import { ApiEditBody } from '../../../../shared/services/api-data/api-edit-params.model';
-import { ApiBodyType, JsonRootType } from '../../../../shared/services/api-data/api-body-type';
+import { ApiBodyType, JsonRootType } from '../../../../shared/services/api-data/api-data.model';
 import { ApiEditService } from '../api-edit.service';
 @Component({
   selector: 'eo-api-edit-body',

diff --git a/src/app/pages/api/group/tree/api-group-tree.component.html b/src/app/pages/api/group/tree/api-group-tree.component.html
@@ -26,16 +26,11 @@
             <i nz-icon nzType="caret-down" nzTheme="outline"></i>
           </button>
         </nz-button-group>
-        <!-- <button nz-button nzType="primary" nz-dropdown [nzDropdownMenu]="menu">
-          <i nz-icon nzType="plus"></i>
-          API
-          <i nz-icon nzType="down"></i>
-        </button> -->
         <nz-dropdown-menu #menu="nzDropdownMenu">
           <ul nz-menu>
-            <li nz-menu-item (click)="onClick({ event: $event, eventName: 'newApi' })">新建API</li>
-            <li nz-menu-item (click)="onClick({ event: $event, eventName: 'newApiTest' })">新建测试</li>
-            <li nz-menu-item (click)="newGroup()">新建分组</li>
+            <li nz-menu-item (click)="onClick({ event: $event, eventName: 'newApi' })"><a>新建API</a></li>
+            <li nz-menu-item (click)="onClick({ event: $event, eventName: 'newApiTest' })"><a>新建测试</a></li>
+            <li nz-menu-item (click)="newGroup()"><a>新建分组</a></li>
           </ul>
         </nz-dropdown-menu>
       </div>

diff --git a/src/app/pages/api/tab/api-tab.component.html b/src/app/pages/api/tab/api-tab.component.html
@@ -1,3 +1,4 @@
+
 <nz-tabset
   [(nzSelectedIndex)]="selectedIndex"
   nzType="editable-card"
@@ -9,7 +10,7 @@
     *ngFor="let tab of tabs; let i = index"
     nzClosable
     [nzTitle]="titleTemplate"
-    (nzSelect)="tabSelect(tab)"
+    (nzSelect)="tabSelect({index:i,tab:tab})"
   >
     <ng-template #titleTemplate>
       <span class="mr5 method_text_{{tab.method}}"  *ngIf="tab.method">{{ tab.method | uppercase }}</span>
@@ -29,4 +30,4 @@
       <li nz-menu-item>关闭右侧标签页</li>
     </ul>
   </nz-dropdown-menu>
-</ng-template>
+</ng-template>
diff --git a/src/app/pages/api/tab/api-tab.component.scss b/src/app/pages/api/tab/api-tab.component.scss
@@ -2,7 +2,15 @@
   eo-api-tab {
     .ant-tabs-card.ant-tabs-top > .ant-tabs-nav .ant-tabs-tab {
       border-radius: 6px 6px 0 0;
-      border: 1px solid var(--BORDER);
+      border-width: 1px;
+      border-bottom: 1px solid var(--BORDER);
+    }
+    .ant-tabs-card.ant-tabs-top > .ant-tabs-nav .ant-tabs-tab-active {
+      border-color: rgba($color: #000000, $alpha: 0.15);
+      border-bottom-color: var(--MAIN_BG);
+    }
+    .ant-tabs > .ant-tabs-nav .ant-tabs-nav-add {
+      border: 0 none;
     }
     .ant-tabs-tab {
       &.ant-tabs-tab-active {