rb-document-form-constructor 0.8.44 → 0.8.46

package/dist/rb-document-form-constructor.ssr.js

@@ -5314,7 +5314,7 @@ var script$5 = {
   data: function data() {
     return {
       id: 'rb-doc-template-section-modal',
-      label: null
+      label: {}
     };
   },
   computed: {
@@ -5325,7 +5325,7 @@ var script$5 = {
   watch: {
     section: function section() {
       if (this.section) {
-        this.label = this.section.labelRu;
+        this.label = this.section;
       }
     }
   },
@@ -5333,7 +5333,7 @@ var script$5 = {
     onOk: function onOk() {
       var _this = this;
 
-      this.section.labelRu = this.label;
+      this.section = this.label;
 
       if (this.onAfterOk) {
         this.onAfterOk();
@@ -5346,7 +5346,7 @@ var script$5 = {
   },
   created: function created() {
     if (this.section) {
-      this.label = this.section.labelRu;
+      this.label = this.section;
     }
   }
 };function normalizeComponent(template, style, script, scopeId, isFunctionalTemplate, moduleIdentifier /* server only */, shadowMode, createInjector, createInjectorSSR, createInjectorShadow) {
@@ -5463,7 +5463,7 @@ var __vue_render__$5 = function __vue_render__() {
     attrs: {
       "label": "Наименование секции"
     }
-  }, [_c('b-form-input', {
+  }, [_c('rb-multi-lang-input', {
     model: {
       value: _vm.label,
       callback: function callback($$v) {
@@ -5483,7 +5483,7 @@ var __vue_inject_styles__$5 = undefined;
 var __vue_scope_id__$5 = undefined;
 /* module identifier */
 
-var __vue_module_identifier__$5 = "data-v-0dc54a8c";
+var __vue_module_identifier__$5 = "data-v-4f837662";
 /* functional template */
 
 var __vue_is_functional_template__$5 = false;
@@ -11143,6 +11143,10 @@ var _typeof = function(object) {
       type: Boolean,
       default: true
     },
+    displayField: {
+      type: String,
+      default: 'labelRu'
+    },
     showRequiredInLabel: {
       type: Boolean,
       default: true
@@ -11176,9 +11180,19 @@ var _typeof = function(object) {
           _ref.multiple;
       this.getResolveValue(field);
     },
+    getDisplayField: function getDisplayField(value) {
+      if (!value[this.displayField]) {
+        return value.labelRu;
+      } else {
+        return value[this.displayField];
+      }
+    },
     onEventFired: function onEventFired(eventName, event, field) {
       var _this = this;
 
+      console.info("eventName", eventName);
+      console.info("event", event);
+
       if (eventName === 'input' && field.ref && !field.multiple) {
         var dataField = null;
 
@@ -11261,7 +11275,7 @@ var _typeof = function(object) {
             var feedback = '';
 
             if (f.required && _this3.isValueEmpty(f.name)) {
-              feedback += "\u041F\u043E\u043B\u0435 \"".concat(f.labelRu, "\" \u043E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u043E");
+              feedback += "\u041F\u043E\u043B\u0435 \"".concat(_this3.getDisplayField(f), "\" \u043E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u043E");
             }
 
             if (f.type === 'integer' && _this3.isValueLessThanMin(f.name, f.input.propsData.min)) {
@@ -11377,7 +11391,7 @@ var __vue_render__$3 = function __vue_render__() {
       attrs: {
         "lg": "12"
       }
-    }, [_c('h4', [_vm._v(_vm._s(section.labelRu))])]), _vm._v(" "), _vm._l(section.columns, function (column) {
+    }, [_c('h4', [_vm._v(_vm._s(_vm.getDisplayField(section)))])]), _vm._v(" "), _vm._l(section.columns, function (column) {
       return [_c('b-col', {
         key: column.index,
         attrs: {
@@ -11403,9 +11417,9 @@ var __vue_render__$3 = function __vue_render__() {
             fn: function fn() {
               return [_c('span', {
                 attrs: {
-                  "title": field.labelRu
+                  "title": _vm.getDisplayField(field)
                 }
-              }, [_vm._v(_vm._s(field.labelRu))]), _vm._v(" "), _vm.showRequiredInLabel && field.required ? _c('span', {
+              }, [_vm._v(_vm._s(_vm.getDisplayField(field)))]), _vm._v(" "), _vm.showRequiredInLabel && field.required ? _c('span', {
                 staticClass: "text-danger"
               }, [_vm._v("*")]) : _vm._e()];
             },
@@ -11423,6 +11437,18 @@ var __vue_render__$3 = function __vue_render__() {
             "required": field.required
           },
           on: {
+            "hook:created": function hookCreated($event) {
+              return _vm.onEventFired('created', $event, field);
+            },
+            "hook:destroyed": function hookDestroyed($event) {
+              return _vm.onEventFired('destroyed', $event, field);
+            },
+            "hook:activated": function hookActivated($event) {
+              return _vm.onEventFired('activated', $event, field);
+            },
+            "hook:mounted": function hookMounted($event) {
+              return _vm.onEventFired('mounted', $event, field);
+            },
             "input": function input($event) {
               return _vm.onEventFired('input', $event, field);
             },
@@ -11456,7 +11482,7 @@ var __vue_inject_styles__$3 = undefined;
 var __vue_scope_id__$3 = undefined;
 /* module identifier */
 
-var __vue_module_identifier__$3 = "data-v-6f2add85";
+var __vue_module_identifier__$3 = "data-v-6a02b054";
 /* functional template */
 
 var __vue_is_functional_template__$3 = false;
@@ -11773,6 +11799,18 @@ var __vue_render__$2 = function __vue_render__() {
       "value": 'defaultValue'
     }
   }, [_vm._v("\n                    Установить значение по умолчанию\n                  ")]), _vm._v(" "), _c('b-form-select-option', {
+    attrs: {
+      "value": 'created'
+    }
+  }, [_vm._v("\n                    Инпут создан\n                  ")]), _vm._v(" "), _c('b-form-select-option', {
+    attrs: {
+      "value": 'mounted'
+    }
+  }, [_vm._v("\n                    Инпут подключен\n                  ")]), _vm._v(" "), _c('b-form-select-option', {
+    attrs: {
+      "value": 'activated'
+    }
+  }, [_vm._v("\n                    Инпут активирован\n                  ")]), _vm._v(" "), _c('b-form-select-option', {
     attrs: {
       "value": 'form-mounted'
     }
@@ -11888,7 +11926,7 @@ var __vue_inject_styles__$2 = undefined;
 var __vue_scope_id__$2 = undefined;
 /* module identifier */
 
-var __vue_module_identifier__$2 = "data-v-6df2f273";
+var __vue_module_identifier__$2 = "data-v-4391e2c5";
 /* functional template */
 
 var __vue_is_functional_template__$2 = false;
@@ -12147,13 +12185,13 @@ var __vue_render__$1 = function __vue_render__() {
     attrs: {
       "label": "Заголовок"
     }
-  }, [_c('b-form-input', {
+  }, [_c('rb-multi-lang-input', {
     model: {
-      value: _vm.field.labelRu,
+      value: _vm.field,
       callback: function callback($$v) {
-        _vm.$set(_vm.field, "labelRu", $$v);
+        _vm.field = $$v;
       },
-      expression: "field.labelRu"
+      expression: "field"
     }
   })], 1)], 1)], 1), _vm._v(" "), _c('b-form-row', [_c('b-col', {
     attrs: {
@@ -12324,7 +12362,7 @@ var __vue_inject_styles__$1 = undefined;
 var __vue_scope_id__$1 = undefined;
 /* module identifier */
 
-var __vue_module_identifier__$1 = "data-v-683b4764";
+var __vue_module_identifier__$1 = "data-v-d1baa99a";
 /* functional template */
 
 var __vue_is_functional_template__$1 = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rb-document-form-constructor",
-  "version": "0.8.44",
+  "version": "0.8.46",
   "description": "",
   "main": "dist/rb-document-form-constructor.ssr.js",
   "browser": "dist/rb-document-form-constructor.esm.js",

package/src/components/DocForm.vue

@@ -8,7 +8,7 @@
     >
       <b-row>
         <b-col lg="12">
-          <h4>{{ section.labelRu }}</h4>
+          <h4>{{ getDisplayField(section) }}</h4>
         </b-col>
         <template v-for="column in section.columns">
           <b-col :key="column.index" :lg="getColumnSize(section)" :sm="12">
@@ -41,7 +41,7 @@
                         v-bind="field.input.propsData"
                     ></component>
                     <template #label>
-                      <span :title="field.labelRu">{{ field.labelRu }}</span>
+                      <span :title="getDisplayField(field)">{{ getDisplayField(field) }}</span>
                       <span v-if="showRequiredInLabel && field.required" class="text-danger"
                       >*</span
                       >
@@ -72,6 +72,7 @@ export default {
     doc: {type: Object, default: () => ({})},
     refSuffix: {type: String, default: 'Id'},
     editable: {type: Boolean, default: true},
+    displayField: {type: String, default: 'labelRu'},
     showRequiredInLabel: {type: Boolean, default: true},
   },
   data() {
@@ -104,7 +105,17 @@ export default {
         resolveValue = null;
       }
     },
+    getDisplayField(value) {
+      if (!value[this.displayField]) {
+        return value.labelRu
+      } else {
+        return value[this.displayField]
+      }
+    },
     onEventFired(eventName, event, field) {
+      console.info("eventName", eventName);
+      console.info("event", event);
+
       if (eventName === 'input' && field.ref && !field.multiple) {
         let dataField = null;
         if (field.name.lastIndexOf(this.refSuffix) >= 0) {
@@ -176,7 +187,7 @@ export default {
             let feedback = '';
 
             if (f.required && this.isValueEmpty(f.name)) {
-              feedback += `Поле "${f.labelRu}" обязательно`;
+              feedback += `Поле "${this.getDisplayField(f)}" обязательно`;
             }
 
             if (f.type === 'integer' && this.isValueLessThanMin(f.name, f.input.propsData.min)) {

package/src/components/DocTemplateFieldSidebar.vue

@@ -34,7 +34,7 @@
                 <b-form-row>
                     <b-col lg="12">
                         <b-form-group label="Заголовок">
-                            <b-form-input v-model="field.labelRu"></b-form-input>
+                            <rb-multi-lang-input v-model="field" />
                         </b-form-group>
                     </b-col>
                 </b-form-row>

package/src/components/DocTemplateSectionModal.vue

@@ -9,7 +9,7 @@
             <b-form-row>
                 <b-col lg="12">
                     <b-form-group label="Наименование секции">
-                        <b-form-input v-model="label"></b-form-input>
+                        <rb-multi-lang-input v-model="label" />
                     </b-form-group>
                 </b-col>
             </b-form-row>
@@ -28,7 +28,7 @@
         data() {
             return {
                 id: 'rb-doc-template-section-modal',
-                label: null
+                label: {}
             }
         },
         computed: {
@@ -39,13 +39,13 @@
         watch: {
             section() {
                 if(this.section) {
-                    this.label = this.section.labelRu;
+                    this.label = this.section;
                 }
             }
         },
         methods: {
             onOk() {
-                this.section.labelRu = this.label;
+                this.section = this.label;
                 if(this.onAfterOk) {
                     this.onAfterOk();
                 }
@@ -56,7 +56,7 @@
         },
         created() {
             if(this.section) {
-                this.label = this.section.labelRu;
+                this.label = this.section;
             }
         }
     }