@processmaker/screen-builder 2.5.24 → 2.5.27

package/src/mixins/ScreenBase.js

@@ -44,10 +44,14 @@ export default {
       };
     },
     findParent(child, data = this.vdata, parent = this._parent) {
+
       if (child === data) {
         return parent;
       }
       for (const key in data) {
+        if (key === '_parent') {
+          continue;
+        }
         if (data[key] instanceof Array) {
           for (const item of data[key]) {
             const result = this.findParent(child, item, data);
@@ -104,7 +108,7 @@ export default {
         },
       });
     },
-    initialValue(component, dataFormat) {
+    initialValue(component, dataFormat, config) {
       let value = null;
       if (component === 'FormInput') {
         if (stringFormats.includes(dataFormat)) {
@@ -114,6 +118,10 @@ export default {
         }
       } else if (component === 'FormTextArea') {
         value = '';
+      } else if (component === 'FormSelectList' && config.options.allowMultiSelect) {
+        value = [];
+      } else if (component === 'FormSelectList' && !config.options.allowMultiSelect) {
+        value = null;
       }
       return value;
     },

package/src/mixins/VisibilityRule.js

@@ -3,7 +3,7 @@ import { debounce } from 'lodash';
 
 export default {
   mounted() {
-    this.refreshValidationRulesByName = debounce(this.refreshValidationRulesByName, 300);
+    this.refreshValidationRulesByName = debounce(this.refreshValidationRulesByName, 1000);
 
     this.$root.$on('refresh-validation-rules', () => {
       this.loadValidationRules();
@@ -28,7 +28,9 @@ export default {
         const data = Object.assign({ _parent: this._parent }, this.vdata);
         const isVisible = !!Parser.evaluate(rule, Object.assign({}, data));
 
-        this.refreshValidationRulesByName(fieldName, isVisible);
+        window.setTimeout(() => {
+          this.refreshValidationRulesByName(fieldName, isVisible);
+        }, 1000);
         return isVisible;
       } catch (e) {
         return false;

package/src/mixins/extensions/DataManager.js

@@ -10,7 +10,7 @@ export default {
           this.addData(screen, v.name, `
             this.getValue(${JSON.stringify(v.name)}, this.vdata) || 
             this.getValue(${JSON.stringify(v.name)}, data) || 
-            this.initialValue('${component}', '${dataFormat}')
+            this.initialValue('${component}', '${dataFormat}', ${JSON.stringify(v.config)})
           `);
           this.addWatch(screen, v.name, `this.setValue(${JSON.stringify(v.name)}, value, this.vdata);`);
           this.addWatch(screen, `vdata.${v.name}`, `this.${v.name} = this.vdata.${v.name};`);

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