yh-i18n 2.1.3 → 2.1.6

package/index.js

@@ -38,7 +38,7 @@ Object.keys(zhCNBase).forEach((key) => {
   keySet.add(key);
 });
 
-const unHandle: string[] = [];
+const unHandle = [];
 
 function addTranslate(key) {
   if (key.indexOf("vxe") === -1) {
@@ -57,32 +57,33 @@ function addTranslate(key) {
   }
 }
 
+let recursionAddTimer = null;
 function recursionAddTranslate() {
+  if (recursionAddTimer !== null) {
+    return false;
+  }
   // 当触发 content 加载完成触发递归方法后，判断是否有需要处理的键，有则处理，没有则忽略
-  if (unHandle.length) {
+  if (unHandle.length && contentReady) {
     let key = unHandle.pop();
     if (!keySet.has(key) && window.translateReady) {
       keySet.add(key);
       addTranslate(key);
     }
     // 通过延时降低任务密度，避免挤兑正常逻辑的运算资源
-    setTimeout(() => {
+    recursionAddTimer = setTimeout(() => {
+      cLog(`${unHandle.length} ${key}`);
+      recursionAddTimer = null;
       recursionAddTranslate();
-    }, 500);
+    }, 150);
   }
 }
 
 export const ct = (key, args) => {
-  if (isDev) {
-    // 当 content 加载完成时，进行翻译键是否已存在的判断
-    if (contentReady) {
-      if (!keySet.has(key) && window.translateReady) {
-        keySet.add(key);
-        addTranslate(key);
-      }
-    } else {
-      // 当 content 加载未完成时，现将翻译键放入缓存中，等待加载完成后再处理。
+  if (isDev && window.translateCollect) {
+    // 将 键的处理全部放入队列中，避免挤兑正常逻辑的运算资源
+    if (!unHandle.includes(key)) {
       unHandle.push(key);
+      recursionAddTranslate();
     }
   }
   if (i18n) {
@@ -216,7 +217,7 @@ async function getRemoteMessage(list) {
         });
       } catch (err) {
         if (isDev) {
-          console.error(err);
+          // console.count("翻译数据格式不对");
         }
       }
     });
@@ -275,9 +276,9 @@ export function addI18nPage(router) {
 
 export function cLog(string, isError = false) {
   if (isError) {
-    console.error("%cyhI18n：", "font-size: 16px;font-weight: bold;color: #61AFEF", string);
+    console.error("%cyhI18n：%c", "font-size: 16px;font-weight: bold;color: #00ffff", "font-size: 16px;font-weight: bold;color: #ccccc", string);
   } else {
-    console.log("%cYHI18n", "font-size: 18px;font-weight: bold;color: #61AFEF", string);
+    console.log("%cYh-i18n%c " + string, "font-size: 18px;font-weight: bold;color: #61AFEF", "font-size: 12px;color: #999");
   }
 }
 

package/language.vue

@@ -3,29 +3,32 @@
     split-button
     class="language-dropdown"
     trigger="click"
-    @command="setLang"
-  >
+    @command="setLang">
     {{ title }}
     <template #dropdown>
       <el-dropdown-menu>
-        <el-dropdown-item v-for="lo in localList" :command="lo.value">
+        <el-dropdown-item
+          v-for="lo in localList"
+          :command="lo.value">
           {{ lo.label }}
         </el-dropdown-item>
       </el-dropdown-menu>
     </template>
   </el-dropdown>
   &nbsp;&nbsp;&nbsp;
-  <el-link v-if="isDev" type="warning" href="/#/translate">{{
-    ct("翻译管理")
-  }}</el-link>
+  <el-link
+    v-if="isDev"
+    type="warning"
+    href="/#/translate">
+    {{ ct("翻译管理") }}
+  </el-link>
   &nbsp;&nbsp;&nbsp;
   <el-switch
     active-text="收集"
     inactive-text="不收集"
     inline-prompt
     v-if="isDev"
-    v-model="isCollect"
-  ></el-switch>
+    v-model="isCollect"></el-switch>
 </template>
 
 <script setup>
@@ -36,11 +39,19 @@ import { ref, watch } from "vue";
 const isDev = ref(window.translateReady);
 
 const i18nStore = useI18nStore();
-const isCollect = ref(window.translateReady);
+const isCollect = ref(!!localStorage.translateCollect);
 watch(
   () => isCollect.value,
   (val) => {
-    window.translateReady = val;
+    if (val) {
+      localStorage.translateCollect = "1";
+    } else {
+      localStorage.removeItem("translateCollect");
+    }
+    window.translateCollect = val;
+  },
+  {
+    immediate: true,
   }
 );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yh-i18n",
-  "version": "2.1.3",
+  "version": "2.1.6",
   "description": "对于国际化的封装",
   "main": "index.js",
   "scripts": {