quasar-factory-lib 0.0.62 → 0.0.63

package/package.json

@@ -97,6 +97,6 @@
     "release": "standard-version"
   },
   "type": "module",
-  "version": "0.0.62",
+  "version": "0.0.63",
   "author": ""
 }

package/src/components/Table/Table.vue

@@ -331,19 +331,27 @@ export default defineComponent({
             return (hours * 3600) + (minutes * 60) + seconds;
           };
 
+          const parsePercentage = (percentageString: string): number => {
+            return parseFloat(percentageString.replace('%', '')) / 100;
+          };
+
           if (typeof xValue === 'string' && typeof yValue === 'string') {
             const xDate = parseDate(xValue);
             const yDate = parseDate(yValue);
-            
+
             if (!isNaN(xDate.getTime()) && !isNaN(yDate.getTime())) {
               return xDate.getTime() - yDate.getTime();
             }
 
             const xTime = parseTime(xValue);
             const yTime = parseTime(yValue);
-            
+
             if (!isNaN(xTime) && !isNaN(yTime)) {
               return xTime - yTime;
+            } else if (xValue.includes('%') && yValue.includes('%')) {
+              const xPercent = parsePercentage(xValue);
+              const yPercent = parsePercentage(yValue);
+              return xPercent - yPercent;
             } else {
               return xValue.localeCompare(yValue);
             }
@@ -352,6 +360,7 @@ export default defineComponent({
             return xValue - yValue;
           } 
           else if (typeof xValue === 'boolean' && typeof yValue === 'boolean') {
+            console.log(xValue, yValue)
             return xValue === yValue ? 0 : xValue ? 1 : -1;
           } 
           else {

package/src/components/Table/components/BasicCheckBox.vue

@@ -30,6 +30,11 @@ export default {
       tablePropsData: this.tableProps,
       modelData: this.model
     }
+  },
+  watch: {
+    model (val) {
+      this.modelData = val
+    }
   }
 }
 </script>

package/src/components/Table/components/CustomizedCheckBox.vue

@@ -51,6 +51,11 @@ export default {
       tablePropsData: this.tableProps,
       modelData: this.model
     }
+  },
+  watch: {
+    model (val) {
+      this.modelData = val
+    }
   }
 }
 </script>

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

@@ -16,7 +16,7 @@
           : tablePropsData.row.rowBgColor || 'bg-main-color'
       "
     >
-      <q-card-section>
+      <q-card-section class="q-py-sm">
         <q-checkbox
           :data-cy="'checkbox-' + tablePropsData.row.id"
           size="sm"

package/src/css/app.css

@@ -56,12 +56,9 @@
 .text-color-negative-bold {
   color: var(--negative);
   font-weight: bold;
-  font-size: 30px;
+  font-size: 18px;
 }
 
 .border-bottom-darkGrey{
   border-bottom: 0.7px solid var(--dark-gray);
 }
-
-/* const labelTextColor = 'color: #597765 !important;'
-const labelTextColorBold = 'color: #597765 !important; font-weight: bold;' */

package/src/layouts/MenuLayout.vue

@@ -2,6 +2,7 @@
   <div class="column full-height justify-center">
     <q-btn
       label="Table"
+      data-cy="table"
       @click="() => {
         router.push('tablePage')
       }"

package/src/layouts/PdaLayout.vue

@@ -55,7 +55,7 @@
             position="bottom"
             expand
           >
-            <q-btn class="full-width" color="accent" icon="arrow_forward" />
+            <q-btn class="full-width" color="black" icon="arrow_forward" />
           </q-page-sticky>
         </q-page>
       </q-page-container>