Merge pull request #18 from kyxyes/update

Update
LabShare-Archive · Jun 25, 2018 · 7d142cc · 7d142cc
2 parents d8f90b3 + 0c83a23
commit 7d142cc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/dist/ngx-forms.js b/dist/ngx-forms.js
diff --git a/package.json b/package.json
@@ -25,11 +25,11 @@
     "@angular/router": "^4.4.4",
     "bootstrap": "^4.0.0",
     "core-js": "^2.4.1",
+    "lodash": "4.17.10",
     "ngx-chips": "^1.9.1",
     "ngx-quill": "^3.1.0",
     "quill": "^1.3.4",
     "reflect-metadata": "^0.1.12",
-    "lodash": "4.17.10",
     "rxjs": "5.5.6",
     "zone.js": "^0.8.18"
   },

diff --git a/src/app.ts b/src/app.ts
@@ -62,5 +62,5 @@ import { DynamicFieldService } from "./app/services/dynamic-field.service";
 })
 export class NgxFormModule { }
 
-export {DynamicFieldService}
+export {DynamicFieldService, DataService}
 
diff --git a/src/app/containers/dynamic-form/dynamic-form.component.ts b/src/app/containers/dynamic-form/dynamic-form.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { FormGroup, FormBuilder, Validators, FormArray} from '@angular/forms';
 
 import { FieldConfig } from '../../models/field-config.interface';
 import { DataService } from '../../services/data.service';
@@ -54,9 +54,15 @@ export class DynamicFormComponent implements OnChanges, OnInit {
         }
     }
 
+  /**
+   * @description create FormGroup and FormControl for all general field, exclude custom field
+   * @return {FormGroup}
+   */
     createGroup() {
         const group = this.fb.group({});
-        this.controls.forEach(control => group.addControl(control.name, this.createControl(control)));
+        this.controls.forEach(control => {
+          if (!control.custom)  group.addControl(control.name, this.createControl(control));
+        });
         return group;
     }
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -8,7 +8,6 @@
     "emitDecoratorMetadata": true,
     "baseUrl": ".",
     "allowJs": true,
-    "outDir": "dist",
     "skipLibCheck": true,
     "suppressImplicitAnyIndexErrors": true,
     "inlineSources": true,