@mythpe/quasar-ui-qui 0.1.7 → 0.1.9

package/package.json

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

package/src/components/form/MSelect.vue

@@ -111,7 +111,7 @@ const emit = defineEmits<Emits>()
 
 const { __, props: pluginOptions } = useMyth()
 const helper = useBindInput<P & Props>(() => props, 'select', () => ({ choose: !0 }))
-const { theme, hasTopLabel, getLabel, getPlaceholder, getAutocompleteAttribute, inputRules, getProp } = helper
+const { theme, hasTopLabel, getLabel, getAutocompleteAttribute, inputRules, getProp } = helper
 const inputScope = useField<Props['modelValue']>(() => props.name, inputRules, {
   syncVModel: !0,
   label: getLabel,
@@ -239,8 +239,8 @@ defineOptions({
         autocomplete: getAutocompleteAttribute || undefined,
         clearable: viewMode ? !1 : clearable,
         hint: hint ? __(hint) : undefined,
-        label: viewMode && hasTopLabel ? undefined : (loading ? undefined : getPlaceholder),
-        modelValue: value,
+        label: viewMode && hasTopLabel ? undefined : (getLabel || undefined),
+        modelValue: value
       }"
       v-on="listeners"
     >

package/src/composable/useBindInput.ts

@@ -64,7 +64,7 @@ export const useBindInput = <P extends G = G> (Props: MaybeRefOrGetter<P>, key:
   })
   const getLabel = computed<string | undefined>(() => {
     const k = nameLabel.value
-    if (k && k.indexOf('.*.')) {
+    if (k && k.indexOf('.*.') !== -1) {
       return __(k.split('.').pop()) || undefined
     }
     return k ? (__(k) || undefined) : undefined

package/src/composable/useMyth.ts

@@ -24,7 +24,7 @@ export const useMyth = () => {
   const $route = useRoute()
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
-  const __ = (key: any, ...rest: unknown[]) => !key ? '' : te(`attributes.${key}`) ? t(`attributes.${key}`, ...rest) : te(key) ? t(key, ...rest) : key
+  const __ = (key: any, ...rest: unknown[]) => !key ? key : te(`attributes.${key}`) ? t(`attributes.${key}`, ...rest) : te(key) ? t(key, ...rest) : key
   const getPageTitle = (route?: RouteLocationNormalizedLoaded | number | string, number?: number | string): string => {
     if (typeof route !== 'object') {
       number = route
@@ -56,6 +56,8 @@ export const useMyth = () => {
     const pluralize = Str.pascalCase(lodash.pluralize(lastRouteName))
     const singular = Str.pascalCase(lodash.singularize(lastRouteName))
     const keys = lodash.filter(lodash.uniq([
+      `routes.${routeName}`,
+      `routes.${routePath}`,
       `${lastRouteName}Page.title`,
       `${lodash.camelCase(lastRouteName)}Page.title`,
       `choice.${pluralize}`,
@@ -71,14 +73,6 @@ export const useMyth = () => {
     let str: string | null = null
     let k: string | any
 
-    if (te((k = `routes.${routeName}`)) && lodash.isString((str = t(k)))) {
-      return str
-    }
-
-    if (te((k = `routes.${routePath}`)) && lodash.isString((str = t(k)))) {
-      return str
-    }
-
     for (const f in keys) {
       if (!(k = keys[f])) {
         continue