Merge pull request #1489 from jumpserver/dev

baijiangjie · web-flow · commit 394b7f543a0b · 2025-12-18T17:24:06.000+08:00
v4.10.14
diff --git a/src/app/elements/connect/connect.component.ts b/src/app/elements/connect/connect.component.ts
@@ -169,6 +169,10 @@ export class ElementConnectComponent implements OnInit, OnDestroy {
     if (!this._settingSvc.hasXPack()) {
       appletConnectMethod = 'web';
     }
+    let virtualappConnectMethod = connectOption ? connectOption['virtualappConnectMethod'] : 'web';
+    if (!this._settingSvc.hasXPack()) {
+      virtualappConnectMethod = 'web';
+    }
 
     if (connectInfo.downloadRDP) {
       return this._http.downloadRDPFile(
@@ -180,6 +184,8 @@ export class ElementConnectComponent implements OnInit, OnDestroy {
       this.callLocalClient(connToken).then();
     } else if (connectMethod.type === 'applet' && appletConnectMethod === 'client') {
       this.callLocalClient(connToken).then();
+    } else if (connectMethod.type === 'virtual_app' && virtualappConnectMethod === 'client') {
+      this.callLocalClient(connToken).then();
     } else {
       this.createWebView(asset, connectInfo, connToken);
     }
diff --git a/src/app/elements/content/content-window/magnus/magnus.component.ts b/src/app/elements/content/content-window/magnus/magnus.component.ts
@@ -112,8 +112,7 @@ export class ElementConnectorMagnusComponent implements OnInit {
         cli = `redis-cli` +
           ` -h ${host}` +
           ` -p ${port ? port : ''}` +
-          ` -a ${this.token.id}` +
-          `@${passwordHolder}`;
+          ` -a ${passwordHolder}`;
         break;
       case 'oracle':
         cli = `sqlplus` +
diff --git a/src/app/elements/content/content.component.ts b/src/app/elements/content/content.component.ts
@@ -1,7 +1,7 @@
 import _ from 'lodash-es';
-import jQuery from 'jquery';
 import { View, ViewAction } from '@app/model';
 import { fromEvent, Subscription } from 'rxjs';
+import { I18nService } from '@app/services/i18n';
 import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
 import {
   ViewService,
@@ -60,8 +60,9 @@ export class ElementContentComponent implements OnInit, OnDestroy {
 
   constructor(
     public _viewSvc: ViewService,
-    private _connectTokenSvc: ConnectTokenService,
+    private _i18nSvc: I18nService,
     private _settingSvc: SettingService,
+    private _connectTokenSvc: ConnectTokenService,
     private _drawerStateService: DrawerStateService
   ) {}
 
@@ -116,9 +117,20 @@ export class ElementContentComponent implements OnInit, OnDestroy {
   onNewView(view) {
     this.scrollEnd();
     this.toggleMenu.emit();
-    setTimeout(() => {
-      this._viewSvc.addView(view);
-      this.setViewActive(view);
+
+    setTimeout(async () => {
+      // 如果已经打开了 15 个，那么弹出一个确认框，点击确认重新再一个新的浏览器 tab 下打开 luna 应用
+      if (this.viewList.length >= 15) {
+        const msg = await this._i18nSvc.t('tabLimits');
+        const ok = window.confirm(msg);
+
+        if (ok) {
+          window.open(window.location.href, '_blank');
+        }
+      } else {
+        this._viewSvc.addView(view);
+        this.setViewActive(view);
+      }
     }, 100);
   }
 
@@ -208,16 +220,26 @@ export class ElementContentComponent implements OnInit, OnDestroy {
       {
         title: 'Clone Connect',
         icon: 'fa-copy',
-        callback: () => {
+        callback: async () => {
           const id = this.rIdx + 1;
           const oldId = this.viewIds[this.rIdx];
           const oldView = this.viewList.find(i => i.id === oldId);
           const oldConnectToken = oldView.connectToken;
-          this._connectTokenSvc.exchange(oldConnectToken).then(newConnectToken => {
-            const newView = new View(oldView.asset, oldView.connectData, newConnectToken);
-            this._viewSvc.addView(newView);
-            this.setViewActive(newView);
-          });
+
+          if (this.viewList.length >= 15) {
+            const msg = await this._i18nSvc.t('tabLimits');
+            const ok = window.confirm(msg);
+
+            if (ok) {
+              window.open(window.location.href, '_blank');
+            }
+          } else {
+            this._connectTokenSvc.exchange(oldConnectToken).then(newConnectToken => {
+              const newView = new View(oldView.asset, oldView.connectData, newConnectToken);
+              this._viewSvc.addView(newView);
+              this.setViewActive(newView);
+            });
+          }
         }
       },
       {
@@ -227,7 +249,7 @@ export class ElementContentComponent implements OnInit, OnDestroy {
           const viewId = this.viewIds[this.rIdx];
           const currentView = this.viewList.find(i => i.id === viewId);
           this._drawerStateService.sendComponentMessage({
-            name: 'DRAWER_RECONNECT',
+            name: 'DRAWER_RECONNECT'
           });
           currentView.termComp.reconnect();
         }
diff --git a/src/app/elements/iframe/iframe.component.html b/src/app/elements/iframe/iframe.component.html
@@ -13,6 +13,7 @@
     [src]="src | safeUrl"
     [style.visibility]="showIframe ? 'visible' : 'hidden'"
     allowtransparency="true"
+    allow="clipboard-read; clipboard-write"
     height="100%"
     width="100%"
   >
diff --git a/src/app/elements/iframe/iframe.component.ts b/src/app/elements/iframe/iframe.component.ts
@@ -124,6 +124,8 @@ export class ElementIframeComponent implements OnInit, AfterViewInit, OnDestroy
           }
           break;
         case 'CLICK':
+          this.renewalTrigger.next();
+
           document.body.click();
           document.dispatchEvent(
             new MouseEvent('mouseup', {
@@ -138,12 +140,6 @@ export class ElementIframeComponent implements OnInit, AfterViewInit, OnDestroy
             this._viewSvc.keyboardSwitchTab(msg.data);
           }, 200);
           break;
-        case 'KEYBOARDEVENT':
-        case 'MOUSEEVENT':
-          this.renewalTrigger.next();
-          // Lion 组件 默认会发送的 KEYBOARDEVENT 和 MOUSEEVENT
-          this.sendInputActiveToOtherViews();
-          break;
         case 'CREATE_FILE_CONNECT_TOKEN':
           this.createFileConnectToken.emit(true);
           break;
@@ -157,7 +153,10 @@ export class ElementIframeComponent implements OnInit, AfterViewInit, OnDestroy
           this.view.terminalContentData = msg.data;
           this._iframeSvc.sendMessage({ name: 'TERMINAL_CONTENT_RESPONSE', data: msg.data });
           break;
+        case 'KEYBOARDEVENT':
+        case 'MOUSEEVENT':
         case 'INPUT_ACTIVE':
+          this.renewalTrigger.next();
           // KOKO 新定义的 input 事件，给所有其他 view 发送 sendInputActive 函数续期
           this.sendInputActiveToOtherViews();
       }
diff --git a/src/app/pages/connect/connect.component.html b/src/app/pages/connect/connect.component.html
@@ -1,6 +1,32 @@
 <app-face-monitor *ngIf="isAdminConnect"></app-face-monitor>
 <elements-chat></elements-chat>
 
+<ng-template #timerWidget>
+  <div
+    *ngIf="isTimerVisible"
+    class="timer-container"
+    [class.dragging]="isTimerDragging"
+    [ngStyle]="getTimerContainerStyle()"
+    (pointerdown)="onTimerPointerDown($event)"
+    (pointermove)="onTimerPointerMove($event)"
+    (pointerup)="onTimerPointerUp($event)"
+    (pointercancel)="onTimerPointerUp($event)"
+  >
+    <div class="timer">
+      <div [class.active]="isActive" class="status-dot"></div>
+      <span class="time-value">{{ totalConnectTime }}</span>
+      <span
+        class="timer-close"
+        nz-icon
+        nzType="close"
+        nzTheme="outline"
+        (pointerdown)="$event.stopPropagation()"
+        (click)="hideTimer()"
+      ></span>
+    </div>
+  </div>
+</ng-template>
+
 <div #contentWindow *ngIf="isDirect">
   <div class="terminal-connect" *ngIf="view && isTerminalComponent()">
     <div *ngIf="isWebSftp()" style="height: 100%; width: 100%">
@@ -55,12 +81,7 @@
           </div>
         </div> -->
       </div>
-      <div class="timer-container">
-        <div class="timer">
-          <div [class.active]="isActive" class="status-dot"></div>
-          <span>{{ totalConnectTime }}</span>
-        </div>
-      </div>
+      <ng-container *ngTemplateOutlet="timerWidget"></ng-container>
       <nz-card class="terminal-card" [nzBordered]="false">
         <div class="card-content" style="height: 100%; overflow: hidden">
           <elements-content-window #contentWindow *ngIf="view" [view]="view">
@@ -71,12 +92,7 @@
   </div>
 
   <div class="gui" *ngIf="view && isGuiComponent()">
-    <div class="timer-container">
-      <div class="timer">
-        <div [class.active]="isActive" class="status-dot"></div>
-        <span>{{ totalConnectTime }}</span>
-      </div>
-    </div>
+    <ng-container *ngTemplateOutlet="timerWidget"></ng-container>
 
     <div class="action-icons" [class.show]="showActionIcons">
       <div class="close-icon" (click)="handleCloseConnect()">
@@ -156,12 +172,7 @@
             </div>
           </div>
         </div>
-        <div class="timer-container">
-          <div class="timer">
-            <div [class.active]="isActive" class="status-dot"></div>
-            <span>{{ totalConnectTime }}</span>
-          </div>
-        </div>
+        <ng-container *ngTemplateOutlet="timerWidget"></ng-container>
         <nz-card class="terminal-card" [nzBordered]="false">
           <div class="card-content" style="height: 100%; overflow: hidden">
             <elements-connect
@@ -176,12 +187,7 @@
     </div>
 
     <div class="gui" *ngIf="view && isGuiComponent()">
-      <div class="timer-container">
-        <div class="timer">
-          <div [class.active]="isActive" class="status-dot"></div>
-          <span>{{ totalConnectTime }}</span>
-        </div>
-      </div>
+      <ng-container *ngTemplateOutlet="timerWidget"></ng-container>
 
       <div class="action-icons" [class.show]="showActionIcons">
         <div class="close-icon" (click)="handleCloseConnect()">
diff --git a/src/app/pages/connect/connect.component.scss b/src/app/pages/connect/connect.component.scss
@@ -3,6 +3,13 @@
   bottom: 40px;
   right: 30px;
   z-index: 999999;
+  touch-action: none;
+
+  &.dragging {
+    .timer {
+      cursor: grabbing;
+    }
+  }
 
   .timer {
     display: flex;
@@ -14,8 +21,10 @@
     font-family: monospace;
     font-size: 14px;
     box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
+    cursor: grab;
+    user-select: none;
 
-    span {
+    .time-value {
       margin-left: 4px;
     }
 
@@ -31,6 +40,23 @@
         animation: blink 1s infinite;
       }
     }
+
+    .timer-close {
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      margin-left: 8px;
+      width: 18px;
+      height: 18px;
+      border-radius: 50%;
+      cursor: pointer;
+      color: rgba(255, 255, 255, 0.9);
+
+      &:hover {
+        background: rgba(255, 255, 255, 0.15);
+        color: rgba(255, 255, 255, 1);
+      }
+    }
   }
 
   @media screen and (max-width: 768px) {
diff --git a/src/app/pages/connect/connect.component.ts b/src/app/pages/connect/connect.component.ts
diff --git a/src/app/services/http.ts b/src/app/services/http.ts

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`[src]="src \| safeUrl"`
`14`	`14`	`[style.visibility]="showIframe ? 'visible' : 'hidden'"`
`15`	`15`	`allowtransparency="true"`
	`16`	`+ allow="clipboard-read; clipboard-write"`
`16`	`17`	`height="100%"`
`17`	`18`	`width="100%"`
`18`	`19`	`>`