Merge pull request #1051 from jumpserver/dev

v3.10.2

src/app/elements/asset-tree/asset-tree.component.html

@@ -48,9 +48,16 @@
         ></i>
         <i
           (click)="refreshTree($event, tree)"
+          *ngIf="tree.complete"
           [matTooltip]="('Refresh' | translate)"
           class="fa fa-refresh tree-banner-icon"
         ></i>
+        <i
+          (click)="stopOffsetTree(tree)"
+          *ngIf="!tree.complete"
+          [matTooltip]="('Stop' | translate)"
+          class="fa fa-square tree-banner-icon"
+        ></i>
       </span>
     </span>
     <div

src/app/elements/asset-tree/asset-tree.component.scss

@@ -264,3 +264,8 @@ tr:hover {
   border: none;
   outline: none;
 }
+
+.tree-banner-icon-zone .disabled {
+  pointer-events: none;
+  opacity: 0.6;
+}

src/app/elements/asset-tree/asset-tree.component.ts

@@ -9,17 +9,18 @@ import {connectEvt, DEFAULT_ORG_ID, SYSTEM_ORG_ID} from '@app/globals';
 import * as _ from 'lodash';
 import {
   AppService,
+  ConnectTokenService,
   HttpService,
   I18nService,
   LogService,
   OrganizationService,
   SettingService,
   TreeFilterService,
-  ConnectTokenService,
   ViewService
 } from '@app/services';
 import {ConnectEvt, InitTreeConfig, TreeNode} from '@app/model';
 import {CookieService} from 'ngx-cookie-service';
+import {HttpHeaders} from '@angular/common/http';
 
 declare var $: any;
 
