diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 260597c..3ad7dc3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +8,8 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/base/datax.add.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/base/datax.add.component.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/base/datax.add.step4.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/base/datax.add.step4.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/base/datax.add.step5.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/base/datax.add.step5.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/base/datax.add.step6.cols-meta-setter.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/base/datax.add.step6.cols-meta-setter.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/base/datax.add.step7.confirm.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/base/datax.add.step7.confirm.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/common/pagination.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/pagination.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/schema.edit.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/schema.edit.component.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/common/tis.plugin.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/tis.plugin.ts" afterDir="false" />
@@ -165,7 +165,9 @@
       <workItem from="1692881425500" duration="7703000" />
       <workItem from="1693357372671" duration="14055000" />
       <workItem from="1693621330132" duration="54806000" />
-      <workItem from="1694004421951" duration="28155000" />
+      <workItem from="1694004421951" duration="28794000" />
+      <workItem from="1694418382716" duration="663000" />
+      <workItem from="1694477787341" duration="15501000" />
     </task>
     <servers />
   </component>
@@ -173,130 +175,128 @@
     <option name="version" value="3" />
     <option name="exactExcludedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/common/common.module.js" />
-        <option value="$PROJECT_DIR$/src/common/common.module.js.map" />
-        <option value="$PROJECT_DIR$/src/datax/datax-routing.module.js" />
+        <option value="$PROJECT_DIR$/src/offline/table.add.step.js.map" />
         <option value="$PROJECT_DIR$/src/datax/datax-routing.module.js.map" />
-        <option value="$PROJECT_DIR$/src/common/tis.service.js" />
-        <option value="$PROJECT_DIR$/src/common/tis.service.js.map" />
-        <option value="$PROJECT_DIR$/src/datax/datax.index.component.js" />
-        <option value="$PROJECT_DIR$/src/datax/datax.index.component.js.map" />
-        <option value="$PROJECT_DIR$/src/runtime/root-welcome-component.js" />
-        <option value="$PROJECT_DIR$/src/runtime/root-welcome-component.js.map" />
-        <option value="$PROJECT_DIR$/src/datax/datax.module.js" />
-        <option value="$PROJECT_DIR$/src/datax/datax.module.js.map" />
-        <option value="$PROJECT_DIR$/src/offline/offline-routing.module.js" />
+        <option value="$PROJECT_DIR$/src/runtime/core.node.manage.index.component.js" />
         <option value="$PROJECT_DIR$/src/offline/offline-routing.module.js.map" />
-        <option value="$PROJECT_DIR$/src/common/basic.form.component.js" />
-        <option value="$PROJECT_DIR$/src/common/basic.form.component.js.map" />
-        <option value="$PROJECT_DIR$/src/common/table.select.component.js" />
-        <option value="$PROJECT_DIR$/src/common/table.select.component.js.map" />
-        <option value="$PROJECT_DIR$/src/offline/workflow.add.component.js" />
-        <option value="$PROJECT_DIR$/src/offline/workflow.add.component.js.map" />
-        <option value="$PROJECT_DIR$/src/test.js" />
-        <option value="$PROJECT_DIR$/src/test.js.map" />
-        <option value="$PROJECT_DIR$/src/polyfills.js" />
-        <option value="$PROJECT_DIR$/src/polyfills.js.map" />
-        <option value="$PROJECT_DIR$/src/user/user.list.component.js" />
-        <option value="$PROJECT_DIR$/src/user/user.list.component.js.map" />
-        <option value="$PROJECT_DIR$/src/user/user.module.js" />
-        <option value="$PROJECT_DIR$/src/user/user.module.js.map" />
-        <option value="$PROJECT_DIR$/src/user/user-routing.module.js" />
-        <option value="$PROJECT_DIR$/src/user/user-routing.module.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/incr.build.step4.running.tab-base.component.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/app.component.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/core.plugin.config.component.js.map" />
+        <option value="$PROJECT_DIR$/src/common/navigate.bar.component.js" />
         <option value="$PROJECT_DIR$/src/user/user.add.component.js" />
+        <option value="$PROJECT_DIR$/src/runtime/line.chart.component.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/line.chart.component.js" />
+        <option value="$PROJECT_DIR$/src/common/MultiViewDAG.js" />
+        <option value="$PROJECT_DIR$/src/common/full.build.history.component.js" />
+        <option value="$PROJECT_DIR$/src/common/steps.component.js" />
+        <option value="$PROJECT_DIR$/src/corecfg/compare.eachother.component.js.map" />
+        <option value="$PROJECT_DIR$/src/user/user.module.js" />
+        <option value="$PROJECT_DIR$/src/runtime/mvn.dependency.list.component.js.map" />
+        <option value="$PROJECT_DIR$/src/service/basic.service.js.map" />
+        <option value="$PROJECT_DIR$/src/common/safe.pipe.js.map" />
         <option value="$PROJECT_DIR$/src/user/user.add.component.js.map" />
-        <option value="$PROJECT_DIR$/src/user/user.index.component.js" />
-        <option value="$PROJECT_DIR$/src/user/user.index.component.js.map" />
+        <option value="$PROJECT_DIR$/src/offline/workflow.add.component.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/core.node.manage.module.js" />
+        <option value="$PROJECT_DIR$/src/runtime/core.node.manage.index.component.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/misc/RCDeployment.js" />
+        <option value="$PROJECT_DIR$/src/service/basic.service.js" />
         <option value="$PROJECT_DIR$/src/datax/datax.config.component.js" />
-        <option value="$PROJECT_DIR$/src/datax/datax.config.component.js.map" />
-        <option value="$PROJECT_DIR$/src/datax/datax.main.component.js" />
+        <option value="$PROJECT_DIR$/src/common/consume.time.pipe.js" />
         <option value="$PROJECT_DIR$/src/datax/datax.main.component.js.map" />
-        <option value="$PROJECT_DIR$/src/index/application.module.js" />
-        <option value="$PROJECT_DIR$/src/index/application.module.js.map" />
-        <option value="$PROJECT_DIR$/src/common/safe.pipe.js" />
-        <option value="$PROJECT_DIR$/src/common/safe.pipe.js.map" />
-        <option value="$PROJECT_DIR$/src/common/snapshot.link.js" />
-        <option value="$PROJECT_DIR$/src/common/snapshot.link.js.map" />
-        <option value="$PROJECT_DIR$/src/common/steps.component.js" />
-        <option value="$PROJECT_DIR$/src/common/steps.component.js.map" />
-        <option value="$PROJECT_DIR$/src/common/init.system.component.js" />
+        <option value="$PROJECT_DIR$/src/common/basic.form.component.js.map" />
         <option value="$PROJECT_DIR$/src/common/init.system.component.js.map" />
-        <option value="$PROJECT_DIR$/src/common/form.component.js" />
-        <option value="$PROJECT_DIR$/src/common/form.component.js.map" />
-        <option value="$PROJECT_DIR$/src/common/date.format.pipe.js" />
-        <option value="$PROJECT_DIR$/src/common/date.format.pipe.js.map" />
-        <option value="$PROJECT_DIR$/src/common/snapshotset.component.js" />
-        <option value="$PROJECT_DIR$/src/common/snapshotset.component.js.map" />
-        <option value="$PROJECT_DIR$/src/common/navigate.bar.component.js" />
-        <option value="$PROJECT_DIR$/src/common/navigate.bar.component.js.map" />
-        <option value="$PROJECT_DIR$/src/common/consume.time.pipe.js" />
         <option value="$PROJECT_DIR$/src/common/consume.time.pipe.js.map" />
-        <option value="$PROJECT_DIR$/src/common/application.js" />
-        <option value="$PROJECT_DIR$/src/common/application.js.map" />
-        <option value="$PROJECT_DIR$/src/common/codemirror.component.js" />
-        <option value="$PROJECT_DIR$/src/common/codemirror.component.js.map" />
-        <option value="$PROJECT_DIR$/src/common/breadcrumb.component.js" />
-        <option value="$PROJECT_DIR$/src/common/breadcrumb.component.js.map" />
-        <option value="$PROJECT_DIR$/src/common/MultiViewDAG.js" />
-        <option value="$PROJECT_DIR$/src/common/MultiViewDAG.js.map" />
-        <option value="$PROJECT_DIR$/src/common/pagination.component.js" />
-        <option value="$PROJECT_DIR$/src/common/pagination.component.js.map" />
-        <option value="$PROJECT_DIR$/src/common/full.build.history.component.js" />
-        <option value="$PROJECT_DIR$/src/common/full.build.history.component.js.map" />
-        <option value="$PROJECT_DIR$/src/common/pager.header.component.js" />
-        <option value="$PROJECT_DIR$/src/common/pager.header.component.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/pojo.component.js" />
+        <option value="$PROJECT_DIR$/src/datax/datax-routing.module.js" />
+        <option value="$PROJECT_DIR$/src/datax/datax.module.js" />
+        <option value="$PROJECT_DIR$/src/offline/workflow.add.component.js" />
+        <option value="$PROJECT_DIR$/src/offline/offline-routing.module.js" />
+        <option value="$PROJECT_DIR$/src/runtime/copy.other.core.component.js.map" />
+        <option value="$PROJECT_DIR$/src/index/application.module.js" />
+        <option value="$PROJECT_DIR$/src/runtime/snapshot.change.log.js" />
+        <option value="$PROJECT_DIR$/src/runtime/membership.component.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/monitor.component.js.map" />
+        <option value="$PROJECT_DIR$/src/common/form.component.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/core.node.manage-routing.module.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/sync.cfg.component.js.map" />
+        <option value="$PROJECT_DIR$/src/service/script.service.js" />
         <option value="$PROJECT_DIR$/src/corecfg/basic.edit.component.js" />
-        <option value="$PROJECT_DIR$/src/corecfg/basic.edit.component.js.map" />
+        <option value="$PROJECT_DIR$/src/common/snapshotset.component.js" />
         <option value="$PROJECT_DIR$/src/corecfg/compare.eachother.component.js" />
-        <option value="$PROJECT_DIR$/src/corecfg/compare.eachother.component.js.map" />
-        <option value="$PROJECT_DIR$/src/corecfg/schema-xml-edit.component.js" />
+        <option value="$PROJECT_DIR$/src/common/breadcrumb.component.js.map" />
         <option value="$PROJECT_DIR$/src/corecfg/schema-xml-edit.component.js.map" />
-        <option value="$PROJECT_DIR$/src/offline/table.add.step.js" />
-        <option value="$PROJECT_DIR$/src/offline/table.add.step.js.map" />
         <option value="$PROJECT_DIR$/src/runtime/copy.other.core.component.js" />
-        <option value="$PROJECT_DIR$/src/runtime/copy.other.core.component.js.map" />
-        <option value="$PROJECT_DIR$/src/runtime/corenodemanage.component.js" />
-        <option value="$PROJECT_DIR$/src/runtime/corenodemanage.component.js.map" />
-        <option value="$PROJECT_DIR$/src/runtime/trigger_dump.component.js" />
-        <option value="$PROJECT_DIR$/src/runtime/trigger_dump.component.js.map" />
+        <option value="$PROJECT_DIR$/src/common/basic.form.component.js" />
+        <option value="$PROJECT_DIR$/src/runtime/incr.build.step4.running.tab-base.component.js" />
         <option value="$PROJECT_DIR$/src/runtime/app.component.js" />
-        <option value="$PROJECT_DIR$/src/runtime/app.component.js.map" />
-        <option value="$PROJECT_DIR$/src/runtime/core.node.manage-routing.module.js" />
-        <option value="$PROJECT_DIR$/src/runtime/core.node.manage-routing.module.js.map" />
-        <option value="$PROJECT_DIR$/src/runtime/index.query.component.js" />
-        <option value="$PROJECT_DIR$/src/runtime/index.query.component.js.map" />
-        <option value="$PROJECT_DIR$/src/runtime/membership.component.js" />
-        <option value="$PROJECT_DIR$/src/runtime/membership.component.js.map" />
-        <option value="$PROJECT_DIR$/src/runtime/incr.build.step3.component.js" />
-        <option value="$PROJECT_DIR$/src/runtime/incr.build.step3.component.js.map" />
+        <option value="$PROJECT_DIR$/src/datax/datax.module.js.map" />
+        <option value="$PROJECT_DIR$/src/common/pager.header.component.js" />
         <option value="$PROJECT_DIR$/src/runtime/sync.cfg.component.js" />
