quasar-factory-lib 0.0.69 → 0.0.71

package/package.json

@@ -97,6 +97,6 @@
     "release": "standard-version"
   },
   "type": "module",
-  "version": "0.0.69",
+  "version": "0.0.71",
   "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,27 +173,29 @@ 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) {
-      const disableFieldMap = {
-        btnStartDisabled: 'btnStartDisabled',
-        btnPauseDisabled: 'btnPauseDisabled',
-        btnFinishDisabled: 'btnFinishDisabled'
+      if (col.field === 'btnStart') {
+        return tablePropsData.row.btnStartDisabled
+      } else if (col.field === 'btnPause') {
+        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'
       }
-      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

@@ -222,13 +222,24 @@ export default {
       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'
+      if (col.field === 'btnStart') {
+        return tablePropsData.row.btnStartDisabled
+      } else if (col.field === 'btnPause') {
+        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'
       }
-      const field = disableFieldMap[col.field]
-      return field ? tablePropsData.row[field] : false
     }
   }
 }

package/src/pages/TablePage.vue

@@ -112,26 +112,26 @@ export default {
       {
         name: 'fat',
         label: 'Fat (g)',
-        field: 'fat',
+        field: 'btnPause',
         sortable: true,
         align: 'left',
         showCustomizedButton: true,
         btnIcon: 'save',
         btnEmit: 'onClickButton',
         dataCy: 'onClickButton',
-        btnColor: 'primary'
+        // btnColor: 'primary'
       },
       {
         name: 'fat2',
         label: 'Fat 2',
-        field: 'fat2',
+        field: 'btnStart',
         sortable: true,
         align: 'left',
         showCustomizedButton: true,
         btnIcon: 'save',
         btnEmit: 'onClickButton',
         dataCy: 'onClickButton',
-        btnColor: 'secondary',
+        // btnColor: 'secondary'
       },
       {
         name: 'carbs',
@@ -392,8 +392,11 @@ export default {
           toolTipText: this.getBadgeText(lista[i].carbs),
           iconWithToolTipColor: this.getBadgeColor(lista[i].carbs),
           iconWithToolTipName: this.getIconWithToolTipName(lista[i].carbs),
-          btnDisable: this.getBtnDisable(lista[i]),
-          btnDisable2: this.getBtnDisable2(lista[i]),
+          btnStartDisabled: this.getBtnDisable2(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
     },