quasar-factory-lib 0.0.68 → 0.0.69

package/package.json

@@ -97,6 +97,6 @@
     "release": "standard-version"
   },
   "type": "module",
-  "version": "0.0.68",
+  "version": "0.0.69",
   "author": ""
 }

package/src/components/Table/components/TableSlotBody.vue

@@ -87,13 +87,12 @@
         :customized-icon-name="(tablePropsData.row[col.name] ? col.customizedIconNameCaseTrue : col.customizedIconNameCaseFalse) || ''"
         :customized-icon-color="(tablePropsData.row[col.name] ? col.customizedIconColorCaseTrue : col.customizedIconColorCaseFalse) || ''"
       />
-
       <CustomizedButton
         v-if="col.showCustomizedButton"
         :data-cy="col.colButtonDataCy + '-' + tablePropsData.row.id"
-        :btn-color="col.btnColor || tablePropsData.row.btnColor || 'primary'"
+        :btn-color="col.btnColor || 'primary'"
         :btn-icon="col.btnIcon|| ''"
-        :btn-disable="tablePropsData.row.btnDisable"
+        :btn-disable="getBtnDisabled(tablePropsData, col)"
         @on-click-button="() => {
           $emit('onClickButton', col.btnEmit, tablePropsData.row)
         }"
@@ -176,7 +175,25 @@ export default {
   methods: {
     getColumnValue (col: { showBasicCheckbox: boolean; showCustomizedCheckBox: boolean; showCustomizedIcon: boolean; showColumButton: boolean, showBadge: boolean, showIconWithToolTip: boolean }): boolean {
       return !(col.showBasicCheckbox || col.showCustomizedCheckBox || col.showCustomizedIcon || col.showColumButton || col.showBadge || col.showIconWithToolTip)
+    },
+    getBtnDisabled(tablePropsData, col) {
+      const disableFieldMap = {
+        btnStartDisabled: 'btnStartDisabled',
+        btnPauseDisabled: 'btnPauseDisabled',
+        btnFinishDisabled: 'btnFinishDisabled'
+      }
+      const field = disableFieldMap[col.field]
+      return field ? tablePropsData.row[field] : false
     }
+  // getBtnDisabled(tablePropsData, col) {
+  //   const disableFieldMap = {
+  //     fat: 'btnDisable',
+  //     fat2: 'btnDisable2'
+  //   }
+
+  //   const field = disableFieldMap[col.field]
+  //   return field ? tablePropsData.row[field] : false
+  //   }
   }
 }
 </script>

package/src/components/Table/components/TableSlotGrid.vue

@@ -120,9 +120,9 @@
               <CustomizedButton
                 v-if="col.showCustomizedButton"
                 :data-cy="col.colButtonDataCy + '-' + tablePropsData.row.id"
-                :btn-color="col.btnColor || tablePropsData.row.btnColor || 'primary'"
+                :btn-color="col.btnColor || 'primary'"
                 :btn-icon="col.btnIcon|| ''"
-                :btn-disable="tablePropsData.row.btnDisable"
+                :btn-disable="getBtnDisabled(tablePropsData, col)"
                 @on-click-button="() => {
                   $emit('onClickButton', col.btnEmit, tablePropsData.row)
                 }"
@@ -220,6 +220,15 @@ export default {
   methods: {
     getColumnValue (col: { showBasicCheckbox: boolean; showCustomizedCheckBox: boolean; showCustomizedIcon: boolean; showColumButton: boolean, showBadge: boolean, showIconWithToolTip: boolean, showCustomizedButton: boolean }): boolean {
       return !(col.showBasicCheckbox || col.showCustomizedCheckBox || col.showCustomizedIcon || col.showColumButton || col.showBadge || col.showIconWithToolTip || col.showCustomizedButton)
+    },
+    getBtnDisabled(tablePropsData, col) {
+      const disableFieldMap = {
+        btnStartDisabled: 'btnStartDisabled',
+        btnPauseDisabled: 'btnPauseDisabled',
+        btnFinishDisabled: 'btnFinishDisabled'
+      }
+      const field = disableFieldMap[col.field]
+      return field ? tablePropsData.row[field] : false
     }
   }
 }

package/src/pages/TablePage.vue

@@ -119,8 +119,19 @@ export default {
         btnIcon: 'save',
         btnEmit: 'onClickButton',
         dataCy: 'onClickButton',
-        btnColor: 'black',
-        btnDisable: (row: { btnDisable: string }) => row.btnDisable
+        btnColor: 'primary'
+      },
+      {
+        name: 'fat2',
+        label: 'Fat 2',
+        field: 'fat2',
+        sortable: true,
+        align: 'left',
+        showCustomizedButton: true,
+        btnIcon: 'save',
+        btnEmit: 'onClickButton',
+        dataCy: 'onClickButton',
+        btnColor: 'secondary',
       },
       {
         name: 'carbs',
@@ -360,7 +371,7 @@ export default {
     this.rows = []
       const lista = this.rowsData
       for (let i = 0; i < lista.length; i++) {
-        this.rows.push({
+        const rows = {
           id:  i + '-' + lista[i].dessert,
           date: lista[i].date,
           time: lista[i].time,
@@ -369,20 +380,23 @@ export default {
           available: lista[i].available,
           calories: lista[i].calories,
           fat: lista[i].fat,
+          fat2: lista[i].calories,
           carbs: lista[i].carbs,
           checked: lista[i].checked,
           protein: lista[i].protein,
           sodium: lista[i].sodium,
           calcium: lista[i].calcium,
           iron: lista[i].iron,
-          // btnColor: this.getBadgeColor(lista[i].carbs),
-          btnDisable: this.getBtnDisable(lista[i].carbs),
           badgeColor: this.getBadgeColor(lista[i].carbs),
           badgeText: this.getBadgeText(lista[i].carbs),
           toolTipText: this.getBadgeText(lista[i].carbs),
           iconWithToolTipColor: this.getBadgeColor(lista[i].carbs),
-          iconWithToolTipName: this.getIconWithToolTipName(lista[i].carbs)
-        })
+          iconWithToolTipName: this.getIconWithToolTipName(lista[i].carbs),
+          btnDisable: this.getBtnDisable(lista[i]),
+          btnDisable2: this.getBtnDisable2(lista[i]),
+        }
+
+        this.rows.push(rows)
       }
       setTimeout(() => {
         this.showSkeleton = false
@@ -395,8 +409,11 @@ export default {
     getBadgeText (carbs: number) {
       return carbs > 50 ? 'header.hello': 'global.total' 
     },
-    getBtnDisable (carbs: number) {
-      return carbs > 50
+    getBtnDisable (row) {
+      return row.fat > 10
+    },
+    getBtnDisable2 (row) {
+      return row.calories > 300
     },
     getIconWithToolTipName (carbs: number) {
       return carbs > 50 ? 'warning': 'home'