@yh-ui/hooks 0.1.56 → 1.0.1

package/dist/use-locale/index.cjs

@@ -45,17 +45,25 @@ const useLocale = localeOverrides => {
   }, {
     immediate: true
   });
-  const t = (path, options) => {
+  const resolveLocaleValue = path => {
     const keys = path.split(".");
-    let result = locale.value.yh;
-    for (const key of keys) {
-      if (result && typeof result === "object") {
-        result = result[key];
-      } else {
-        result = void 0;
+    const sources = [locale.value.yh, _locale.zhCn.yh, _locale.en.yh];
+    for (const source of sources) {
+      let result = source;
+      for (const key of keys) {
+        if (result && typeof result === "object") {
+          result = result[key];
+        } else {
+          result = void 0;
+          break;
+        }
       }
-      if (result === void 0) return path;
+      if (result !== void 0) return result;
     }
+    return void 0;
+  };
+  const t = (path, options) => {
+    const result = resolveLocaleValue(path);
     if (typeof result !== "string") return path;
     if (options) {
       return result.replace(/\{(\w+)\}/g, (_match, key) => {
@@ -66,16 +74,8 @@ const useLocale = localeOverrides => {
     return result;
   };
   const tRaw = path => {
-    const keys = path.split(".");
-    let result = locale.value.yh;
-    for (const key of keys) {
-      if (result && typeof result === "object") {
-        result = result[key];
-      } else {
-        result = void 0;
-      }
-      if (result === void 0) return path;
-    }
+    const result = resolveLocaleValue(path);
+    if (result === void 0) return path;
     return result;
   };
   return {

package/dist/use-locale/index.d.ts

@@ -2,11 +2,6 @@ import type { Ref } from 'vue';
 import type { Language } from '@yh-ui/locale';
 export type { Language };
 export { setDayjsLocale, getDayjsLocale, setDayjsLocaleSync, updateDayjsMonths } from './dayjs-locale';
-/**
- * useLocale - 国际化
- * @param localeOverrides - 可选的自定义语言包
- * @returns 国际化相关方法
- */
 export declare const useLocale: (localeOverrides?: Ref<Language>) => {
     locale: import("vue").ComputedRef<Language>;
     lang: import("vue").ComputedRef<string>;

package/dist/use-locale/index.mjs

@@ -1,5 +1,5 @@
 import { computed, unref, watch } from "vue";
-import { zhCn } from "@yh-ui/locale";
+import { en, zhCn } from "@yh-ui/locale";
 import { useConfig } from "../use-config/index.mjs";
 import { setDayjsLocale } from "./dayjs-locale.mjs";
 export {
@@ -21,17 +21,25 @@ export const useLocale = (localeOverrides) => {
     },
     { immediate: true }
   );
-  const t = (path, options) => {
+  const resolveLocaleValue = (path) => {
     const keys = path.split(".");
-    let result = locale.value.yh;
-    for (const key of keys) {
-      if (result && typeof result === "object") {
-        result = result[key];
-      } else {
-        result = void 0;
+    const sources = [locale.value.yh, zhCn.yh, en.yh];
+    for (const source of sources) {
+      let result = source;
+      for (const key of keys) {
+        if (result && typeof result === "object") {
+          result = result[key];
+        } else {
+          result = void 0;
+          break;
+        }
       }
-      if (result === void 0) return path;
+      if (result !== void 0) return result;
     }
+    return void 0;
+  };
+  const t = (path, options) => {
+    const result = resolveLocaleValue(path);
     if (typeof result !== "string") return path;
     if (options) {
       return result.replace(/\{(\w+)\}/g, (_match, key) => {
@@ -42,16 +50,8 @@ export const useLocale = (localeOverrides) => {
     return result;
   };
   const tRaw = (path) => {
-    const keys = path.split(".");
-    let result = locale.value.yh;
-    for (const key of keys) {
-      if (result && typeof result === "object") {
-        result = result[key];
-      } else {
-        result = void 0;
-      }
-      if (result === void 0) return path;
-    }
+    const result = resolveLocaleValue(path);
+    if (result === void 0) return path;
     return result;
   };
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yh-ui/hooks",
-  "version": "0.1.56",
+  "version": "1.0.1",
   "description": "YH-UI composition hooks",
   "type": "module",
   "sideEffects": false,
@@ -23,8 +23,8 @@
     "dist"
   ],
   "dependencies": {
-    "@yh-ui/locale": "^0.1.56",
-    "@yh-ui/utils": "^0.1.56",
+    "@yh-ui/locale": "^1.0.1",
+    "@yh-ui/utils": "^1.0.1",
     "dayjs": "^1.11.19"
   },
   "devDependencies": {