@bildvitta/quasar-ui-asteroid 3.5.0-beta.5 → 3.5.0-beta.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bildvitta/quasar-ui-asteroid",
   "description": "Asteroid",
-  "version": "3.5.0-beta.5",
+  "version": "3.5.0-beta.6",
   "author": "Bild & Vitta <systemteam@bild.com.br>",
   "license": "MIT",
   "main": "dist/asteroid.cjs.min.js",

package/src/components/field/QasField.vue

@@ -149,28 +149,38 @@ export default {
         select: { is: 'qas-select', entity, name, multiple, options, useLazyLoading, ...input }
       }
 
-      return { ...(profiles[type] || profiles.default), ...this.$attrs }
+      return {
+        ...(profiles[type] || profiles.default),
+        ...this.$attrs,
+        label: this.formattedLabel
+      }
     },
 
     errorMessage () {
       return Array.isArray(this.error) ? this.error.join(' ') : this.error
     },
 
+    formattedLabel () {
+      const nonRequiredFieldsLabel = ['boolean', 'checkbox', 'radio']
+
+      const label = this.$attrs.label || this.formattedField.label
+      const { required, type } = this.formattedField
+
+      if (required && label && !nonRequiredFieldsLabel.includes(type)) {
+        return `${label}*`
+      }
+
+      return label
+    },
+
     // This computed will change the key name when the server sends different key.
     formattedField () {
       const field = {}
-      const nonRequiredFieldsLabel = ['boolean', 'checkbox', 'radio']
 
       for (const key in this.field) {
         field[attributesProfile[key] || key] = this.field[key]
       }
 
-      const { label, required, type } = field
-
-      if (required && label && !nonRequiredFieldsLabel.includes(type)) {
-        field.label = `${label}*`
-      }
-
       return field
     },
 

package/src/components/form-view/QasFormView.vue

@@ -10,7 +10,7 @@
       <slot v-if="useActions" name="actions">
         <div class="justify-end q-col-gutter-md q-my-lg row">
           <div v-if="hasCancelButton" class="col-12 col-sm-2" :class="cancelButtonClass">
-            <qas-btn v-close-popup class="full-width" :data-cy="`btnCancel-${entity}`" :disable="isCancelButtonDisabled" :label="cancelButtonLabel" outline type="button" @click="cancel" />
+            <qas-btn v-close-popup class="full-width" :data-cy="`btnCancel-${entity}`" :disable="isSubmitting" :label="cancelButtonLabel" outline type="button" @click="cancel" />
           </div>
 
           <div v-if="useSubmitButton" class="col-12 col-sm-2" :class="submitButtonClass">
@@ -194,10 +194,6 @@ export default {
       return this.$qas.screen.isSmall && 'order-first'
     },
 
-    isCancelButtonDisabled () {
-      return this.disable || this.isSubmitting
-    },
-
     defaultNotifyMessages () {
       return {
         validationError: 'Existem campos no formulário que ainda não foram preenchidos. Complete todas as informações para avançar.',