diff --git a/src/controls/dynamicForm/DynamicForm.tsx b/src/controls/dynamicForm/DynamicForm.tsx index eb3a2e609..bc7235453 100644 --- a/src/controls/dynamicForm/DynamicForm.tsx +++ b/src/controls/dynamicForm/DynamicForm.tsx @@ -597,7 +597,7 @@ export class DynamicForm extends React.Component< hiddenName = response.value; termSetId = field.TermSetId; anchorId = field.AnchorId; - if (item !== null && item[field.InternalName] !== null && item[field.InternalName].results !== null) { + if (item && item[field.InternalName] && item[field.InternalName].results) { item[field.InternalName].results.forEach((element) => { selectedTags.push({ key: element.TermGuid, @@ -605,9 +605,18 @@ export class DynamicForm extends React.Component< }); }); + defaultValue = selectedTags; + } else if (defaultValue && defaultValue.results) { + defaultValue.results.forEach((element) => { + selectedTags.push({ + key: element.TermGuid, + name: element.Label, + }); + }); + defaultValue = selectedTags; } else { - if (defaultValue !== null && defaultValue !== "") { + if (defaultValue && defaultValue !== "") { defaultValue.split(/#|;/).forEach((element) => { if (element.indexOf("|") !== -1) selectedTags.push({