From 2ac0ce8c57b7dee93f1518d6e7187f010aa00d9b Mon Sep 17 00:00:00 2001 From: Orange Date: Sat, 12 Dec 2020 15:19:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DTree=20=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/elements/asset-tree/asset-tree.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/elements/asset-tree/asset-tree.component.ts b/src/app/elements/asset-tree/asset-tree.component.ts index 84b7e844..7d6cf162 100644 --- a/src/app/elements/asset-tree/asset-tree.component.ts +++ b/src/app/elements/asset-tree/asset-tree.component.ts @@ -220,7 +220,7 @@ export class ElementAssetTreeComponent implements OnInit, OnDestroy { } const cloudNodes = await this._http.getMyGrantedK8SApps().toPromise(); if (cloudNodes.length > 0) { - const _cloudTree = $.fn.zTree.init($('#K8SAppsTree'), setting, remoteNodes); + const _cloudTree = $.fn.zTree.init($('#K8SAppsTree'), setting, cloudNodes); cloudAppRootNode['children'] = _cloudTree.getNodes(); applicationNodes[0].children.push(cloudAppRootNode); _cloudTree.destroy(); From 0c6119f5b5e11e50233930ad350f7d537ecfe2f6 Mon Sep 17 00:00:00 2001 From: Orange Date: Mon, 14 Dec 2020 15:51:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DConnect=5Fto?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=93=BE=E6=8E=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/elements/connect/connect.component.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/elements/connect/connect.component.ts b/src/app/elements/connect/connect.component.ts index 0b66ff1b..120c8f06 100644 --- a/src/app/elements/connect/connect.component.ts +++ b/src/app/elements/connect/connect.component.ts @@ -57,9 +57,9 @@ export class ElementConnectComponent implements OnInit, OnDestroy { case 'asset': this._http.filterMyGrantedAssetsById(loginTo).subscribe( nodes => { - if (nodes.length === 1) { + if (nodes.length === 2) { this.hasLoginTo = true; - const node = nodes[0]; + const node = nodes[1]; this.Connect(node); } } @@ -68,9 +68,9 @@ export class ElementConnectComponent implements OnInit, OnDestroy { case 'remote_app': this._http.getMyGrantedRemoteApps(loginTo).subscribe( nodes => { - if (nodes.length === 1) { + if (nodes.length === 2) { this.hasLoginTo = true; - const node = nodes[0]; + const node = nodes[1]; this.Connect(node); } } @@ -79,9 +79,9 @@ export class ElementConnectComponent implements OnInit, OnDestroy { case 'database_app': this._http.getMyGrantedDBApps(loginTo).subscribe( nodes => { - if (nodes.length === 1) { + if (nodes.length === 2) { this.hasLoginTo = true; - const node = nodes[0]; + const node = nodes[1]; this.Connect(node); } } From b197b285b07bb38d5464fe8297134465766aa1c3 Mon Sep 17 00:00:00 2001 From: Orange Date: Mon, 14 Dec 2020 19:00:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DConnect=5Fto?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=93=BE=E6=8E=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/elements/connect/connect.component.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/elements/connect/connect.component.ts b/src/app/elements/connect/connect.component.ts index 120c8f06..f2065928 100644 --- a/src/app/elements/connect/connect.component.ts +++ b/src/app/elements/connect/connect.component.ts @@ -57,9 +57,9 @@ export class ElementConnectComponent implements OnInit, OnDestroy { case 'asset': this._http.filterMyGrantedAssetsById(loginTo).subscribe( nodes => { - if (nodes.length === 2) { + if (nodes.length === 1) { this.hasLoginTo = true; - const node = nodes[1]; + const node = nodes[0]; this.Connect(node); } } @@ -90,9 +90,9 @@ export class ElementConnectComponent implements OnInit, OnDestroy { case 'k8s_app': this._http.getMyGrantedK8SApps(loginTo).subscribe( nodes => { - if (nodes.length === 1) { + if (nodes.length === 2) { this.hasLoginTo = true; - const node = nodes[0]; + const node = nodes[1]; this.Connect(node); } }