gc_i18n 1.2.13 → 1.3.1

package/lang/index.js

@@ -22,15 +22,15 @@ export const languages = [
 ];
 export default {
   install(app, router) {
+    console.log("i18n", import.meta.env);
     const { i18n } = new gc_i18n({
       appCode: "TEST",
       router,
-      token: localStorage.getItem("token"),
-      local: localStorage.getItem("I18N_LANGUAGE"),
+      orgCode: import.meta.env.MODE === "unit" ? "DD" : "GREENCLOUD",
+      // locale: localStorage.getItem("I18N_LANGUAGE"),
       // loginRouteName: "Login",
       dev: true,
       login: false,
-      orgCode: "GREENCLOUD",
       messages: {
         "zh-CN": { ...pro_zh_CN, ...iview_zh_CN },
         "zh-TW": { ...pro_zh_TW, ...iview_zh_TW },

package/lang/index.json

@@ -33,5 +33,65 @@
 		"zh-cn": "清理",
 		"zh-tw": "清理",
 		"en-us": "清理"
+	},
+	"koca2": {
+		"zh-cn": "登录",
+		"zh-tw": "登錄",
+		"en-us": "登录"
+	},
+	"klpb2": {
+		"zh-cn": "登出",
+		"zh-tw": "登出",
+		"en-us": "登出"
+	},
+	"sah0y05": {
+		"zh-cn": "当前单位:",
+		"zh-tw": "當前單位:",
+		"en-us": "当前单位:"
+	},
+	"ely02": {
+		"zh-cn": "单位",
+		"zh-tw": "單位",
+		"en-us": "单位"
+	},
+	"imbi2": {
+		"zh-cn": "模板",
+		"zh-tw": "模板",
+		"en-us": "模板"
+	},
+	"sf96jw5": {
+		"zh-cn": "当前环境:",
+		"zh-tw": "當前環境:",
+		"en-us": "当前环境:"
+	},
+	"wt0nrm7": {
+		"zh-cn": "单位 : dd",
+		"zh-tw": "單位 : dd",
+		"en-us": "单位 : dd"
+	},
+	"tbqqg98": {
+		"zh-cn": "单位级 : dd",
+		"zh-tw": "單位級 : dd",
+		"en-us": "单位级 : dd"
+	},
+	"vo9pqm7": {
+		"zh-cn": "当前环境 --",
+		"zh-tw": "當前環境 --",
+		"en-us": "当前环境 --"
+	},
+	"ledywde": {
+		"zh-cn": "单位级 : 单位代码: dd",
+		"zh-tw": "單位級 : 單位代碼: dd",
+		"en-us": "单位级 : 单位代码: dd"
+	},
+	"g44k6lc": {
+		"zh-cn": "单位级 单位代码: dd",
+		"zh-tw": "單位級 單位代碼: dd",
+		"en-us": "单位级 单位代码: dd"
+	},
+	"g1wx53": {
+		"zh-cn": "模板级",
+		"zh-tw": "模板級",
+		"en-us": "模板级"
 	}
 }

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "gc_i18n",
-  "version": "1.2.13",
+  "version": "1.3.1",
   "type": "module",
   "main": "./lib/gc_i18n.umd.cjs",
   "module": "./lib/gc_i18n.js",
   "scripts": {
     "dev": "vite",
+    "dev:unit": "vite --mode unit --port 8080",
+    "dev:template": "vite --mode template --port 8081",
     "build": "vite build",
     "preview": "vite preview",
     "cnpm": "cnpm sync gc_i18n"
   },
   "dependencies": {
     "axios": "^1.7.9",
-    "jose": "^6.0.11",
     "jsrsasign": "^11.1.0",
     "keyboardjs": "^2.7.0",
     "lodash-es": "^4.17.21",
@@ -33,5 +34,6 @@
     "vite": "^6.1.0",
     "vite-gc-i18n-plugin": "^1.0.4",
     "vite-plugin-libcss": "^1.1.1"
-  }
+  },
+  "packageManager": "pnpm@10.15.1+sha512.34e538c329b5553014ca8e8f4535997f96180a1d0f614339357449935350d924e22f8614682191264ec33d1462ac21561aff97f6bb18065351c162c7e8f6de67"
 }

package/packages/components/config.vue

@@ -98,6 +98,7 @@ export default {
   },
   props: {
     appCode: String,
+    router: Object,
     setLanguage: Function,
     token: String,
     baseUrl: String, // 基础URL
@@ -185,15 +186,8 @@ export default {
         this.initialData = _.cloneDeep(this.data.datas);
 
         this.mySaveData = [];
-        Modal.confirm({
-          title: "是否刷新页面",
-          onOk: () => {
-            window.location.reload();
-          },
-          onCancel: () => {
-            close && this.closeModal();
-          }
-        });
+        // window.location.reload();
+        this.router.go(0);
       } else {
         Message.error({ content: res.data.msg || "保存失败" });
       }
@@ -263,6 +257,7 @@ export default {
     },
     changeTab(name) {
       this.type = name;
+      this.mySaveData = [];
       if (name === "data") {
         this.search();
       } else if (name === "pageData") {
@@ -455,6 +450,9 @@ export default {
 }
 .gc_i18n_tabs {
   padding-top: 5px;
+  :deep(.ivu-tabs-tab) {
+    width: 111px;
+  }
   :deep(.ivu-tabs-content) {
     width: 100%;
   }

package/packages/index.js

@@ -37,13 +37,15 @@ export default class I18n {
       orgCode,
       loginRouteName,
       login,
-      keyboard
+      keyboard,
+      locale
     } = options;
-    this.token = token || generateJWT(orgCode);
+    this.token = token || generateJWT(orgCode) || store2.get("I18N_TOKEN");
     this.loadI18n = true;
     this.appCode = appCode;
     this.router = router;
-    this.locale = store2.get("I18N_LANGUAGE") || navigator.language || "zh-CN";
+    this.locale =
+      locale || store2.get("I18N_LANGUAGE") || navigator.language || "zh-CN";
     this.name = "";
     this.messages = messages || {};
     this.translationKeys = [];
@@ -74,7 +76,6 @@ export default class I18n {
     // 监听浏览器语言变化
     this.setupLanguageChangeListener();
   }
-
   // 监听浏览器语言变化
   setupLanguageChangeListener() {
     if ("onlanguagechange" in window) {
@@ -111,8 +112,8 @@ export default class I18n {
         );
       });
 
-      if (loginRoute) {
-        let loginComponent = loginRoute.components.default;
+      if (loginRoute && loginRoute.components) {
+        let loginComponent = loginRoute.components?.default;
         if (
           typeof loginComponent === "function" &&
           loginComponent.toString().includes("import(")
@@ -132,29 +133,29 @@ export default class I18n {
         this.loginTranslationKeys = loginRouteKeys;
       }
       if (to.matched.length > 0) {
-        // 兼容保留：静态扫描路由组件，获取初步 keys（可能不包含自动注册的子组件）
-        const allTranslationKeys = [];
-        for (const match of to.matched) {
-          let component = match.components.default;
-          if (
-            typeof component === "function" &&
-            component.toString().includes("import(")
-          ) {
-            try {
+        try {
+          // 兼容保留：静态扫描路由组件，获取初步 keys（可能不包含自动注册的子组件）
+          const allTranslationKeys = [];
+          for (const match of to.matched) {
+            let component = match.components?.default;
+            if (
+              typeof component === "function" &&
+              component.toString().includes("import(")
+            ) {
               component = await component();
               component = component.default;
-            } catch (error) {
-              console.error("加载异步组件时出错:", error);
-              next();
-              return;
+            }
+            if (component) {
+              const keys = extractTranslationKeys(component);
+              allTranslationKeys.push(...keys);
             }
           }
-          if (component) {
-            const keys = extractTranslationKeys(component);
-            allTranslationKeys.push(...keys);
-          }
+          this.translationKeys = allTranslationKeys;
+        } catch (error) {
+          console.error("加载异步组件时出错:", error);
+          next();
+          return;
         }
-        this.translationKeys = allTranslationKeys;
       }
       next();
     });
@@ -219,11 +220,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 +247,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 +272,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);
@@ -291,6 +304,7 @@ export default class I18n {
     // 创建 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>

package/vite.config.js

@@ -26,7 +26,10 @@ export default defineConfig({
         "view-ui-plus",
         "store2",
         "jsrsasign",
+        "pro_iview_v3",
         "keyboardjs",
+        "vue-i18n",
+        "vue-router",
         "view-ui-plus/dist/styles/viewuiplus.css"
       ],
       output: {

package/lib/gc_i18n.css

@@ -1 +0,0 @@
-.gc_i18n_spin[data-v-ef963ad8]{min-height:300px;display:flex;justify-content:center;padding-top:50px}.gc_i18n_tabs[data-v-ef963ad8]{padding-top:5px}.gc_i18n_tabs[data-v-ef963ad8] .ivu-tabs-content{width:100%}.gc_i18n_tabs[data-v-ef963ad8] .ivu-tabs-bar{margin-bottom:0!important}.gc_i18n_tabs .ivu-tabs-content[data-v-ef963ad8]{position:relative;top:-1px}.gc_i18n_tabs .extra[data-v-ef963ad8]{position:relative;top:-3px;display:flex;align-items:center}.gc_i18n_page[data-v-ef963ad8]{display:flex;justify-content:space-between;align-items:center;margin-top:10px}