@mythpe/quasar-ui-qui 0.4.33 → 0.4.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mythpe/quasar-ui-qui",
-  "version": "0.4.33",
+  "version": "0.4.34",
   "description": "MyTh Quasar UI Kit App Extension",
   "author": {
     "name": "MyTh Ahmed Faiz",

package/src/components/datatable/MDatatable.vue

@@ -243,7 +243,7 @@ const {
   setDialogErrors,
   resetDialogs,
   getHeaders,
-  // controlProps,
+  getSortedHeaders,
   controlKey,
   controlJustify,
   visibleHeaders,
@@ -635,7 +635,7 @@ defineExpose({
         v-model:pagination="pagination"
         v-model:selected="selected"
         :class="['m-datatable',{'m-datatable-grid' : isSmall}]"
-        :columns="getHeaders"
+        :columns="getSortedHeaders"
         :filter="search"
         :grid="isGrid"
         :hide-pagination="endReach"
@@ -1188,7 +1188,7 @@ defineExpose({
                           </q-card-section>
                           <q-separator />
                           <q-card-section>
-                            <div class="row justify-between">
+                            <div class="row">
                               <template
                                 v-for="h in getHeaders"
                                 :key="h.name"

package/src/composable/useDtHelpers.ts

@@ -138,6 +138,14 @@ export const useDtHelpers = (options: MaybeRefOrGetter<MDatatableProps>, emit?:
     }
     return h
   })
+  const getSortedHeaders = computed(() => getHeaders.value.slice().sort((a, b) => {
+    if (a.name === controlKey.value || b.name === controlKey.value) {
+      return 0
+    }
+    const f = visibleHeaders.value.indexOf(a.name)
+    const l = visibleHeaders.value.indexOf(b.name)
+    return f - l
+  }))
   const visibleHeaders = ref<string[]>([])
   const onManageColumnsClick = () => {
     visibleHeaders.value = visibleHeaders.value.length === getHeaders.value.length ? [getHeaders.value[0].name] : getHeaders.value.map(e => e.name)
@@ -984,6 +992,7 @@ export const useDtHelpers = (options: MaybeRefOrGetter<MDatatableProps>, emit?:
     setDialogErrors,
     resetDialogs,
     getHeaders,
+    getSortedHeaders,
     controlProps,
     controlKey,
     controlJustify,