@processmaker/screen-builder 2.5.26 → 2.5.27-alpha.1

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/screen-builder",
-  "version": "2.5.26",
+  "version": "2.5.27-alpha.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/screen-builder",
-  "version": "2.5.26",
+  "version": "2.5.27-alpha.1",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -83,7 +83,7 @@
   },
   "peerDependencies": {
     "@panter/vue-i18next": "^0.15.0",
-    "@processmaker/vue-form-elements": "0.18.4-N",
+    "@processmaker/vue-form-elements": "0.18.4-O-alpha.1",
     "i18next": "^15.0.8",
     "vue": "^2.6.12",
     "vuex": "^3.1.1"

package/src/mixins/Json2Vue.js

@@ -284,7 +284,7 @@ export default {
         Object.keys(component.watch).forEach((key) => {
           const watch = { deep: true };
           component.watch[key].forEach(w => Object.assign(watch, w.options));
-          watch.handler = new Function('value', component.watch[key].map(w => w.code).join('\n'));
+          watch.handler = new Function('value', component.watch[key].map(w => `try{${w.code}}catch(e){console.warn(e)}`).join('\n'));
           component.watch[key] = watch;
         });
         // Add validation rules

package/src/mixins/extensions/LoadFieldComponents.js

@@ -26,7 +26,7 @@ export default {
         }
       });
     },
-    loadFieldProperties({ properties, element, componentName, definition , formIndex}) {
+    loadFieldProperties({ properties, element, componentName, definition , formIndex, screen}) {
       properties.class = this.elementCssClass(element);
       properties[':validation-data'] = 'getValidationData()';
 
@@ -38,7 +38,19 @@ export default {
           properties[':image'] = this.byRef(element.config.image);
         } else if (this.validVariableName(element.config.name)) {
           this.registerVariable(element.config.name, element);
-          properties['v-model'] = `${element.config.name}`;
+          // v-model are not assigned directly to the field name, to prevent invalid references like:
+          // `person.content` when `person`=null
+          const computed_property = `computedProxy__${element.config.name.split('.').join('_DOT_')}`;
+          properties['v-model'] = computed_property;
+          screen.computed[computed_property] = {
+            get() {
+              return this.getValue(element.config.name);
+            },
+            set(value) {
+              this.setValue(element.config.name, value);
+              return true;
+            },
+          };
         }
       }
       // Do not replace mustache in RichText control, it is replaced by the control