@mythpe/quasar-ui-qui 0.3.70 → 0.3.71

package/package.json

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

package/src/components/datatable/MDatatable.vue

@@ -13,7 +13,7 @@
 import type { ApiInterface, GenericMDtBtn, MDatatableProps } from '../../types'
 import type { InvalidSubmissionHandler, SubmissionHandler } from 'vee-validate'
 import { useForm } from 'vee-validate'
-import { computed, onMounted, ref, toValue, watch } from 'vue'
+import { computed, onMounted, ref, toValue, useAttrs, watch } from 'vue'
 import { is as quasarHelpers, QCardSection, QTable, useQuasar } from 'quasar'
 import { useDtHelpers, useMyth } from '../../composable'
 import { useI18n } from 'vue-i18n'
@@ -466,6 +466,21 @@ watch(formDialogModel, (v) => {
   }
 })
 const table = ref<InstanceType<typeof QTable>>()
+const mainAttrs = computed(() => ({
+  title: getTableTitle.value,
+  bordered: props.bordered === undefined ? pluginOptions.value.datatable?.bordered : props.bordered,
+  dense: props.dense === undefined ? (theme.value?.inputs?.dense !== undefined ? theme.value.inputs.dense : pluginOptions.value.datatable?.dense) : props.dense,
+  flat: props.flat === undefined ? pluginOptions.value.datatable?.flat : props.flat,
+  wrapCells: wrapCellsRef.value
+}))
+const attrs = useAttrs()
+console.log(attrs)
+const bindAttr = computed(() => ({
+  virtualScroll: !0,
+  ...pluginOptions.value.datatable as any,
+  ...attrs as any,
+  ...mainAttrs.value as any
+}))
 defineOptions({
   name: 'MDatatable',
   inheritAttrs: !1
@@ -579,16 +594,7 @@ defineExpose({
         card-container-class="m-datatable-container"
         color="primary"
         table-class="m-datatable-container"
-        v-bind="{
-          virtualScroll: !0,
-          ...pluginOptions.datatable as any,
-          ...$attrs as any,
-          title: getTableTitle,
-          bordered: bordered === undefined ? pluginOptions.datatable?.bordered : bordered,
-          dense: dense === undefined ? ( theme.inputs.dense !== undefined ? theme.inputs.dense : pluginOptions.datatable?.dense) : dense,
-          flat: flat === undefined ? pluginOptions.datatable?.flat : flat,
-          wrapCells: wrapCellsRef,
-        } as any"
+        v-bind="bindAttr"
         @request="fetchDatatableItems"
         @update:selected="onUpdateSelectedItems"
         @virtual-scroll="endReach ? onScroll : undefined"

package/src/components/sar/MSarIcon.vue

@@ -13,7 +13,9 @@ import { computed } from 'vue'
 type Props = QIconProps
 const noDefault = defineModel<boolean>('noDefault', { required: !1, default: !1 })
 const props = defineProps<Props>()
-const getSize = computed<Props['size']>(() => noDefault.value ? props.size : props.size || '100%')
+const getSize = computed<any>(() => ({
+  size: noDefault.value ? props.size : (props.size || '100%')
+}))
 defineOptions({
   name: 'MSarString',
   inheritAttrs: !1
@@ -21,7 +23,7 @@ defineOptions({
 </script>
 
 <template>
-  <q-icon v-bind="{...$props,...$attrs,size: getSize} as any">
+  <q-icon v-bind="{...$props,...$attrs, ...getSize} as any">
     <slot name="default">
       <svg
         viewBox="0 0 1124.14 1256.39"