diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts index 3b043834db..c7ad7c23d5 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts @@ -37,7 +37,8 @@ export class RequiredFieldValidator implements FormFieldValidator { FormFieldTypes.FUNCTIONAL_GROUP, FormFieldTypes.RADIO_BUTTONS, FormFieldTypes.UPLOAD, - FormFieldTypes.AMOUNT + FormFieldTypes.AMOUNT, + FormFieldTypes.DYNAMIC_TABLE ]; isSupported(field: FormFieldModel): boolean { @@ -66,6 +67,10 @@ export class RequiredFieldValidator implements FormFieldValidator { return field.value && field.value.length > 0; } + if (field.type === FormFieldTypes.DYNAMIC_TABLE) { + return field.value && field.value instanceof Array && field.value.length > 0; + } + if (field.value === null || field.value === undefined || field.value === '') { return false; } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.css b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.css index 140696a06f..758c2d71bc 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.css +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.css @@ -7,27 +7,32 @@ background-color: #eef !important; } -.dynamic-table-widget__table { +.dynamic-table-widget__table-container { overflow-y: auto; width: 100%; } -.dynamic-table-widget__table > table { +.dynamic-table-widget__table { width: 100%; } -.dynamic-table-widget__invalid .mdl-textfield__input { - border-color: #d50000; -} - -.dynamic-table-widget__invalid .mdl-textfield__label { +.dynamic-table-widget__invalid .dynamic-table-widget__label { color: #d50000; } -.dynamic-table-widget__invalid .mdl-textfield__label:after { - background-color: #d50000; +.dynamic-table-widget__invalid .dynamic-table-widget__table-container { + border: 1px solid #d50000; } -.dynamic-table-widget__invalid .mdl-textfield__error { +.dynamic-table-widget__invalid .dynamic-table-widget__table { + border: none; +} + +.dynamic-table-widget__summary { + visibility: hidden; + color: #d50000; +} + +.dynamic-table-widget__invalid .dynamic-table-widget__summary { visibility: visible !important; } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.html index 3a1bfc2117..541312c836 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.html @@ -1,9 +1,10 @@ -