@@ -50,14 +51,18 @@ class Tree {
   search: boolean;
   checkbox: boolean;
   ztree: any;
+  config: any;
+  inited = false;
+  complete = true;
 
-  constructor(name, label, open, loading, search, checkbox) {
+  constructor(name, label, open, loading, search, checkbox, config = null) {
     this.name = name;
     this.label = label;
     this.open = open;
     this.loading = loading;
     this.search = search;
     this.checkbox = checkbox;
+    this.config = config;
   }
 }
 
@@ -213,11 +218,9 @@ export class ElementAssetTreeComponent implements OnInit {
   }
 
   ngOnInit() {
-    this._settingSvc.isLoadTreeAsync$.subscribe((state) => {
-      this.isLoadTreeAsync = state;
-    });
     this.currentOrgID = this._cookie.get('X-JMS-LUNA-ORG') || this._cookie.get('X-JMS-ORG');
-    this._settingSvc.initialized$.subscribe((state) => {
+    this._settingSvc.afterInited().then((state) => {
+      this.isLoadTreeAsync = this._settingSvc.isLoadTreeAsync();
       if (state) {
         if (!this._settingSvc.hasXPack() && this.currentOrgID === SYSTEM_ORG_ID) {
           this.currentOrgID = DEFAULT_ORG_ID;
@@ -271,13 +274,13 @@ export class ElementAssetTreeComponent implements OnInit {
     );
     const token = this._route.snapshot.queryParams.token;
     const url = `/api/v1/perms/users/self/nodes/children-with-k8s/tree/?token=${token}`;
-    this.initTreeInfo(tree, {
+    const config = {
       refresh,
       url,
+      asyncUrl: url,
       setting: {
         async: {
           enable: true,
-          url: url,
           autoParam: ['id=key', 'name=n', 'level=lv'],
           type: 'get',
           headers: {
@@ -286,54 +289,95 @@ export class ElementAssetTreeComponent implements OnInit {
         }
       },
       showFavoriteAssets: false
-    }).then();
+    };
+    if (!refresh) {
+      this.trees.push(tree);
+    }
+    this.initTreeInfo(tree, config).then();
   }
 
   async initAssetTree(refresh = false) {
+    const config = {
+      refresh,
+      showFavoriteAssets: true,
+      url: '/api/v1/perms/users/self/nodes/all-with-assets/tree/',
+      asyncUrl: '/api/v1/perms/users/self/nodes/children-with-assets/tree/?'
+    };
     const tree = new Tree(
       'AssetTree',
       'My assets',
+      false,
       true,
       true,
       true,
-      true
+      config
     );
-    await this.initTreeInfo(tree, {
-      refresh,
-      apiName: 'getMyGrantedNodes',
-      showFavoriteAssets: true,
-      loadTreeAsyncUrl: '/api/v1/perms/users/self/nodes/children-with-assets/tree/?'
-    });
+    if (!refresh) {
+      this.trees.push(tree);
+    }
+    this.initTreeInfo(tree, config).then();
   }
 
   async initTypeTree(refresh = false) {
+    const config = {
+      refresh,
+      url: '/api/v1/perms/users/self/nodes/children-with-assets/category/tree/?sync=1',
+      asyncUrl: '/api/v1/perms/users/self/nodes/children-with-assets/category/tree/',
+      setting: {
+        async: {
+          autoParam: ['type', 'category']
+        }
+      },
+    };
     const tree = new Tree(
       'AssetTypeTree',
       this._i18n.instant('Type tree'),
       true,
       true,
       false,
-      true
+      true,
+      config
     );
-    await this.initTreeInfo(tree, {
-      refresh,
-      apiName: 'getAssetTypeTree',
-      showFavoriteAssets: false,
-      loadTreeAsyncUrl: '/api/v1/perms/users/self/nodes/children-with-assets/category/tree/?',
-      setting: {
-        async: {
-          autoParam: ['type']
+    if (!refresh) {
+      this.trees.push(tree);
+    } else {
+      this.initTreeInfo(tree, config).then();
+    }
+  }
+
+  getOffsetTreeNodes(body, url, headers: HttpHeaders, tree) {
+    const offset = headers.get('X-JMS-TREE-OFFSET');
+    const options = {
+      observe: 'response', params: {offset: offset}
+    };
+    const treeObj = tree.ztree;
+    this._http.get(url, options).subscribe(
+      resp => {
+        const newBody = resp.body;
+        const newHeaders = resp.headers;
+        if (newBody.length === 0) {
+          tree.complete = true;
+          const parents = treeObj.getNodesByParam('isParent', true);
+          for (const node of parents) {
+            node.name = node.meta._name;
+            treeObj.updateNode(node);
+          }
+          return;
         }
+        const grouped = _.groupBy(newBody, 'pId');
+        Object.entries(grouped).forEach(([key, value]) => {
+          const parent = treeObj.getNodeByParam('id', key);
+          treeObj.addNodes(parent, -1, value, true);
+        });
+        return this.getOffsetTreeNodes(body, url, newHeaders, tree);
       },
-    });
+      error => {
+        this._logger.error('Get tree error: ', error);
+      }
+    );
   }
 
-  async initTreeInfo(tree: Tree, config: InitTreeConfig) {
-    if (config.refresh) {
-      tree = this.trees.find(t => t.name === tree.name);
-    } else {
-      this.trees.push(tree);
-    }
+  cleanupTreeSetting(config: InitTreeConfig) {
     let setting = Object.assign({}, this.setting);
     setting['callback'] = {
       onClick: _.debounce(this.onNodeClick, 300, {
@@ -343,44 +387,73 @@ export class ElementAssetTreeComponent implements OnInit {
       onCheck: this.onAssetTreeCheck.bind(this),
       onRightClick: this.onRightClick.bind(this)
     };
+    let url = config.url;
     if (this.isLoadTreeAsync) {
       setting['async'] = {
         enable: true,
-        url: config.loadTreeAsyncUrl,
+        url: config.asyncUrl,
         autoParam: ['id=key', 'name=n', 'level=lv'],
         type: 'get',
         headers: {
           'X-JMS-ORG': this.currentOrgID
         }
       };
+      url = config.asyncUrl;
     }
     setting = _.merge(setting, config.setting || {});
+    console.log('Is load tree async: ', this.isLoadTreeAsync, url);
+    return {setting, url};
+  }
+
+  async initTreeInfo(tree: Tree, config: InitTreeConfig) {
+    tree.inited = true;
+    if (config.refresh) {
+      tree = this.trees.find(t => t.name === tree.name);
+    }
+    const {setting, url} = this.cleanupTreeSetting(config);
 
     if (config.showFavoriteAssets) {
       this._http.getFavoriteAssets().subscribe(resp => {
         this.favoriteAssets = resp.map(i => i.asset);
       });
     }
     tree.loading = true;
-    const request = config.hasOwnProperty('apiName')
-      ? this._http[config.apiName](this.isLoadTreeAsync)
-      : this._http.get(config.url);
-    request.subscribe(resp => {
-      if (config.refresh) {
-        tree.ztree.expandAll(false);
-        tree.ztree.destroy();
-      }
-      setTimeout(() => {
-        tree.ztree = $.fn.zTree.init($('#' + tree.name), setting, resp);
-      }, 100);
-    }, error => {
-      if (error.status === 400) {
-        alert(error.error.detail);
-      }
-      this._logger.error('Get tree error: ', error);
-    }, () => {
-      tree.loading = false;
-    });
+    const request = this._http.get(url, {observe: 'response'});
+    request.subscribe(
+      resp => {
+        // 如果是刷新，需要先销毁原来的树, 重新初始化
+        if (config.refresh) {
+          tree.ztree.expandAll(false);
+          tree.ztree.destroy();
+        }
+        const body = resp.body;
+        const headers = resp.headers;
+        setTimeout(() => {
+          // 新的 api 支持树的分页
+          const offset = headers.get('X-JMS-TREE-OFFSET');
+          if (offset && offset !== '0') {
+            const parents = body.filter(node => node.isParent);
+            for (const node of parents) {
+              node.meta._name = node.name;
+              node.name = node.name.replace(/\(\d+\)$/, '(-)');
+            }
+            setTimeout(() => {
+              tree.complete = false;
+              this.getOffsetTreeNodes(body, url, resp.headers, tree);
+            }, 100);
+          }
+          tree.ztree = $.fn.zTree.init($('#' + tree.name), setting, body);
+        }, 100);
+      },
+      error => {
+        if (error.status === 400) {
+          alert(error.error.detail);
+        }
+        this._logger.error('Get tree error: ', error);
+      },
+      () => {
+        tree.loading = false;
+      });
   }
 
   isTreeCheckEnabled(tree) {
@@ -429,16 +502,17 @@ export class ElementAssetTreeComponent implements OnInit {
     this.searchValue = '';
     if (this.isK8s) {
       this.initK8sTree(true).then();
-    } else {
-      if (tree.name === 'AssetTree') {
-        this.initAssetTree(true).then();
-      }
-      if (tree.name === 'AssetTypeTree') {
-        this.initTypeTree(true).then();
-      }
+    } else if (tree.name === 'AssetTree') {
+      this.initAssetTree(true).then();
+    } else if (tree.name === 'AssetTypeTree') {
+      this.initTypeTree(true).then();
     }
   }
 
+  stopOffsetTree(tree) {
+    tree.complete = true;
+  }
+
   async connectAsset(node: TreeNode) {
     const action = this.isK8s ? 'k8s' : 'asset';
     const evt = new ConnectEvt(node, action);
@@ -742,6 +816,10 @@ export class ElementAssetTreeComponent implements OnInit {
 
   foldTree(tree: Tree) {
     this.trees.map(item => {
+      if (!tree.inited) {
+        this.initTreeInfo(tree, tree.config).then(() => {
+        });
+      }
       if (tree.name === item.name) {
         item.open = !item.open;
       } else {

src/app/elements/content/content-tab/content-tab.component.scss

@@ -14,18 +14,17 @@ li.hidden {
 
 li {
   display: inline-block;
-  width: 150px;
+  max-width: 200px;
+  min-width: 90px;
   height: 30px;
   position: relative;
-  box-sizing: content-box;
-  float: left;;
+  box-sizing: border-box;
   background-color: #463a3a66;
   border-right: 1px solid #6b6565c2;
   border-radius: 2px;
 
   .view_icon {
     width: 12px;
-    height: 12px;
     vertical-align: middle;
     display: inline-block;
   }
@@ -51,10 +50,9 @@ li {
     font-size: 13px;
     text-decoration: none;
     padding-left: 12px;
-    padding-right: 14px;
+    padding-right: 18px;
     line-height: 26px;
     cursor: default;
-    width: 142px;
     height: 26px;
     display: block;
 
@@ -70,7 +68,7 @@ li a.close {
   position: absolute;
   color: gray;
   top: 0;
-  right: 5px;
+  right: 6px;
   cursor: pointer;
   line-height: 26px;
   display: inline-block;