yh-i18n 2.2.9 → 2.2.11

package/excelTool.ts

@@ -139,7 +139,7 @@ async function getFile() {
     id: "importTranslateExcel",
     types: [
       {
-        description: "请选择之前导出并已经翻译好了的Excel文件",
+        description: "请选择之前导出的文件",
         accept: {
           "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": [".xlsx", ".xls"],
         },
@@ -162,6 +162,20 @@ async function getFile() {
   }
 }
 
+
+async function saveData(dataList){
+  return await http
+      .request({
+        url: "/translate/save",
+        type: "json",
+        method: "POST",
+        data: dataList,
+      })
+      .then((res) => {
+        return res?.data?.status === 200
+      })
+}
+
 export async function importExcel(getDataList) {
   if (!window["showOpenFilePicker"]) {
     ElMessage({
@@ -178,56 +192,62 @@ export async function importExcel(getDataList) {
     });
     return false;
   } else {
-    const workbook = new ExcelJS.Workbook();
-    await workbook.xlsx.load(file);
-    if (workbook.keywords !== verificationCode) {
-      ElMessage({
-        message: "您选择的文件不是系统导出的文件",
-        type: "warning",
-      });
-      return false;
-    }
-    const loading = ElLoading.service({
-      lock: true,
-      text: "开始读取已翻译的字段",
-      background: "rgba(255, 255, 255, 0.2)",
-    });
-    let sheet = workbook.worksheets[0];
-    let len = sheet._rows.length - 1;
-    let dataList: any[] = [];
-    sheet.getRows(2, len)?.forEach((row) => {
-      let id = row.getCell(1).value;
-      let key = row.getCell(2).value;
-      let content: any = {};
-      Config.i18nList.forEach((item, index) => {
-        content[item] = row.getCell(index + 3).value;
+    try {
+      const workbook = new ExcelJS.Workbook();
+      await workbook.xlsx.load(file);
+      if (workbook.keywords !== verificationCode) {
+        ElMessage({
+          message: "您选择的文件不是系统导出的文件",
+          type: "warning",
+        });
+        return false;
+      }
+      const loading = ElLoading.service({
+        lock: true,
+        text: "开始读取已翻译的字段",
+        background: "rgba(255, 255, 255, 0.5)",
+        customClass: "yh-i18n-loading"
       });
-      dataList.push({
-        id,
-        key,
-        content: JSON.stringify(content),
+      let sheet = workbook.worksheets[0];
+      let len = sheet._rows.length - 1;
+      let dataList: any[] = [];
+      sheet.getRows(2, len)?.forEach((row) => {
+        let id = row.getCell(1).value;
+        let key = row.getCell(2).value;
+        let content: any = {};
+        Config.i18nList.forEach((item, index) => {
+          content[item] = row.getCell(index + 3).value;
+        });
+        dataList.push({
+          id,
+          key,
+          content: JSON.stringify(content),
+        });
       });
-    });
-    loading.setText("读取完成，正在更新");
-
-    http
-      .request({
-        url: "/translate/save",
-        type: "json",
-        method: "POST",
-        data: dataList,
-      })
-      .then((res) => {
-        loading.close();
-        if (res?.data?.status === 200) {
-          ElMessage.success("导入成功！");
-          getDataList();
+      loading.setText("读取完成，正在更新");
+  
+      let dataLen = dataList.length;
+      let flag = true;
+      let saveLength = 200;
+      while (flag) {
+        if(dataList.length > saveLength) {
+          let perCent = (dataLen - dataList.length)/dataLen
+          let fillIndex = parseInt((perCent / 0.5 * 10).toFixed(0));
+          let loadingText = new Array(20);
+          loadingText.fill('◇',0,20-fillIndex)
+          loadingText.fill('◆',20-fillIndex)
+          loading.setText(`${(perCent*100).toFixed(2)}%　${loadingText.join('')}　正在更新…………`)
+          await saveData(dataList.splice(0,saveLength))
         } else {
-          ElMessage.error(res.data.msg);
+          await saveData(dataList)
+          flag = false;
         }
-      })
-      .finally((err) => {
-        loading.close();
-      });
+      }
+      loading.close();
+      ElMessage.success("导入数据保存成功")
+      getDataList();
+    } catch (error) {
+      ElMessage.error("导入保存翻译数据遇到错误：",error.message)
+    }
   }
 }

package/list.vue

@@ -468,14 +468,21 @@ onMounted(() => {
   display: flex;
   flex-direction: column;
   .yh-i18n-list-actions {
-    padding: 16px;
+    padding: 8px 16px;
     box-sizing: border-box;
     display: flex;
     .yh-i18n-list-conditions {
       padding: 0 8px;
       flex: 1;
+      .el-form--inline .el-form-item {
+       margin-bottom: 0;
+       margin-right: 18px; 
+      }
     }
   }
+  .yh-i18n-list-actions + .yh-i18n-list-actions {
+    padding-top: 0;
+  }
   .el-table {
     flex: 1;
   }
@@ -489,4 +496,10 @@ onMounted(() => {
     flex: 1;
   }
 }
+.yh-i18n-loading {
+  .el-loading-text {
+    font-size: 20px;
+    font-weight: 600;
+  }
+}
 </style>

package/package.json

@@ -1,20 +1,20 @@
-{
-  "name": "yh-i18n",
-  "version": "2.2.9",
-  "description": "对于国际化的封装",
-  "main": "index.js",
-  "scripts": {
-    "pub:npm": "npm publish --registry https://registry.npmjs.org/ --no-git-checks",
-    "pub:aliyun": "npm publish --registry https://packages.aliyun.com/60765e0161a945067837bb5f/npm/npm-registry/ --no-git-checks"
-  },
-  "dependencies": {
-    "exceljs": "4.4.0"
-  },
-  "peerDependencies": {
-    "vue-i18n": "9.8.0",
-    "vue": "3.2.47",
-    "vxe-table": "4.3.10",
-    "element-plus": "2.3.8"
-  },
-  "author": "Liubin"
-}
+{
+  "name": "yh-i18n",
+  "version": "2.2.11",
+  "description": "对于国际化的封装",
+  "main": "index.js",
+  "scripts": {
+    "pub:npm": "npm publish --registry https://registry.npmjs.org/ --no-git-checks",
+    "pub:aliyun": "npm publish --registry https://packages.aliyun.com/60765e0161a945067837bb5f/npm/npm-registry/ --no-git-checks"
+  },
+  "dependencies": {
+    "exceljs": "4.4.0"
+  },
+  "peerDependencies": {
+    "vue-i18n": "9.8.0",
+    "vue": "3.2.47",
+    "vxe-table": "4.3.10",
+    "element-plus": "2.3.8"
+  },
+  "author": "Liubin"
+}