gc_i18n 1.2.12 → 1.3.0

package/packages/index.js

@@ -39,7 +39,7 @@ export default class I18n {
       login,
       keyboard
     } = options;
-    this.token = token || generateJWT(orgCode);
+    this.token = token || generateJWT(orgCode) || store2.get("I18N_TOKEN");
     this.loadI18n = true;
     this.appCode = appCode;
     this.router = router;
@@ -74,7 +74,6 @@ export default class I18n {
     // 监听浏览器语言变化
     this.setupLanguageChangeListener();
   }
-
   // 监听浏览器语言变化
   setupLanguageChangeListener() {
     if ("onlanguagechange" in window) {
@@ -204,7 +203,7 @@ export default class I18n {
       if (routeName) {
         const routerKey = `${routeName}.${key}`;
         const routeTranslation = originalT(routerKey);
-        if (routeTranslation !== routerKey) {
+        if (routeTranslation !== routerKey && !_.isEmpty(routeTranslation)) {
           return routeTranslation;
         } else {
           const commonKey = `common.${key}`;
@@ -219,11 +218,21 @@ export default class I18n {
         return originalT(key, comment);
       }
     };
+    globalThis.$i18nLogin = async (orgCode) => {
+      this.setToken(generateJWT(orgCode));
+      this.clearI18n();
+      await this.setLanguage(this.locale);
+      location.reload();
+    };
+    globalThis.$i18nLogout = (orgCode) => {
+      this.clearI18n();
+      location.reload();
+    };
 
     globalThis.$deepScan = function (val) {
       return val;
     };
-    globalThis.$clearI18n = () => {
+    globalThis.$clearI18n = this.clearI18n = () => {
       const languageStore = store2.namespace(`I18N_${_.toUpper(this.appCode)}`);
       languageStore.clearAll();
     };
@@ -236,6 +245,7 @@ export default class I18n {
   }
   setToken(token) {
     this.token = token;
+    store2.set("I18N_TOKEN", token);
   }
   async getLanguages(isRemote = false) {
     const langs = store2.get("I18N_LANGUAGES");
@@ -260,7 +270,8 @@ export default class I18n {
         baseUrl: this.baseUrl,
         appCode: this.appCode,
         language: language ? language : this.locale,
-        token: this.token
+        token: this.token,
+        routerName: this.name
       });
       if (res) {
         const remoteMessages = convertArrayToObject(res);
@@ -287,9 +298,11 @@ export default class I18n {
     emitter.on("closeModal", (payload) => {
       this.configInstance = null;
     });
+
     // 创建 config 组件的实例
     return createApp(configVue, {
       appCode: this.appCode,
+      router: this.router,
       token: this.token,
       setLanguage: this.setLanguage.bind(this, this.locale),
       name: name || this.name,

package/packages/libs/service.js

@@ -77,7 +77,8 @@ export const getTranslate = async ({
   baseUrl,
   appCode,
   language = "zh-CN",
-  token
+  token,
+  routerName
 }) => {
   return new Promise(async (resolve, reject) => {
     // const appCodeStore = i18nStore.get(appCode);
@@ -107,7 +108,11 @@ export const getTranslate = async ({
         // 合并增量数据
         const langData = _.get(lastData, "translatesDTOs");
         if (!_.isEmpty(res.translatesDTOs)) {
-          const data = mergeArraysByKey(langData, res.translatesDTOs);
+          const data = mergeArraysByKey(
+            langData,
+            res.translatesDTOs,
+            routerName
+          );
           const saveData = {
             lastPullDate: res.lastPullDate,
             translatesDTOs: data

package/packages/libs/utils.js

@@ -7,8 +7,17 @@ export const convertArrayToObject = (arr) => {
   return result;
 };
 
-export const mergeArraysByKey = (arr1, arr2) => {
+export const mergeArraysByKey = (arr1, arr2, routerName) => {
   arr2.forEach((obj2) => {
+    console.log("obj2.key ", obj2.key);
+    const type = obj2.key.split(".");
+    if (type[0] === "common") {
+      const findHome = _.find(arr1, { key: `${routerName}.${type[1]}` });
+      // 如果找到 删除
+      if (findHome) {
+        _.remove(arr1, { key: `${routerName}.${type[1]}` });
+      }
+    }
     const foundObj = _.find(arr1, { key: obj2.key });
     if (foundObj) {
       _.merge(foundObj, obj2);

package/src/view/Home.vue

@@ -6,15 +6,26 @@ const change = async (lang) => {
 const clear = () => {
   $clearI18n();
 };
+const login = () => {
+  $i18nLogin("abc");
+};
+const logout = () => {
+  $i18nLogout();
+};
+const type = import.meta.env.MODE === "unit" ? "单位级 单位代码: dd" : "模板级";
 </script>
 
 <template>
-  <h1>首页</h1>
+  <h1>当前环境 -- {{ type }}</h1>
+
+  <div>首页</div>
   <RouterLink to="/test">测试</RouterLink>
   <h1>{{ $t("dsgljksdg") }}</h1>
   <button @click="change('en-US')">en</button>
   <button @click="change('zh-CN')">zh</button>
   <div>
     <button @click="clear">清理</button>
+    <button @click="login">登录</button>
+    <button @click="logout">登出</button>
   </div>
 </template>