rb-document-form-constructor 0.2.0 → 0.2.4

package/dist/scss/components/_doc-template-constructor.scss

@@ -98,10 +98,13 @@
       }
     }
 
-    .rb-form-column:not(.rb-single-column) {
+    .rb-form-column {
       padding: 10px;
-      margin: 0 10px;
       border: 2px dashed $rb-doc-template-constructor-form-column-border-color;
     }
+
+    .rb-form-column:not(.rb-single-column) {
+      margin: 0 10px;
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rb-document-form-constructor",
-  "version": "0.2.0",
+  "version": "0.2.4",
   "description": "",
   "main": "dist/rb-document-form-constructor.ssr.js",
   "browser": "dist/rb-document-form-constructor.esm.js",
@@ -24,6 +24,7 @@
     "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",
     "uuid": "^8.3.2",

package/src/components/DocForm.vue

@@ -47,6 +47,7 @@
                         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);

package/src/components/FieldRuleFormModal.vue

@@ -20,7 +20,7 @@
                                     <b-form-select @input="onRuleSelected($event)">
                                         <b-form-select-option v-for="r in rulePresets" :key="r.name"
                                                               :value="r.name">
-                                            {{r.name}}
+                                            {{r.labelRu}} ({{r.name}})
                                         </b-form-select-option>
                                     </b-form-select>
                                 </b-form-group>
@@ -80,14 +80,14 @@
                                                         size="sm" class="mx-1">
                                                 <b-dropdown-item v-for="f in fields" :key="f.name"
                                                                  v-if="fields" @click="addSetVariableToScript(f)">
-                                                    {{f.name}}
+                                                    {{f.labelRu}} ({{f.name}})
                                                 </b-dropdown-item>
                                             </b-dropdown>
                                             <b-dropdown text="Вызвать функцию инпута" variant="outline-secondary"
                                                         size="sm" class="mx-1">
                                                 <b-dropdown-item v-for="f in fields" :key="f.name"
                                                                  v-if="fields" @click="addCallInputFunction(f)">
-                                                    {{f.name}}
+                                                    {{f.labelRu}} ({{f.name}})
                                                 </b-dropdown-item>
                                             </b-dropdown>
                                         </b-button-toolbar>
@@ -95,6 +95,7 @@
                                                          :state="state.script"
                                                          :invalid-feedback="state.script_feedback"
                                                          rows="8"
+                                                         ref="scriptInput"
                                         ></b-form-textarea>
                                     </div>
                                 </b-form-group>
@@ -219,18 +220,23 @@
                 this.innerRule = null;
             },
             addVariableToScript(varName) {
-                let r = this.innerRule;
-                r.script = r.script ? r.script + varName : varName;
+                let caretPosition = this.$refs.scriptInput.selectionStart;
+                this.insertTextToScript(varName, caretPosition);
             },
             addSetVariableToScript(field) {
-                let r = this.innerRule;
-                let setVariableScript = `doc['${field.name}'] = Значение;`;
-                r.script = r.script? r.script + setVariableScript: setVariableScript;
+                let caretPosition = this.$refs.scriptInput.selectionStart;
+                this.insertTextToScript(`doc['${field.name}'] = Значение;`, caretPosition);
             },
             addCallInputFunction(field) {
-                let r = this.innerRule;
-                let setVariableScript = `form.$refs['${field.name}'][0].Название функции();`;
-                r.script = r.script? r.script + setVariableScript: setVariableScript;
+                let caretPosition = this.$refs.scriptInput.selectionStart;
+                this.insertTextToScript(`form.$refs['${field.name}'][0].Название функции();`, caretPosition);
+            },
+            insertTextToScript(text, position) {
+                position = position != null? position: this.script.length;
+                this.innerRule.script = this.innerRule.script != null? this.innerRule.script: '';
+                let scriptSplit = this.innerRule.script.split('');
+                scriptSplit.splice(position, 0, text);
+                this.innerRule.script = scriptSplit.join('');
             },
             onRuleSelected(ruleName) {
                 let rule = this.rulePresets.find(rule => rule.name === ruleName);