diff --git a/src/behaviours/field.js b/src/behaviours/field.js index 1ed735b..4dff019 100644 --- a/src/behaviours/field.js +++ b/src/behaviours/field.js @@ -51,6 +51,7 @@ const fieldForBuilder = (props, textOnly = false, multiple = false, list = false if (get(definitions, `${entityPath}.${propertyName}`).validateOnBlur !== false) onInputBlur(propertyName, entityPath, rawInputValue); if (userDefinedOnBlur) userDefinedOnBlur(); }; + options.displayLabel === undefined ? options.displayLabel = true : options.displayLabel const fieldForLine = list ? fieldForListBuilder(entityPath, propertyName, false, false, options.displayLabel, options.isRaw)(props): {}; const selectForLine = list ? fieldForListBuilder(entityPath, propertyName, true, false)(props): {}; const textForLine = list ? fieldForListBuilder(entityPath, propertyName, false, true)(props): {}; @@ -99,6 +100,7 @@ const fieldForListBuilder = (entityPathList, propertyNameList, multiple=false, t const fieldError = fieldTab.error && fieldTab.error[index] ? fieldTab.error[index][propertyName] : undefined; return ( +const FieldLabelValueComponent = ({editing, isRequired, label, name, valid, ValueComponent, displayLabel, isRaw, index}) => (
- {(displayLabel || displayLabel === undefined) && -
-
- } -
+
+ {(displayLabel || (displayLabel === false && index != undefined) || displayLabel === undefined) &&
+
{ValueComponent} {editing && valid && check}
@@ -26,7 +24,7 @@ FieldLabelValueComponent.displayName = 'FieldLabelValueComponent'; class Field extends PureComponent { render() { - const {textOnly, multiple, list, fieldForLine, ...otherProps} = this.props; + const {textOnly, multiple, list, fieldForLine, index, ...otherProps} = this.props; const { TextComponent = DefaultTextComponent, DisplayComponent = DefaultDisplayComponent, @@ -38,7 +36,7 @@ class Field extends PureComponent { const renderConsult = () => list ? : (multiple ? : ); const renderEdit = () => list ? : (multiple ? : ); const ValueComponent = otherProps.editing ? renderEdit() : renderConsult(); - return textOnly ? ValueComponent : + return textOnly ? ValueComponent : } } Field.displayName = 'Field';