rb-document-form-constructor 0.6.0 → 0.6.3

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

@@ -5222,6 +5222,7 @@ var UtFormConstructor = {
   runRule: function runRule(context, script) {
     context = context ? context : {};
     context['console'] = console;
+    context['Date'] = new Date();
 
     var func = function func(script) {
       return notevil(script, context);
@@ -11108,6 +11109,7 @@ var script$3 = {
     formConfig: function formConfig() {
       this.validationState = {};
       this.execApplyDefaultValues();
+      this.execApplyDefaultValRule();
     }
   },
   methods: {
@@ -11209,13 +11211,34 @@ var script$3 = {
           });
         });
       }
+    },
+    execApplyDefaultValRule: function execApplyDefaultValRule() {
+      var _this4 = this;
+
+      this.formConfig.sections.forEach(function (el) {
+        el.columns.forEach(function (c) {
+          c.fields.forEach(function (f) {
+            if (f.rules) {
+              var rule = f.rules.find(function (rule) {
+                return rule.event === 'defaultValue';
+              });
+
+              if (rule) {
+                _this4.$set(_this4.doc, f.name, f.defaultValue = eval(rule.script));
+              }
+            }
+          });
+        });
+      });
     }
   },
   mounted: function mounted() {
     this.execApplyDefaultValues();
+    this.execApplyDefaultValRule();
   },
   activated: function activated() {
     this.execApplyDefaultValues();
+    this.execApplyDefaultValRule();
   }
 };/* script */
 var __vue_script__$3 = script$3;
