@processmaker/screen-builder 2.77.15 → 2.77.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/screen-builder",
-  "version": "2.77.15",
+  "version": "2.77.17",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/components/renderer/form-analytics-chart.vue

@@ -5,21 +5,17 @@
         class="card-header d-flex justify-content-between align-items-center"
       >
         <span class="control-text">{{ title }}</span>
+        <b-link @click="openExternalLink">
+          <i class="fas fa-external-link-alt custom-icon" />
+        </b-link>
       </div>
       <div>
         <div class="d-flex flex-wrap p-2">
           <template>
             <b-col cols="12">
-              <b-card
-                :title="graphic.name"
-                img-top
-                tag="article"
-                class="mb-0 mr-0 card-graphic"
-              >
-                <b-card-text>
-                  <b-embed type="iframe" :src="graphic.link"></b-embed>
-                </b-card-text>
-              </b-card>
+              <b-card-text>
+                <b-embed type="iframe" :src="graphic.link"></b-embed>
+              </b-card-text>
             </b-col>
           </template>
         </div>
@@ -37,6 +33,11 @@ export default {
       graphic: []
     };
   },
+  methods: {
+    openExternalLink() {
+      window.open("/package-analytics-reporting", "_blank");
+    }
+  },
   watch: {
     listChartOption() {
       if (this.listChartOption && this.listChartOption.name) {

package/src/mixins/extensions/ValidationRules.js

@@ -17,8 +17,8 @@ export default {
               console.error("Invalid variable name");
             }
           } else {
-            properties[':class'] = `{ 'form-group--error': showValidationErrors && ${this.checkVariableExists('$v.vdata.' + element.config.name)} && $v.vdata.${element.config.name}.$invalid || showValidationErrors && ${this.checkVariableExists('$v.schema.' + element.config.name)} && $v.schema.${element.config.name}.$invalid }`;
-            properties[':error'] = `showValidationErrors && ${this.checkVariableExists('$v.vdata.' + element.config.name)} && validationMessage($v.vdata.${element.config.name}) || showValidationErrors && ${this.checkVariableExists('$v.schema.' + element.config.name)} && validationMessage($v.schema.${element.config.name})`;
+            properties[':class'] = `{ 'form-group--error': (showValidationErrors || ${this.fieldValidationShow(element)}) && ${this.checkVariableExists('$v.vdata.' + element.config.name)} && $v.vdata.${element.config.name}.$invalid || (showValidationErrors || ${this.fieldValidationShow(element)}) && ${this.checkVariableExists('$v.schema.' + element.config.name)} && $v.schema.${element.config.name}.$invalid }`;
+            properties[':error'] = `(showValidationErrors || ${this.fieldValidationShow(element)}) && ${this.checkVariableExists('$v.vdata.' + element.config.name)} && validationMessage($v.vdata.${element.config.name}) || (showValidationErrors || ${this.fieldValidationShow(element)}) && ${this.checkVariableExists('$v.schema.' + element.config.name)} && validationMessage($v.schema.${element.config.name})`;
           }
         }
       },
@@ -53,5 +53,21 @@ export default {
       }, {str: '', variable: ''});
       return check.str;
     },
+    fieldValidationShow (element) {
+      let showError = true;
+      if (element.config && element.config.validation) {
+        const validationHidden = ['Required', 'Required if'];
+        if (Array.isArray(element.config.validation)) {
+          element.config.validation.forEach((validation) => {
+            if (validationHidden.includes(validation.content)) {
+              showError = false;
+            }
+          });
+        } else {
+          showError = validationHidden.includes(element.config.validation);
+        }
+      }
+      return showError;
+    }
   },
 };