diff --git a/src/components/Form/FormGroup.vue b/src/components/Form/FormGroup.vue index 5528f30e8..7470ccf85 100644 --- a/src/components/Form/FormGroup.vue +++ b/src/components/Form/FormGroup.vue @@ -62,6 +62,8 @@ import FieldPubId from './fields/FieldPubId.vue'; import FieldHtml from './fields/FieldHtml.vue'; import FieldMetadataSetting from './fields/FieldMetadataSetting.vue'; import FieldOptions from './fields/FieldOptions.vue'; +import FieldOptions2 from './fields/FieldOptions2.vue'; + import FieldPreparedContent from './fields/FieldPreparedContent.vue'; import FieldRadioInput from './fields/FieldRadioInput.vue'; import FieldRichTextarea from './fields/FieldRichTextarea.vue'; @@ -89,6 +91,7 @@ export default { FieldHtml, FieldMetadataSetting, FieldOptions, + FieldOptions2, FieldPreparedContent, FieldRadioInput, FieldRichTextarea, diff --git a/src/components/Form/fields/FieldBase.vue b/src/components/Form/fields/FieldBase.vue index 025cb3fee..ed30a82c9 100644 --- a/src/components/Form/fields/FieldBase.vue +++ b/src/components/Form/fields/FieldBase.vue @@ -185,7 +185,7 @@ export default { if (this.isMultilingual) { ids.push(this.multilingualProgressId); } - return ids.length ? ids.join(' ') : false; + return ids.length ? ids.join(' ') : undefined; }, /** diff --git a/src/components/Form/fields/FieldOptions2.vue b/src/components/Form/fields/FieldOptions2.vue new file mode 100644 index 000000000..4f1482778 --- /dev/null +++ b/src/components/Form/fields/FieldOptions2.vue @@ -0,0 +1,277 @@ + + + + + diff --git a/src/components/Form/mocks/form-base.js b/src/components/Form/mocks/form-base.js index 110e30c74..e83560572 100644 --- a/src/components/Form/mocks/form-base.js +++ b/src/components/Form/mocks/form-base.js @@ -3,17 +3,22 @@ import FieldTextGivenName from './field-text-given-name'; import FieldTextFamilyName from './field-text-family-name'; import FieldTextEmail from './field-text-email'; import FieldTextareaMailingAddress from './field-textarea-mailing-address'; - +import FieldOptionsOrderable from './field-options-orderable'; export default { ...Form, id: 'example', action: 'http://httpbin.org/put', method: 'PUT', fields: [ - {...FieldTextGivenName, groupId: 'default'}, + { + ...FieldTextGivenName, + groupId: 'default', + description: 'very useful and interesting description', + }, {...FieldTextFamilyName, groupId: 'default'}, {...FieldTextEmail, groupId: 'default'}, {...FieldTextareaMailingAddress, groupId: 'default'}, + {...FieldOptionsOrderable, groupId: 'default', component: 'field-options2'}, ], groups: [ {