From 47feef8a0bca3cf3a5b33df13818d7e607b8ef62 Mon Sep 17 00:00:00 2001
From: mozhenghua <baisui@qlangtech.com>
Date: Thu, 28 Mar 2024 09:28:14 +0800
Subject: [PATCH] modify system initialize process

---
 .idea/workspace.xml                 | 16 ++--------------
 src/common/init.system.component.ts | 27 +++++++++++++++++++++------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9956d89..997ab7a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,19 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="5f10523e-898f-484b-9208-c914dd2c75e8" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/base/base.manage-routing.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/base/base.manage-routing.module.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/base/datax.worker.add.step0.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/base/datax.worker.add.step0.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/base/datax.worker.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/base/datax.worker.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/base/datax.worker.running.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/base/datax.worker.running.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/common/basic.form.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/basic.form.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/common/launch.waitting.process.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/launch.waitting.process.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/common/navigate.bar.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/navigate.bar.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/common/plugins.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/plugins.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/common/tis.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/tis.service.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/datax/datax.index.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/datax/datax.index.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/runtime/app.module-jit.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/runtime/app.module-jit.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/runtime/incr.pod.logs.status.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/runtime/incr.pod.logs.status.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/runtime/misc/RCDeployment.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/runtime/misc/RCDeployment.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/common/init.system.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/init.system.component.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -208,7 +196,7 @@
       <workItem from="1708498515669" duration="28236000" />
       <workItem from="1709011380537" duration="53759000" />
       <workItem from="1710341418442" duration="55807000" />
-      <workItem from="1711444715700" duration="2582000" />
+      <workItem from="1711444715700" duration="5359000" />
     </task>
     <servers />
   </component>
diff --git a/src/common/init.system.component.ts b/src/common/init.system.component.ts
index 021fe44..bc2fa65 100644
--- a/src/common/init.system.component.ts
+++ b/src/common/init.system.component.ts
@@ -20,21 +20,25 @@ import {Component, OnInit} from "@angular/core";
 import {BasicFormComponent} from "./basic.form.component";
 import {TISService} from "./tis.service";
 import {NzModalRef} from "ng-zorro-antd/modal";
+import {ActivatedRoute, Router} from "@angular/router";
+import {NzProgressStatusType} from "ng-zorro-antd/progress/typings";
 
 @Component({
   template: `
-      <nz-alert nzType="info" nzMessage="初次使用TIS，系统需要对相关配置进行初始化" nzShowIcon></nz-alert>
-      <tis-page-header [result]="this.result" [showBreadcrumb]="false">
-          <button nz-button nzType="primary" (click)="startInitialize()" [nzLoading]="_startInitialize">开始初始化</button>
-      </tis-page-header>
-      <nz-progress *ngIf="_startInitialize" [nzPercent]="_percent" nzStatus="active"></nz-progress>
+    <nz-alert nzType="info" nzMessage="初次使用TIS，系统需要对相关配置进行初始化" nzShowIcon></nz-alert>
+    <tis-page-header [result]="this.result" [showBreadcrumb]="false">
+      <button nz-button nzType="primary" (click)="startInitialize()" [nzLoading]="_startInitialize">开始初始化</button>
+    </tis-page-header>
+    <nz-progress *ngIf="_startInitialize" [nzPercent]="_percent" [nzStatus]="_progressStatus"></nz-progress>
   `
 })
 export class InitSystemComponent extends BasicFormComponent implements OnInit {
   _startInitialize = false;
   _percent = 0;
 
-  constructor(tisService: TISService, private activeModal: NzModalRef) {
+  _progressStatus: NzProgressStatusType = 'active';
+
+  constructor(tisService: TISService, private activeModal: NzModalRef, private router: Router, private route: ActivatedRoute) {
     super(tisService);
   }
 
@@ -56,9 +60,20 @@ export class InitSystemComponent extends BasicFormComponent implements OnInit {
       clearInterval(timer);
       if (r.success) {
         this.activeModal.close(r);
+        this._progressStatus = "success";
+        // this.router.navigateByUrl('/', {skipLocationChange: true})
+        //   .then(() => {
+        //     this.router.navigate(["/"]);
+        //   });
+        window.location.reload();
       } else {
         this.processResult(r);
+        this._progressStatus = 'exception';
       }
+    }, () => {
+      this._progressStatus = 'exception';
+    }).finally(() => {
+
     });
   }
 }