fix some bug for dataflow parser,datavane/tis#429

Author: baisui1981

.idea/workspace.xml

@@ -23,13 +23,12 @@ import {BasicFormComponent, CurrentCollection} from '../common/basic.form.compon
 
 import {Pager} from '../common/pagination.component';
 import {NzModalService} from "ng-zorro-antd/modal";
-import {Application, AppType} from "../common/application";
+import {Application} from "../common/application";
 import {LatestSelectedIndex} from "../common/LatestSelectedIndex";
 import {LocalStorageService} from "angular-2-local-storage";
 import {DataxAddStep7Component} from "./datax.add.step7.confirm.component";
 import {StepType} from "../common/steps.component";
 import {Descriptor, SavePluginEvent} from "../common/tis.plugin";
-import {PluginsComponent} from "../common/plugins.component";
 import {DataxDTO} from "./datax.add.component";
 
 
@@ -84,7 +83,7 @@ import {DataxDTO} from "./datax.add.component";
       <!--            </page-header>-->
 
 
-      <tis-col title="管道" width="14">
+      <tis-col title="实例" width="14" (search)="filterByAppName($event)">
         <ng-template let-app='r'>
 
           <button nz-button nzType="link" style="cursor: pointer" nzSize="small"
@@ -140,13 +139,15 @@ import {DataxDTO} from "./datax.add.component";
           <!--              </li>-->
           <!--            </ul>-->
           <!--          </nz-dropdown-menu>-->
-          <tis-plugin-add-btn btnSize="small"
+          <tis-plugin-add-btn [enableAddplugin]="false" btnSize="small"
                               [extendPoint]="processorExend"
                               [descriptors]="processorDescriptors" [initDescriptors]="false">
             <tis-plugin-add-btn-extract-item (click)="startEditReader(app)" nz-icon="edit" li-name="Reader">
             </tis-plugin-add-btn-extract-item>
             <tis-plugin-add-btn-extract-item (click)="startEditWriter(app)" nz-icon="edit" li-name="Writer">
             </tis-plugin-add-btn-extract-item>
+            <tis-plugin-add-btn-extract-item (click)="startDeletePipeline(app)" nz-icon="delete" li-name="删除">
+            </tis-plugin-add-btn-extract-item>
             <i nz-icon nzType="setting" nzTheme="outline"></i>
           </tis-plugin-add-btn>
 
@@ -187,6 +188,18 @@ export class ApplistComponent extends BasicFormComponent implements OnInit {
     DataxAddStep7Component.startDataXEdit(this, StepType.UpdateDataxWriter, this.router, this.route, `/x/${app.projectName}/update`, "writer", saveEvent);
   }
 
