浏览代码

more testin

Richard Knight 6 年之前
父节点
当前提交
a7fb46ffb5
共有 4 个文件被更改,包括 9 次插入4 次删除
  1. 2 2
      src/app/app.component.html
  2. 5 1
      src/app/app.component.ts
  3. 1 1
      src/app/dynaform/libs/index.ts
  4. 1 0
      src/app/dynaform/models/index.ts

+ 2 - 2
src/app/app.component.html

@@ -8,9 +8,9 @@
 				</p>
 			</div>
 		</div>
-		<app-dynaform [formGroup]="form" [meta]="formMetaDataObj" [template]="tref"></app-dynaform>
+		<app-dynaform formGroupName="dynaformtest" [meta]="formMetaDataObj" [template]="tref"></app-dynaform>
 		<div calss="row">
-			<div class="col-12 pt-4 pb-4">
+			<div class="col-12 pt-4">
 				<json-formatter [data]="form.value" open="2"></json-formatter>
 			</div>
 		</div>

+ 5 - 1
src/app/app.component.ts

@@ -24,7 +24,11 @@ export class AppComponent implements OnInit {
 	}
 
 	ngOnInit() {
-		this.form = buildFormGroup(this.formMetaDataObj);
+		const fg = buildFormGroup({
+			dynaformtest: { name: 'dynaformtest', meta: this.formMetaDataObj }
+		});
+		console.log(fg);
+		this.form = fg;
 	}
 }
 

+ 1 - 1
src/app/dynaform/libs/index.ts

@@ -15,7 +15,7 @@ const buildFormControl = metaF => new FormControl(buildControlState(metaF) /*, b
 
 // Build Form Group Member
 // metaFoG = metadata for Field Or Group
-const isGroup = metaFoG => Array.isArray(metaFoG.meta);
+const isGroup = metaFoG => metaFoG.meta && !metaFoG._field;
 const buildFormGroupMember = metaFoG => isGroup(metaFoG) ? buildFormGroup(metaFoG.meta) : buildFormControl(metaFoG);
 
 // metaG = metadata for Group - possibly nested

+ 1 - 0
src/app/dynaform/models/index.ts

@@ -58,6 +58,7 @@ class SimpleField {
 	validators: Array<ValidatorFn> = [];
 	asyncValidators: Array<AsyncValidatorFn> = [];
 	valFailureMsgs: StringMap = {};
+	_field = true;
 
 	constructor(meta: SimpleFieldMetaData) {
 		Object.assign(this, meta);