@mythpe/quasar-ui-qui 0.2.34 → 0.2.36

package/package.json

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

package/src/components/datatable/MDatatable.vue

@@ -911,19 +911,17 @@ defineExpose({
                             <MRow class="justify-between">
                               <MBtn
                                 v-close-popup
-                                :label="__('myth.datatable.filter.cancel')"
-                                color="negative"
-                                flat
+                                :label="__('myth.datatable.filter.save')"
                                 v-bind="pluginOptions.dt?.dialogButtonsProps as any"
-                                @click="closeFilterDialog"
+                                @click="saveFilterDialog"
                               />
                               <MBtn
                                 v-close-popup
-                                :label="__('myth.datatable.filter.save')"
-                                color="positive"
-                                flat
+                                :label="__('myth.datatable.filter.cancel')"
+                                color="secondary"
+                                text-color="white"
                                 v-bind="pluginOptions.dt?.dialogButtonsProps as any"
-                                @click="saveFilterDialog"
+                                @click="closeFilterDialog"
                               />
                             </MRow>
                           </MCol>
@@ -1323,7 +1321,6 @@ defineExpose({
           class="print-hide"
         >
           <MBtn
-            color="secondary"
             label="myth.titles.close"
             v-bind="pluginOptions.dt?.dialogButtonsProps"
             @click="closeShowDialog"
@@ -1364,17 +1361,16 @@ defineExpose({
                       <q-skeleton width="200px" />
                     </template>
                     <template v-else>
-                      <q-btn
-                        color="negative"
-                        fab-mini
+                      <MBtn
                         flat
                         icon="close"
+                        text-color="none"
                         @click="closeFormDialog"
                       >
                         <q-tooltip class="m--dt-btn-tooltip">
                           {{ __('myth.titles.close') }}
                         </q-tooltip>
-                      </q-btn>
+                      </MBtn>
                       {{ getFormTitle }}
                     </template>
                   </q-toolbar-title>
@@ -1441,8 +1437,6 @@ defineExpose({
                   :class="{'full-width': $q.screen.lt.sm}"
                   :label="__(`myth.titles.${isUpdateMode ? 'save' : 'store'}`)"
                   :loading="loading"
-                  color="primary"
-                  no-caps
                   type="submit"
                   v-bind="pluginOptions.dt?.dialogButtonsProps"
                 />
@@ -1452,7 +1446,7 @@ defineExpose({
                 :disable="loading"
                 color="secondary"
                 label="myth.titles.close"
-                no-caps
+                text-color="white"
                 v-bind="pluginOptions.dt?.dialogButtonsProps"
                 @click="closeFormDialog"
               />

package/src/components/form/MBtn.vue

@@ -13,6 +13,7 @@
 import type { MBtnProps } from '../../types'
 import { computed } from 'vue'
 import { useBindInput, useMyth } from '../../composable'
+import { extend } from 'quasar'
 
 type Props = {
   label?: MBtnProps['label'];
@@ -44,7 +45,6 @@ const hasLabel = computed<boolean>(() => !!getLabel.value)
 const loadingOptions = computed(() => theme.value.buttonLoading)
 const loadingSize = computed<string | undefined>(() => loadingOptions.value ? loadingOptions.value.size : undefined)
 const loadingColor = computed<string | undefined>(() => loadingOptions.value ? loadingOptions.value.color : undefined)
-
 defineOptions({
   name: 'MBtn',
   inheritAttrs: !1
@@ -53,15 +53,19 @@ defineOptions({
 
 <template>
   <q-btn
-    v-bind="{
-      ...btnTheme,
-      ...pluginOptions.btn,
-      ariaLabel: getAriaLabel,
-      ...$attrs,
-      loading,
-      label2: loading && getLabel && loadingOptions ? `${getLabel} ...` : getLabel,
-      label: getLabel,
-    }"
+    v-bind="extend(
+      true,
+      {},
+      btnTheme,
+      pluginOptions.btn,
+      {ariaLabel: getAriaLabel},
+      $attrs,
+      {
+        loading,
+        label2: loading && getLabel && loadingOptions ? `${getLabel} ...` : getLabel,
+        label: getLabel,
+      }
+    )"
   >
     <template
       v-if="!!$slots.loading"

package/src/components/form/MToggle.vue

@@ -164,6 +164,7 @@ defineOptions({
         <q-field
           :hide-bottom-space="hideBottomSpace"
           v-bind="{
+            ...theme,
             error: !!errorMessage,
             errorMessage,
             hint: hint ? __(hint) : undefined,
@@ -183,8 +184,8 @@ defineOptions({
             :model-value="value"
             :true-value="trueValue"
             v-bind="{
-              ...pluginOptions.toggle,
               ...theme,
+              ...pluginOptions.toggle,
               ...$attrs,
               // dense: theme.dense !== undefined ? theme.dense : getProp('dense'),
               dense: !0,

package/src/style/main.sass

@@ -69,13 +69,14 @@ $maxes: ('width', 'height') !default
   .max-#{$max}
     max-#{$max}: 100% !important
 
+$m--bordered-color: var(--q-primary) !default
 $alignsX: ('top', 'bottom') !default
 $alignsY: ('left', 'right') !default
 $radius-class-name: 'border-rounded' !default
 $radius-value: $generic-border-radius !default
 $bordered-class-name: 'bordered' !default
 $bordered-size: 1px !default
-$bordered-style: $bordered-size solid var(--q-primary) !default
+$bordered-style: $bordered-size solid $m--bordered-color !default
 
 
 .#{$radius-class-name}