Merge pull request #1174 from jumpserver/dev

v4.3.0

Author: BaiJiangJie

src/app/elements/replay/parts/parts.component.html

@@ -37,7 +37,7 @@
           <div class="loading-spinner">
             <mat-spinner *ngIf="videoLoading"></mat-spinner>
           </div>
-          <elements-replay-guacamole class='guacamole-video' [replay]="currentVideo" *ngIf="currentVideo"></elements-replay-guacamole>
+          <elements-replay-guacamole class='guacamole-video' [replay]="currentVideo" *ngIf="currentVideo && currentVideo.src"></elements-replay-guacamole>
         </mat-card>
       </div>
       <mat-card  class="video-list">

src/app/elements/replay/parts/parts.component.ts

@@ -120,6 +120,67 @@ export class ElementsPartsComponent implements OnInit {
     return result.trim();
   }
 
+  /**
+   * 获取录像源的逻辑
+   *
+   * @param item
+   * @param sessionId
+   * @param isFirstPush
+   */
+  async fetchSection (item: IFile, sessionId: string, isFirstPush: boolean): Promise<boolean> {
+    let section: Section;
+    try {
+      const res: Replay = await this._http.getPartFileReplay(sessionId, item.name).toPromise();
+
+      if (res) {
+        // 3.5 的 TS 版本无法使用 ?.
+        // @ts-ignore
+        const data = res.type ? res : (res.resp ? res.resp.data : undefined);
+
+        if (data && data.src && res.status !== 'running') {
+          section = {
+            id: this.id,
+            account: data.account,
+            asset: data.asset,
+            date_end: data.date_end,
+            date_start: data.date_start,
+            download_url: data.download_url,
+            src: data.src,
+            type: data.type,
+            user: data.user,
+            size: this.formatFileSize(item.size),
+            name: `Part ${this.folders.length + 1}`,
+            updated: this.formatDuration(item.duration),
+          };
+
+          this.folders.push(section);
+
+          if (isFirstPush && section.src) {
+            this.currentVideo = section;
+            this.videoLoading = true;
+            this.cdRef.detectChanges();
+
+            setTimeout(() => {
+              this.videoLoading = false;
+            }, 300);
+
+            return false;
+          }
+
+      } else if (res && res.status === 'running') {
+          this.alertShown = true;
+          await this.delay(3000);
+          return await this.fetchSection(item, sessionId, isFirstPush);
+        }
+      }
+    } catch (e) {
+      this._logger.error(e);
+    } finally {
+      this.alertShown = false;
+    }
+    return isFirstPush;
+  }
+
   /**
    * 分割 File 对象
    * @param file
@@ -129,57 +190,7 @@ export class ElementsPartsComponent implements OnInit {
     let isFirstPush = true;
 
     for (const item of file) {
-      let res: Replay;
-      let retry = true;
-
-      while (retry) {
-        try {
-          res = await this._http
-            .getPartFileReplay(sessionId, item.name)
-            .toPromise();
-
-          if (res && res.status !== 'running') {
-            const section: Section = {
-              id: this.id,
-              account: res.account,
-              asset: res.asset,
-              date_end: res.date_end,
-              date_start: res.date_start,
-              download_url: res.download_url,
-              src: res.src,
-              type: res.type,
-              user: res.user,
-              size: this.formatFileSize(item.size),
-              name: `Part ${this.folders.length + 1}`,
-              updated: this.formatDuration(item.duration),
-            };
-
-            this.folders.push(section);
-
-            if (isFirstPush) {
-              this.currentVideo = section;
-              this.videoLoading = true;
-              this.cdRef.detectChanges();
-
-              setTimeout(() => {
-                this.videoLoading = false;
-              }, 300);
-
-              isFirstPush = false;
-            }
-
-            retry = false;
-          } else if (res && res.status === 'running') {
-            this.alertShown = true;
-            await this.delay(3000);
-          }
-        } catch (e) {
-          this._logger.error(e);
-          retry = false;
-        } finally {
-          this.alertShown = false;
-        }
-      }
+      isFirstPush = await this.fetchSection(item, sessionId, isFirstPush);
     }
   }
 

src/app/utils/common.ts

@@ -303,6 +303,7 @@ export function connectOnNewPage(node: TreeNode, newWindowMode?: string) {
       count = 0;
     }
     let left = 100 + count * 100;
+    top = 50 + count * 50;
     if (left + screen.width / 3 > screen.width) {
       // 支持两排足以
       top = screen.height / 3;