rb-document-form-constructor 0.4.9 → 0.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "rb-document-form-constructor",
3
- "version": "0.4.9",
3
+ "version": "0.5.2",
4
4
  "description": "",
5
5
  "main": "dist/rb-document-form-constructor.ssr.js",
6
6
  "browser": "dist/rb-document-form-constructor.esm.js",
@@ -2,18 +2,20 @@
2
2
  <b-form v-if="formConfig" class="rb-doc-form">
3
3
  <div v-for="(section) in formConfig.sections" :key="section.labelRu" v-if="formConfig && formConfig.sections"
4
4
  class="rb-form-section">
5
- <h4>{{section.labelRu}}</h4>
5
+ <h4>{{ section.labelRu }}</h4>
6
6
 
7
7
  <div class="d-flex flex-row">
8
8
  <div class="rb-form-column" v-for="column in section.columns" :key="column.index">
9
9
  <template v-for="field in column.fields">
10
10
  <b-form-row :key="field.name" v-if="field.visible">
11
11
  <b-col lg="12">
12
- <b-form-group :invalid-feedback="validationState[`${field.name}__feedback`]"
12
+ <b-form-group :state="validationState[field.name]"
13
+ :invalid-feedback="validationState[`${field.name}__feedback`]"
13
14
  ref="inputContainer">
14
15
  <component v-bind:is="field.input.type"
15
16
  v-model="doc[field.name]"
16
17
  :disabled="!editable || !field.editable"
18
+ :id="field.name"
17
19
  :state="validationState[field.name]"
18
20
  :ref="field.name"
19
21
  @input="onEventFired('input', $event, field)"
@@ -21,8 +23,8 @@
21
23
  @click="onEventFired('click', $event, field)"
22
24
  v-bind="field.input.propsData"></component>
23
25
  <template #label>
24
- {{field.labelRu}} <span v-if="showRequiredInLabel && field.required"
25
- class="text-danger">*</span>
26
+ {{ field.labelRu }} <span v-if="showRequiredInLabel && field.required"
27
+ class="text-danger">*</span>
26
28
  </template>
27
29
  </b-form-group>
28
30
  </b-col>
@@ -85,14 +87,30 @@
85
87
  })
86
88
  }
87
89
  },
90
+ isValueEmpty(fieldName) {
91
+ console.info('isValueEmpty', fieldName, this.doc[fieldName]);
92
+
93
+ if (this.doc[fieldName] == null) {
94
+ console.info(`${fieldName} is empty`);
95
+ return true;
96
+ }
97
+
98
+ if (typeOf(this.doc[fieldName] === 'string') && this.doc[fieldName] === '') {
99
+ console.info(`${fieldName} is empty`);
100
+ return true;
101
+ }
102
+
103
+ console.info(`${fieldName} is not empty`);
104
+ return false;
105
+ },
88
106
  validate() {
89
107
  this.formConfig.sections.forEach(s => {
90
108
  s.columns.forEach(c => {
91
109
  c.fields.forEach(f => {
92
- if (f.required && this.doc[f.name] == null) {
110
+ if (f.required && this.isValueEmpty(f.name)) {
93
111
  Vue.set(this.validationState, f.name, false);
94
112
  Vue.set(this.validationState, `${f.name}__feedback`,
95
- `Поле ${f.labelRu} обязательно`);
113
+ `Поле "${f.labelRu} обязательно"`);
96
114
  } else {
97
115
  Vue.set(this.validationState, f.name, null);
98
116
  }
@@ -33,7 +33,7 @@
33
33
  <rb-icon :icon="iconDrag"
34
34
  class="cursor-pointer rb-row-drag-handle"></rb-icon>
35
35
  <rb-text class="flex-fill" @click="editSection(section)">
36
- {{section.labelRu}}
36
+ {{ section.labelRu }}
37
37
  </rb-text>
38
38
  <span class="rb-actions">
39
39
  <rb-icon :icon="iconEdit" class="cursor-pointer"
@@ -61,12 +61,13 @@
61
61
  <b-form-group :label="field.labelRu">
62
62
  <template #label>
63
63
  <rb-icon :icon="iconDrag" class="rb-field-drag-handle"></rb-icon>
64
- <rb-text>{{field.labelRu}}</rb-text>
64
+ <rb-text>{{ field.labelRu }}</rb-text>
65
65
  <rb-icon :icon="iconDelete" class="rb-remove-field"
66
66
  @click.prevent="onRemoveField($event, field, column)">
67
67
  </rb-icon>
68
68
  </template>
69
69
  <component v-bind:is="field.input.type"
70
+ :id="field.name"
70
71
  v-if="field.input"
71
72
  v-bind="getFieldExtendedPropsData(field)"
72
73
  disabled
@@ -15,7 +15,7 @@
15
15
  <div class="rb-facet" v-for="facet in innerFacets"
16
16
  :key="facet.name" v-if="facet.fields.length > 0">
17
17
  <h6 class="rb-facet-label d-flex cursor-pointer" @click="facet.expanded = !facet.expanded">
18
- <rb-text class="flex-fill">{{facet.labelRu}}</rb-text>
18
+ <rb-text class="flex-fill">{{ facet.labelRu }}</rb-text>
19
19
  <rb-icon :icon="facet.expanded? iconCollapseFacet: iconExpandFacet"></rb-icon>
20
20
  </h6>
21
21
 
@@ -27,9 +27,10 @@
27
27
  @end="onFieldMoveEnd($event)"
28
28
  ghost-class="rb-facet-field-moving">
29
29
  <b-list-group-item v-for="field in facet.fields"
30
+ :id="field.name + 'Sidebar'"
30
31
  :key="field.name"
31
32
  class="cursor-pointer">
32
- <rb-text>{{field.labelRu}}</rb-text>
33
+ <rb-text>{{ field.labelRu }}</rb-text>
33
34
  </b-list-group-item>
34
35
  </draggable>
35
36
  </b-list-group>
@@ -102,7 +103,7 @@
102
103
  },
103
104
  handleFacetsProp() {
104
105
  let innerFacets = this.facets.map(f => ({...f, expanded: false}));
105
- if(innerFacets) {
106
+ if (innerFacets) {
106
107
  innerFacets.forEach(facet => {
107
108
  facet.fields = facet.fields.filter(field => !field.hiddenOnFormConfig);
108
109
  })