@mythpe/quasar-ui-qui 0.1.58 → 0.1.59

package/package.json

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

package/src/components/datatable/MDatatable.vue

@@ -13,7 +13,7 @@
 import type { MDatatableProps } from '../../types'
 import type { InvalidSubmissionHandler, SubmissionHandler } from 'vee-validate'
 import { useForm } from 'vee-validate'
-import { computed, onMounted, ref, toValue, watch } from 'vue'
+import { onMounted, ref, toValue, watch } from 'vue'
 import { is as quasarHelpers, QCardSection, QTable, useQuasar } from 'quasar'
 import lodash from 'lodash'
 import { useDtHelpers, useMyth } from '../../composable'
@@ -237,6 +237,7 @@ const {
   deleteSelectionItem,
   logoutDatatable,
   contextmenuItems,
+  activeContextItems,
   datatableItemsScope,
   onCloneItem,
   imageDialog,
@@ -380,9 +381,6 @@ watch(formDialogModel, (v) => {
     dialogErrors.value = {}
   }
 })
-const activeContextItems = computed(() => {
-  return contextmenuItems.value.filter((e, i) => typeof e.showIf === 'function' ? e.showIf(e, i) : e.showIf !== !1) as Required<MDatatableProps['contextItems']> || []
-})
 const table = ref<InstanceType<typeof QTable>>()
 defineOptions({
   name: 'MDatatable',
@@ -670,8 +668,8 @@ defineExpose({
                       </div>
                       <div class="col">
                         <div
-                          class="text-h5 bordered-bottom ellipsis"
                           v-if="!!getTableTitle"
+                          class="text-h5 bordered-bottom ellipsis"
                         >
                           {{ getTableTitle }}
                         </div>

package/src/composable/useDtHelpers.ts

@@ -7,7 +7,8 @@ import type {
   MDatatableMetaServer,
   MDatatableOptions,
   MDatatablePagination,
-  MDatatableProps, MDatatableScope,
+  MDatatableProps,
+  MDatatableScope,
   MDtExportOptions,
   MDtHeadersParameter,
   MDtItem,
@@ -102,8 +103,13 @@ export const useDtHelpers = (options: MaybeRefOrGetter<MDatatableProps>) => {
     dialogErrors.value = {}
   }
 
-  const getHeaders = computed<any[]>(() => parseHeaders(props.headers as MDtHeadersParameter,
-    { noSort: props.imageColumns }) || [])
+  const getHeaders = computed<any[]>(() => {
+    const h = parseHeaders(props.headers as MDtHeadersParameter, { noSort: props.imageColumns }) || []
+    if (!activeContextItems.value.length) {
+      return h.filter(e => e.name !== props.controlKey)
+    }
+    return h
+  })
   const visibleHeaders = ref<string[]>([])
 
   const contextmenu = ref(!1)
@@ -253,10 +259,7 @@ export const useDtHelpers = (options: MaybeRefOrGetter<MDatatableProps>) => {
     }
     return v.join(',') ?? null
   }
-  const getDatatableParams = ({
-    pagination,
-    filter
-  }: FetchRowsArgs = {}, merge: Partial<ApiServiceParams> = {}): ApiServiceParams => {
+  const getDatatableParams = ({ pagination, filter }: FetchRowsArgs = {}, merge: Partial<ApiServiceParams> = {}): ApiServiceParams => {
     const headerItems = getHeaders.value.map((e: any) => e.name).join(',')
     // console.log(headerItems)
     let params: ApiServiceParams = {
@@ -745,6 +748,7 @@ export const useDtHelpers = (options: MaybeRefOrGetter<MDatatableProps>) => {
     },
     ...(props.contextItems || [])
   ].sort((a, b) => (a.order ?? 0) - (b.order ?? 0))))
+  const activeContextItems = computed(() => contextmenuItems.value.filter((e, i) => typeof e.showIf === 'function' ? e.showIf(e, i) : e.showIf !== !1) as Required<MDatatableProps['contextItems']> || [])
   const onCloneItem = (item: MDtItem) => {
     item = toValue(item)
     confirmMessage()
@@ -824,6 +828,9 @@ export const useDtHelpers = (options: MaybeRefOrGetter<MDatatableProps>) => {
     if (props.hideSelection) {
       return !1
     }
+    if (!activeContextItems.value.length && !props.pdf && !props.excel) {
+      return !1
+    }
     return props.showSelection
   })
   const defaultTopBtnProps: any = {
@@ -937,6 +944,7 @@ export const useDtHelpers = (options: MaybeRefOrGetter<MDatatableProps>) => {
     deleteSelectionItem,
     logoutDatatable,
     contextmenuItems,
+    activeContextItems,
     datatableItemsScope,
     onCloneItem,
     openImageDialog,