rb-document-form-constructor 0.3.1 → 0.3.5

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

@@ -1,4 +1,4 @@
-'use strict';var crypto=require('crypto');function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}var crypto__default=/*#__PURE__*/_interopDefaultLegacy(crypto);function ownKeys(object, enumerableOnly) {
+'use strict';var Vue=require('vue'),crypto=require('crypto');function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}var Vue__default=/*#__PURE__*/_interopDefaultLegacy(Vue);var crypto__default=/*#__PURE__*/_interopDefaultLegacy(crypto);function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
 
   if (Object.getOwnPropertySymbols) {
@@ -4949,6 +4949,12 @@ var __applyRefProps = function __applyRefProps(input, refConfig) {
   }
 };
 
+var __filterInputsByMultiple = function __filterInputsByMultiple(inputs, multiple) {
+  return inputs.filter(function (i) {
+    return i.multiple && multiple || !i.multiple && !multiple;
+  });
+};
+
 var fcInputs = {
   string: {
     text: 'Текст',
@@ -5112,25 +5118,38 @@ var UtFormConstructor = {
     }
   },
   getInputTypes: function getInputTypes(field) {
+    var inputs = [];
+
     if (!field) {
-      return [];
+      return inputs;
     }
 
     if (field.dict && !this.config.refInputs[field.ref]) {
-      return this.config.dictInputs;
-    }
-
-    if (field.ref) {
-      return this.config.refInputs[field.ref];
+      inputs = __filterInputsByMultiple(this.config.dictInputs, field.multiple);
+    } else if (field.ref) {
+      inputs = __filterInputsByMultiple(this.config.refInputs[field.ref], field.multiple);
+    } else {
+      inputs = __filterInputsByMultiple(this.config.primitiveInputs[field.type], field.multiple);
     }
 
-    return this.config.primitiveInputs[field.type];
+    return inputs;
+  },
+  hasMultipleInputTypes: function hasMultipleInputTypes(field) {
+    var inputs = this.getInputTypes(_objectSpread2(_objectSpread2({}, field), {}, {
+      multiple: true
+    }));
+    return inputs && inputs.length > 0;
   },
   getDefaultInput: function getDefaultInput(field) {
     var input = null;
+    var inputs = this.getInputTypes(field);
+
+    if (!inputs) {
+      input = this.primitiveInputs[0];
+    }
 
     if (field.ref && this.config.refInputs[field.ref]) {
-      input = __clone(this.config.refInputs[field.ref][0]);
+      input = __clone(inputs[0]);
 
       __applyDefaultProps(input);
 
@@ -5138,12 +5157,12 @@ var UtFormConstructor = {
         __applyRefProps(input, this.config.refInputConfigs[field.ref][input.name]);
       }
     } else if (field.dict) {
-      input = __clone(this.config.dictInputs[0]);
+      input = __clone(inputs[0]);
       input.props.dict.default = field.ref;
 
       __applyDefaultProps(input);
     } else {
-      input = __clone(this.config.primitiveInputs[field.type][0]);
+      input = __clone(inputs[0]);
 
       __applyDefaultProps(input);
     }
@@ -5181,17 +5200,12 @@ var UtFormConstructor = {
   runRule: function runRule(context, script) {
     context = context ? context : {};
     context['console'] = console;
-    var appendScript = '';
-    /*for(let v in context) {
-        appendScript = appendScript + `var ${v} = this.${v};\n`;
-    }
-    appendScript = appendScript? appendScript + '\n': '';*/
 
     var func = function func(script) {
       return notevil(script, context);
     };
 
-    func.call(context, appendScript + script);
+    func.call(context, script);
   }
 };//
 //
@@ -10856,6 +10870,15 @@ if (typeof window !== "undefined" && "Vue" in window) {
       });
       this.innerFacets = JSON.parse(JSON.stringify(innerFacets));
       this.allFacets = JSON.parse(JSON.stringify(innerFacets));
+    },
+    getVisibleFields: function getVisibleFields(facet) {
+      if (!facet || !facet.fields) {
+        return [];
+      }
+
+      return facet.fields.filter(function (field) {
+        return !field.hiddenOnFormConfig;
+      });
     }
   },
   created: function created() {
@@ -10890,7 +10913,7 @@ var __vue_render__$4 = function __vue_render__() {
       expression: "facetSearchStr"
     }
   })], 1)], 1)], 1)], 1), _vm._ssrNode(" "), _vm._ssrNode("<div class=\"rb-facet-list\">", "</div>", _vm._l(_vm.innerFacets, function (facet) {
-    return facet.fields && facet.fields.length > 0 ? _vm._ssrNode("<div class=\"rb-facet\">", "</div>", [_vm._ssrNode("<h6 class=\"rb-facet-label d-flex cursor-pointer\">", "</h6>", [_c('rb-text', {
+    return _vm.getVisibleFields(facet).length > 0 ? _vm._ssrNode("<div class=\"rb-facet\">", "</div>", [_vm._ssrNode("<h6 class=\"rb-facet-label d-flex cursor-pointer\">", "</h6>", [_c('rb-text', {
       staticClass: "flex-fill"
     }, [_vm._v(_vm._s(facet.labelRu))]), _vm._ssrNode(" "), _c('rb-icon', {
       attrs: {
@@ -10919,7 +10942,7 @@ var __vue_render__$4 = function __vue_render__() {
         },
         expression: "facet.fields"
       }
-    }, _vm._l(facet.fields, function (field) {
+    }, _vm._l(_vm.getVisibleFields(facet), function (field) {
       return _c('b-list-group-item', {
         key: field.name,
         staticClass: "cursor-pointer"
@@ -10937,7 +10960,7 @@ var __vue_inject_styles__$4 = undefined;
 var __vue_scope_id__$4 = undefined;
 /* module identifier */
 
-var __vue_module_identifier__$4 = "data-v-0fee67ee";
+var __vue_module_identifier__$4 = "data-v-be2c30ac";
 /* functional template */
 
 var __vue_is_functional_template__$4 = false;
@@ -11022,17 +11045,24 @@ var script$3 = {
         return {};
       }
     },
-    validationState: {
-      type: Object,
-      default: function _default() {
-        return {};
-      }
+    refDataSuffix: {
+      type: String,
+      default: 'Data'
     }
   },
+  data: function data() {
+    return {
+      validationState: {}
+    };
+  },
   methods: {
     onEventFired: function onEventFired(eventName, event, field) {
       var _this = this;
 
+      if (eventName === 'input' && field.ref) {
+        this.doc[field.name + this.refDataSuffix] = null;
+      }
+
       if (field.rules) {
         field.rules.forEach(function (rule) {
           if (rule.event === eventName && rule.script) {
@@ -11045,16 +11075,45 @@ var script$3 = {
           }
         });
       }
+    },
+    validate: function validate() {
+      var _this2 = this;
+
+      this.formConfig.sections.forEach(function (s) {
+        s.columns.forEach(function (c) {
+          c.fields.forEach(function (f) {
+            if (f.required && _this2.doc[f.name] == null) {
+              Vue__default["default"].set(_this2.validationState, f.name, false);
+              Vue__default["default"].set(_this2.validationState, "".concat(f.name, "__feedback"), "\u041F\u043E\u043B\u0435 ".concat(f.labelRu, " \u043E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u043E"));
+            } else {
+              Vue__default["default"].set(_this2.validationState, f.name, null);
+            }
+
+            _this2.onEventFired('validate', {
+              validationState: _this2.validationState,
+              doc: _this2.doc
+            }, f);
+          });
+        });
+      });
+
+      for (var fieldName in this.validationState) {
+        if (this.validationState[fieldName] === false) {
+          return false;
+        }
+      }
+
+      return true;
     }
   },
   created: function created() {
-    var _this2 = this;
+    var _this3 = this;
 
     if (this.applyDefaultValues) {
       this.formConfig.sections.forEach(function (r) {
         r.columns.forEach(function (c) {
           c.fields.forEach(function (f) {
-            _this2.$set(_this2.doc, f.name, f.defaultValue == null ? null : f.defaultValue);
+            _this3.$set(_this3.doc, f.name, f.defaultValue == null ? null : f.defaultValue);
           });
         });
       });
@@ -11122,7 +11181,7 @@ var __vue_render__$3 = function __vue_render__() {
             },
             expression: "doc[field.name]"
           }
-        }, 'component', field.input.propsData, false))], 1)], 1)], 1) : _vm._e()];
+        }, 'component', field.input.propsData, false)), _vm._v(" "), !_vm.validationState[field.name] ? _c('b-form-invalid-feedback', [_vm._v("\n                                    " + _vm._s(_vm.validationState[field.name + "__feedback"]) + "\n                                ")]) : _vm._e()], 1)], 1)], 1) : _vm._e()];
       })], 2);
     }), 0)]) : _vm._e();
   }), 0);
