@processmaker/screen-builder 2.28.1 → 2.29.0

package/package.json

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

package/src/components/inspector/form-multiselect.vue

@@ -45,7 +45,7 @@ export default {
   computed: {
     classList() {
       return {
-        'is-invalid': (this.validator && this.validator.errorCount) || this.error,
+        'has-errors': (this.validator && this.validator.errorCount) || this.error,
       };
     },
   },
@@ -59,7 +59,7 @@ export default {
 </script>
 
 <style lang="scss">
-  .is-invalid .multiselect__tags {
-    border-color: red !important;
+  .has-errors .multiselect__tags {
+    border-color: red;
   }
-</style>
+</style>

package/src/components/renderer/form-input-masked.vue

@@ -1,5 +1,5 @@
 <template>
-  <input type="text" class="form-control" v-model="currencyValue" ref="currencyInput" >
+  <input type="text" class="form-control" @keyup="keyup" v-model="currencyValue" ref="currencyInput" >
 </template>
 
 <script>
@@ -66,6 +66,13 @@ export default {
         this.currencyInput.inputmask.setValue(this.value);
       }
     },
+    keyup(event) {
+      // Workaround for a bug in inputmask where backspacing after
+      // the decimal does not trigger an input event
+      if (this.currencyValue !== event.target.value) {
+        this.currencyValue = event.target.value;
+      }
+    },
   },
   mounted() {
     this.loadMasks();

package/src/components/task.vue

@@ -327,17 +327,25 @@ export default {
               this.redirecting = task.process_request_id;
               this.$emit('redirect', task.id, true);
               return;
-            } else if (this.task && requestId == this.task.process_request_id && this.parentRequest && this.task.process_request.status === 'COMPLETED') {
-              // Only emit completed after getting the subprocess tasks and there are no tasks and process is completed
-              this.$emit('completed', this.parentRequest);
+            } else {
+              this.emitIfTaskCompleted(requestId);
             }
             this.taskId = task.id;
             this.nodeId = task.element_id;
-          } else if (this.parentRequest) {
+          } else if (this.parentRequest && ['COMPLETED', 'CLOSED'].includes(this.task.process_request.status)) {
             this.$emit('completed', this.parentRequest);
           }
         });
     },
+    emitIfTaskCompleted(requestId) {
+      // Only emit completed after getting the subprocess tasks and there are no tasks and process is completed
+      if (this.task
+          && this.parentRequest
+          && requestId == this.task.process_request_id
+          && this.task.process_request.status === 'COMPLETED') {
+        this.$emit('completed',  this.parentRequest);
+      }
+    },
     classHeaderCard(status) {
       let header = 'bg-success';
       switch (status) {

package/src/mixins/ScreenBase.js

@@ -103,15 +103,7 @@ export default {
     },
     mustache(text) {
       try {
-        const data = new Proxy(this, {
-          get(target, name) {
-            if (name === '_parent') {
-              return target._parent;
-            } else {
-              return target.vdata[name];
-            }
-          },
-        });
+        const data = Object.assign({_parent: this._parent}, this.vdata);
         return text && Mustache.render(text, data);
       } catch (e) {
         return 'MUSTACHE: ' + e.message;
@@ -187,7 +179,7 @@ export default {
           this.$set(
             object,
             attr,
-            setValue
+            setValue,
           );
 
           object = get(object, attr);