remove useless import

qlangtech · Mar 31, 2024 · 089f6af · 089f6af
1 parent 1e743bd
commit 089f6af
Show file tree

Hide file tree

Showing 46 changed files with 489 additions and 521 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/base/base-config.component.ts b/src/base/base-config.component.ts
@@ -17,14 +17,12 @@
  */
 
 import {BasicFormComponent} from "../common/basic.form.component";
-import {Component, EventEmitter, OnInit} from "@angular/core";
+import {Component, OnInit} from "@angular/core";
 import {TISService} from "../common/tis.service";
 
 import {PluginSaveResponse, TisResponseResult} from "../common/tis.plugin";
 import {NzModalService} from "ng-zorro-antd/modal";
 import {ActivatedRoute, Router} from "@angular/router";
-import {NzDrawerService} from "ng-zorro-antd/drawer";
-import {NotebookwrapperComponent} from "../common/plugins.component";
 
 enum PluginCategory {
   Global = 'global',
@@ -34,31 +32,32 @@ enum PluginCategory {
 
 @Component({
   template: `
-      <tis-page-header title="插件配置"></tis-page-header>
-      <nz-spin [nzSize]="'large'" [nzSpinning]="this.formDisabled || pluginComponentDisabled">
-          <nz-tabset (nzSelectedIndexChange)="tabChange($event)" [nzSelectedIndex]="selectedIndex">
-              <nz-tab nzTitle="全局" (nzClick)="goto('global')" (nzDeselect)="configDeSelect($event)">
-                  <ng-template nz-tab>
-                      <tis-plugins [showExtensionPoint]="this.showExtensionPoint" [showSaveButton]="true"
-                                   [plugins]="['flink-image','dft-image','powerjob-image','params-cfg']"
-                                   (ajaxOccur)="buildStep1ParamsSetComponentAjax($event)"></tis-plugins>
-                  </ng-template>
-              </nz-tab>
-              <!--              <nz-tab nzTitle="实时" (nzClick)="goto('incr')" (nzDeselect)="configDeSelect($event)">-->
-              <!--                  <ng-template nz-tab>-->
-              <!--                      <tis-plugins [showExtensionPoint]="this.showExtensionPoint" [showSaveButton]="true" [plugins]="['incr-config']" (ajaxOccur)="buildStep1ParamsSetComponentAjax($event)"></tis-plugins>-->
-              <!--                  </ng-template>-->
-              <!--              </nz-tab>-->
-              <nz-tab nzTitle="离线" (nzClick)="goto('offline')" (nzDeselect)="configDeSelect($event)">
-                  <ng-template nz-tab>
-                      <tis-plugins [showExtensionPoint]="this.showExtensionPoint" [showSaveButton]="true" [plugins]="['fs']" (ajaxOccur)="buildStep1ParamsSetComponentAjax($event)"></tis-plugins>
-                  </ng-template>
-              </nz-tab>
-          </nz-tabset>
-          <!--          <ng-template #extraTemplate>-->
-          <!--              <span>扩展点显示<nz-switch [nzLoading]="formDisabled" (ngModelChange)="showExtendsPointChange($event)" [ngModel]="this.showExtensionPoint.open" nzCheckedChildren="开" nzUnCheckedChildren="关"></nz-switch></span>-->
-          <!--          </ng-template>-->
-      </nz-spin>
+    <tis-page-header title="插件配置"></tis-page-header>
+    <nz-spin [nzSize]="'large'" [nzSpinning]="this.formDisabled || pluginComponentDisabled">
+      <nz-tabset (nzSelectedIndexChange)="tabChange($event)" [nzSelectedIndex]="selectedIndex">
+        <nz-tab nzTitle="全局" (nzClick)="goto('global')" (nzDeselect)="configDeSelect($event)">
+          <ng-template nz-tab>
+            <tis-plugins [showExtensionPoint]="this.showExtensionPoint" [showSaveButton]="true"
+                         [plugins]="['flink-image','dft-image','powerjob-image','params-cfg']"
+                         (ajaxOccur)="buildStep1ParamsSetComponentAjax($event)"></tis-plugins>
+          </ng-template>
+        </nz-tab>
+        <!--              <nz-tab nzTitle="实时" (nzClick)="goto('incr')" (nzDeselect)="configDeSelect($event)">-->
+        <!--                  <ng-template nz-tab>-->
+        <!--                      <tis-plugins [showExtensionPoint]="this.showExtensionPoint" [showSaveButton]="true" [plugins]="['incr-config']" (ajaxOccur)="buildStep1ParamsSetComponentAjax($event)"></tis-plugins>-->
+        <!--                  </ng-template>-->
+        <!--              </nz-tab>-->
+        <nz-tab nzTitle="离线" (nzClick)="goto('offline')" (nzDeselect)="configDeSelect($event)">
+          <ng-template nz-tab>
+            <tis-plugins [showExtensionPoint]="this.showExtensionPoint" [showSaveButton]="true" [plugins]="['fs']"
+                         (ajaxOccur)="buildStep1ParamsSetComponentAjax($event)"></tis-plugins>
+          </ng-template>
+        </nz-tab>
+      </nz-tabset>
+      <!--          <ng-template #extraTemplate>-->
+      <!--              <span>扩展点显示<nz-switch [nzLoading]="formDisabled" (ngModelChange)="showExtendsPointChange($event)" [ngModel]="this.showExtensionPoint.open" nzCheckedChildren="开" nzUnCheckedChildren="关"></nz-switch></span>-->
+      <!--          </ng-template>-->
+    </nz-spin>
   `
   ,
   styles: [`

diff --git a/src/base/base.manage-routing.module.ts b/src/base/base.manage-routing.module.ts
@@ -34,16 +34,14 @@ import {Breadcrumb, DataxWorkerDTO, ProcessMeta} from "../runtime/misc/RCDeploym
 import {PluginManageComponent} from "./plugin.manage.component";
 import {StepType} from "../common/steps.component";
 import {ErrorListComponent} from "./error.list.component";
-import {NotebookwrapperComponent} from "../common/plugins.component";
-import {Descriptor, HeteroList, ItemPropVal, PluginMeta, PluginType, SavePluginEvent} from "../common/tis.plugin";
+import {Descriptor, ItemPropVal, PluginMeta, SavePluginEvent} from "../common/tis.plugin";
 import {DataxWorkerAddStep0Component} from "./datax.worker.add.step0.component";
-import {K8SRCSpec} from "../common/k8s.replics.spec.component";
 import {FlinkClusterListComponent} from "./flink.cluster.list.component";
 import {DataxWorkerAddStep3Component} from "./datax.worker.add.step3.component";
 import {DataxWorkerRunningComponent} from "./datax.worker.running.component";
 
 const get_job_worker_meta = "get_job_worker_meta";
-const flinkClusterCfgTargetName = PowerjobCptType.FlinkCluster.toString();// "flink-cluster";
+const flinkClusterCfgTargetName = ()=> PowerjobCptType.FlinkCluster.toString();// "flink-cluster";
 const dataXWorkerCfgTargetName = "datax-worker";
 
 const KEY_TARGET_NAME = 'targetName';
@@ -208,12 +206,12 @@ export const flinkClusterCfg: { processMeta: ProcessMeta }
 
       let itemPkVal = flinkClusterHeteroPkGetter(dto);
       if (itemPkVal) {
-        return flinkClusterCfgTargetName + "/" + itemPkVal.primary;
+        return flinkClusterCfgTargetName() + "/" + itemPkVal.primary;
       }
-      return flinkClusterCfgTargetName + (justGroup ? '' : '/dummpnameX');
+      return flinkClusterCfgTargetName() + (justGroup ? '' : '/dummpnameX');
     },
     runningTabRouterGetter: (params) => {
-      return [flinkClusterCfgTargetName];
+      return [flinkClusterCfgTargetName()];
     },
     init_get_job_worker_meta: get_job_worker_meta,
     runningStepCfg: {
@@ -226,7 +224,7 @@ export const flinkClusterCfg: { processMeta: ProcessMeta }
     },
     launchClusterMethod: "Launch_flink_cluster",
     relaunchClusterMethod: "relaunch_flink_cluster",
-    targetName: flinkClusterCfgTargetName
+    targetName: flinkClusterCfgTargetName()
     , pageHeader: FlinkSessionPageHeader
     // , createButtonLabel: "创建Flink Native Cluster执行器"
     , notCreateTips: "还未创建Flink Kubernetes Session执行器，创建之后可以将Flink Job提交到Kubernetes Session集群，高效并行执行数据实时同步任务"
@@ -260,7 +258,7 @@ export const flinkClusterCfg: { processMeta: ProcessMeta }
             throw new Error("itemPkVal can not be null");
           }
           return <PluginMeta>{
-            name: flinkClusterCfgTargetName,
+            name: flinkClusterCfgTargetName(),
             require: true,
             extraParam: 'dataxName_' + itemPkVal.primary
           };
@@ -299,7 +297,7 @@ export const flinkSessionDetail: { processMeta: ProcessMeta }
     },
     targetNameGetter: (params) => {
       // @ts-ignore
-      return flinkClusterCfgTargetName + "/" + params[KEY_TARGET_NAME];
+      return flinkClusterCfgTargetName() + "/" + params[KEY_TARGET_NAME];
     },
     init_get_job_worker_meta: get_flink_session,
     runningTabRouterGetter: (params) => {
@@ -340,7 +338,7 @@ export const flinkSessionDetail: { processMeta: ProcessMeta }
           //   throw new Error("itemPkVal can not be null");
           // }
           return <PluginMeta>{
-            name: flinkClusterCfgTargetName,
+            name: flinkClusterCfgTargetName(),
             require: true,
             extraParam: 'dataxName_' + params[KEY_TARGET_NAME]
           };

diff --git a/src/base/datax.add.step6.cols-meta-setter.component.ts b/src/base/datax.add.step6.cols-meta-setter.component.ts
@@ -20,7 +20,7 @@ import {AfterViewInit, Component, OnInit} from "@angular/core";
 import {TISService} from "../common/tis.service";
 import {CurrentCollection} from "../common/basic.form.component";
 import {NzModalService} from "ng-zorro-antd/modal";
-import {Item, ItemPropVal, ReaderColMeta, DataTypeMeta, TabletView} from "../common/tis.plugin";
+import {Item, ItemPropVal, ReaderColMeta, TabletView} from "../common/tis.plugin";
 import {BasicDataXAddComponent} from "./datax.add.base";
 import {ActivatedRoute, Router} from "@angular/router";
 

diff --git a/src/base/datax.add.step7.confirm.component.ts b/src/base/datax.add.step7.confirm.component.ts
@@ -21,7 +21,6 @@ import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
-  ElementRef,
   Input,
   OnInit,
   ViewChild

diff --git a/src/base/datax.worker.add.exist.powerjob.cluster.component.ts b/src/base/datax.worker.add.exist.powerjob.cluster.component.ts
@@ -18,15 +18,12 @@
 
 import {AfterViewInit, Component, EventEmitter, Input, OnInit, Output} from "@angular/core";
 import {TISService} from "../common/tis.service";
-import {AppFormComponent, BasicFormComponent, CurrentCollection} from "../common/basic.form.component";
+import {BasicFormComponent, CurrentCollection} from "../common/basic.form.component";
 
 import {NzModalService} from "ng-zorro-antd/modal";
-import {HeteroList, PluginSaveResponse, PluginType, SavePluginEvent} from "../common/tis.plugin";
+import {PluginSaveResponse, PluginType, SavePluginEvent} from "../common/tis.plugin";
 import {PluginsComponent} from "../common/plugins.component";
 import {DataxWorkerDTO} from "../runtime/misc/RCDeployment";
-import {ActivatedRoute, Router} from "@angular/router";
-import {NzNotificationService} from "ng-zorro-antd/notification";
-import {K8SReplicsSpecComponent} from "../common/k8s.replics.spec.component";
 import {PowerjobCptType} from "./datax.worker.component";