@mythpe/quasar-ui-qui 0.4.99 → 0.4.100

package/package.json

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

package/src/components/datatable/MDatatable.vue

@@ -774,8 +774,9 @@ defineExpose({
                             :align="col.align as any"
                             :copy="computedCopyColumns.includes(col.name)"
                             :copy-value="col.copyValue && typeof col.copyValue === 'function' ? () => col.copyValue(itemProps.row) : itemProps.row[col.copyValue || col.field]"
-                            :string="col.field.includes('_to_string') || col.field.includes('ToString')"
+                            :string="col.field.includes('_to_string') || col.field.includes('ToString') || col.string === !0"
                             :value="col.value"
+                            :digits="col.digits"
                           />
                         </template>
                         <template v-else-if="computedDescColumns.indexOf(col.name) !== -1">
@@ -1485,8 +1486,9 @@ defineExpose({
               :align="sarCellProps.col.align as any"
               :copy="computedCopyColumns.includes(sarCellProps.col.name)"
               :copy-value="sarCellProps.col.copyValue && typeof sarCellProps.col.copyValue === 'function' ? () => sarCellProps.col.copyValue(sarCellProps.row) : sarCellProps.row[sarCellProps.col.copyValue || sarCellProps.col.field]"
-              :string="sarCellProps.col.field.includes('_to_string') || sarCellProps.col.field.includes('ToString')"
+              :string="sarCellProps.col.field.includes('_to_string') || sarCellProps.col.field.includes('ToString') || sarCellProps.col.string === !0"
               :value="sarCellProps.row[sarCellProps.col.field]"
+              :digits="sarCellProps.col.digits"
             />
           </q-td>
         </template>

package/src/components/datatable/MDtSarColumn.vue

@@ -19,6 +19,7 @@ interface Props {
   copyValue?: MDtSarColumnProps['copyValue'];
   align?: MDtSarColumnProps['align'];
   string?: boolean;
+  digits?: MDtSarColumnProps['digits'];
 }
 
 const props = defineProps<Props>()
@@ -67,6 +68,7 @@ defineOptions({
     </q-btn>
     <MSarString
       :string="string"
+      :digits="digits"
       :text="val"
     />
     <slot />

package/src/components/sar/MSarString.vue

@@ -11,31 +11,36 @@ import { useI18n } from 'vue-i18n'
 import { computed } from 'vue'
 import { useMyth } from '../../composable'
 import type { MSarStringProps } from '../../types'
-import { useQuasar } from 'quasar'
+import { extend } from 'quasar'
 
 interface Props {
+  tag?: MSarStringProps['tag'];
   text?: MSarStringProps['text'];
   string?: boolean;
+  format?: MSarStringProps['format'];
+  digits?: MSarStringProps['digits'];
 }
 
 const props = defineProps<Props>()
 
-const $q = useQuasar()
 const { te } = useI18n({ useScope: 'global' })
 const { __, formatMoney } = useMyth()
 const getText = computed<string | undefined>(() => {
-  if (!props.text?.toString().length) {
-    return props.text
+  const text = props.text?.toString?.() || ''
+  const length = text.length
+  if (length < 1) {
+    return undefined
   }
-  const text = props.text?.toString?.() || null
-  if (!text) {
-    return props.text
-  }
-  if (props.string) {
-    return te(`labels.${text}`) ? __(`labels.${text}`) : (te(text) ? __(text) : text)
-  }
-  const v = isNaN(text) ? text : formatMoney(text)
-  return v !== null && v !== undefined ? (v?.toString?.() || v) : undefined
+  const suffix = '﷼'
+  const def = 2
+  const digits = props.digits !== undefined ? parseInt(props.digits?.toString?.() ?? `${def}`) ?? def : def
+  const opt = extend<Intl.NumberFormatOptions>(!0, {
+    minimumFractionDigits: digits ?? def,
+    maximumFractionDigits: digits ?? def
+  }, props.format)
+  const value = props.string ? (te(`labels.${text}`) ? __(`labels.${text}`) : (te(text) ? __(text) : `${text}`)) : text
+  return !isNaN(value) ? formatMoney(value, suffix, opt) : `${value} ${suffix}`.trim()
+  // return v !== null && v !== undefined ? (v?.toString?.() || v) : undefined
 })
 
 defineOptions({
@@ -45,12 +50,9 @@ defineOptions({
 </script>
 
 <template>
-  <div
-    class="m-sar-col"
-    style="direction: rtl !important;"
+  <span
+    class="m-sar-string sar-icon"
     v-bind="$attrs"
-  >
-    <span>{{ getText }}</span>
-    <span :class="['sar-icon',{'q-pl-xs': $q.lang.rtl, 'q-pr-xs': !$q.lang.rtl}]">{{ __('sr') }}</span>
-  </div>
+    v-text="getText"
+  />
 </template>

package/src/style/sar-font.sass

@@ -8,14 +8,20 @@
 
 @font-face
   font-family: SarIcon
-  font-style: normal
-  font-weight: 400
   src: url("data:application/x-font-ttf;charset=utf-8;base64,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") format("truetype")
-  font-display: block
+  font-display: swap
+  unicode-range: U+FDFC
 
 .sar-icon
-  font-family: SarIcon, sans-serif !important
   font-style: normal !important
   font-weight: 400 !important
   font-variant: normal !important
   text-transform: none !important
+
+[dir="rtl"]
+  .sar-icon
+    font-family: SarIcon, var(--m-font-rtl, 'inherit'), 'Roboto', sans-serif
+
+[dir="ltr"]
+  .sar-icon
+    font-family: SarIcon, var(--m-font-ltr, 'inherit'), 'Roboto', sans-serif

package/src/types/api/MSar.d.ts

@@ -16,8 +16,11 @@ export interface MSarIconSlots {
 }
 
 export type MSarStringProps = {
+  tag?: any;
   text?: any;
   string?: boolean;
+  format?: Intl.NumberFormatOptions;
+  digits?: number | string;
 }
 
 export interface MSarStringSlots {

package/src/types/m-datatable.d.ts

@@ -474,6 +474,7 @@ export interface MDtSarColumnProps {
   copyValue?: any;
   align?: 'left' | 'right' | 'center';
   string?: boolean;
+  digits?: number | string;
 }
 
 export interface MDtSarColumnSlots {