yh-i18n 2.2.13 → 2.2.15

package/index.js

@@ -37,10 +37,10 @@ const initlang = localStorage.translateLanguage || navLang || "zh_CN";
 
 export let i18n = null;
 window.translateReady = localStorage.translateReady ? localStorage.translateReady === "1" : import.meta.env.DEV;
-const isDev = window.translateReady;
 let contentReady = false;
 
 const keySet = new Set();
+window.keySet = keySet;
 Object.keys(zhCNBase).forEach((key) => {
   keySet.add(key);
 });
@@ -48,7 +48,7 @@ Object.keys(zhCNBase).forEach((key) => {
 const unHandle = [];
 
 function addTranslate (key) {
-  if (key.indexOf("vxe") === -1) {
+  if (key && key.indexOf("vxe") === -1) {
     try {
       axios.request({
         url: "/translate/insert",
@@ -78,7 +78,6 @@ function recursionAddTranslate () {
     }
     // 通过延时降低任务密度，避免挤兑正常逻辑的运算资源
     recursionAddTimer = setTimeout(() => {
-      // cLog(`${unHandle.length} ${key}`);
       recursionAddTimer = null;
       recursionAddTranslate();
     }, 150);
@@ -86,14 +85,14 @@ function recursionAddTranslate () {
 }
 
 export const ct = (key, args) => {
-  if (isDev && window.translateCollect) {
+  if (key && window.translateReady && window.translateCollect) {
     // 将 键的处理全部放入队列中，避免挤兑正常逻辑的运算资源
-    if (!unHandle.includes(key)) {
+    if (!keySet.has(key) && !unHandle.includes(key)) {
       unHandle.push(key);
       recursionAddTranslate();
     }
   }
-  if (i18n) {
+  if (key && i18n) {
     return i18n.global.t(key, args);
   } else {
     return key;
@@ -180,7 +179,6 @@ export const useI18nStore = defineStore("i18nStore", () => {
   });
 
   return {
-    isDev,
     lang,
     setLang,
     langList,
@@ -214,7 +212,7 @@ async function getRemoteMessage (list) {
       try {
         let itemObj = JSON.parse(item);
         let mKey = itemObj.zh_CN;
-        if (import.meta.env.DEV && !keySet.has(mKey)) {
+        if (window.translateReady && !keySet.has(mKey)) {
           keySet.add(mKey);
         }
         Object.entries(itemObj).forEach(([key, val]) => {
@@ -223,7 +221,7 @@ async function getRemoteMessage (list) {
           }
         });
       } catch (err) {
-        if (isDev) {
+        if (window.translateReady) {
           // console.count("翻译数据格式不对");
         }
       }
@@ -268,7 +266,7 @@ function createLocalMessage (list) {
 }
 
 export function addI18nPage (router) {
-  if (isDev) {
+  if (window.translateReady) {
     router.addRoute("Index", {
       path: "translate",
       name: "翻译管理",
@@ -304,10 +302,10 @@ export const yhI18n = {
     app.use(i18n);
     app.config.globalProperties.$T = ct;
 
-    if (!isDev) {
-      cLog("没有开启翻译管理，可以在开发环境或者在控制台运行后面的代码再刷新页面： `localStorage.translateLanguage = '1'`");
+    if (!window.translateReady) {
+      cLog("没有开启翻译管理，可以在开发环境或者在控制台运行后面的代码再刷新页面： `localStorage.translateReady = '1'`");
     }
-    if (router && isDev) {
+    if (router && window.translateReady) {
       addI18nPage(router);
     } else {
       if (!router) {

package/list.vue

@@ -14,34 +14,34 @@
       <el-button
         type="primary"
         @click="getDataList">
-        {{ ct("搜索") }}
+        {{ ct('搜索') }}
       </el-button>
-      <el-button @click="resetList">{{ ct("重置") }}</el-button>
+      <el-button @click="resetList">{{ ct('重置') }}</el-button>
     </div>
     <div class="yh-i18n-list-actions">
       <el-button
         type="primary"
         @click="addOne">
         <i class="iconfont icon-add"></i>
-        {{ ct("新增") }}
+        {{ ct('新增') }}
       </el-button>
       <el-button
         type="danger"
         @click="delMore">
         <i class="iconfont icon-delete"></i>
-        {{ ct("批量删除") }}
+        {{ ct('批量删除') }}
       </el-button>
       <el-button
         text
         @click="exportExcel(listForm.total)">
-        {{ ct("导出") }}
+        {{ ct('导出') }}
       </el-button>
       <div class="el-button is-text import-excel-button">
         <input
           class="import-excel-input"
           type="file"
           @change="importExcel($event, getDataList)" />
-        {{ ct("导入") }}
+        {{ ct('导入') }}
       </div>
     </div>
     <el-table
@@ -66,18 +66,18 @@
         width="140"
         align="center"
         fixed="left">
-        <template #default="{ row, $index }">
+        <template #default="{row, $index}">
           <el-button
             link
             type="primary"
             @click="editOne(row, $index)">
-            {{ ct("编辑") }}
+            {{ ct('编辑') }}
           </el-button>
           <el-button
             link
             type="danger"
             @click="delOne(row.adTranslateId)">
-            {{ ct("删除") }}
+            {{ ct('删除') }}
           </el-button>
         </template>
       </el-table-column>
@@ -95,7 +95,7 @@
     </el-table>
     <el-pagination
       background
-      :page-sizes="[10, 100, 200, 500, 1000]"
+      :page-sizes="[10, 100, 200, 500, 10000]"
       v-model:page-size="listForm.pageSize"
       :total="listForm.total"
       v-model:current-page="listForm.pageNum"
@@ -121,46 +121,46 @@
           @click="prevOne"
           text
           :disabled="!isNaN(formDataIndex) && formDataIndex <= 0">
-          {{ ct("上一个") }}（←）
+          {{ ct('上一个') }}（←）
         </el-button>
         <el-button
           type="primary"
           plain
           @click="cancelForm">
-          {{ ct("取消") }}
+          {{ ct('取消') }}
         </el-button>
         <el-button
           type="primary"
           @click="saveOne">
-          {{ ct("保存") }}
+          {{ ct('保存') }}
         </el-button>
         <el-button
           @click="nextOne"
           text
           :disabled="!isNaN(formDataIndex) && formDataIndex >= dataList.leng - 1">
-          {{ ct("下一个") }}（→）
+          {{ ct('下一个') }}（→）
         </el-button>
       </div>
     </template>
   </el-dialog>
 </template>
 <script setup lang="ts">
-import { reactive, ref, onMounted, watch } from "vue";
-import { ElLoadingService, ElMessage, ElMessageBox } from "element-plus";
-import { useI18nStore, ct } from "yh-i18n";
-import http from "@/libs/api.request";
-import { VxeFormInstance, VxeFormPropTypes } from "vxe-table";
-import { exportExcel, importExcel } from "./excelTool";
+import {reactive, ref, onMounted, watch} from 'vue';
+import {ElLoadingService, ElMessage, ElMessageBox} from 'element-plus';
+import {useI18nStore, ct} from 'yh-i18n';
+import http from '@/libs/api.request';
+import {VxeFormInstance, VxeFormPropTypes} from 'vxe-table';
+import {exportExcel, importExcel} from './excelTool';
 const i18nStore = useI18nStore();
 const vxeFormRef = ref<VxeFormInstance>();
 
-const insertUrl = "/translate/insert";
-const updateUrl = "/translate/edit";
-const deleteUrl = "/translate/deleteTranslate";
+const insertUrl = '/translate/insert';
+const updateUrl = '/translate/edit';
+const deleteUrl = '/translate/deleteTranslate';
 
 const i18nList = ref();
 const listForm = reactive({
-  key: "",
+  key: '',
   pageNum: 1,
   pageSize: 10,
   total: 0,
@@ -168,14 +168,17 @@ const listForm = reactive({
 const listColumns = reactive<any>([]);
 const dataList = ref<any>([]);
 function getDataList(isReset = false) {
-  let { key, pageNum, pageSize } = listForm;
+  let {key, pageNum, pageSize} = listForm;
   if (isReset) {
     pageNum = 1;
   }
+  let loading = ElLoadingService({
+    text: '获取列表数据中……',
+  });
   http
     .request({
-      url: "/translate/select",
-      method: "post",
+      url: '/translate/select',
+      method: 'post',
       data: {
         key,
         pageNum,
@@ -184,7 +187,7 @@ function getDataList(isReset = false) {
     })
     .then((res) => {
       let localKeys = i18nStore.localList.map((item) => item.value);
-      let { records, total } = res.data.data;
+      let {records, total} = res.data.data;
       records = records.map((item) => {
         try {
           let content = JSON.parse(item.content);
@@ -196,7 +199,7 @@ function getDataList(isReset = false) {
           });
           localKeys.forEach((k) => {
             if (!keys.includes(k)) {
-              item[k] = "";
+              item[k] = '';
             }
           });
         } catch (error) {}
@@ -204,6 +207,9 @@ function getDataList(isReset = false) {
       });
       dataList.value = records;
       listForm.total = total;
+    })
+    .finally(() => {
+      loading.close();
     });
 }
 
@@ -225,7 +231,7 @@ function rowClickHandler(row) {
 }
 
 function resetList() {
-  listForm.key = "";
+  listForm.key = '';
   listForm.pageNum = 1;
   listForm.total = 0;
   getDataList();
@@ -266,8 +272,8 @@ function editOne(item, index) {
   }
   formShow.value = true;
   setTimeout(() => {
-    (document.querySelector("#i18nFormItem1 input") as HTMLInputElement)?.focus();
-    inputs = Array.from(document.querySelectorAll(".i18n-form-item input"));
+    (document.querySelector('#i18nFormItem1 input') as HTMLInputElement)?.focus();
+    inputs = Array.from(document.querySelectorAll('.i18n-form-item input'));
   }, 500);
 }
 
@@ -294,7 +300,7 @@ function saveOne() {
         data.id = formData.adTranslateId;
       }
       for (const key in formData) {
-        if (key !== "key" && langList.includes(key)) {
+        if (key !== 'key' && langList.includes(key)) {
           const val = formData[key];
           data.content[key] = val;
         }
@@ -303,7 +309,7 @@ function saveOne() {
       http
         .request({
           url,
-          method: "POST",
+          method: 'POST',
           data,
         })
         .then((res) => {
@@ -326,11 +332,11 @@ function saveOne() {
 }
 
 function delOne(id) {
-  ElMessageBox.confirm("确认删除这条翻译记录吗？").then(() => {
+  ElMessageBox.confirm('确认删除这条翻译记录吗？').then(() => {
     http
       .request({
         url: deleteUrl,
-        method: "POST",
+        method: 'POST',
         data: {
           id,
         },
@@ -347,19 +353,19 @@ function delOne(id) {
 }
 
 function delMore() {
-  ElMessageBox.confirm("确认删除选中的翻译记录吗？").then(async () => {
+  ElMessageBox.confirm('确认删除选中的翻译记录吗？').then(async () => {
     let ids = i18nList.value?.getSelectionRows().map((row) => row.adTranslateId);
     if (ids && ids.length) {
       let len = ids.length;
       let loading = ElLoadingService({
-        text: "正在删除选中的翻译……",
+        text: '正在删除选中的翻译……',
       });
       for (let i = 0; i < ids.length; i++) {
         const id = ids[i];
         loading.setText(`正在删除... ${i + 1}/${len}`);
         await http.request({
           url: deleteUrl,
-          method: "POST",
+          method: 'POST',
           data: {
             id,
           },
@@ -373,18 +379,18 @@ function delMore() {
 
 const formItems = reactive<VxeFormPropTypes.Items>([
   {
-    field: "key",
+    field: 'key',
     span: 24,
-    title: "翻译键值",
+    title: '翻译键值',
     itemRender: {
-      name: "$input",
-      props: { class: "i18n-form-item", id: `i18nFormItem${1}` },
+      name: '$input',
+      props: {class: 'i18n-form-item', id: `i18nFormItem${1}`},
     },
   },
 ]);
 
 const fromRules = reactive<VxeFormPropTypes.Rules>({
-  key: [{ required: true, type: "string", message: "请输入翻译键值" }],
+  key: [{required: true, type: 'string', message: '请输入翻译键值'}],
 });
 
 let needInit = true;
@@ -397,15 +403,15 @@ watch(
         listColumns.push({
           field: item.value,
           title: item.label,
-          minWidth: "200",
+          minWidth: '200',
         });
         formItems.push({
           field: item.value,
           span: 24,
           title: item.label,
           itemRender: {
-            name: "$input",
-            props: { class: "i18n-form-item", id: `i18nFormItem${index + 2}` },
+            name: '$input',
+            props: {class: 'i18n-form-item', id: `i18nFormItem${index + 2}`},
           },
         });
       });
@@ -419,24 +425,24 @@ watch(
 
 onMounted(() => {
   getDataList();
-  window.addEventListener("keydown", (e) => {
-    let { key, ctrlKey, altKey } = e;
-    if (key === "s" && ctrlKey) {
+  window.addEventListener('keydown', (e) => {
+    let {key, ctrlKey, altKey} = e;
+    if (key === 's' && ctrlKey) {
       e.preventDefault();
       e.stopPropagation();
       saveOne();
     }
-    if (key === "ArrowRight" && (ctrlKey || altKey)) {
+    if (key === 'ArrowRight' && (ctrlKey || altKey)) {
       e.preventDefault();
       e.stopPropagation();
       nextOne();
     }
-    if (key === "ArrowLeft" && (ctrlKey || altKey)) {
+    if (key === 'ArrowLeft' && (ctrlKey || altKey)) {
       e.preventDefault();
       e.stopPropagation();
       prevOne();
     }
-    if (key === "Tab") {
+    if (key === 'Tab') {
       e.preventDefault();
       e.stopPropagation();
       if (
@@ -456,7 +462,7 @@ onMounted(() => {
       } else {
         setTimeout(() => {
           if (!document.activeElement || !inputs.includes(document.activeElement as HTMLInputElement)) {
-            (document.querySelector("#i18nFormItem1 input") as HTMLInputElement)?.focus();
+            (document.querySelector('#i18nFormItem1 input') as HTMLInputElement)?.focus();
           }
         }, 100);
       }

package/package.json

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