@@ -11279,7 +11302,8 @@ var __vue_render__$3 = function __vue_render__() {
           attrs: {
             "disabled": !_vm.editable || !field.editable,
             "id": field.name,
-            "state": _vm.validationState[field.name]
+            "state": _vm.validationState[field.name],
+            "required": field.required
           },
           on: {
             "input": function input($event) {
@@ -11314,7 +11338,7 @@ var __vue_inject_styles__$3 = undefined;
 var __vue_scope_id__$3 = undefined;
 /* module identifier */
 
-var __vue_module_identifier__$3 = "data-v-519938d8";
+var __vue_module_identifier__$3 = "data-v-65467378";
 /* functional template */
 
 var __vue_is_functional_template__$3 = false;
@@ -11626,7 +11650,11 @@ var __vue_render__$2 = function __vue_render__() {
     attrs: {
       "value": 'validate'
     }
-  }, [_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": 'defaultValue'
+    }
+  }, [_vm._v("\n                                        Установить значение по умолчанию\n                                    ")])], 1)], 1)], 1), _vm._v(" "), _c('b-col', {
     attrs: {
       "lg": "12"
     }
@@ -11734,7 +11762,7 @@ var __vue_inject_styles__$2 = undefined;
 var __vue_scope_id__$2 = undefined;
 /* module identifier */
 
-var __vue_module_identifier__$2 = "data-v-397a42e7";
+var __vue_module_identifier__$2 = "data-v-2b82f62a";
 /* functional template */
 
 var __vue_is_functional_template__$2 = false;
@@ -11991,22 +12019,6 @@ var __vue_render__$1 = function __vue_render__() {
     attrs: {
       "lg": "12"
     }
-  }, [_c('b-checkbox', {
-    attrs: {
-      "size": "lg",
-      "disabled": !_vm.hasMultipleInputTypes
-    },
-    model: {
-      value: _vm.field.multiple,
-      callback: function callback($$v) {
-        _vm.$set(_vm.field, "multiple", $$v);
-      },
-      expression: "field.multiple"
-    }
-  }, [_vm._v("\n                        Множественное\n                    ")])], 1)], 1), _vm._v(" "), _c('b-form-row', [_c('b-col', {
-    attrs: {
-      "lg": "12"
-    }
   }, [_c('b-checkbox', {
     attrs: {
       "size": "lg"
@@ -12052,7 +12064,7 @@ var __vue_render__$1 = function __vue_render__() {
     staticClass: "rb-form-section"
   }, [_c('div', {
     staticClass: "rb-title"
-  }, [_vm._v("\n                Настройки ввода\n            ")]), _vm._v(" "), _c('b-form-row', [_c('b-col', {
+  }, [_vm._v("\n                    Настройки ввода\n                ")]), _vm._v(" "), _c('b-form-row', [_c('b-col', {
     attrs: {
       "lg": "12"
     }
@@ -12172,7 +12184,7 @@ var __vue_inject_styles__$1 = undefined;
 var __vue_scope_id__$1 = undefined;
 /* module identifier */
 
-var __vue_module_identifier__$1 = "data-v-48140b1d";
+var __vue_module_identifier__$1 = "data-v-a0db2474";
 /* functional template */
 
 var __vue_is_functional_template__$1 = false;

package/package.json

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

package/src/components/DocForm.vue

@@ -7,7 +7,7 @@
                      class="rb-form-section">
             <b-row>
                 <b-col lg="12">
-                    <h4>{{section.labelRu}}</h4>
+                    <h4>{{ section.labelRu }}</h4>
                 </b-col>
                 <template v-for="column in section.columns">
                     <b-col :key="column.index" :lg="getColumnSize(section)" :sm="12">
@@ -23,14 +23,15 @@
                                                    :id="field.name"
                                                    :state="validationState[field.name]"
                                                    :ref="field.name"
+                                                   :required="field.required"
                                                    @input="onEventFired('input', $event, field)"
                                                    @change="onEventFired('change', $event, field)"
                                                    @click="onEventFired('click', $event, field)"
                                                    v-bind="field.input.propsData"></component>
                                         <template #label>
-                                            <span :title="field.labelRu">{{field.labelRu}}</span> <span
-                                                v-if="showRequiredInLabel && field.required"
-                                                class="text-danger">*</span>
+                                            <span :title="field.labelRu">{{ field.labelRu }}</span>
+                                            <span v-if="showRequiredInLabel && field.required"
+                                                  class="text-danger">*</span>
                                         </template>
                                     </b-form-group>
                                 </b-col>
@@ -45,133 +46,155 @@
 </template>
 
 <script>
-    import Vue from 'vue';
-    import {UtFormConstructor} from "../utils/UtFormConstructor";
-    import typeOf from 'typeof';
+import Vue from 'vue';
+import {UtFormConstructor} from "../utils/UtFormConstructor";
+import typeOf from 'typeof';
+import safeEval from "notevil";
 
-    export default {
-        name: 'DocForm',
-        props: {
-            formConfig: Object,
-            applyDefaultValues: {type: Boolean, default: true},
-            doc: {type: Object, default: () => ({})},
-            refSuffix: {type: String, default: 'Id'},
-            editable: {type: Boolean, default: true},
-            showRequiredInLabel: {type: Boolean, default: true},
-        },
-        data() {
-            return {
-                validationState: {}
+export default {
+    name: 'DocForm',
+    props: {
+        formConfig: Object,
+        applyDefaultValues: {type: Boolean, default: true},
+        doc: {type: Object, default: () => ({})},
+        refSuffix: {type: String, default: 'Id'},
+        editable: {type: Boolean, default: true},
+        showRequiredInLabel: {type: Boolean, default: true},
+    },
+    data() {
+        return {
+            validationState: {}
+        }
+    },
+    watch: {
+        formConfig() {
+            this.validationState = {};
+            this.execApplyDefaultValues();
+            this.execApplyDefaultValRule();
+        }
+    },
+    methods: {
+        onEventFired(eventName, event, field) {
+            if (eventName === 'input' && field.ref && !field.multiple) {
+                let dataField = null;
+                if (field.name.lastIndexOf(this.refSuffix) >= 0) {
+                    dataField = field.name.substring(0, field.name.lastIndexOf(this.refSuffix));
+                }
+
+                if (dataField && dataField.length > 0) {
+                    this.doc[dataField] = null;
+                }
             }
-        },
-        watch: {
-            formConfig() {
-                this.validationState = {};
-                this.execApplyDefaultValues();
+
+            if (field.rules) {
+                field.rules.forEach(rule => {
+                    if (rule.event === eventName && rule.script) {
+                        let ruleContext = UtFormConstructor.getRuleContext();
+                        ruleContext.form = this;
+                        ruleContext.doc = this.doc;
+                        ruleContext.event = event;
+                        ruleContext.eventName = eventName;
+                        UtFormConstructor.runRule(ruleContext, rule.script);
+                    }
+                })
             }
         },
-        methods: {
-            onEventFired(eventName, event, field) {
-                if (eventName === 'input' && field.ref && !field.multiple) {
-                    let dataField = null;
-                    if (field.name.lastIndexOf(this.refSuffix) >= 0) {
-                        dataField = field.name.substring(0, field.name.lastIndexOf(this.refSuffix));
-                    }
+        isValueEmpty(fieldName) {
+            if (this.doc[fieldName] == null) {
+                return true;
+            }
 
-                    if (dataField && dataField.length > 0) {
-                        this.doc[dataField] = null;
-                    }
-                }
+            if (typeOf(this.doc[fieldName] === 'string') && this.doc[fieldName] === '') {
+                return true;
+            }
 
-                if (field.rules) {
-                    field.rules.forEach(rule => {
-                        if (rule.event === eventName && rule.script) {
-                            let ruleContext = UtFormConstructor.getRuleContext();
-                            ruleContext.form = this;
-                            ruleContext.doc = this.doc;
-                            ruleContext.event = event;
-                            ruleContext.eventName = eventName;
-                            UtFormConstructor.runRule(ruleContext, rule.script);
+            return false;
+        },
+        validate() {
+            this.formConfig.sections.forEach(s => {
+                s.columns.forEach(c => {
+                    c.fields.forEach(f => {
+                        if (f.required && this.isValueEmpty(f.name)) {
+                            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);
                     })
-                }
-            },
-            isValueEmpty(fieldName) {
-                if (this.doc[fieldName] == null) {
-                    return true;
-                }
+                })
+            });
 
-                if (typeOf(this.doc[fieldName] === 'string') && this.doc[fieldName] === '') {
-                    return true;
+            for (let fieldName in this.validationState) {
+                if (this.validationState[fieldName] === false) {
+                    return false;
                 }
+            }
+
+            return true;
+        },
+        getColumnSize(section) {
+            const MAX_COLUMN_SIZE = 12;
+            if (!section || !section.columnCount) {
+                return MAX_COLUMN_SIZE;
+            }
 
-                return false;
-            },
-            validate() {
-                this.formConfig.sections.forEach(s => {
-                    s.columns.forEach(c => {
+            let colSize = Math.floor(MAX_COLUMN_SIZE / section.columnCount);
+            return colSize;
+        },
+        execApplyDefaultValues() {
+            if (this.applyDefaultValues) {
+                this.formConfig.sections.forEach(r => {
+                    r.columns.forEach(c => {
                         c.fields.forEach(f => {
-                            if (f.required && this.isValueEmpty(f.name)) {
-                                Vue.set(this.validationState, f.name, false);
-                                Vue.set(this.validationState, `${f.name}__feedback`,
-                                    `Поле "${f.labelRu} обязательно"`);
+                            let defValue;
+                            if (this.defaultValue && typeOf(f.defaultValue) === 'function') {
+                                defValue = f.defaultValue();
                             } else {
-                                Vue.set(this.validationState, f.name, null);
+                                defValue = f.defaultValue == null ? null : f.defaultValue;
                             }
 
-                            this.onEventFired('validate', {
-                                validationState: this.validationState,
-                                doc: this.doc,
-                            }, f);
+                            this.$set(
+                                this.doc,
+                                f.name,
+                                f.defaultValue = defValue
+                            );
                         })
-                    })
+                    });
                 });
-
-                for (let fieldName in this.validationState) {
-                    if (this.validationState[fieldName] === false) {
-                        return false;
-                    }
-                }
-
-                return true;
-            },
-            getColumnSize(section) {
-                const MAX_COLUMN_SIZE = 12;
-                if (!section || !section.columnCount) {
-                    return MAX_COLUMN_SIZE;
-                }
-
-                let colSize = Math.floor(MAX_COLUMN_SIZE / section.columnCount);
-                return colSize;
-            },
-            execApplyDefaultValues() {
-                if (this.applyDefaultValues) {
-                    this.formConfig.sections.forEach(r => {
-                        r.columns.forEach(c => {
-                            c.fields.forEach(f => {
-                                let defValue;
-                                if (this.defaultValue && typeOf(f.defaultValue) === 'function') {
-                                    defValue = f.defaultValue();
-                                } else {
-                                    defValue = f.defaultValue == null ? null : f.defaultValue;
-                                }
-
+            }
+        },
+        execApplyDefaultValRule() {
+            this.formConfig.sections.forEach(el => {
+                el.columns.forEach(c => {
+                    c.fields.forEach(f => {
+                        if (f.rules) {
+                            const rule = f.rules.find(rule => rule.event === 'defaultValue')
+                            if (rule) {
                                 this.$set(
                                     this.doc,
                                     f.name,
-                                    f.defaultValue = defValue
+                                    f.defaultValue = eval(rule.script)
                                 );
-                            })
-                        });
-                    });
-                }
-            }
-        },
-        mounted() {
-            this.execApplyDefaultValues();
-        },
-        activated() {
-            this.execApplyDefaultValues();
+                            }
+                        }
+                    })
+                });
+            });
         }
+    },
+    mounted() {
+        this.execApplyDefaultValues();
+        this.execApplyDefaultValRule();
+    },
+    activated() {
+        this.execApplyDefaultValues();
+        this.execApplyDefaultValRule();
     }
+}
 </script>

package/src/components/DocTemplateFieldSidebar.vue

@@ -38,13 +38,13 @@
                         </b-form-group>
                     </b-col>
                 </b-form-row>
-                <b-form-row>
-                    <b-col lg="12">
-                        <b-checkbox size="lg" v-model="field.multiple" :disabled="!hasMultipleInputTypes">
-                            Множественное
-                        </b-checkbox>
-                    </b-col>
-                </b-form-row>
+<!--                <b-form-row>-->
+<!--                    <b-col lg="12">-->
+<!--                        <b-checkbox size="lg" v-model="field.multiple" :disabled="!hasMultipleInputTypes">-->
+<!--                            Множественное-->
+<!--                        </b-checkbox>-->
+<!--                    </b-col>-->
+<!--                </b-form-row>-->
                 <b-form-row>
                     <b-col lg="12">
                         <b-checkbox size="lg" v-model="field.visible">Отображаемое</b-checkbox>

package/src/components/FieldRuleFormModal.vue

@@ -56,6 +56,9 @@
                                         <b-form-select-option :value="'validate'">
                                             Валидация
                                         </b-form-select-option>
+                                        <b-form-select-option :value="'defaultValue'">
+                                            Установить значение по умолчанию
+                                        </b-form-select-option>
                                     </b-form-select>
                                 </b-form-group>
                             </b-col>

package/src/assets/fontello/README.txt

@@ -1,75 +0,0 @@
-This webfont is generated by https://fontello.com open source project.
-
-
-================================================================================
-Please, note, that you should obey original font licenses, used to make this
-webfont pack. Details available in LICENSE.txt file.
-
-- Usually, it's enough to publish content of LICENSE.txt file somewhere on your
-  site in "About" section.
-
-- If your project is open-source, usually, it will be ok to make LICENSE.txt
-  file publicly available in your repository.
-
-- Fonts, used in Fontello, don't require a clickable link on your site.
-  But any kind of additional authors crediting is welcome.
-================================================================================
-
-
-Comments on archive content
----------------------------
-
-- /font/* - fonts in different formats
-
-- /css/*  - different kinds of css, for all situations. Should be ok with 
-  twitter bootstrap. Also, you can skip <i> style and assign icon classes
-  directly to text elements, if you don't mind about IE7.
-
-- demo.html - demo file, to show your webfont content
-
-- LICENSE.txt - license info about source fonts, used to build your one.
-
-- config.json - keeps your settings. You can import it back into fontello
-  anytime, to continue your work
-
-
-Why so many CSS files ?
------------------------
-
-Because we like to fit all your needs :)
-
-- basic file, <your_font_name>.css - is usually enough, it contains @font-face
-  and character code definitions
-
-- *-ie7.css - if you need IE7 support, but still don't wish to put char codes
-  directly into html
-
-- *-codes.css and *-ie7-codes.css - if you like to use your own @font-face
-  rules, but still wish to benefit from css generation. That can be very
-  convenient for automated asset build systems. When you need to update font -
-  no need to manually edit files, just override old version with archive
-  content. See fontello source code for examples.
-
-- *-embedded.css - basic css file, but with embedded WOFF font, to avoid
-  CORS issues in Firefox and IE9+, when fonts are hosted on the separate domain.
-  We strongly recommend to resolve this issue by `Access-Control-Allow-Origin`
-  server headers. But if you ok with dirty hack - this file is for you. Note,
-  that data url moved to separate @font-face to avoid problems with <IE9, when
-  string is too long.
-
-- animate.css - use it to get ideas about spinner rotation animation.
-
-
-Attention for server setup
---------------------------
-
-You MUST setup server to reply with proper `mime-types` for font files -
-otherwise some browsers will fail to show fonts.
-
-Usually, `apache` already has necessary settings, but `nginx` and other
-webservers should be tuned. Here is list of mime types for our file extensions:
-
-- `application/vnd.ms-fontobject` - eot
-- `application/x-font-woff` - woff
-- `application/x-font-ttf` - ttf
-- `image/svg+xml` - svg