quasar-factory-lib 0.0.70 → 0.0.72

package/package.json

@@ -97,6 +97,6 @@
     "release": "standard-version"
   },
   "type": "module",
-  "version": "0.0.70",
+  "version": "0.0.72",
   "author": ""
 }

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

@@ -90,7 +90,7 @@
       <CustomizedButton
         v-if="col.showCustomizedButton"
         :data-cy="col.colButtonDataCy + '-' + tablePropsData.row.id"
-        :btn-color="col.btnColor || 'primary'"
+        :btn-color="getButtonColor(tablePropsData, col)"
         :btn-icon="col.btnIcon|| ''"
         :btn-disable="getBtnDisabled(tablePropsData, col)"
         @on-click-button="() => {
@@ -173,8 +173,8 @@ 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)
+    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) {
       if (col.field === 'btnStart') {
@@ -183,6 +183,17 @@ export default {
         return tablePropsData.row.btnPauseDisabled
       } else {
         return false
+      } 
+    },
+    getButtonColor (tablePropsData, col, ):string {
+      if (col.btnColor) {
+        return col.btnColor
+      } else if (col.field === 'btnStart') {
+        return tablePropsData.row.btnColorCaseStart
+      } else if (col.field === 'btnPause') {
+        return tablePropsData.row.btnColorCasePause
+      } else {
+        return 'primary'
       }
     }
   }

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

@@ -120,7 +120,7 @@
               <CustomizedButton
                 v-if="col.showCustomizedButton"
                 :data-cy="col.colButtonDataCy + '-' + tablePropsData.row.id"
-                :btn-color="col.btnColor || 'primary'"
+                :btn-color="getButtonColor(tablePropsData, col)"
                 :btn-icon="col.btnIcon|| ''"
                 :btn-disable="getBtnDisabled(tablePropsData, col)"
                 @on-click-button="() => {
@@ -229,6 +229,17 @@ export default {
       } else {
         return false
       }
+    },
+    getButtonColor (tablePropsData, col, ):string {
+      if (col.btnColor) {
+        return col.btnColor
+      } else if (col.field === 'btnStart') {
+        return tablePropsData.row.btnColorCaseStart
+      } else if (col.field === 'btnPause') {
+        return tablePropsData.row.btnColorCasePause
+      } else {
+        return 'primary'
+      }
     }
   }
 }

package/src/pages/TablePage.vue

@@ -13,7 +13,7 @@
           :rows="rows"
           :columns="columns"
           :visible-columns="store.visiblecolumns"
-          :small-device="false"
+          :small-device="true"
           :store="store"
           :table-style="tableStyle"
           :show-skeleton="showSkeleton"
@@ -119,7 +119,7 @@ export default {
         btnIcon: 'save',
         btnEmit: 'onClickButton',
         dataCy: 'onClickButton',
-        btnColor: 'primary'
+        // btnColor: 'primary'
       },
       {
         name: 'fat2',
@@ -131,7 +131,7 @@ export default {
         btnIcon: 'save',
         btnEmit: 'onClickButton',
         dataCy: 'onClickButton',
-        btnColor: 'secondary',
+        // btnColor: 'secondary'
       },
       {
         name: 'carbs',
@@ -393,7 +393,10 @@ export default {
           iconWithToolTipColor: this.getBadgeColor(lista[i].carbs),
           iconWithToolTipName: this.getIconWithToolTipName(lista[i].carbs),
           btnStartDisabled: this.getBtnDisable2(lista[i]),
-          btnPauseDisabled: this.getBtnDisable(lista[i])
+          btnPauseDisabled: this.getBtnDisable(lista[i]),
+          btnColorCaseStart: this.getBtnColorCaseStart(lista[i]),
+          btnColorCasePause: this.getBtnColorCasePause(lista[i]),
+
         }
 
         this.rows.push(rows)
@@ -409,6 +412,12 @@ export default {
     getBadgeText (carbs: number) {
       return carbs > 50 ? 'header.hello': 'global.total' 
     },
+    getBtnColorCaseStart (row) {
+      return row.fat > 10 ? 'amber': 'black' 
+    },
+    getBtnColorCasePause (row) {
+      return row.fat >= 20 ? 'green': 'purple' 
+    },
     getBtnDisable (row) {
       return row.fat > 10
     },