rb-document-form-constructor 0.8.61 → 0.8.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rb-document-form-constructor",
-  "version": "0.8.61",
+  "version": "0.8.63",
   "description": "",
   "main": "dist/rb-document-form-constructor.ssr.js",
   "browser": "dist/rb-document-form-constructor.esm.js",
@@ -20,7 +20,15 @@
     "build:unpkg": "cross-env kNODE_ENV=production rollup --config build/rollup.config.js --format iife"
   },
   "dependencies": {
-    "nanoid": "^4.0.2",
+    "bootstrap": "^4.5.0",
+    "bootstrap-vue": "^2.15.0",
+    "debounce": "^1.2.1",
+    "jquery": "^3.6.0",
+    "notevil": "^1.3.3",
+    "sass": "^1.32.0",
+    "sass-loader": "^10.1.0",
+    "typeof": "^1.0.0",
+    "uuid": "^9.0.0",
     "vuedraggable": "^2.24.3"
   },
   "devDependencies": {
@@ -29,6 +37,7 @@
     "@rollup/plugin-alias": "^3.1.2",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-commonjs": "^14.0.0",
+    "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^9.0.0",
     "@rollup/plugin-replace": "^2.4.2",
     "@vue/cli-plugin-babel": "^4.5.13",
@@ -38,21 +47,17 @@
     "rb-bv-components": "^2.5.26",
     "rimraf": "^3.0.2",
     "rollup": "^2.52.8",
-    "rollup-plugin-analyzer": "^4.0.0",
     "rollup-plugin-copy-assets": "^2.0.3",
     "rollup-plugin-sass": "^1.2.6",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-visualizer": "^5.9.2",
     "rollup-plugin-vue": "^5.1.9",
     "rubles": "^0.2.0",
-    "sass": "^1.32.0",
-    "sass-loader": "^10.1.0",
     "vue": "^2.6.14",
+    "vue-i18n": "^8.28.2",
     "vue-template-compiler": "^2.6.14"
   },
   "peerDependencies": {
-    "bootstrap": "^4.5.3",
-    "bootstrap-vue": "^2.21.2",
     "vue": "^2.6.14"
   },
   "engines": {

package/src/components/DocForm.vue

@@ -1,7 +1,6 @@
 <template>
-  <b-form v-if="formConfig" class="rb-doc-form">
+  <b-form v-if="formConfig && formConfig.sections" class="rb-doc-form" @submit.prevent>
     <b-container
-        v-if="formConfig && formConfig.sections"
         v-for="section in formConfig.sections"
         :key="section.labelRu"
         class="rb-form-section"
@@ -62,6 +61,7 @@
 import Vue from 'vue';
 import {UtFormConstructor} from '../utils/UtFormConstructor';
 import typeOf from 'typeof';
+import {i18n} from '../locales/i18n'
 import {UtFormConfig} from '@/utils/UtFormConfig';
 // import safeEval from "notevil";
 
@@ -108,9 +108,9 @@ export default {
     },
     getDisplayField(value) {
       if (!value[this.displayField]) {
-        return value.labelRu
+        return value.labelRu;
       } else {
-        return value[this.displayField]
+        return value[this.displayField];
       }
     },
     onEventFired(eventName, event, field) {
@@ -166,7 +166,7 @@ export default {
         return true;
       }
 
-      if (typeof this.doc[fieldName] === 'string' && this.doc[fieldName] === '') {
+      if (typeOf(this.doc[fieldName] === 'string') && this.doc[fieldName] === '') {
         return true;
       }
       return false;
@@ -192,11 +192,11 @@ export default {
             let feedback = '';
 
             if (f.required && this.isValueEmpty(f.name)) {
-              feedback += `Поле "${this.getDisplayField(f)}" обязательно`;
+              feedback += i18n.t('validate.required', {field: this.getDisplayField(f)});
             }
 
             if (f.type === 'integer' && this.isValueLessThanMin(f.name, f.input.propsData.min)) {
-              feedback += `\nМинимальное значение для этого поля ${f.input.propsData.min}`;
+              feedback += `\n${i18n.t('validate.min', {min: f.input.propsData.min})}`;
             }
             // TODO: Костыль так как на бэке нету типа memo
             if (f.input.type === 'b-form-textarea' && this.isValueLessThanMax(f.name, f.input.propsData?.max)) {
@@ -245,7 +245,7 @@ export default {
             c.fields.forEach((f) => {
               if (f.defaultValue) {
                 let defValue;
-                if (this.defaultValue && typeof f.defaultValue === 'function') {
+                if (this.defaultValue && typeOf(f.defaultValue) === 'function') {
                   defValue = f.defaultValue();
                 } else {
                   defValue = f.defaultValue == null ? null : f.defaultValue;

package/src/components/DocTemplateFieldSidebar.vue

@@ -133,7 +133,7 @@
 
 <script>
     import FieldRuleFormModal from "./FieldRuleFormModal";
-    import {nanoid} from 'nanoid';
+    import {v4 as uuidv4} from 'uuid';
     import {UtFormConstructor} from "../utils/UtFormConstructor";
 
     export default {
@@ -160,7 +160,7 @@
                     rule: {},
                     mode: 'ins',
                 },
-                rulesHash: nanoid(),
+                rulesHash: uuidv4(),
             }
         },
         computed: {
@@ -252,7 +252,7 @@
                         this.field.rules.push({
                             ...rule
                         });
-                        this.rulesHash = nanoid();
+                        this.rulesHash = uuidv4();
                     }
                 }
                 this.$bvModal.show(this.modalId);
@@ -277,7 +277,7 @@
                 if (index >= 0) {
                     this.field.rules.splice(index, 1);
                 }
-                this.rulesHash = nanoid();
+                this.rulesHash = uuidv4();
             }
         },
     created() {

package/src/components/FieldRuleFormModal.vue

@@ -135,7 +135,7 @@
 
 <script>
 import {UtFormConfig} from "../utils/UtFormConfig";
-import { nanoid } from 'nanoid';
+import {v4 as uuidv4} from 'uuid';
 import {UtFormConstructor} from "../utils/UtFormConstructor";
 import DocForm from "./DocForm";
 
@@ -230,7 +230,7 @@ export default {
     },
     getDefaultRule() {
       return {
-        id: nanoid(),
+        id: uuidv4(),
         name: null,
         event: null,
         script: null,