-        <option value="$PROJECT_DIR$/src/runtime/sync.cfg.component.js.map" />
-        <option value="$PROJECT_DIR$/src/runtime/snapshot.change.log.js" />
+        <option value="$PROJECT_DIR$/src/common/tis.service.js" />
+        <option value="$PROJECT_DIR$/src/polyfills.js" />
+        <option value="$PROJECT_DIR$/src/common/application.js" />
         <option value="$PROJECT_DIR$/src/runtime/snapshot.change.log.js.map" />
-        <option value="$PROJECT_DIR$/src/runtime/incr.build.step4.running.tab-base.component.js" />
-        <option value="$PROJECT_DIR$/src/runtime/incr.build.step4.running.tab-base.component.js.map" />
-        <option value="$PROJECT_DIR$/src/runtime/core.node.manage.index.component.js" />
-        <option value="$PROJECT_DIR$/src/runtime/core.node.manage.index.component.js.map" />
-        <option value="$PROJECT_DIR$/src/runtime/pojo.component.js" />
-        <option value="$PROJECT_DIR$/src/runtime/pojo.component.js.map" />
-        <option value="$PROJECT_DIR$/src/runtime/core.node.manage.module.js" />
-        <option value="$PROJECT_DIR$/src/runtime/core.node.manage.module.js.map" />
-        <option value="$PROJECT_DIR$/src/runtime/line.chart.component.js" />
-        <option value="$PROJECT_DIR$/src/runtime/line.chart.component.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/core.node.manage-routing.module.js" />
+        <option value="$PROJECT_DIR$/src/service/script.service.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/trigger_dump.component.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/index.query.component.js" />
+        <option value="$PROJECT_DIR$/src/common/form.component.js" />
+        <option value="$PROJECT_DIR$/src/runtime/root-welcome-component.js.map" />
+        <option value="$PROJECT_DIR$/src/polyfills.js.map" />
+        <option value="$PROJECT_DIR$/src/common/snapshot.link.js" />
+        <option value="$PROJECT_DIR$/src/runtime/misc/RCDeployment.js.map" />
         <option value="$PROJECT_DIR$/src/runtime/monitor.component.js" />
-        <option value="$PROJECT_DIR$/src/runtime/monitor.component.js.map" />
         <option value="$PROJECT_DIR$/src/runtime/mvn.dependency.list.component.js" />
-        <option value="$PROJECT_DIR$/src/runtime/mvn.dependency.list.component.js.map" />
-        <option value="$PROJECT_DIR$/src/runtime/core.plugin.config.component.js" />
-        <option value="$PROJECT_DIR$/src/runtime/core.plugin.config.component.js.map" />
-        <option value="$PROJECT_DIR$/src/runtime/misc/RCDeployment.js" />
-        <option value="$PROJECT_DIR$/src/runtime/misc/RCDeployment.js.map" />
-        <option value="$PROJECT_DIR$/src/service/basic.service.js" />
-        <option value="$PROJECT_DIR$/src/service/basic.service.js.map" />
-        <option value="$PROJECT_DIR$/src/service/script.service.js" />
-        <option value="$PROJECT_DIR$/src/service/script.service.js.map" />
-        <option value="$PROJECT_DIR$/src/service/script.store.js" />
+        <option value="$PROJECT_DIR$/src/datax/datax.main.component.js" />
+        <option value="$PROJECT_DIR$/src/runtime/corenodemanage.component.js" />
         <option value="$PROJECT_DIR$/src/service/script.store.js.map" />
+        <option value="$PROJECT_DIR$/src/test.js.map" />
+        <option value="$PROJECT_DIR$/src/common/date.format.pipe.js" />
+        <option value="$PROJECT_DIR$/src/runtime/incr.build.step3.component.js" />
+        <option value="$PROJECT_DIR$/src/service/script.store.js" />
+        <option value="$PROJECT_DIR$/src/user/user.list.component.js.map" />
+        <option value="$PROJECT_DIR$/src/common/full.build.history.component.js.map" />
+        <option value="$PROJECT_DIR$/src/common/pager.header.component.js.map" />
+        <option value="$PROJECT_DIR$/src/user/user.index.component.js" />
+        <option value="$PROJECT_DIR$/src/corecfg/schema-xml-edit.component.js" />
+        <option value="$PROJECT_DIR$/src/corecfg/basic.edit.component.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/trigger_dump.component.js" />
+        <option value="$PROJECT_DIR$/src/common/application.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/index.query.component.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/incr.build.step3.component.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/core.plugin.config.component.js" />
+        <option value="$PROJECT_DIR$/src/common/safe.pipe.js" />
+        <option value="$PROJECT_DIR$/src/runtime/root-welcome-component.js" />
+        <option value="$PROJECT_DIR$/src/common/navigate.bar.component.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/membership.component.js" />
+        <option value="$PROJECT_DIR$/src/datax/datax.index.component.js" />
+        <option value="$PROJECT_DIR$/src/offline/table.add.step.js" />
+        <option value="$PROJECT_DIR$/src/user/user-routing.module.js.map" />
+        <option value="$PROJECT_DIR$/src/common/codemirror.component.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/core.node.manage.module.js.map" />
+        <option value="$PROJECT_DIR$/src/common/common.module.js" />
+        <option value="$PROJECT_DIR$/src/common/table.select.component.js" />
+        <option value="$PROJECT_DIR$/src/common/common.module.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/corenodemanage.component.js.map" />
+        <option value="$PROJECT_DIR$/src/common/codemirror.component.js" />
+        <option value="$PROJECT_DIR$/src/common/snapshotset.component.js.map" />
+        <option value="$PROJECT_DIR$/src/user/user.index.component.js.map" />
+        <option value="$PROJECT_DIR$/src/common/breadcrumb.component.js" />
+        <option value="$PROJECT_DIR$/src/index/application.module.js.map" />
+        <option value="$PROJECT_DIR$/src/common/snapshot.link.js.map" />
+        <option value="$PROJECT_DIR$/src/common/tis.service.js.map" />
+        <option value="$PROJECT_DIR$/src/runtime/pojo.component.js.map" />
+        <option value="$PROJECT_DIR$/src/datax/datax.index.component.js.map" />
+        <option value="$PROJECT_DIR$/src/common/init.system.component.js" />
+        <option value="$PROJECT_DIR$/src/user/user.module.js.map" />
+        <option value="$PROJECT_DIR$/src/common/table.select.component.js.map" />
+        <option value="$PROJECT_DIR$/src/common/date.format.pipe.js.map" />
+        <option value="$PROJECT_DIR$/src/test.js" />
+        <option value="$PROJECT_DIR$/src/user/user.list.component.js" />
+        <option value="$PROJECT_DIR$/src/common/steps.component.js.map" />
+        <option value="$PROJECT_DIR$/src/datax/datax.config.component.js.map" />
+        <option value="$PROJECT_DIR$/src/common/MultiViewDAG.js.map" />
+        <option value="$PROJECT_DIR$/src/user/user-routing.module.js" />
       </list>
     </option>
     <option name="additionalRoots">
diff --git a/src/base/datax.add.component.ts b/src/base/datax.add.component.ts
index 724bd3c..ce2f13d 100644
--- a/src/base/datax.add.component.ts
+++ b/src/base/datax.add.component.ts
@@ -162,16 +162,16 @@ export class DataxAddComponent extends AppFormComponent implements AfterViewInit
     /**=====================================================
      * <<<<<<<<<for test
      =======================================================*/
-    DataxAddStep2Component.getDataXReaderWriterEnum(this,new AddStep2ComponentCfg()).then((rwEnum: DataXReaderWriterEnum) => {
-      let dto = new DataxDTO();
-      dto.dataxPipeName = "mongo_mysql";
-      dto.processMeta = {readerRDBMS: true, explicitTable: true, writerRDBMS: true, writerSupportMultiTab: false};
-      // dto.readerDescriptor = rwEnum.readerDescs.find((r) => "OSS" === r.displayName);
-      // dto.writerDescriptor = rwEnum.writerDescs.find((r) => "Elasticsearch" === r.displayName);
-      dto.readerDescriptor = rwEnum.readerDescs.find((r) => "MongoDB" === r.displayName);
-      dto.writerDescriptor = rwEnum.writerDescs.find((r) => "MySQL" === r.displayName);
-      this.multiViewDAG.loadComponent(DataxAddStep4Component, dto);
-    });
+    // DataxAddStep2Component.getDataXReaderWriterEnum(this,new AddStep2ComponentCfg()).then((rwEnum: DataXReaderWriterEnum) => {
+    //   let dto = new DataxDTO();
+    //   dto.dataxPipeName = "mongo_mysql";
+    //   dto.processMeta = {readerRDBMS: true, explicitTable: true, writerRDBMS: true, writerSupportMultiTab: false};
+    //   // dto.readerDescriptor = rwEnum.readerDescs.find((r) => "OSS" === r.displayName);
+    //   // dto.writerDescriptor = rwEnum.writerDescs.find((r) => "Elasticsearch" === r.displayName);
+    //   dto.readerDescriptor = rwEnum.readerDescs.find((r) => "MongoDB" === r.displayName);
+    //   dto.writerDescriptor = rwEnum.writerDescs.find((r) => "MySQL" === r.displayName);
+    //   this.multiViewDAG.loadComponent(DataxAddStep4Component, dto);
+    // });
     /**=====================================================
      * for test end>>>>>>>>
      =======================================================*/
diff --git a/src/base/datax.add.step4.component.ts b/src/base/datax.add.step4.component.ts
index 64c500f..16272ba 100644
--- a/src/base/datax.add.step4.component.ts
+++ b/src/base/datax.add.step4.component.ts
@@ -22,7 +22,21 @@ import {BasicFormComponent, CurrentCollection} from "../common/basic.form.compon
 import {NzModalService} from "ng-zorro-antd/modal";
 import {NzDrawerRef, NzDrawerService} from "ng-zorro-antd/drawer";
 import {TransferChange, TransferDirection, TransferItem} from "ng-zorro-antd/transfer";
-import {AttrDesc, Descriptor, HeteroList, Item, ItemPropVal, KEY_OPTIONS_ENUM, OptionEnum, PluginMeta, PluginSaveResponse, PluginType, SavePluginEvent, TisResponseResult, TYPE_PLUGIN_MULTI_SELECTION} from "../common/tis.plugin";
+import {
+  AttrDesc,
+  Descriptor,
+  HeteroList,
+  Item,
+  ItemPropVal,
+  KEY_OPTIONS_ENUM,
+  OptionEnum,
+  PluginMeta,
+  PluginSaveResponse,
+  PluginType,
+  SavePluginEvent,
+  TisResponseResult,
+  TYPE_PLUGIN_MULTI_SELECTION
+} from "../common/tis.plugin";
 import {PluginsComponent} from "../common/plugins.component";
 import {DataxDTO} from "./datax.add.component";
 import {BasicDataXAddComponent, DATAX_PREFIX_DB} from "./datax.add.base";