+  startDeletePipeline(app: Application) {
+    // let saveEvent = new SavePluginEvent();
+    // saveEvent.overwriteHttpHeaderOfAppName(app.projectName);
+    // DataxAddStep7Component.startDataXEdit(this, StepType.UpdateDataxWriter, this.router, this.route, `/x/${app.projectName}/manage#control`, "writer", saveEvent);
+
+
+    this.router.navigate(["/", "x", app.projectName, "manage"], {
+      relativeTo: this.route,
+      fragment: "control"
+    });
+  }
+
   ngOnInit(): void {
     this.route.queryParams.subscribe((param) => {
 
@@ -259,13 +272,13 @@ export class ApplistComponent extends BasicFormComponent implements OnInit {
   }
 
   toggleOpenAssist(app: Application) {
-    let a:any = app;
-    if(!a.openAssist){
-      this.pageList.forEach((app)=>{
-        (app as any).openAssist= false;
+    let a: any = app;
+    if (!a.openAssist) {
+      this.pageList.forEach((app) => {
+        (app as any).openAssist = false;
       });
       this.tisService.currentApp = new CurrentCollection(0, app.projectName);
-    }else{
+    } else {
       this.tisService.currentApp = null;
     }
     a.openAssist = !a.openAssist;

src/base/applist.component.ts

@@ -26,7 +26,7 @@ import {ApplistComponent} from './applist.component';
 import {OperationLogComponent} from '../common/operation.log.component';
 import {AddAppStepFlowComponent} from './addapp.step.flow.component';
 import {BaseConfigComponent} from "./base-config.component";
-import {SnapshotsetComponent} from "../common/snapshotset.component";
+// import {SnapshotsetComponent} from "../common/snapshotset.component";
 import {SchemaEditVisualizingModelComponent, SchemaXmlEditComponent} from "../corecfg/schema-xml-edit.component";
 import {DataxAddComponent} from "./datax.add.component";
 import {DataxWorkerComponent} from "./datax.worker.component";
@@ -412,14 +412,14 @@ const basemanageRoutes: Routes = [
             path: 'appadd',
             component: AddAppStepFlowComponent
           },
-          {   // 配置模版一览
-            path: 'tpl/snapshotset',
-            component: SnapshotsetComponent,
-            data: {
-              showBreadcrumb: true,
-              template: true
-            }
-          },
+          // {   // 配置模版一览
+          //   path: 'tpl/snapshotset',
+          //   component: SnapshotsetComponent,
+          //   data: {
+          //     showBreadcrumb: true,
+          //     template: true
+          //   }
+          // },
           {
             path: 'tpl/xml_conf/:restype/:snapshotid',
             component: SchemaXmlEditComponent

src/base/base.manage-routing.module.ts

@@ -0,0 +1,66 @@
+export const KEY_DATAFLOW_PARSER = "数据流分析（EMR）";
+
+/**
+ * 被选中的列
+ */
+export interface ISelectedCol {
+  label: string;
+  value: string;
+  checked: boolean;
+  pk: boolean;
+}
+
+export interface ISelectedTabMeta {
+
+  tableName: string,
+  selectableCols: Array<ISelectedCol> // r.bizresult
+}
+
+export class DataxProfile {
+  projectName: string;
+  recept: string;
+  dptId: string;
+}
+
+// "transformerInfo":[
+//   {
+//     "ruleCount":3,
+//     "tableName":"base"
+//   }
+// ]
+export interface TransformerInfo {
+  ruleCount: number;
+  tableName: string;
+}
+
+export interface DataXCfgFile {
+  dbFactoryId?: string;
+  fileName: string;//:"totalpayinfo_0.json"
+}
+
+export class AddStep2ComponentCfg {
+  public readerCptNeed = true;
+  public headerCaption = 'Reader & Writer类型';
+  public writerTypeLable = "Writer类型";
+  public writerPluginTag: string = '';
+
+  public stepIndex = 0;
+
+  get stepToolbarNeed(): boolean {
+    return true; //this.readerCptNeed;
+  }
+
+  installableExtension: Array<string> = ['com.qlangtech.tis.datax.impl.DataxReader', 'com.qlangtech.tis.datax.impl.DataxWriter'];
+}
+
+export interface DataXCreateProcessMeta {
+  readerRDBMS: boolean;
+  readerRDBMSChangeableInLifetime?: boolean;
+  // DataX Reader 是否有明确的表名
+  explicitTable: boolean;
+
+  // writer 是否符合关系型数据库要求
+  writerRDBMS: boolean;
+  // reader 中是否可以选择多个表，例如像elastic这样的writer中对于column的设置比较复杂，需要在writer plugin页面中完成，所以就不能支持在reader中选择多个表了
+  writerSupportMultiTab: boolean;
+}

src/base/common/datax.common.ts

@@ -33,7 +33,7 @@ import {ActivatedRoute, Router} from "@angular/router";
 import {MultiViewDAG} from "../common/MultiViewDAG";
 import {NzModalService} from "ng-zorro-antd/modal";
 import {DataxAddStep1Component} from "./datax.add.step1.component";
-import {DataxAddStep2Component, DataXReaderWriterEnum} from "./datax.add.step2.component";
+import {DataxAddStep2Component} from "./datax.add.step2.component";
 import {DataxAddStep3Component} from "./datax.add.step3.component";
 import {DataxAddStep4Component} from "./datax.add.step4.component";
 import {DataxAddStep5Component} from "./datax.add.step5.component";
@@ -43,10 +43,10 @@ import {DataxAddStep6ColsMetaSetterComponent} from "./datax.add.step6.cols-meta-
 import {StepType} from "../common/steps.component";
 import {Descriptor} from "../common/tis.plugin";
 import {AddAppDefSchemaComponent} from "./addapp-define-schema.component";
-import {PluginsComponent} from "../common/plugins.component";
 import {NzSafeAny} from "ng-zorro-antd/core/types";
 import {TablePojo} from "../offline/table.add.component";
 import {Subject} from "rxjs";
+import {AddStep2ComponentCfg, DataXCreateProcessMeta, DataxProfile, ISelectedTabMeta} from "./common/datax.common";
 
 
 @Component({
@@ -76,9 +76,14 @@ export class DataxAddComponent extends AppFormComponent implements AfterViewInit
           dto.processMeta = r.bizresult.processMeta;
           // this.dto.readerDescriptor = null;
           let wdescIt: IterableIterator<Descriptor> = Descriptor.wrapDescriptors(r.bizresult.writerDesc).values();
-          let rdescIt: IterableIterator<Descriptor> = Descriptor.wrapDescriptors(r.bizresult.readerDesc).values();
           dto.writerDescriptor = wdescIt.next().value;
-          dto.readerDescriptor = rdescIt.next().value;
+
+          if (r.bizresult.readerDesc) {
+            let rdescIt: IterableIterator<Descriptor> = Descriptor.wrapDescriptors(r.bizresult.readerDesc).values();
+            dto.readerDescriptor = rdescIt.next().value;
+          }
+
+
           return dto;
         }
       });
@@ -181,49 +186,12 @@ export class DataxAddComponent extends AppFormComponent implements AfterViewInit
 }
 
 
-/**
- * 被选中的列
- */
-export interface ISelectedCol {
-  label: string;
-  value: string;
-  checked: boolean;
-  pk: boolean;
-}
-
-export interface ISelectedTabMeta {
-
-  tableName: string,
-  selectableCols: Array<ISelectedCol> // r.bizresult
-}
-
-class DataxProfile {
-  projectName: string;
-  recept: string;
-  dptId: string;
-}
-
-export interface DataXCfgFile {
-  dbFactoryId?: string;
-  fileName: string;//:"totalpayinfo_0.json"
-}
-
-// "transformerInfo":[
-//   {
-//     "ruleCount":3,
-//     "tableName":"base"
-//   }
-// ]
-export interface TransformerInfo {
-  ruleCount: number;
-  tableName: string;
-}
-
 export class DataxDTO {
   static KEY_PROCESS_MODEL = 'processModel';
   execModel: ExecModel = ExecModel.Create;
   public headerStepShow = true;
 
+
   dataxPipeName: string;
   profile: DataxProfile = new DataxProfile();
   selectableTabs: Map<string /* table */, ISelectedTabMeta> = new Map();
@@ -279,30 +247,3 @@ export class DataxDTO {
   }
 }
 
-export class AddStep2ComponentCfg {
-  public readerCptNeed = true;
-  public headerCaption = 'Reader & Writer类型';
-  public writerTypeLable = "Writer类型";
-  public writerPluginTag: string = '';
-
-  public stepIndex = 0;
-
-  get stepToolbarNeed(): boolean {
-    return true; //this.readerCptNeed;
-  }
-
-  installableExtension: Array<string> = ['com.qlangtech.tis.datax.impl.DataxReader', 'com.qlangtech.tis.datax.impl.DataxWriter'];
-}
-
-export interface DataXCreateProcessMeta {
-  readerRDBMS: boolean;
-  readerRDBMSChangeableInLifetime?: boolean;
-  // DataX Reader 是否有明确的表名
-  explicitTable: boolean;
-
-  // writer 是否符合关系型数据库要求
-  writerRDBMS: boolean;
-  // reader 中是否可以选择多个表，例如像elastic这样的writer中对于column的设置比较复杂，需要在writer plugin页面中完成，所以就不能支持在reader中选择多个表了
-  writerSupportMultiTab: boolean;
-}
-