@processmaker/screen-builder 2.60.1 → 2.60.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/screen-builder",
-  "version": "2.60.1",
+  "version": "2.60.2",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -39,7 +39,7 @@
     "@cypress/code-coverage": "^3.8.1",
     "@fortawesome/fontawesome-free": "^5.6.1",
     "@panter/vue-i18next": "^0.15.2",
-    "@processmaker/vue-form-elements": "0.41.2",
+    "@processmaker/vue-form-elements": "0.41.4",
     "@processmaker/vue-multiselect": "^2.2.0",
     "@vue/cli-plugin-babel": "^3.6.0",
     "@vue/cli-plugin-e2e-cypress": "^4.0.3",
@@ -88,7 +88,7 @@
   },
   "peerDependencies": {
     "@panter/vue-i18next": "^0.15.0",
-    "@processmaker/vue-form-elements": "0.41.2",
+    "@processmaker/vue-form-elements": "0.41.4",
     "i18next": "^15.0.8",
     "vue": "^2.6.12",
     "vuex": "^3.1.1"

package/src/mixins/DataReference.js

@@ -0,0 +1,85 @@
+/**
+ * Gets the screen parent or null if don't have
+ * @returns {object|null}
+ */
+function findScreenOwner(control) {
+  let owner = control;
+  let level = 1;
+  while (owner) {
+    const isScreen = owner.$options.name === "ScreenContent";
+    const isNested = owner.$options.name === "FormNestedScreen";
+    if (isScreen) {
+      level--;
+    }
+    if (isNested) {
+      level++;
+    }
+    if (level === -1) {
+      return owner;
+    }
+    owner = owner.$parent;
+  }
+  return null;
+}
+/**
+ * Wrap the data of a control using a Proxy
+ * @return {object} proxy
+ */
+function wrapScreenData(screen, customProperties = null, setter = null) {
+  const handler = {
+    get: (target, name) => {
+      if (customProperties && customProperties[name]) {
+        return customProperties[name];
+      }
+      if (name === "_parent") {
+        if (screen.vdata._parent !== undefined) {
+          return screen.vdata._parent;
+        }
+        const screenOwner = findScreenOwner(screen);
+        // Get _parent for the current screen (e.g. Inside Loops, Inside Tabs?, RecordLists...?)
+        if (screenOwner && screenOwner !== screen) {
+          return wrapScreenData(screenOwner);
+        }
+        return undefined;
+      }
+      // Check if vdata exists
+      if (screen.vdata !== undefined && screen.vdata !== null) {
+        return screen.vdata[name];
+      }
+      return undefined;
+    },
+    has(target, name) {
+      // customProperties is used by RichText controls
+      // to add custom Mustache functions
+      if (customProperties && customProperties[name]) {
+        return true;
+      }
+      if (name === "_parent") {
+        return true;
+      }
+      // Check if vdata exists
+      if (screen.vdata !== undefined && screen.vdata !== null) {
+        return screen.vdata[name] !== undefined;
+      }
+      return false;
+    },
+    set(target, name, value) {
+      if (setter) {
+        setter(screen, name, value);
+      }
+    }
+  };
+  return new Proxy({}, handler);
+}
+
+export default {
+  methods: {
+    /**
+     * Wrap the data of a control using a Proxy
+     * @return {object} proxy
+     */
+    getDataReference(customProperties = null, setter = null) {
+      return wrapScreenData(this, customProperties, setter);
+    }
+  }
+};

package/src/mixins/ScreenBase.js

@@ -2,12 +2,14 @@ import { get, isEqual, set } from 'lodash';
 import Mustache from 'mustache';
 import { mapActions, mapState } from 'vuex';
 import { ValidationMsg } from './ValidationRules';
+import DataReference from "./DataReference";
 
 const stringFormats = ['string', 'datetime', 'date', 'password'];
 const parentReference = [];
 
 export default {
   name: "ScreenContent",
+  mixins: [DataReference],
   schema: [
     function() {
       if (window.ProcessMaker && window.ProcessMaker.packages && window.ProcessMaker.packages.includes('package-vocabularies')) {

package/src/mixins/computedFields.js

@@ -1,79 +1,8 @@
 import { Parser } from "expr-eval";
 
-/**
- * Gets the screen parent or null if don't have
- * @returns {object|null}
- */
-function findScreenOwner(control) {
-  let owner = control.$parent;
-  while (owner) {
-    const isScreen = owner.$options.name === "ScreenContent";
-    const nestedScreen =
-      owner.$parent && owner.$parent.$parent && owner.$parent.$parent.$parent;
-    const isNestedScreen =
-      nestedScreen &&
-      nestedScreen.$options._componentTag === "form-nested-screen";
-    if (isScreen && !isNestedScreen) {
-      return owner;
-    }
-    if (isNestedScreen) {
-      owner = nestedScreen;
-    } else {
-      owner = owner.$parent;
-    }
-  }
-  return null;
-}
-/**
- * Wrap the data of a control using a Proxy
- * @return {object} proxy
- */
-function wrapScreenData(screen, customFunctions = null) {
-  const handler = {
-    get: (target, name) => {
-      if (customFunctions && customFunctions[name]) {
-        return customFunctions[name];
-      }
-      if (name === "_parent") {
-        const screenOwner = findScreenOwner(screen);
-        // Get _parent for the current screen (e.g. Inside Loops, Inside Tabs?, RecordLists...?)
-        if (screenOwner) {
-          return wrapScreenData(screenOwner);
-        }
-        if (screen.vdata) {
-          return screen.vdata._parent;
-        }
-        return undefined;
-      }
-      // Check if vdata exists
-      if (screen.vdata !== undefined && screen.vdata !== null) {
-        return screen.vdata[name];
-      }
-      return undefined;
-    },
-    has(target, name) {
-      // customFunctions is used by RichText controls
-      // to add custom Mustache functions
-      if (screen.customFunctions && screen.customFunctions[name]) {
-        return true;
-      }
-      if (name === "_parent") {
-        return true;
-      }
-      // Check if vdata exists
-      if (screen.vdata !== undefined && screen.vdata !== null) {
-        return screen.vdata[name] !== undefined;
-      }
-      return false;
-    }
-  };
-  return new Proxy({}, handler);
-}
-
 export default {
   methods: {
     evaluateExpression(expression, type) {
-      const self = this;
       let value = null;
 
       try {
@@ -81,30 +10,11 @@ export default {
         // vdata (external variables)in this way the event is not
         // executed again when the variable is update
 
-        const data = new Proxy(
-          {},
-          {
-            get(data, name) {
-              if (name === "_parent") {
-                // Recursive access to _parent
-                const screen = findScreenOwner(self);
-                const parentScreen = screen && findScreenOwner(screen);
-                if (parentScreen) {
-                  return wrapScreenData(parentScreen);
-                }
-              }
-              if (self.vdata[name] !== undefined) {
-                return self.vdata[name];
-              }
-              return self[name];
-            },
-            set() {
-              throw new Error(
-                "You are not allowed to set properties from inside an expression"
-              );
-            }
-          }
-        );
+        const data = this.getDataReference(null, () => {
+          throw new Error(
+            "You are not allowed to set properties from inside an expression"
+          );
+        });
 
         if (type === "expression") {
           value = Parser.evaluate(expression, data);

package/src/mixins/extensions/DefaultValues.js

@@ -12,7 +12,7 @@ export default {
           if (config.defaultValue.mode === 'basic') {
             this.setupDefaultValue(screen, name, `this.mustache(${JSON.stringify(config.defaultValue.value)})`);
           } else if (config.defaultValue.mode === 'js') {
-            this.setupDefaultValue(screen, name, `(function() {${config.defaultValue.value}}).bind(this.vdata)()`);
+            this.setupDefaultValue(screen, name, `(function() {${config.defaultValue.value}}).bind(this.getDataReference())()`);
           }
         }
         if ('initiallyChecked' in config) {