Merge branch release/v7.3.0 into master

oform/format/FieldGroup.js

@@ -149,8 +149,11 @@
 		let fields = [];
 		for (let fieldIndex = 0, fieldCount = this.Fields.length; fieldIndex < fieldCount; ++fieldIndex)
 		{
-			if (this.Fields[fieldIndex].isUseInDocument())
+			if (this.Fields[fieldIndex].isUseInDocument()
+				&& this.Fields[fieldIndex].isMainField())
+			{
 				fields.push(this.Fields[fieldIndex]);
+			}
 		}
 		
 		if (this.Users.length && this.Parent)
@@ -160,8 +163,12 @@
 				let userFields = this.Parent.getAllFieldsByUserMaster(this.Users[index]);
 				for (let fieldIndex = 0, fieldCount = userFields.length; fieldIndex < fieldCount; ++fieldIndex)
 				{
-					if (-1 === fields.indexOf(userFields[fieldIndex]) && userFields[fieldIndex].isUseInDocument())
+					if (-1 === fields.indexOf(userFields[fieldIndex])
+						&& userFields[fieldIndex].isUseInDocument()
+						&& userFields[fieldIndex].isMainField())
+					{
 						fields.push(userFields[fieldIndex]);
+					}
 				}
 			}
 		}

oform/format/FieldMaster.js

@@ -178,6 +178,10 @@
 			&& this.Field.IsUseInDocument()
 			&& this === this.Field.GetFieldMaster());
 	};
+	CFieldMaster.prototype.isMainField = function()
+	{
+		return (this.Field && this.Field.IsMainForm());
+	};
 	CFieldMaster.prototype.toXml = function(writer)
 	{
 		let context = writer.context;