@@ -33,46 +47,50 @@ import {NzNotificationService} from "ng-zorro-antd/notification";
 @Component({
   selector: "selected-tables",
   template: `
-      <nz-table #t [nzData]="convertItems(items)" [nzFrontPagination]="showPagination" nzSize="small">
-          <thead>
-          <tr>
-              <th
-                      nzShowCheckbox
-                      [nzDisabled]="disabled"
-                      [nzChecked]="stat.checkAll"
-                      [nzIndeterminate]="stat.checkHalf"
-                      (nzCheckedChange)="_onItemSelectAll($event)"
-              ></th>
-              <th>表名
-                  <button *ngIf="direction === 'right'" [disabled]="batchSettableTabs.length < 1 " nz-button nzType="primary" (click)="batchSet()" nzSize="small">批量设置</button>
-
-                  <button *ngIf="direction === 'left'" nzSize="small" nz-button (click)="reload()" style=" margin: 5px;">
-                      <i nz-icon nzType="reload" nzTheme="outline"></i>Reload
-                  </button>
-              </th>
-              <th *ngIf="direction === 'right'">操作</th>
-          </tr>
-          </thead>
-          <tbody>
-          <tr *ngFor="let data of t.data" (click)="_onItemSelect(data)">
-              <td
-                      nzShowCheckbox
-                      [nzChecked]="data.checked"
-                      [nzDisabled]="disabled || data.disabled"
-                      (nzCheckedChange)="_onItemSelect(data)"
-              ></td>
-              <td>{{ data.title }}</td>
-              <td *ngIf="direction === 'right'">
-                  <ng-container [ngSwitch]="subFormSetted( data.meta)">
-                      <nz-tag *ngSwitchCase="true" [nzColor]="'#87d068'"><i nz-icon nzType="check" nzTheme="outline"></i>已设置</nz-tag>
-                      <nz-tag *ngSwitchCase="false" [nzColor]="'#999999'"><i nz-icon nzType="warning" nzTheme="outline"></i>未设置</nz-tag>
-                  </ng-container>
-                  <!--                              <button nz-button (click)="tableColsSelect($event,data.meta)" [nzSize]="'small'">{{data.meta.behaviorMeta.clickBtnLabel}}</button>-->
-                  <button nz-button (click)="tableColsSelect($event,data.meta)" [nzSize]="'small'">设置</button>
-              </td>
-          </tr>
-          </tbody>
-      </nz-table>
+    <nz-table #t [nzData]="convertItems(items)" [nzFrontPagination]="showPagination" nzSize="small">
+      <thead>
+      <tr>
+        <th
+          nzShowCheckbox
+          [nzDisabled]="disabled"
+          [nzChecked]="stat.checkAll"
+          [nzIndeterminate]="stat.checkHalf"
+          (nzCheckedChange)="_onItemSelectAll($event)"
+        ></th>
+        <th>表名
+          <button *ngIf="direction === 'right'" [disabled]="batchSettableTabs.length < 1 " nz-button nzType="primary"
+                  (click)="batchSet()" nzSize="small">批量设置
+          </button>
+
+          <button *ngIf="direction === 'left'" nzSize="small" nz-button (click)="reload()" style=" margin: 5px;">
+            <i nz-icon nzType="reload" nzTheme="outline"></i>Reload
+          </button>
+        </th>
+        <th *ngIf="direction === 'right'">操作</th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr *ngFor="let data of t.data" (click)="_onItemSelect(data)">
+        <td
+          nzShowCheckbox
+          [nzChecked]="data.checked"
+          [nzDisabled]="disabled || data.disabled"
+          (nzCheckedChange)="_onItemSelect(data)"
+        ></td>
+        <td>{{ data.title }}</td>
+        <td *ngIf="direction === 'right'">
+          <ng-container [ngSwitch]="subFormSetted( data.meta)">
+            <nz-tag *ngSwitchCase="true" [nzColor]="'#87d068'"><i nz-icon nzType="check" nzTheme="outline"></i>已设置
+            </nz-tag>
+            <nz-tag *ngSwitchCase="false" [nzColor]="'#999999'"><i nz-icon nzType="warning" nzTheme="outline"></i>未设置
+            </nz-tag>
+          </ng-container>
+          <!--                              <button nz-button (click)="tableColsSelect($event,data.meta)" [nzSize]="'small'">{{data.meta.behaviorMeta.clickBtnLabel}}</button>-->
+          <button nz-button (click)="tableColsSelect($event,data.meta)" [nzSize]="'small'">设置</button>
+        </td>
+      </tr>
+      </tbody>
+    </nz-table>
   `
 })
 export class SelectedTabsComponent extends BasicFormComponent {
@@ -142,13 +160,13 @@ export class SelectedTabsComponent extends BasicFormComponent {
       throw new Error("descriptor can not be null");
     }
     // ,targetItemDesc_batch_source_process_extend
-     console.log([meta, this.dataXReaderTargetName,this.descriptor]);
+    //  console.log([meta, this.dataXReaderTargetName,this.descriptor]);
     let detailId = meta.id;
     let pluginMeta: PluginType[]
       = [DataxAddStep4Component.dataXReaderSubFormPluginMeta(
       this.descriptor.displayName, this.descriptor.impl, meta.fieldName
-      , this.dataXReaderTargetName+ ",subformDetailIdValue_" + detailId, this.skipSubformDescNullError)];
-     console.log(pluginMeta);
+      , this.dataXReaderTargetName + ",subformDetailIdValue_" + detailId, this.skipSubformDescNullError)];
+    // console.log(pluginMeta);
     let ip = this.subFormHetero.items[0].vals[meta.id];
     if (ip instanceof ItemPropVal) {
       throw new Error("illegal type");
@@ -174,8 +192,8 @@ export class SelectedTabsComponent extends BasicFormComponent {
 
         let oitems = h.items;
         let items: Array<Item> = [];
-      //  h.items = items;
-       // console.log([oitems]);
+        //  h.items = items;
+        // console.log([oitems]);
         h.descriptorList.forEach((desc) => {
 
           for (let itemIdx = 0; itemIdx < oitems.length; itemIdx++) {
@@ -192,7 +210,7 @@ export class SelectedTabsComponent extends BasicFormComponent {
             }
             return propVal;
           });
-        //  console.log(h.items);
+          //  console.log(h.items);
         });
 
         // if (h.items.length < 1) {
@@ -232,27 +250,49 @@ export class SelectedTabsComponent extends BasicFormComponent {
         }
 
         let tabDesc = r.bizresult.subformDescriptor;
-        let subTabs: { string: any } = r.bizresult.tabVals;
+        let subTabs: { [Key: string]: Array<Item> } = r.bizresult.tabVals;
+        // console.log(subTabs);
         for (let tabName in subTabs) {
           if (!tabDesc[tabName]) {
             throw new Error("table:" + tabName + " relevant descriptor can not be null")
           }
+         // console.log(subTabs[tabName]);
+          if (!Array.isArray(subTabs[tabName])) {
+            throw new Error("subTabs[tabName] must be array,but now is:" + (typeof subTabs[tabName]));
+          }
+          let rawItems = new Map<string, Item>();
+          let rawItem: Item;
+          subTabs[tabName].forEach((item) => {
+            rawItems.set(item.impl, item);
+          })
+
           let descMap = PluginsComponent.wrapDescriptors(tabDesc[tabName]);
+          let tabItems: Array<Item> = [];
           descMap.forEach((val, _) => {
-            // let subTabs: { string: any } = r.bizresult.tabVals;
-            // for (let tabName in subTabs) {
+
             let ii = new Item(val);
-            if (Array.isArray(subTabs[tabName])) {
-              ii.vals = subTabs[tabName][0].vals;
-            } else {
-              throw new Error("subTabs[tabName] must be array,but now is:" + (typeof subTabs[tabName]));
+            // if (Array.isArray(subTabs[tabName])) {
+            //   ii.vals = subTabs[tabName][0].vals;
+            // } else {
+            //   throw new Error("subTabs[tabName] must be array,but now is:" + (typeof subTabs[tabName]));
+            // }
+            rawItem = rawItems.get(ii.impl);
+            if(!rawItem){
+              throw new Error("impl:"+ ii.impl+" relevant rawItem can not be null");
             }
+            ii.vals = rawItem.vals;
+
             ii.wrapItemVals();
             // console.log([tabName, ii, ii.vals, subTabs[tabName], val, this.subFormHetero.items[0].vals]);
-            this.subFormHetero.items[0].vals[tabName] = [ii];
-            this.subFormItemSetterFlag.set(tabName, true);
+           // console.log([tabName, ii]);
+            tabItems.push(ii);
+
             // }
           });
+         // console.log(tabItems);
+          this.subFormHetero.items[0].vals[tabName] = tabItems;
+          this.subFormItemSetterFlag.set(tabName, true);
+          //
         }
 
 
@@ -281,10 +321,12 @@ export class SelectedTabsComponent extends BasicFormComponent {
     pluginMeta = pluginMeta.map((pm) => {
       let m: PluginMeta = <any>pm;
       // 主要目的是将subFormPlugin的desc信息去除掉
-      return {name: m.name, require: m.require, extraParam: m.extraParam };
+      return {name: m.name, require: m.require, extraParam: m.extraParam};
     });
-   // console.log([hlist,pluginMeta]);
-    const drawerRef = this.drawerService.create<PluginSubFormComponent, { hetero: HeteroList[] }, { hetero: HeteroList }>({
+    // console.log([hlist,pluginMeta]);
+    const drawerRef = this.drawerService.create<PluginSubFormComponent, { hetero: HeteroList[] }, {
+      hetero: HeteroList
+    }>({
       nzWidth: "80%",
       nzTitle: `设置 ${detailId}`,
       nzContent: PluginSubFormComponent,
@@ -298,7 +340,7 @@ export class SelectedTabsComponent extends BasicFormComponent {
         return;
       }
       meta.setted = true;
-       // console.log([this.subFormHetero.items[0].vals,hetero.hetero.items]);
+      // console.log([this.subFormHetero.items[0].vals,hetero.hetero.items]);
       // for (let itemIndex = 0; itemIndex < hetero.hetero.items.length; itemIndex++) {
       //
       // }
@@ -331,51 +373,55 @@ export class SelectedTabsComponent extends BasicFormComponent {
   // templateUrl: '/runtime/addapp.htm'
   selector: "datax-reader-table-select",
   template: `
-      <tis-steps *ngIf="createModel && this.dto.headerStepShow" [type]="stepType" [step]="offsetStep(1)"></tis-steps>
-      <nz-spin [nzSpinning]="this.formDisabled">
-          <ng-container [ngSwitch]="createModel">
-              <tis-steps-tools-bar [result]="this.result" *ngSwitchCase="true" [title]="'Reader 选择导入表'"
-                                   (cancel)="cancel()" [goBackBtnShow]="_offsetStep>0" (goBack)="goback()" (goOn)="createStepNext()"></tis-steps-tools-bar>
-              <tis-steps-tools-bar [result]="this.result" *ngSwitchCase="false">
-                  <final-exec-controller *ngIf="!inReadonly">
-                      <button nz-button [nzType]="'primary'" (click)="createStepNext()">保存</button>
-                  </final-exec-controller>
-              </tis-steps-tools-bar>
-          </ng-container>
-
-          <nz-transfer (nzChange)="transferChange($event)"
-                       [nzDataSource]="transferList"
-                       [nzDisabled]="inReadonly"
-                       [nzShowSearch]="true"
-                       [nzShowSelectAll]="true"
-                       [nzRenderList]="[renderList, renderList]"
-          >
-              <!--              <ng-template #footer let-direction>-->
-              <!--                  <button *ngIf="direction=='left'" nzSize="small" nz-button (click)="reload()" style=" margin: 5px;">-->
-              <!--                      <i nz-icon nzType="reload" nzTheme="outline"></i>Reload-->
-              <!--                  </button>-->
-              <!--              </ng-template>-->
-              <ng-template
-                      #renderList
-                      let-items
-                      let-direction="direction"
-                      let-stat="stat"
-                      let-disabled="disabled"
-                      let-onItemSelectAll="onItemSelectAll"
-                      let-onItemSelect="onItemSelect"
-              >
-                  <selected-tables (onReload)="this.reload()" [direction]="direction" [items]="items" [disabled]="disabled" [descriptor]="this.dto.readerDescriptor" [batchSettableTabs]="batchSettableTabs"
-                                   [pluginMetas]="getPluginMetas()" [subFormHetero]="this.subFormHetero" [stat]="stat" [subFieldForms]="subFieldForms"
-                                   [dataXReaderTargetName]="getDataXReaderTargetName" (onItemSelect)="onItemSelect($event)" (onItemSelectAll)="onItemSelectAll($event)"></selected-tables>
-              </ng-template>
-          </nz-transfer>
-          <ng-template #drawerTemplate let-data let-drawerRef="drawerRef">
-
-          </ng-template>
-      </nz-spin>
+    <tis-steps *ngIf="createModel && this.dto.headerStepShow" [type]="stepType" [step]="offsetStep(1)"></tis-steps>
+    <nz-spin [nzSpinning]="this.formDisabled">
+      <ng-container [ngSwitch]="createModel">
+        <tis-steps-tools-bar [result]="this.result" *ngSwitchCase="true" [title]="'Reader 选择导入表'"
+                             (cancel)="cancel()" [goBackBtnShow]="_offsetStep>0" (goBack)="goback()"
+                             (goOn)="createStepNext()"></tis-steps-tools-bar>
+        <tis-steps-tools-bar [result]="this.result" *ngSwitchCase="false">
+          <final-exec-controller *ngIf="!inReadonly">
+            <button nz-button [nzType]="'primary'" (click)="createStepNext()">保存</button>
+          </final-exec-controller>
+        </tis-steps-tools-bar>
+      </ng-container>
+
+      <nz-transfer (nzChange)="transferChange($event)"
+                   [nzDataSource]="transferList"
+                   [nzDisabled]="inReadonly"
+                   [nzShowSearch]="true"
+                   [nzShowSelectAll]="true"
+                   [nzRenderList]="[renderList, renderList]"
+      >
+        <!--              <ng-template #footer let-direction>-->
+        <!--                  <button *ngIf="direction=='left'" nzSize="small" nz-button (click)="reload()" style=" margin: 5px;">-->
+        <!--                      <i nz-icon nzType="reload" nzTheme="outline"></i>Reload-->
+        <!--                  </button>-->
+        <!--              </ng-template>-->
+        <ng-template
+          #renderList
+          let-items
+          let-direction="direction"
+          let-stat="stat"
+          let-disabled="disabled"
+          let-onItemSelectAll="onItemSelectAll"
+          let-onItemSelect="onItemSelect"
+        >
+          <selected-tables (onReload)="this.reload()" [direction]="direction" [items]="items" [disabled]="disabled"
+                           [descriptor]="this.dto.readerDescriptor" [batchSettableTabs]="batchSettableTabs"
+                           [pluginMetas]="getPluginMetas()" [subFormHetero]="this.subFormHetero" [stat]="stat"
+                           [subFieldForms]="subFieldForms"
+                           [dataXReaderTargetName]="getDataXReaderTargetName" (onItemSelect)="onItemSelect($event)"
+                           (onItemSelectAll)="onItemSelectAll($event)"></selected-tables>
+        </ng-template>
+      </nz-transfer>
+      <ng-template #drawerTemplate let-data let-drawerRef="drawerRef">
+
+      </ng-template>
+    </nz-spin>
   `
   , styles: [
-      `
+    `
     `
   ]
 })
@@ -410,11 +456,13 @@ export class DataxAddStep4Component extends BasicDataXAddComponent implements On
 
 
   public static dataXReaderSubFormPluginMeta(readerDescName: string, readerDescImpl: string //
-                                             , subformFieldName: string, dataXReaderTargetName: string, skipSubformDescNullError?: boolean): PluginType {
+    , subformFieldName: string, dataXReaderTargetName: string, skipSubformDescNullError?: boolean): PluginType {
     return {
       skipSubformDescNullError: skipSubformDescNullError,
-      name: "dataxReader", require: true
-      , extraParam: `targetDescriptorImpl_${readerDescImpl},targetDescriptorName_${readerDescName},subFormFieldName_${subformFieldName},${dataXReaderTargetName}`
+      name: "dataxReader",
+      require: true
+      ,
+      extraParam: `targetDescriptorImpl_${readerDescImpl},targetDescriptorName_${readerDescName},subFormFieldName_${subformFieldName},${dataXReaderTargetName}`
     };
   }
 
@@ -427,7 +475,7 @@ export class DataxAddStep4Component extends BasicDataXAddComponent implements On
         if (!r.success) {
           return;
         }
-         console.log(r);
+        console.log(r);
         let h: HeteroList = PluginsComponent.wrapperHeteroList(r.bizresult, pluginMeta);
         let hlist: HeteroList[] = [h];
         return hlist;
@@ -445,7 +493,7 @@ export class DataxAddStep4Component extends BasicDataXAddComponent implements On
   static initializeSubFieldForms(baseCpt: BasicFormComponent, pm: PluginType, readerDescriptorImpl: string
     , useCache: boolean
     , subFieldFormsCallback: (subFieldForms: Map<string /*tableName*/, Array<Item>>, subFormHetero: HeteroList, readDesc: Descriptor) => void): Promise<TisResponseResult> {
-  // console.log(pm);
+    // console.log(pm);
     return PluginsComponent.initializePluginItems(baseCpt, [pm],
       useCache, (success: boolean, hList: HeteroList[], _) => {
         if (!success) {
@@ -469,7 +517,7 @@ export class DataxAddStep4Component extends BasicDataXAddComponent implements On
         if (!readerDescriptorImpl) {
           throw new Error("readerDescriptorImpl can not be undefined");
         }
- //console.log([subFormHetero.descriptors,readerDescriptorImpl]);
+        //console.log([subFormHetero.descriptors,readerDescriptorImpl]);
         let desc: Descriptor = subFormHetero.descriptors.get(readerDescriptorImpl);
         if (!desc) {
           // console.log(subFormHetero.descriptors.keys());
@@ -540,7 +588,7 @@ export class DataxAddStep4Component extends BasicDataXAddComponent implements On
   private initializeSubFieldForms(useCache: boolean): Promise<TisResponseResult> {
     return DataxAddStep4Component.initializeSubFieldForms(this, this.getPluginMetas()[0], undefined // this.dto.readerDescriptor.impl
       , useCache, (subFieldForms: Map<string /*tableName*/, Array<Item>>, subFormHetero: HeteroList, readerDesc: Descriptor) => {
-         console.log([subFieldForms,subFormHetero]);
+        console.log([subFieldForms, subFormHetero]);
         this.subFieldForms = subFieldForms;
         this.subFormHetero = subFormHetero;
         this.transferList.splice(0);
@@ -563,8 +611,10 @@ export class DataxAddStep4Component extends BasicDataXAddComponent implements On
 
   getPluginMetas(): PluginType[] {
     return [{
-      name: "dataxReader", require: true
-      , extraParam: `targetDescriptorImpl_${this.dto.readerDescriptor.impl},targetDescriptorName_${this.dto.readerDescriptor.displayName},subFormFieldName_selectedTabs,${this.getDataXReaderTargetName},maxReaderTableCount_${!this.dto.writerDescriptor || (this.dto.writerDescriptor && this.dto.writerDescriptor.extractProps['supportMultiTable']) ? 9999 : 1}`
+      name: "dataxReader",
+      require: true
+      ,
+      extraParam: `targetDescriptorImpl_${this.dto.readerDescriptor.impl},targetDescriptorName_${this.dto.readerDescriptor.displayName},subFormFieldName_selectedTabs,${this.getDataXReaderTargetName},maxReaderTableCount_${!this.dto.writerDescriptor || (this.dto.writerDescriptor && this.dto.writerDescriptor.extractProps['supportMultiTable']) ? 9999 : 1}`
     }];
   }
 
@@ -581,7 +631,7 @@ export class DataxAddStep4Component extends BasicDataXAddComponent implements On
   public createStepNext(): void {
     let savePluginEvent = new SavePluginEvent();
     savePluginEvent.notShowBizMsg = true;
-   // console.log(this.subFormHetero.items[0].vals);
+    // console.log(this.subFormHetero.items[0].vals);
     PluginsComponent.postHeteroList(this, this.getPluginMetas(), [this.subFormHetero], savePluginEvent, true, (result) => {
       if (result.success) {
         this.nextStep.emit(this.dto);
@@ -697,9 +747,10 @@ interface GetDateMethodMeta {
 @Component({
   // selector: 'nz-drawer-custom-component',
   template: `
-      <sidebar-toolbar [deleteDisabled]="true" (close)="close()" (save)="_saveClick()"></sidebar-toolbar>
-      <tis-plugins [getCurrentAppCache]="true" [pluginMeta]="pluginMeta" (ajaxOccur)="verifyPluginConfig($event)" [savePlugin]="savePlugin" [formControlSpan]="21"
-                   [showSaveButton]="false" [shallInitializePluginItems]="false" [_heteroList]="hetero"></tis-plugins>
+    <sidebar-toolbar [deleteDisabled]="true" (close)="close()" (save)="_saveClick()"></sidebar-toolbar>
+    <tis-plugins [disableVerify]="true" [getCurrentAppCache]="true" [pluginMeta]="pluginMeta" (ajaxOccur)="verifyPluginConfig($event)"
+                 [savePlugin]="savePlugin" [formControlSpan]="21"
+                 [showSaveButton]="false" [shallInitializePluginItems]="false" [_heteroList]="hetero"></tis-plugins>
   `
 })
 export class PluginSubFormComponent {
@@ -707,7 +758,7 @@ export class PluginSubFormComponent {
   @Input() pluginMeta: PluginType[] = [];
   savePlugin = new EventEmitter<{ verifyConfig: boolean }>();
 
-  constructor(public  drawer: NzDrawerRef<{ hetero: HeteroList }>) {
+  constructor(public drawer: NzDrawerRef<{ hetero: HeteroList }>) {
   }
 
   close(): void {
diff --git a/src/base/datax.add.step7.confirm.component.ts b/src/base/datax.add.step7.confirm.component.ts
index 4bf02e4..0677fc8 100644
--- a/src/base/datax.add.step7.confirm.component.ts
+++ b/src/base/datax.add.step7.confirm.component.ts
@@ -104,28 +104,52 @@ export enum ExecModel {
       </ng-container>
 
       <ng-container *ngIf=" dto.supportBatch">
-        <h3>DataX脚本文件</h3>
-        <ul class="item-block child-block script-block">
-          <li *ngFor="let f of genCfgFileList">
-            <button (click)="viewDataXCfg(f)" nz-button nzType="link" nzSize="large">
-              <i nz-icon nzType="file-text" nzTheme="outline"></i>{{f.fileName}}
-            </button>
-          </li>
-          <i style="color:#777777;font-size: 10px">生成时间：{{lastestGenFileTime | date : "yyyy/MM/dd HH:mm:ss"}}</i>
-        </ul>
+
+        <nz-page-header  [nzGhost]="true">
+          <nz-page-header-title>DataX脚本</nz-page-header-title>
+
+          <nz-page-header-extra>
+            <nz-space>
+              <button *nzSpaceItem nz-button nzSize="small" (click)="reGenerate()">重新生成</button>
+            </nz-space>
+          </nz-page-header-extra>
+          <nz-page-header-content class="item-block child-block script-block">
+            <ul >
+              <li *ngFor="let f of genCfgFileList">
+                <button (click)="viewDataXCfg(f)" nz-button nzType="link" nzSize="large">
+                  <i nz-icon nzType="file-text" nzTheme="outline"></i>{{f.fileName}}
+                </button>
+              </li>
+              <i style="color:#777777;font-size: 10px">生成时间：{{lastestGenFileTime | date : "yyyy/MM/dd HH:mm:ss"}}</i>
+            </ul>
+          </nz-page-header-content>
+        </nz-page-header>
+
+
       </ng-container>
       <ng-container *ngIf="createDDLFileList.length > 0">
-        <h3>Create Table DDL</h3>
 
-        <ul class="child-block item-block script-block">
-          <li *ngFor="let f of createDDLFileList">
-            <button (click)="viewCreateDDLFile(f)" nz-button nzType="link" nzSize="large"><i nz-icon
-                                                                                             nzType="console-sql"
-                                                                                             nzTheme="outline"></i>{{f}}
-            </button>
-          </li>
-          <i style="color:#777777;font-size: 10px">生成时间：{{lastestGenFileTime | date : "yyyy/MM/dd HH:mm:ss"}}</i>
-        </ul>
+        <nz-page-header  [nzGhost]="true">
+          <nz-page-header-title>Table DDL Script</nz-page-header-title>
+
+          <nz-page-header-extra>
+            <nz-space>
+              <button *nzSpaceItem nz-button nzSize="small" (click)="reGenerateSqlDDL()">重新生成</button>
+            </nz-space>
+          </nz-page-header-extra>
+
+          <nz-page-header-content class="item-block child-block script-block">
+            <ul>
+              <li *ngFor="let f of createDDLFileList">
+                <button (click)="viewCreateDDLFile(f)" nz-button nzType="link" nzSize="large"><i nz-icon
+                                                                                                 nzType="console-sql"
+                                                                                                 nzTheme="outline"></i>{{f}}
+                </button>
+              </li>
+              <i style="color:#777777;font-size: 10px">生成时间：{{lastestGenFileTime | date : "yyyy/MM/dd HH:mm:ss"}}</i>
+            </ul>
+          </nz-page-header-content>
+        </nz-page-header>
       </ng-container>
       <h3>基本信息</h3>
       <div class="item-block">
diff --git a/src/common/pagination.component.ts b/src/common/pagination.component.ts
index 5bd7ca0..6013a0e 100644
--- a/src/common/pagination.component.ts
+++ b/src/common/pagination.component.ts
@@ -229,7 +229,7 @@ export class TdContentDirective implements OnInit {
                   [nzSize]="this.tabSize"
                   [nzShowPagination]="showPagination" [nzLoading]="isSpinning" [(nzPageIndex)]="pager.page"
                   (nzPageIndexChange)="searchData()"
-                  [nzFrontPagination]="false" [nzTotal]="pager.totalCount" [nzPageSize]="pager.pageSize">
+                  [nzFrontPagination]="false" [nzTotal]="pager.totalCount" [nzPageSize]="pager.pageSize" >
             <thead>
             <tr>
                 <th *ngFor="let k of cls" tis-th [key-meta]='k' [nzCustomFilter]="k.searchable">{{k.title}}
diff --git a/src/common/plugins.component.ts b/src/common/plugins.component.ts
index 8710a09..4a3aa54 100644
--- a/src/common/plugins.component.ts
+++ b/src/common/plugins.component.ts
@@ -110,7 +110,7 @@ import {NzSafeAny} from "ng-zorro-antd/core/types";
             </button>
           </div>
           <div>
-            <button *ngIf="item.dspt.veriflable" nz-button nzSize="small" (click)="configCheck(h , item,$event)"><i
+            <button *ngIf="!disableVerify && item.dspt.veriflable" nz-button nzSize="small" (click)="configCheck(h , item,$event)"><i
               nz-icon nzType="check" nzTheme="outline"></i>校验
             </button> &nbsp;
             <button *ngIf="!this.disableNotebook && item.dspt.notebook.ability" nz-button nzSize="small"
@@ -197,6 +197,10 @@ export class PluginsComponent extends AppFormComponent implements AfterContentIn
   // 是否显示扩展点详细
   // @Input()
   // disabled = false;
+
+  @Input()
+  disableVerify: boolean;
+
   @Input()
   showExtensionPoint: { open: boolean } = {open: false};
 
@@ -367,7 +371,7 @@ export class PluginsComponent extends AppFormComponent implements AfterContentIn
       let _heteroList: HeteroList[] = [];
       if (r.success) {
         let bizArray: HeteroList[] = r.bizresult.plugins;
-         console.log([pm, bizArray]);
+        console.log([pm, bizArray]);
         for (let i = 0; i < pm.length; i++) {
           // console.log([bizArray[i], pm[i]]);
           let h: HeteroList = PluginsComponent.wrapperHeteroList(bizArray[i], pm[i]);
@@ -385,7 +389,7 @@ export class PluginsComponent extends AppFormComponent implements AfterContentIn
     let d: Descriptor = null;
     let attrs: AttrDesc[];
     let attr: AttrDesc;
-   // console.log(descriptors);
+    // console.log(descriptors);
     for (let impl in descriptors) {
       d = Object.assign(new Descriptor(), descriptors[impl]);
       attrs = [];
@@ -426,7 +430,7 @@ export class PluginsComponent extends AppFormComponent implements AfterContentIn
       items.push(h.items);
     });
     let postData: any = {"items": items};
-   // console.log(postData);
+    // console.log(postData);
     if (savePluginEvent.serverForward) {
       postData.serverForward = savePluginEvent.serverForward;
     }
@@ -470,7 +474,7 @@ export class PluginsComponent extends AppFormComponent implements AfterContentIn
     if (!h.pluginCategory) {
       throw new Error("pluginCategory can not be null");
     }
-console.log( [this.plugins,h.pluginCategory]);
+    console.log([this.plugins, h.pluginCategory]);
     let nh = Object.assign(new HeteroList(), h);
     nh.items = [item];
     this._savePluginInfo(event, savePlugin, [h.pluginCategory], [nh]);
@@ -561,7 +565,7 @@ console.log( [this.plugins,h.pluginCategory]);
 
 
   public initializePluginItems() {
-     console.log(this.plugins);
+    console.log(this.plugins);
     PluginsComponent.initializePluginItems(this, this.plugins, true, (success: boolean, hList: HeteroList[], showExtensionPoint: boolean) => {
       if (success) {
         this.showExtensionPoint.open = showExtensionPoint;
@@ -598,7 +602,7 @@ console.log( [this.plugins,h.pluginCategory]);
     // let pluginMeta = PluginsComponent.getPluginMetaParams(this.plugins);
     // 如果 传入的tisService 中设置了appname的header那可以通过plugin的表单提交一并提交到服务端
     let formContext = !!savePluginEvent.basicModule ? savePluginEvent.basicModule : this;
-     console.log(_heteroList);
+    console.log(_heteroList);
     PluginsComponent.postHeteroList(formContext, pluginTypes, _heteroList, savePluginEvent, this.errorsPageShow, (r) => {
       // 成功了
       this.ajaxOccur.emit(new PluginSaveResponse(r.success, false));
@@ -757,16 +761,16 @@ export class NotebookwrapperComponent implements OnInit {
   selector: 'item-prop-val',
   changeDetection: ChangeDetectionStrategy.Default,
   template: `
-      <nz-form-item [hidden]="hide">
-          <nz-form-label [ngClass]="{'form-label-verical':!horizontal}" [nzSpan]="horizontal? 5: null"
-                         [nzRequired]="_pp.required">{{_pp.label}}<i class="field-help" *ngIf="descContent || asyncHelp"
-                                                                     nz-icon nzType="question-circle" nzTheme="twotone"
-                                                                     (click)="toggleDescContentShow()"></i>
-          </nz-form-label>
-          <nz-form-control [nzSpan]="horizontal ? valSpan: null" [nzValidateStatus]="_pp.validateStatus"
-                           [nzHasFeedback]="_pp.hasFeedback" [nzErrorTip]="_pp.error">
-              <ng-container [ngSwitch]="_pp.primaryVal">
-                  <ng-container *ngSwitchCase="true">
+    <nz-form-item [hidden]="hide">
+      <nz-form-label [ngClass]="{'form-label-verical':!horizontal}" [nzSpan]="horizontal? 5: null"
+                     [nzRequired]="_pp.required">{{_pp.label}}<i class="field-help" *ngIf="descContent || asyncHelp"
+                                                                 nz-icon nzType="question-circle" nzTheme="twotone"
+                                                                 (click)="toggleDescContentShow()"></i>
+      </nz-form-label>
+      <nz-form-control [nzSpan]="horizontal ? valSpan: null" [nzValidateStatus]="_pp.validateStatus"
+                       [nzHasFeedback]="_pp.hasFeedback" [nzErrorTip]="_pp.error">
+        <ng-container [ngSwitch]="_pp.primaryVal">
+          <ng-container *ngSwitchCase="true">
               <span [ngClass]="{'has-help-url': !this.disabled && (helpUrl !== null || createRouter !== null)}"
                     [ngSwitch]="_pp.type">
                   <ng-container *ngSwitchCase="1">
@@ -798,7 +802,8 @@ export class NotebookwrapperComponent implements OnInit {
                   <ng-container *ngSwitchCase="fieldTypeEnums">
                     <!--ENUM-->
                       <nz-select nzShowSearch [nzMode]="_pp.enumMode" [disabled]="disabled"
-                                 [(ngModel)]="_pp.primary" [name]="_pp.key" (ngModelChange)="inputValChange(_pp,$event)" nzAllowClear>
+                                 [(ngModel)]="_pp.primary" [name]="_pp.key" (ngModelChange)="inputValChange(_pp,$event)"
+                                 nzAllowClear>
                            <nz-option *ngFor="let e of _pp.getEProp('enum')" [nzLabel]="e.label"
                                       [nzValue]="e.val"></nz-option>
                        </nz-select>
@@ -824,14 +829,15 @@ export class NotebookwrapperComponent implements OnInit {
                  <ng-container *ngSwitchCase="8">
                    <ng-container [ngSwitch]="_pp.isMcolsEnums">
                        <ng-container *ngSwitchCase="true">
-                          <db-schema-editor [nameEditDisable]="true" [pkSetDisable]="true" [error]="_pp.error"  [tabletView]="_pp.mcolsEnums" ></db-schema-editor>
+                          <db-schema-editor [nameEditDisable]="true" [pkSetDisable]="true" [error]="_pp.error"
+                                            [tabletView]="_pp.mcolsEnums"></db-schema-editor>
                        </ng-container>
                       <ng-container *ngSwitchCase="false">
                          <label nz-checkbox [(ngModel)]="_pp._eprops['allChecked']"
                                 (ngModelChange)="updateAllChecked(_pp)"
                                 [nzIndeterminate]="_pp._eprops['indeterminate']">全选</label> <br/>
                          <nz-checkbox-group [ngModel]="_pp.getEProp('enum')"
-                                         (ngModelChange)="updateSingleChecked(_pp)"></nz-checkbox-group>
+                                            (ngModelChange)="updateSingleChecked(_pp)"></nz-checkbox-group>
                       </ng-container>
                    </ng-container>
 
@@ -846,82 +852,82 @@ export class NotebookwrapperComponent implements OnInit {
                        ><button [disabled]="fileupload.nzFileList.length > 0" nz-button><i nz-icon nzType="upload"></i>上传</button></nz-upload>
                  </ng-container>
               </span>
-                      <a *ngIf="this.helpUrl" target="_blank" [href]="this.helpUrl"><i nz-icon nzType="question-circle"
-                                                                                       nzTheme="outline"></i></a>
-                      <ng-container *ngIf="this.createRouter && !this.disabled">
-                          <button class="assist-btn" nz-button nz-dropdown nzSize="small" nzType="link"
-                                  [nzDropdownMenu]="menu">{{createRouter.label}}<i nz-icon nzType="down"></i></button>
-                          <nz-dropdown-menu #menu="nzDropdownMenu">
-                              <ul nz-menu>
-                                  <li nz-menu-item *ngFor="let p of createRouter.plugin">
-                                      <a (click)="openPluginDialog(_pp , p )">
-                                          <i nz-icon nzType="plus"
-                                             nzTheme="outline"></i>{{createRouter.plugin.length > 1 ? p.descName : '添加'}}
-                                      </a>
-                                  </li>
-                                  <li nz-menu-item [ngSwitch]="!!createRouter.routerLink">
-                                      <a *ngSwitchCase="true" target="_blank" [href]="createRouter.routerLink">
-                                          <i nz-icon nzType="link"
-                                             nzTheme="outline"></i>管理</a>
-                                      <a *ngSwitchCase="false" (click)="openSelectableInputManager(createRouter)">
-                                          <i nz-icon nzType="link"
-                                             nzTheme="outline"></i>管理</a>
-                                  </li>
-                                  <li nz-menu-item>
-                                      <a (click)="reloadSelectableItems()"><i nz-icon nzType="reload"
-                                                                              nzTheme="outline"></i>刷新</a>
-                                  </li>
-                              </ul>
-                          </nz-dropdown-menu>
-                      </ng-container>
-                  </ng-container>
-                  <ng-container *ngSwitchCase="false">
-
-                      <nz-select [ngClass]="{'desc-prop-descs' : _pp.descVal.extensible}" [disabled]="disabled"
-                                 [name]="_pp.key"
-                                 nzAllowClear [ngModel]="_pp.descVal.impl"
-                                 (ngModelChange)="changePlugin(_pp,$event)"
-                                 [nzDropdownRender]="_pp.descVal.extensible?renderExtraPluginTemplate:null">
-                          <nz-option *ngFor="let e of _pp.descVal.descriptors.values()"
-                                     [nzLabel]="e.displayName"
-                                     [nzValue]="e.impl"></nz-option>
-                      </nz-select>
-
-                      <button *ngIf="_pp.descVal.extensible" nz-button nzType="link"
-                              (click)="freshDescPropDescriptors(_pluginImpl,_pp)"><i nz-icon nzType="reload"
-                                                                                     nzTheme="outline"></i></button>
-
-                      <ng-template #renderExtraPluginTemplate>
-                          <nz-divider></nz-divider>
-                          <div class="container">
-                              <button style="width: 100%" nz-button nzType="dashed" nzSize="small"
-                                      (click)="addNewPlugin(_pluginImpl,_pp)"><i nz-icon nzType="plus"
-                                                                                 nzTheme="outline"></i>添加
-                              </button>
-                          </div>
-                      </ng-template>
+            <a *ngIf="this.helpUrl" target="_blank" [href]="this.helpUrl"><i nz-icon nzType="question-circle"
+                                                                             nzTheme="outline"></i></a>
+            <ng-container *ngIf="this.createRouter && !this.disabled">
+              <button class="assist-btn" nz-button nz-dropdown nzSize="small" nzType="link"
+                      [nzDropdownMenu]="menu">{{createRouter.label}}<i nz-icon nzType="down"></i></button>
+              <nz-dropdown-menu #menu="nzDropdownMenu">
+                <ul nz-menu>
+                  <li nz-menu-item *ngFor="let p of createRouter.plugin">
+                    <a (click)="openPluginDialog(_pp , p )">
+                      <i nz-icon nzType="plus"
+                         nzTheme="outline"></i>{{createRouter.plugin.length > 1 ? p.descName : '添加'}}
+                    </a>
+                  </li>
+                  <li nz-menu-item [ngSwitch]="!!createRouter.routerLink">
+                    <a *ngSwitchCase="true" target="_blank" [href]="createRouter.routerLink">
+                      <i nz-icon nzType="link"
+                         nzTheme="outline"></i>管理</a>
+                    <a *ngSwitchCase="false" (click)="openSelectableInputManager(createRouter)">
+                      <i nz-icon nzType="link"
+                         nzTheme="outline"></i>管理</a>
+                  </li>
+                  <li nz-menu-item>
+                    <a (click)="reloadSelectableItems()"><i nz-icon nzType="reload"
+                                                            nzTheme="outline"></i>刷新</a>
+                  </li>
+                </ul>
+              </nz-dropdown-menu>
+            </ng-container>
+          </ng-container>
+          <ng-container *ngSwitchCase="false">
 
-                      <form [ngClass]="{'desc-prop-descs' : _pp.descVal.extensible,'sub-prop' :true}" nz-form
-                            [nzLayout]=" childHorizontal ? 'horizontal':'vertical' "
-                            *ngIf=" _pp.descVal.propVals.length >0">
-                          <div *ngIf="_pp.descVal.containAdvanceField" style="padding-left: 20px">
-                              <nz-switch nzSize="small" nzCheckedChildren="高级" nzUnCheckedChildren="精简"
-                                         [(ngModel)]="_pp.descVal.showAllField"
-                                         [ngModelOptions]="{standalone: true}"></nz-switch>
-                          </div>
-                          <item-prop-val [hide]=" pp.advance && !_pp.descVal.showAllField " [formLevel]="formLevel+1"
-                                         [disabled]="disabled" [pluginImpl]="_pp.descVal.dspt.impl" [pp]="pp"
-                                         *ngFor="let pp of _pp.descVal.propVals | itemPropFilter : true"></item-prop-val>
-                      </form>
-                  </ng-container>
-              </ng-container>
-              <nz-alert *ngIf="descContent && descContentShow" (nzOnClose)="descContentShow= false" nzType="info"
-                        [nzDescription]="helpTpl" nzCloseable></nz-alert>
-              <ng-template #helpTpl>
-                  <markdown class="tis-markdown" [data]="descContent"></markdown>
-              </ng-template>
-          </nz-form-control>
-      </nz-form-item>  `,
+            <nz-select [ngClass]="{'desc-prop-descs' : _pp.descVal.extensible}" [disabled]="disabled"
+                       [name]="_pp.key"
+                       nzAllowClear [ngModel]="_pp.descVal.impl"
+                       (ngModelChange)="changePlugin(_pp,$event)"
+                       [nzDropdownRender]="_pp.descVal.extensible?renderExtraPluginTemplate:null">
+              <nz-option *ngFor="let e of _pp.descVal.descriptors.values()"
+                         [nzLabel]="e.displayName"
+                         [nzValue]="e.impl"></nz-option>
+            </nz-select>
+
+            <button *ngIf="_pp.descVal.extensible" nz-button nzType="link"
+                    (click)="freshDescPropDescriptors(_pluginImpl,_pp)"><i nz-icon nzType="reload"
+                                                                           nzTheme="outline"></i></button>
+
+            <ng-template #renderExtraPluginTemplate>
+              <nz-divider></nz-divider>
+              <div class="container">
+                <button style="width: 100%" nz-button nzType="dashed" nzSize="small"
+                        (click)="addNewPlugin(_pluginImpl,_pp)"><i nz-icon nzType="plus"
+                                                                   nzTheme="outline"></i>添加
+                </button>
+              </div>
+            </ng-template>
+
+            <form [ngClass]="{'desc-prop-descs' : _pp.descVal.extensible,'sub-prop' :true}" nz-form
+                  [nzLayout]=" childHorizontal ? 'horizontal':'vertical' "
+                  *ngIf=" _pp.descVal.propVals.length >0">
+              <div *ngIf="_pp.descVal.containAdvanceField" style="padding-left: 20px">
+                <nz-switch nzSize="small" nzCheckedChildren="高级" nzUnCheckedChildren="精简"
+                           [(ngModel)]="_pp.descVal.showAllField"
+                           [ngModelOptions]="{standalone: true}"></nz-switch>
+              </div>
+              <item-prop-val [hide]=" pp.advance && !_pp.descVal.showAllField " [formLevel]="formLevel+1"
+                             [disabled]="disabled" [pluginImpl]="_pp.descVal.dspt.impl" [pp]="pp"
+                             *ngFor="let pp of _pp.descVal.propVals | itemPropFilter : true"></item-prop-val>
+            </form>
+          </ng-container>
+        </ng-container>
+        <nz-alert *ngIf="descContent && descContentShow" (nzOnClose)="descContentShow= false" nzType="info"
+                  [nzDescription]="helpTpl" nzCloseable></nz-alert>
+        <ng-template #helpTpl>
+          <markdown class="tis-markdown" [data]="descContent"></markdown>
+        </ng-template>
+      </nz-form-control>
+    </nz-form-item>  `,
   styles: [
     `
       .form-label-verical {
@@ -1127,12 +1133,12 @@ export class ItemPropValComponent extends BasicFormComponent implements AfterCon
             //  console.log(_pp);
             switch (_pp.type) {
               case TYPE_ENUM: // enum
-                              // enum
-                              // db detail
-                              // let item: Item = Object.assign(new Item(d), );
-                              // let nn = new ValOption();
-                              // n.name = biz.detailed.identityName;
-                              // n.impl = d.impl;
+                // enum
+                // db detail
+                // let item: Item = Object.assign(new Item(d), );
+                // let nn = new ValOption();
+                // n.name = biz.detailed.identityName;
+                // n.impl = d.impl;
 
                 if (biz.detailed) {
                   let db = biz.detailed;
@@ -1250,7 +1256,7 @@ export class ItemPropValComponent extends BasicFormComponent implements AfterCon
 
 
   openSelectableInputManager(createRouter: CreatorRouter) {
-   // console.log(createRouter);
+    // console.log(createRouter);
     const drawerRef = this.drawerService.create<SelectionInputAssistComponent, {}, {}>({
       nzWidth: "60%",
       nzPlacement: "right",
diff --git a/src/common/schema.edit.component.ts b/src/common/schema.edit.component.ts
index 4d3aa61..982dce3 100644
--- a/src/common/schema.edit.component.ts
+++ b/src/common/schema.edit.component.ts
@@ -3,339 +3,351 @@ import {BasicFormComponent} from "./basic.form.component";
 import {TISService} from "./tis.service";
 import {NzModalService} from "ng-zorro-antd/modal";
 import {
-    DataTypeDesc,
-    DataTypeMeta,
-    KEY_DOC_FIELD_SPLIT_METAS,
-    ReaderColMeta,
-    RowAssist,
-    TabletView
+  DataTypeDesc,
+  DataTypeMeta,
+  KEY_DOC_FIELD_SPLIT_METAS,
+  ReaderColMeta,
+  RowAssist,
+  TabletView
 } from "./tis.plugin";
 import {NzNotificationService} from "ng-zorro-antd/notification";
 
 
 @Component({
-    selector: "db-schema-editor",
-    template: `
-
-        <tis-page [rows]="colsMeta" [tabSize]="'small'" [bordered]="true" [showPagination]="false">
-            <page-row-assist>
-                <ng-template let-u='r'>
-                    <p class="row-assist">
-                        <!--class: RowAssist-->
-                        <tis-page [rows]="u?.docFieldSplitMetas" [tabSize]="'small'" [bordered]="true"
-                                  [showPagination]="false">
-                            <page-header>
-                                <button nz-button nzSize="small" (click)="addMongoDocumentSplitter(u)">
+  selector: "db-schema-editor",
+  template: `
+
+    <tis-page [rows]="colsMeta" [tabSize]="'small'" [bordered]="true" [showPagination]="false">
+      <page-row-assist>
+        <ng-template let-u='r'>
+          <p class="row-assist">
+            <!--class: RowAssist-->
+            <tis-page [rows]="u?.docFieldSplitMetas" [tabSize]="'small'" [bordered]="true"
+                      [showPagination]="false">
+              <page-header>
+                <button nz-button nzSize="small" (click)="addMongoDocumentSplitter(u)">
                                     <span nz-icon
                                           nzType="plus"
                                           nzTheme="outline"></span>添加
-                                </button>
-                            </page-header>
-                            <tis-col title="新字段">
-                                <ng-template let-uu='r'>
-                                    <nz-form-item>
-                                        <nz-form-control [nzValidateStatus]="uu.getIp('name').validateStatus"
-                                                         [nzHasFeedback]="uu.getIp('name').hasFeedback"
-                                                         [nzErrorTip]="uu.getIp('name').error">
-                                            <input nz-input [(ngModel)]="uu.name" [disabled]="uu.disable"/>
-                                        </nz-form-control>
-                                    </nz-form-item>
-                                </ng-template>
-                            </tis-col>
-                            <tis-col title="Json路径">
-
-                                <!--                                [nzValidateStatus]="uu.ip.validateStatus"-->
-                                <!--                                [nzHasFeedback]="uu.ip.hasFeedback"-->
-                                <!--                                [nzErrorTip]="uu.ip.error"-->
-
-                                <ng-template let-uu='r'>
-                                    <nz-form-item>
-                                        <nz-form-control [nzValidateStatus]="uu.getIp('jsonPath').validateStatus"
-                                                         [nzHasFeedback]="uu.getIp('jsonPath').hasFeedback"
-                                                         [nzErrorTip]="uu.getIp('jsonPath').error">
-                                            <input nz-input [(ngModel)]="uu.jsonPath" [disabled]="uu.disable"/>
-                                        </nz-form-control>
-                                    </nz-form-item>
-                                </ng-template>
-                            </tis-col>
-                            <tis-col title="Jdbc类型">
-                                <ng-template let-uu='r'>
-                                    <ng-container *ngTemplateOutlet="jdbcTypeTemplate;context:{u:uu}"></ng-container>
-                                </ng-template>
-                            </tis-col>
-
-                            <tis-col title="操作">
-                                <ng-template let-uu='r'>
-                                    <button nz-button nzSize="small" nzType="link"
-                                            (click)="deleteDocFieldSplitRow(uu,u)">删除
-                                    </button>
-                                </ng-template>
-                            </tis-col>
-                        </tis-page>
-
-                    </p>
-                </ng-template>
-            </page-row-assist>
-            <page-header>
-                <button [disabled]="!view!.isContainDBLatestMcols" nz-button nzSize="small" nz-tooltip
-                        nzTooltipTitle="数据表中可能添加了新的字段，或者删除了某列，将以下Schema定义与数据库最新Schema进行同步"
-                        (click)="syncTabSchema()" nzType="primary"><span nz-icon nzType="reload"
-                                                                         nzTheme="outline"></span>sync
                 </button>
-
-            </page-header>
-            <tis-col title="Index" width="15">
-                <ng-template let-u='r'>
-                    <nz-form-control>
-                        {{u.index}}
-                        <nz-switch nzSize="small"
-                                   [(ngModel)]="u.disable"
-                                   [nzCheckedChildren]="checkedTemplate"
-                                   [nzUnCheckedChildren]="unCheckedTemplate"
-                        ></nz-switch>
-                        <ng-template #checkedTemplate><span nz-icon nzType="close"></span></ng-template>
-                        <ng-template #unCheckedTemplate><span nz-icon nzType="check"></span></ng-template>
-
+              </page-header>
+              <tis-col title="新字段">
+                <ng-template let-uu='r'>
+                  <nz-form-item>
+                    <nz-form-control [nzValidateStatus]="uu.getIp('name').validateStatus"
+                                     [nzHasFeedback]="uu.getIp('name').hasFeedback"
+                                     [nzErrorTip]="uu.getIp('name').error">
+                      <input nz-input [(ngModel)]="uu.name" [disabled]="uu.disable"/>
                     </nz-form-control>
+                  </nz-form-item>
                 </ng-template>
-            </tis-col>
-            <tis-col title="Name" width="40">
-                <ng-template let-u='r'>
-                    <nz-form-item>
-
-                        <nz-form-control [nzValidateStatus]="u.ip.validateStatus"
-                                         [nzHasFeedback]="u.ip.hasFeedback"
-                                         [nzErrorTip]="u.ip.error">
-                            <ng-container [ngSwitch]="nameEditDisable">
-                                <ng-container *ngSwitchCase="true">
-                                    <span nz-input
-                                          [ngClass]="{'text-delete':u.disable,'ant-input':true}"> {{u.name}}</span>
-                                </ng-container>
-                                <ng-container *ngSwitchCase="false">
-                                    <input nz-input [(ngModel)]="u.name" [disabled]="u.disable"/>
-                                </ng-container>
-                            </ng-container>
-                        </nz-form-control>
-                    </nz-form-item>
-                </ng-template>
-            </tis-col>
-            <tis-col title="Mongo Type">
-                <ng-template let-u='r'>
-                    {{ u.mongoFieldType}}
-                    <nz-switch *ngIf="u.mongoDocType" nzSize="small" [(ngModel)]="u.openAssist"
-                    ></nz-switch>
-                </ng-template>
-            </tis-col>
-            <tis-col title="Type">
-                <ng-template let-u='r'>
-                    <ng-container *ngTemplateOutlet="jdbcTypeTemplate;context:{u:u}"></ng-container>
+              </tis-col>
+              <tis-col title="Json路径">
+
+                <!--                                [nzValidateStatus]="uu.ip.validateStatus"-->
+                <!--                                [nzHasFeedback]="uu.ip.hasFeedback"-->
+                <!--                                [nzErrorTip]="uu.ip.error"-->
+
+                <ng-template let-uu='r'>
+                  <nz-form-item>
+                    <nz-form-control [nzValidateStatus]="uu.getIp('jsonPath').validateStatus"
+                                     [nzHasFeedback]="uu.getIp('jsonPath').hasFeedback"
+                                     [nzErrorTip]="uu.getIp('jsonPath').error">
+                      <input nz-input [(ngModel)]="uu.jsonPath" [disabled]="uu.disable"/>
+                    </nz-form-control>
+                  </nz-form-item>
                 </ng-template>
-            </tis-col>
-            <tis-col title="主键" *ngIf="!pkSetDisable">
-                <ng-template let-u='r'>
-                    <nz-switch [disabled]="u.type.disabled"
-                               [(ngModel)]="u.pk"
-                               [nzCheckedChildren]="checkedTemplate"
-                               [nzUnCheckedChildren]="unCheckedTemplate"
-                    ></nz-switch>
-                    <ng-template #checkedTemplate><span nz-icon nzType="check"></span></ng-template>
-                    <ng-template #unCheckedTemplate><span nz-icon nzType="close"></span></ng-template>
+              </tis-col>
+              <tis-col title="Jdbc类型">
+                <ng-template let-uu='r'>
+                  <ng-container *ngTemplateOutlet="jdbcTypeTemplate;context:{u:uu}"></ng-container>
                 </ng-template>
-            </tis-col>
-
-        </tis-page>
+              </tis-col>
 
+              <tis-col title="操作">
+                <ng-template let-uu='r'>
+                  <button nz-button nzSize="small" nzType="link"
+                          (click)="deleteDocFieldSplitRow(uu,u)">删除
+                  </button>
+                </ng-template>
+              </tis-col>
+            </tis-page>
 
-        <ng-template #jdbcTypeTemplate let-u='u'>
-            <nz-space>
-                <nz-select *nzSpaceItem nzShowSearch class="type-select" [disabled]="u.disable"
-                           nzDropdownMatchSelectWidth="true" [(ngModel)]="u.type.type"
-                           nzPlaceHolder="请选择" (ngModelChange)="typeChange(u.type)">
-                    <nz-option [nzValue]="tp.type.type" [nzLabel]="tp.type.typeName"
-                               *ngFor="let tp of this.typeMetas"></nz-option>
-                </nz-select>
-
-                <ng-container
-                        *ngTemplateOutlet="assistType;context:{typemeta:this.typeMap.get(u.type.type),u:u};">
+          </p>
+        </ng-template>
+      </page-row-assist>
+      <page-header>
+        <button [disabled]="!view!.isContainDBLatestMcols" nz-button nzSize="small" nz-tooltip
+                nzTooltipTitle="数据表中可能添加了新的字段，或者删除了某列，将以下Schema定义与数据库最新Schema进行同步"
+                (click)="syncTabSchema()" nzType="primary"><span nz-icon nzType="reload"
+                                                                 nzTheme="outline"></span>sync
+        </button>
+
+      </page-header>
+      <tis-col title="Index" width="15">
+        <ng-template let-u='r'>
+          <nz-form-control>
+            {{u.index}}
+            <nz-switch nzSize="small"
+                       [(ngModel)]="u.disable"
+                       [nzCheckedChildren]="checkedTemplate"
+                       [nzUnCheckedChildren]="unCheckedTemplate"
+            ></nz-switch>
+            <ng-template #checkedTemplate><span nz-icon nzType="close"></span></ng-template>
+            <ng-template #unCheckedTemplate><span nz-icon nzType="check"></span></ng-template>
+
+          </nz-form-control>
+        </ng-template>
+      </tis-col>
+      <tis-col title="Name" width="40">
+        <ng-template let-u='r'>
+          <nz-form-item>
+
+            <nz-form-control [nzValidateStatus]="u.ip.validateStatus"
+                             [nzHasFeedback]="u.ip.hasFeedback"
+                             [nzErrorTip]="u.ip.error">
+              <ng-container [ngSwitch]="nameEditDisable">
+                <ng-container *ngSwitchCase="true">
+                                    <span nz-input
+                                          [ngClass]="{'text-delete':u.disable,'ant-input':true}"> {{u.name}}</span>
                 </ng-container>
+                <ng-container *ngSwitchCase="false">
+                  <input nz-input [(ngModel)]="u.name" [disabled]="u.disable"/>
+                </ng-container>
+              </ng-container>
+            </nz-form-control>
+          </nz-form-item>
+        </ng-template>
+      </tis-col>
+      <tis-col title="Mongo Type">
+        <ng-template let-u='r'>
+          {{ u.mongoFieldType}}
+          <nz-switch *ngIf="u.mongoDocType" nzSize="small" [(ngModel)]="u.openAssist"
+          ></nz-switch>
+        </ng-template>
+      </tis-col>
+      <tis-col title="Type">
+        <ng-template let-u='r'>
+          <ng-container *ngTemplateOutlet="jdbcTypeTemplate;context:{u:u}"></ng-container>
+        </ng-template>
+      </tis-col>
+      <tis-col title="主键" *ngIf="!pkSetDisable">
+        <ng-template let-u='r'>
+          <nz-switch [disabled]="u.type.disabled"
+                     [(ngModel)]="u.pk"
+                     [nzCheckedChildren]="checkedTemplate"
+                     [nzUnCheckedChildren]="unCheckedTemplate"
+          ></nz-switch>
+          <ng-template #checkedTemplate><span nz-icon nzType="check"></span></ng-template>
+          <ng-template #unCheckedTemplate><span nz-icon nzType="close"></span></ng-template>
+        </ng-template>
+      </tis-col>
+
+    </tis-page>
+
+
+    <ng-template #jdbcTypeTemplate let-u='u'>
+      <nz-space>
+        <nz-select *nzSpaceItem nzShowSearch class="type-select" [disabled]="u.disable"
+                   nzDropdownMatchSelectWidth="true" [(ngModel)]="u.type.type"
+                   nzPlaceHolder="请选择" (ngModelChange)="typeChange(u.type)">
+          <nz-option [nzValue]="tp.type.type" [nzLabel]="tp.type.typeName"
+                     *ngFor="let tp of this.typeMetas"></nz-option>
+        </nz-select>
+
+        <ng-container
+          *ngTemplateOutlet="assistType;context:{typemeta:getColTypeMeta(u.type.type),u:u};">
+        </ng-container>
+
+        <ng-template #assistType let-typemeta="typemeta" let-u="u">
+          <ng-container *ngIf="typemeta.containColSize">
+            <nz-input-number [disabled]="u.disable" nz-tooltip nzTooltipTitle="Column Size"
+                             *nzSpaceItem
+                             [(ngModel)]="u.type.columnSize"
+                             [nzMin]="typemeta.colsSizeRange.min"
+                             [nzMax]="typemeta.colsSizeRange.max"></nz-input-number>
+          </ng-container>
+          <ng-container *ngIf="typemeta.containDecimalRange">
+            <nz-input-number [disabled]="u.disable" nz-tooltip nzTooltipTitle="Decimal Digits Size"
+                             *nzSpaceItem
+                             [(ngModel)]="u.type.decimalDigits"
+                             [nzMin]="typemeta.decimalRange.min"
+                             [nzMax]="typemeta.decimalRange.max"></nz-input-number>
+          </ng-container>
 
-                <ng-template #assistType let-typemeta="typemeta" let-u="u">
-                    <ng-container *ngIf="typemeta.containColSize">
-                        <nz-input-number [disabled]="u.disable" nz-tooltip nzTooltipTitle="Column Size"
-                                         *nzSpaceItem
-                                         [(ngModel)]="u.type.columnSize"
-                                         [nzMin]="typemeta.colsSizeRange.min"
-                                         [nzMax]="typemeta.colsSizeRange.max"></nz-input-number>
-                    </ng-container>
-                    <ng-container *ngIf="typemeta.containDecimalRange">
-                        <nz-input-number [disabled]="u.disable" nz-tooltip nzTooltipTitle="Decimal Digits Size"
-                                         *nzSpaceItem
-                                         [(ngModel)]="u.type.decimalDigits"
-                                         [nzMin]="typemeta.decimalRange.min"
-                                         [nzMax]="typemeta.decimalRange.max"></nz-input-number>
-                    </ng-container>
-
-                </ng-template>
-            </nz-space>
         </ng-template>
+      </nz-space>
+    </ng-template>
 
+  `
+  , styles: [
     `
-    , styles: [
-        `
-            .row-assist {
-                margin: 8px 0px 8px 0px;
-            }
+      .row-assist {
+        margin: 8px 0px 8px 0px;
+      }
 
-            .type-select {
-                min-width: 14em;
-            }
+      .type-select {
+        min-width: 14em;
+      }
 
-            .text-delete {
-                text-decoration: line-through;
-            }
+      .text-delete {
+        text-decoration: line-through;
+      }
 
-            nz-form-item {
-                margin: 0px;
-            }
-        `
-    ]
+      nz-form-item {
+        margin: 0px;
+      }
+    `
+  ]
 })
 export class SchemaEditComponent extends BasicFormComponent implements AfterContentInit, OnDestroy {
 
-    @Input()
-    dbLatestColsMeta: Array<ReaderColMeta> = [];
+  @Input()
+  dbLatestColsMeta: Array<ReaderColMeta> = [];
 
-    @Input()
-    colsMeta: Array<ReaderColMeta> = [];
-    @Input()
-    typeMetas: Array<DataTypeMeta> = [];
+  @Input()
+  colsMeta: Array<ReaderColMeta> = [];
+  @Input()
+  typeMetas: Array<DataTypeMeta> = [];
 
-    @Input()
-    pkSetDisable = false;
+  @Input()
+  pkSetDisable = false;
 
-    @Input()
-    set error(errors: Array<any>) {
-        if (!Array.isArray(errors)) {
-            return;
-        }
-        // KEY_DOC_FIELD_SPLIT_METAS
-        let err: { name: string, };
-        for (let idx = 0; idx < errors.length; idx++) {
-            err = errors[idx];
-            for (let key in err) {
-                switch (key) {
-                    case "name":
-                        this.colsMeta[idx].ip.error = err[key];
-                        break;
-                    case KEY_DOC_FIELD_SPLIT_METAS:
-                        let splitMetasErrors: Array<any> = err[key];
-                        let metaErr = null;
-                        let splitMetas: Array<RowAssist> = RowAssist.getDocFieldSplitMetas(this.colsMeta[idx]);
-                        let ra: RowAssist = null;
-                        for (let idxMeta = 0; idxMeta < splitMetasErrors.length; idxMeta++) {
-                            ra = splitMetas[idxMeta];
-                            metaErr = splitMetasErrors[idxMeta];
-                            for (let errKey in metaErr) {
-                                ra.getIp(errKey).error = metaErr[errKey];
-                            }
-                        }
-
-                        break;
-                    default:
-                        throw new Error("error key:" + key);
-                }
+  @Input()
+  set error(errors: Array<any>) {
+    if (!Array.isArray(errors)) {
+      return;
+    }
+    // KEY_DOC_FIELD_SPLIT_METAS
+    let err: { name: string, };
+    for (let idx = 0; idx < errors.length; idx++) {
+      err = errors[idx];
+      for (let key in err) {
+        switch (key) {
+          case "name":
+            this.colsMeta[idx].ip.error = err[key];
+            break;
+          case KEY_DOC_FIELD_SPLIT_METAS:
+            let splitMetasErrors: Array<any> = err[key];
+            let metaErr = null;
+            let splitMetas: Array<RowAssist> = RowAssist.getDocFieldSplitMetas(this.colsMeta[idx]);
+            let ra: RowAssist = null;
+            for (let idxMeta = 0; idxMeta < splitMetasErrors.length; idxMeta++) {
+              ra = splitMetas[idxMeta];
+              metaErr = splitMetasErrors[idxMeta];
+              for (let errKey in metaErr) {
+                ra.getIp(errKey).error = metaErr[errKey];
+              }
             }
 
+            break;
+          default:
+            throw new Error("error key:" + key);
         }
+      }
+
     }
+  }
 
-    @Input()
-    nameEditDisable = false;
+  @Input()
+  nameEditDisable = false;
 
-    view: TabletView;
+  view: TabletView;
 
 
-    @Input()
-    public set tabletView(view: TabletView) {
+  @Input()
+  public set tabletView(view: TabletView) {
 
-        this.colsMeta = view.mcols;
-        this.typeMetas = view.typeMetas;
-        this.view = view;
-    }
+    this.colsMeta = view.mcols;
+    this.typeMetas = view.typeMetas;
+    this.view = view;
+  //  console.log([this.colsMeta ,this.typeMetas]);
+  }
 
-    private _typeMap: Map<number, DataTypeMeta>
-    get typeMap(): Map<number, DataTypeMeta> {
-        if (!this._typeMap) {
-            if (this.typeMetas.length > 0) {
-                this._typeMap = new Map();
-                for (let type of this.typeMetas) {
-                    this._typeMap.set(type.type.type, type);
-                }
-            }
+  private _typeMap: Map<number, DataTypeMeta>
+  get typeMap(): Map<number, DataTypeMeta> {
+    if (!this._typeMap) {
+      if (this.typeMetas && this.typeMetas.length > 0) {
+        this._typeMap = new Map();
+        for (let type of this.typeMetas) {
+          this._typeMap.set(type.type.type, type);
         }
-        return this._typeMap;
+      } else {
+        throw new Error("this.typeMetas can not be empty");
+      }
     }
+    return this._typeMap;
+  }
+
+  getColTypeMeta(type: number): DataTypeMeta {
+    let typeMeta: DataTypeMeta = this.typeMap.get(type);
 
-    constructor(tisService: TISService, modalService: NzModalService, notification: NzNotificationService) {
-        super(tisService, modalService, notification);
+    if (!typeMeta) {
+      throw new Error(`type:${type} can not find typeMeta in typeMap:${Array.from(this.typeMap.values()).map((type) => type.type.typeName + '_' + type.type.type).join(",")}`)
     }
+    return typeMeta;
+  }
 
-    syncTabSchema() {
-        let syncResult = this.view.synchronizeMcols();
-        this.colsMeta = syncResult.syncCols;
+  constructor(tisService: TISService, modalService: NzModalService, notification: NzNotificationService) {
+    super(tisService, modalService, notification);
+  }
 
-        if (syncResult.hasAnyDiff) {
-            this.successNotify(syncResult.differSummary);
-        } else {
-            this.warnNotify("与数据库最新表结构没有区别");
-        }
+  syncTabSchema() {
+    let syncResult = this.view.synchronizeMcols();
+    this.colsMeta = syncResult.syncCols;
+
+    if (syncResult.hasAnyDiff) {
+      this.successNotify(syncResult.differSummary);
+    } else {
+      this.warnNotify("与数据库最新表结构没有区别");
     }
+  }
 
-    ngAfterContentInit() {
+  ngAfterContentInit() {
 
-    }
+  }
 
-    ngOnDestroy() {
+  ngOnDestroy() {
 
-    }
+  }
 
-    typeChange(type: DataTypeDesc) {
-        // console.log(type);
+  typeChange(type: DataTypeDesc) {
+    // console.log(type);
 
-        let meta: DataTypeMeta = this.typeMap.get(type.type)
-        if (meta.containColSize) {
-            type.columnSize = meta.type.columnSize;
-        }
-        if (meta.containDecimalRange) {
-            type.decimalDigits = meta.type.decimalDigits;
-        }
+    let meta: DataTypeMeta = this.typeMap.get(type.type)
+    if (meta.containColSize) {
+      type.columnSize = meta.type.columnSize;
     }
+    if (meta.containDecimalRange) {
+      type.decimalDigits = meta.type.decimalDigits;
+    }
+  }
 
 
-    addMongoDocumentSplitter(u: ReaderColMeta) {
+  addMongoDocumentSplitter(u: ReaderColMeta) {
 
-        let rowAssist: Array<RowAssist> = RowAssist.getDocFieldSplitMetas(u);//.docFieldSplitMetas;
+    let rowAssist: Array<RowAssist> = RowAssist.getDocFieldSplitMetas(u);//.docFieldSplitMetas;
 
-        rowAssist.push(new RowAssist("", '', this.typeMap.get(-1).type))
+    rowAssist.push(new RowAssist("", '', this.typeMap.get(-1).type))
 //        u.docFieldSplitMetas = [...rowAssist];
 
-        RowAssist.setDocFieldSplitMetas(u, rowAssist);
-    }
+    RowAssist.setDocFieldSplitMetas(u, rowAssist);
+  }
 
 
-    deleteDocFieldSplitRow(mongoDocSplit: RowAssist, colMeta: ReaderColMeta) {
-        let rowAssist: Array<RowAssist> = (<any>colMeta).docFieldSplitMetas
-        if (!rowAssist) {
-            throw new Error("rowAssist can not be null");
-        }
-        const index = rowAssist.indexOf(mongoDocSplit);
+  deleteDocFieldSplitRow(mongoDocSplit: RowAssist, colMeta: ReaderColMeta) {
+    let rowAssist: Array<RowAssist> = (<any>colMeta).docFieldSplitMetas
+    if (!rowAssist) {
+      throw new Error("rowAssist can not be null");
+    }
+    const index = rowAssist.indexOf(mongoDocSplit);
 
-        if (index > -1) {
-            rowAssist.splice(index, 1);
-            //   (<any>colMeta).docFieldSplitMetas = [...rowAssist];
-            RowAssist.setDocFieldSplitMetas(colMeta, rowAssist)
-        }
+    if (index > -1) {
+      rowAssist.splice(index, 1);
+      //   (<any>colMeta).docFieldSplitMetas = [...rowAssist];
+      RowAssist.setDocFieldSplitMetas(colMeta, rowAssist)
     }
+  }
 }
 
 // interface DataTypeDesc {
diff --git a/src/common/tis.plugin.ts b/src/common/tis.plugin.ts
index d359576..71e035f 100644
--- a/src/common/tis.plugin.ts
+++ b/src/common/tis.plugin.ts
@@ -604,6 +604,7 @@ export class Item {
             }
             // newVal.pk = (at.key === this.dspt.pkField);
         }
+       // console.log([newVal.key,newVal]);
         return newVal;
     }
 
@@ -644,12 +645,14 @@ export class Item {
     public wrapItemVals(): void {
         let newVals = {};
         let ovals: any /**map*/ = this.vals;
+      console.log([this.dspt.impl,this.vals]);
         let newVal: ItemPropVal;
         // console.log(this.dspt.attrs);
         this.dspt.attrs.forEach((at) => {
             let v = ovals[at.key];
             // console.log([at.key, v, at]);
             newVal = Item.wrapItemPropVal(v, at);
+          console.log([at.key,newVal]);
             if (newVal) {
                 newVals[at.key] = (newVal);
             }