diff --git a/src/app/elements/asset-tree/asset-tree.component.ts b/src/app/elements/asset-tree/asset-tree.component.ts index 51ba102a0..2ff7e4ed7 100644 --- a/src/app/elements/asset-tree/asset-tree.component.ts +++ b/src/app/elements/asset-tree/asset-tree.component.ts @@ -238,9 +238,9 @@ export class ElementAssetTreeComponent implements OnInit { return; } - // if (treeNode.meta.data.platform_type === 'k8s') { - // return connectOnNewPage(treeNode, 'auto'); - // } + if (treeNode.meta.data.platform_type === 'k8s') { + return connectOnNewPage(treeNode, 'auto'); + } if (this.isOpenNewWindow) { connectOnNewPage(treeNode, 'auto'); diff --git a/src/app/elements/chat/chat.component.ts b/src/app/elements/chat/chat.component.ts index a3051d5ec..908086673 100644 --- a/src/app/elements/chat/chat.component.ts +++ b/src/app/elements/chat/chat.component.ts @@ -55,8 +55,8 @@ export class ElementChatComponent implements OnInit, OnDestroy, AfterViewInit { get isShowSetting() { const connectMethods = ['koko', 'lion', 'tinker', 'panda']; - // sftp 不展示设置按钮 - if (this.currentView.protocol === 'sftp') { + // sftp 或 k8s 不展示设置按钮 + if (this.currentView.protocol === 'sftp' || this.currentView.protocol === 'k8s') { return false; } diff --git a/src/app/elements/connect/connect.component.ts b/src/app/elements/connect/connect.component.ts index 14ee403ad..a71ea35f0 100644 --- a/src/app/elements/connect/connect.component.ts +++ b/src/app/elements/connect/connect.component.ts @@ -153,11 +153,12 @@ export class ElementConnectComponent implements OnInit, OnDestroy { return; } - if (connToken.protocol === 'k8s') { - const url = `${window.location.protocol}//${window.location.host}/luna/k8s/${connToken.id}?asset=${asset.id}`; - window.open(url); - return; - } + // if (connToken.protocol === 'k8s') { + // const url = `${window.location.protocol}//${window.location.host}/luna/k8s/${connToken.id}?asset=${asset.id}`; + // window.open(url); + // return; + // console.log('k8s', this.viewSrv) + // } // 分屏连接 if (splitConnect) { @@ -168,7 +169,9 @@ export class ElementConnectComponent implements OnInit, OnDestroy { if (connectMethod.value.endsWith('_guide')) { return this.createWebView(asset, connectInfo, connToken); } + let appletConnectMethod = connectOption ? connectOption['appletConnectMethod'] : 'web'; + if (!this._settingSvc.hasXPack()) { appletConnectMethod = 'web'; } diff --git a/src/app/pages/connect/connect.component.html b/src/app/pages/connect/connect.component.html index 24683f365..f5943bba6 100644 --- a/src/app/pages/connect/connect.component.html +++ b/src/app/pages/connect/connect.component.html @@ -1,6 +1,7 @@ -