@@ -11137,7 +11196,7 @@ var __vue_inject_styles__$3 = undefined;
 var __vue_scope_id__$3 = undefined;
 /* module identifier */
 
-var __vue_module_identifier__$3 = "data-v-60c54c35";
+var __vue_module_identifier__$3 = "data-v-6a1523d3";
 /* functional template */
 
 var __vue_is_functional_template__$3 = false;
@@ -11445,7 +11504,11 @@ var __vue_render__$2 = function __vue_render__() {
     attrs: {
       "value": 'click'
     }
-  }, [_vm._v("\n                                        Клик\n                                    ")])], 1)], 1)], 1), _vm._v(" "), _c('b-col', {
+  }, [_vm._v("\n                                        Клик\n                                    ")]), _vm._v(" "), _c('b-form-select-option', {
+    attrs: {
+      "value": 'validate'
+    }
+  }, [_vm._v("\n                                        Валидация\n                                    ")])], 1)], 1)], 1), _vm._v(" "), _c('b-col', {
     attrs: {
       "lg": "12"
     }
@@ -11553,7 +11616,7 @@ var __vue_inject_styles__$2 = undefined;
 var __vue_scope_id__$2 = undefined;
 /* module identifier */
 
-var __vue_module_identifier__$2 = "data-v-3e86235a";
+var __vue_module_identifier__$2 = "data-v-397a42e7";
 /* functional template */
 
 var __vue_is_functional_template__$2 = false;
@@ -11612,6 +11675,12 @@ var FieldRuleFormModal = __vue_component__$3;var script$1 = {
     },
     rules: function rules() {
       return UtFormConstructor.getAvailableFieldRules(this.field);
+    },
+    hasMultipleInputTypes: function hasMultipleInputTypes() {
+      return UtFormConstructor.hasMultipleInputTypes(this.field);
+    },
+    multiple: function multiple() {
+      return this.field && this.field.multiple;
     }
   },
   watch: {
@@ -11631,6 +11700,10 @@ var FieldRuleFormModal = __vue_component__$3;var script$1 = {
     },
     currentInputName: function currentInputName() {
       this.field.input = UtFormConstructor.getInputTypeByName(this.currentInputName, this.field);
+    },
+    multiple: function multiple() {
+      var input = UtFormConstructor.getDefaultInput(this.field);
+      this.currentInputName = input.name;
     }
   },
   methods: {
@@ -11802,7 +11875,8 @@ var __vue_render__$1 = function __vue_render__() {
     }
   }, [_c('b-checkbox', {
     attrs: {
-      "size": "lg"
+      "size": "lg",
+      "disabled": !_vm.hasMultipleInputTypes
     },
     model: {
       value: _vm.field.multiple,
@@ -11811,7 +11885,7 @@ var __vue_render__$1 = function __vue_render__() {
       },
       expression: "field.multiple"
     }
-  }, [_vm._v("Множественное")])], 1)], 1), _vm._v(" "), _c('b-form-row', [_c('b-col', {
+  }, [_vm._v("\n                        Множественное\n                    ")])], 1)], 1), _vm._v(" "), _c('b-form-row', [_c('b-col', {
     attrs: {
       "lg": "12"
     }
@@ -11980,7 +12054,7 @@ var __vue_inject_styles__$1 = undefined;
 var __vue_scope_id__$1 = undefined;
 /* module identifier */
 
-var __vue_module_identifier__$1 = "data-v-6fd56ef5";
+var __vue_module_identifier__$1 = "data-v-e86e382e";
 /* functional template */
 
 var __vue_is_functional_template__$1 = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rb-document-form-constructor",
-  "version": "0.3.1",
+  "version": "0.3.5",
   "description": "",
   "main": "dist/rb-document-form-constructor.ssr.js",
   "browser": "dist/rb-document-form-constructor.esm.js",
@@ -16,7 +16,7 @@
     "prebuild": "rimraf ./dist",
     "build": "cross-env NODE_ENV=production rollup --config build/rollup.config.js",
     "build:ssr": "cross-env NODE_ENV=production rollup --config build/rollup.config.js --format cjs",
-    "build:es": "cross-env NODE_ENV=production rollup --config build/rollup.config.js --format es",
+    "build:es": "cross-env NODE_ENV=pеroduction rollup --config build/rollup.config.js --format es",
     "build:unpkg": "cross-env kNODE_ENV=production rollup --config build/rollup.config.js --format iife"
   },
   "dependencies": {

package/src/components/DocForm.vue

@@ -19,6 +19,9 @@
                                                @change="onEventFired('change', $event, field)"
                                                @click="onEventFired('click', $event, field)"
                                                v-bind="field.input.propsData"></component>
+                                    <b-form-invalid-feedback v-if="!validationState[field.name]">
+                                        {{validationState[`${field.name}__feedback`]}}
+                                    </b-form-invalid-feedback>
                                 </b-form-group>
                             </b-col>
                         </b-form-row>
@@ -30,6 +33,7 @@
 </template>
 
 <script>
+    import Vue from 'vue';
     import {UtFormConstructor} from "../utils/UtFormConstructor";
 
     export default {
@@ -38,10 +42,19 @@
             formConfig: Object,
             applyDefaultValues: {type: Boolean, default: true},
             doc: {type: Object, default: () => ({})},
-            validationState: {type: Object, default: () => ({})}
+            refDataSuffix: {type: String, default: 'Data'}
+        },
+        data() {
+            return {
+                validationState: {}
+            }
         },
         methods: {
             onEventFired(eventName, event, field) {
+                if (eventName === 'input' && field.ref) {
+                    this.doc[field.name + this.refDataSuffix] = null;
+                }
+
                 if (field.rules) {
                     field.rules.forEach(rule => {
                         if (rule.event === eventName && rule.script) {
@@ -54,6 +67,34 @@
                         }
                     })
                 }
+            },
+            validate() {
+                this.formConfig.sections.forEach(s => {
+                    s.columns.forEach(c => {
+                        c.fields.forEach(f => {
+                            if (f.required && this.doc[f.name] == null) {
+                                Vue.set(this.validationState, f.name, false);
+                                Vue.set(this.validationState, `${f.name}__feedback`,
+                                    `Поле ${f.labelRu} обязательно`);
+                            } else {
+                                Vue.set(this.validationState, f.name, null);
+                            }
+
+                            this.onEventFired('validate', {
+                                validationState: this.validationState,
+                                doc: this.doc,
+                            }, f);
+                        })
+                    })
+                });
+
+                for (let fieldName in this.validationState) {
+                    if (this.validationState[fieldName] === false) {
+                        return false;
+                    }
+                }
+
+                return true;
             }
         },
         created() {

package/src/components/DocTemplateFacetList.vue

@@ -13,7 +13,7 @@
         </b-form>
         <div class="rb-facet-list">
             <div class="rb-facet" v-for="facet in innerFacets"
-                 :key="facet.name" v-if="facet.fields && facet.fields.length > 0">
+                 :key="facet.name" v-if="getVisibleFields(facet).length > 0">
                 <h6 class="rb-facet-label d-flex cursor-pointer" @click="facet.expanded = !facet.expanded">
                     <rb-text class="flex-fill">{{facet.labelRu}}</rb-text>
                     <rb-icon :icon="facet.expanded? iconCollapseFacet: iconExpandFacet"></rb-icon>
@@ -26,7 +26,8 @@
                                :group="{name: 'fields', pull: 'clone', put: false}"
                                @end="onFieldMoveEnd($event)"
                                ghost-class="rb-facet-field-moving">
-                        <b-list-group-item v-for="field in facet.fields" :key="field.name"
+                        <b-list-group-item v-for="field in getVisibleFields(facet)"
+                                           :key="field.name"
                                            class="cursor-pointer">
                             <rb-text>{{field.labelRu}}</rb-text>
                         </b-list-group-item>
@@ -103,6 +104,13 @@
                 let innerFacets = this.facets.map(f => ({...f, expanded: false}));
                 this.innerFacets = JSON.parse(JSON.stringify(innerFacets));
                 this.allFacets = JSON.parse(JSON.stringify(innerFacets));
+            },
+            getVisibleFields(facet) {
+                if (!facet || !facet.fields) {
+                    return [];
+                }
+
+                return facet.fields.filter(field => !field.hiddenOnFormConfig);
             }
         },
         created() {

package/src/components/DocTemplateFieldSidebar.vue

@@ -40,7 +40,9 @@
                 </b-form-row>
                 <b-form-row>
                     <b-col lg="12">
-                        <b-checkbox size="lg" v-model="field.multiple">Множественное</b-checkbox>
+                        <b-checkbox size="lg" v-model="field.multiple" :disabled="!hasMultipleInputTypes">
+                            Множественное
+                        </b-checkbox>
                     </b-col>
                 </b-form-row>
                 <b-form-row>
@@ -130,7 +132,6 @@
 </template>
 
 <script>
-    import {UtFormConfig} from "@/utils/UtFormConfig";
     import FieldRuleFormModal from "./FieldRuleFormModal";
     import {v4 as uuidv4} from 'uuid';
     import {UtFormConstructor} from "../utils/UtFormConstructor";
@@ -177,6 +178,12 @@
             },
             rules() {
                 return UtFormConstructor.getAvailableFieldRules(this.field);
+            },
+            hasMultipleInputTypes() {
+                return UtFormConstructor.hasMultipleInputTypes(this.field);
+            },
+            multiple() {
+                return this.field && this.field.multiple;
             }
         },
         watch: {
@@ -196,6 +203,10 @@
             currentInputName() {
                 this.field.input = UtFormConstructor.getInputTypeByName(this.currentInputName, this.field);
             },
+            multiple() {
+                let input = UtFormConstructor.getDefaultInput(this.field);
+                this.currentInputName = input.name;
+            }
         },
         methods: {
             hide() {

package/src/components/FieldRuleFormModal.vue

@@ -53,6 +53,9 @@
                                         <b-form-select-option :value="'click'">
                                             Клик
                                         </b-form-select-option>
+                                        <b-form-select-option :value="'validate'">
+                                            Валидация
+                                        </b-form-select-option>
                                     </b-form-select>
                                 </b-form-group>
                             </b-col>