gc_i18n 1.0.0 → 1.0.1

package/packages/components/LangChange.vue

@@ -16,7 +16,6 @@ export default {
   },
   async mounted() {
     this.language = navigator.language || "zh-CN";
-    console.log("language", this.language);
     const res = await getLanguages();
     if (res && res.result === 0) {
       this.languages = res.retVal;

package/packages/index.js

@@ -32,18 +32,29 @@ export default class I18n {
     // 保存原始的 t 方法
     const originalT = this.i18n.global.t;
     // 自定义 t 方法
-    this.i18n.global.t = (key) => {
-      const routeName = router?.currentRoute?.value?.name;
+    this.i18n.global.t = (key, args) => {
+      const routeName = _.toUpper(router?.currentRoute?.value?.name);
       // 使用原始的 t 方法进行翻译
       const originalTranslation = originalT(key);
       // 如果没有找到翻译值，尝试使用路由名.key
       if (originalTranslation === key && routeName) {
         const prefixedKey = `${routeName}.${key}`;
         // 同样使用原始的 t 方法进行翻译
-        return originalT(prefixedKey);
+        const routeTranslation = originalT(prefixedKey);
+
+        if (routeTranslation !== prefixedKey) {
+          return routeTranslation;
+        } else {
+          if (args && _.has(args, "comment")) {
+            return _.get(args, "comment");
+          } else {
+            return key;
+          }
+        }
       }
       return originalTranslation;
     };
+
     this.i18n.global.changeLocal = (newLocale) => {
       this.setLanguage(newLocale || this.locale);
     };

package/packages/libs/service.js

@@ -3,7 +3,7 @@ import store2 from "store2";
 import _ from "lodash-es";
 import { mergeArraysByKey } from "./utils";
 export const service = "https://test.ihotel.cn";
-const i18nStore = store2.namespace("i18n");
+
 const Authorization =
   "eyJhbGciOiJIUzUxMiJ9.eyJkZXZpY2VUeXBlIjoiQ09NUFVURVIiLCJtYWluQXBwQ29kZSI6IlNTTyIsIm9yZ0NvZGUiOiJHQ0JaRyIsInVjU2VydmVyVXJsIjoiaHR0cHM6Ly90ZXN0Lmlob3RlbC5jbi91Yy13ZWIvIiwiYXBwQ29kZSI6IlNTTyIsInVzZXJUeXBlIjoiTk9STUFMIiwibG9naW5BdCI6MTczODczNTczOTAwMCwicHJpbmNpcGFsVXNlckNvZGUiOiJHQ0JaR19BRE1JTiIsImV4cCI6MzI1MDM2NTEyMDAsInVzZXJDb2RlIjoiR0NCWkdfQURNSU4iLCJzc28iOiJTU09fU0VSVkVSIn0.KQt1YbUdJ7DfqrfXEVYT0Ux-7Zlo2GQBiIoq0rxK0cv1LHqOOMtBkv8kmChM6VavtdnlyXM2GkW6YMvIIHvu0Q";
 export const getLanguages = async () => {
@@ -42,8 +42,6 @@ export const fetchTranslate = async ({
 };
 
 export const getAllTranslate = async (data) => {
-  console.log("data", data);
-
   return axios({
     url: service + "/i18n-web/kv_translate/kv_translates",
     method: "POST",
@@ -62,7 +60,7 @@ export const saveTranslate = async (data) => {
 export const getTranslate = async ({ appCode, language = "zh-CN" }) => {
   return new Promise(async (resolve, reject) => {
     // const appCodeStore = i18nStore.get(appCode);
-    const languageStore = i18nStore.namespace(appCode);
+    const languageStore = store2.namespace(`i18n_${appCode}`);
     const options = {
       appCode,
       language
@@ -88,7 +86,8 @@ export const getTranslate = async ({ appCode, language = "zh-CN" }) => {
         if (!_.isEmpty(res.translatesDTOs)) {
           const data = mergeArraysByKey(langData, res.translatesDTOs);
           const saveData = { lastPullDate, translatesDTOs: data };
-          i18nStore[appCode].set(language, saveData, ":"); // Only update the specific key
+          const languageStore = store2.namespace(`i18n_${appCode}`);
+          languageStore.set(language, saveData, ":"); // Only update the specific key
           resolve(data);
         } else {
           resolve(langData);

package/src/main.js

@@ -1,13 +1,13 @@
 import { createApp } from "vue";
 import App from "./App.vue";
-import gc_i18n from "../packages/index.js";
+import gc_i18n from "../packages/index";
 import router from "./router/index";
 import "view-ui-plus/dist/styles/viewuiplus.css";
-
+import iview from "view-ui-plus";
 import zh from "view-ui-plus/dist/locale/zh-CN";
 import en from "view-ui-plus/dist/locale/en-US";
 
-const i18n = new gc_i18n({
+const { i18n } = new gc_i18n({
   appCode: "TEST",
   router,
   messages: {
@@ -15,7 +15,8 @@ const i18n = new gc_i18n({
     "en-US": en
   }
 });
+console.log("i18n", i18n);
 
-const app = createApp(App).use(router).use(i18n, { router });
+const app = createApp(App).use(router).use(iview).use(i18n);
 
 app.mount("#app");

package/src/router/index.js

@@ -2,8 +2,8 @@ import { createRouter, createWebHashHistory } from "vue-router";
 
 const routes = [
   {
-    path: "/BOOK",
-    name: "BOOK",
+    path: "/book",
+    name: "book",
     component: () => import("../view/Home.vue")
   }
 ];

package/src/view/Home.vue

@@ -40,6 +40,10 @@ const change = (lang) => {
       <div>不带前缀:</div>
       <div>{{ $t("ZHENGJIANLEIXING") }}</div>
     </div>
+    <div>
+      <div>完全找不到的数据:</div>
+      <div>{{ $t("BOOK.abc", { comment: "找不到" }) }}</div>
+    </div>
     <Page
       :total="40"
       size="small"

package/vite.config.js

@@ -3,7 +3,7 @@ import vue from "@vitejs/plugin-vue";
 import vueJsx from "@vitejs/plugin-vue-jsx";
 import { resolve } from "path";
 import libCss from "vite-plugin-libcss";
-import terser from "@rollup/plugin-terser"; // 不用解构出来 有默认导出
+// import terser from "@rollup/plugin-terser"; // 不用解构出来 有默认导出
 
 // https://vite.dev/config/
 export default defineConfig({
@@ -28,11 +28,11 @@ export default defineConfig({
           lodash: "_"
         },
         plugins: [
-          terser({
-            compress: {
-              drop_console: true
-            }
-          })
+          // terser({
+          //   compress: {
+          //     drop_console: false
+          //   }
+          // })
         ]
       }
     },