yh-i18n 2.1.7 → 2.2.7

package/excelTool.ts

@@ -2,14 +2,48 @@ import ExcelJS from "exceljs";
 import Config from "@/config";
 import { ElMessage, ElLoading } from "element-plus";
 import http from "@/libs/api.request";
+import { useI18nStore } from "./index";
 
 const verificationCode = "lkyhtranslateexcel";
-export async function exportExcel(dataList) {
+export async function exportExcel(total) {
   const loading = ElLoading.service({
     lock: true,
-    text: "正在导出当前页面的翻译字段",
+    text: "正在获取所有翻译字段……",
     background: "rgba(255, 255, 255, 0.2)",
   });
+  const i18nStore = useI18nStore();
+  let records = await http
+    .request({
+      url: "/translate/select",
+      method: "post",
+      data: {
+        pageNum: 1,
+        pageSize: total,
+      },
+    })
+    .then((res) => {
+      let localKeys = i18nStore.localList.map((item) => item.value);
+      let { records } = res.data.data;
+      records = records.map((item) => {
+        try {
+          let content = JSON.parse(item.content);
+          let keys = Object.keys(content);
+
+          keys.forEach((key) => {
+            let val = content[key];
+            item[key] = val;
+          });
+          localKeys.forEach((k) => {
+            if (!keys.includes(k)) {
+              item[k] = "";
+            }
+          });
+        } catch (error) {}
+        return item;
+      });
+      return records;
+    });
+  loading.setText("正在序列化表格数据……");
   const workbook = new ExcelJS.Workbook();
   workbook.creator = "力控远海";
   workbook.lastModifiedBy = "力控远海技术中心前端";
@@ -42,7 +76,7 @@ export async function exportExcel(dataList) {
   sheet.columns = columns;
   sheet.addRow(title);
   sheet.addRows(
-    dataList.map((item) => {
+    records.map((item) => {
       let { adTranslateId, key } = item;
       let row = [adTranslateId, key];
       Config.i18nList.forEach((valKey) => {
@@ -68,7 +102,7 @@ export async function exportExcel(dataList) {
       };
     });
   });
-  sheet.getRows(2, dataList.length)?.forEach((row, index) => {
+  sheet.getRows(2, records.length)?.forEach((row, index) => {
     row.height = 25;
     row.eachCell({ includeEmpty: true }, (cell, cellIndex) => {
       cell.alignment = {
@@ -85,6 +119,7 @@ export async function exportExcel(dataList) {
     });
   });
   sheet.views = [{ state: "frozen", xSplit: 0, ySplit: 1, activeCell: "C2" }];
+  loading.setText("正在生成表格文件……");
   workbook.xlsx.writeBuffer().then((data) => {
     const blob = new Blob([data], {
       type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8",
@@ -106,10 +141,7 @@ async function getFile() {
       {
         description: "请选择之前导出并已经翻译好了的Excel文件",
         accept: {
-          "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": [
-            ".xlsx",
-            ".xls",
-          ],
+          "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": [".xlsx", ".xls"],
         },
       },
     ],

package/lang/baseEnUS.js

@@ -9,7 +9,7 @@ export default {
   编辑: "Edit",
   删除: "Delete",
   操作: "Operation",
-  导出当前页: "Export current page",
+  导出: "Export",
   导入: "Import",
   翻译键值: "Translation Key Values",
   新增翻译: "Add translation",

package/lang/baseTh.js

@@ -9,7 +9,7 @@ export default {
   编辑: "บรรณาธิการ",
   删除: "ลบ",
   操作: "การดำเนินงาน",
-  导出当前页: "ส่งออกหน้าปัจจุบัน",
+  导出: "ส่งออก",
   导入: "นำเข้า",
   翻译键值: "แปลค่ากุญแจ",
   新增翻译: "เพิ่มการแปล",

package/lang/baseTr.js

@@ -9,7 +9,7 @@ export default {
   编辑: "edit",
   删除: "Sil",
   操作: "operasyon",
-  导出当前页: "Ağımdaki sayfanı dışarı aktar",
+  导出: "dışarı aktar",
   导入: "İçeri",
   翻译键值: "Çeviri Anahtarı Değerleri",
   新增翻译: "Çeviri ekle",

package/lang/baseVi.js

@@ -9,7 +9,7 @@ export default {
   编辑: "Chỉnh sửa",
   删除: "Xoá",
   操作: "Hoạt động",
-  导出当前页: "Xuất trang hiện tại",
+  导出: "Xuất",
   导入: "Nhập khẩu",
   翻译键值: "Dịch giá trị khóa",
   新增翻译: "Thêm bản dịch",

package/lang/baseZhCn.js

@@ -9,7 +9,7 @@ export default {
   编辑: "编辑",
   删除: "删除",
   操作: "操作",
-  导出当前页: "导出当前页",
+  导出: "导出",
   导入: "导入",
   翻译键值: "翻译键值",
   新增翻译: "新增翻译",

package/list.vue

@@ -7,29 +7,38 @@
             <el-input
               v-model="listForm.key"
               @keyup.enter.stop.prevent="getDataList(true)"
-              :placeholder="ct('键入以筛选键名')"
-            ></el-input>
+              :placeholder="ct('键入以筛选键名')"></el-input>
           </el-form-item>
         </el-form>
       </div>
-      <el-button type="primary" @click="getDataList">{{
-        ct("搜索")
-      }}</el-button>
+      <el-button
+        type="primary"
+        @click="getDataList">
+        {{ ct("搜索") }}
+      </el-button>
       <el-button @click="resetList">{{ ct("重置") }}</el-button>
     </div>
     <div class="yh-i18n-list-actions">
-      <el-button type="primary" @click="addOne">
+      <el-button
+        type="primary"
+        @click="addOne">
         <i class="iconfont icon-add"></i>
         {{ ct("新增") }}
       </el-button>
-      <el-button type="danger" @click="delMore">
+      <el-button
+        type="danger"
+        @click="delMore">
         <i class="iconfont icon-delete"></i>
         {{ ct("批量删除") }}
       </el-button>
-      <el-button text @click="exportExcel(dataList)">
-        {{ ct("导出当前页") }}
+      <el-button
+        text
+        @click="exportExcel(listForm.total)">
+        {{ ct("导出") }}
       </el-button>
-      <el-button text @click="importExcel(getDataList)">
+      <el-button
+        text
+        @click="importExcel(getDataList)">
         {{ ct("导入") }}
       </el-button>
     </div>
@@ -38,66 +47,64 @@
       stripe
       :data="dataList"
       row-key="adTranslateId"
-      @row-click="rowClickHandler"
-    >
+      @row-click="rowClickHandler">
       <el-table-column
         type="selection"
         width="50"
         align="center"
-        fixed="left"
-      ></el-table-column>
+        fixed="left"></el-table-column>
       <el-table-column
         type="index"
         label="#"
         width="60"
         align="center"
-        fixed="left"
-      ></el-table-column>
+        fixed="left"></el-table-column>
       <el-table-column
         :label="ct('操作')"
         width="140"
         align="center"
-        fixed="left"
-      >
+        fixed="left">
         <template #default="{ row, $index }">
-          <el-button link type="primary" @click="editOne(row, $index)">{{
-            ct("编辑")
-          }}</el-button>
-          <el-button link type="danger" @click="delOne(row.adTranslateId)">{{
-            ct("删除")
-          }}</el-button>
+          <el-button
+            link
+            type="primary"
+            @click="editOne(row, $index)">
+            {{ ct("编辑") }}
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="delOne(row.adTranslateId)">
+            {{ ct("删除") }}
+          </el-button>
         </template>
       </el-table-column>
       <el-table-column
         prop="key"
         min-width="140"
         fixed="left"
-        :label="ct('翻译键名')"
-      ></el-table-column>
+        :label="ct('翻译键名')"></el-table-column>
       <el-table-column
         v-for="column in listColumns"
         :prop="column.field"
         :label="ct(column.title)"
         :minWidth="column.minWidth"
-        show-overflow-tooltip
-      ></el-table-column>
+        show-overflow-tooltip></el-table-column>
     </el-table>
     <el-pagination
       background
-      :page-sizes="[100, 200, 1000, 100000]"
+      :page-sizes="[10, 100, 200, 500, 1000]"
       v-model:page-size="listForm.pageSize"
       :total="listForm.total"
       v-model:current-page="listForm.pageNum"
-      layout="sizes,prev,pager,next,total"
-    ></el-pagination>
+      layout="sizes,prev,pager,next,total"></el-pagination>
   </div>
   <el-dialog
     class="form-drawer"
     v-model="formShow"
     @close="cancelForm"
     draggable
-    :title="formData.adTranslateId ? ct('编辑翻译') : ct('新增翻译')"
-  >
+    :title="formData.adTranslateId ? ct('编辑翻译') : ct('新增翻译')">
     <vxe-form
       title-align="right"
       title-width="100px"
@@ -105,30 +112,32 @@
       title-colon
       :data="formData"
       :items="formItems"
-      :rules="fromRules"
-    ></vxe-form>
+      :rules="fromRules"></vxe-form>
     <template #footer>
       <div class="yh-i18n-form-actions">
         <el-button
           @click="prevOne"
           text
-          :disabled="!isNaN(formDataIndex) && formDataIndex <= 0"
-          >{{ ct("上一个") }}（←）</el-button
-        >
-        <el-button type="primary" plain @click="cancelForm">
+          :disabled="!isNaN(formDataIndex) && formDataIndex <= 0">
+          {{ ct("上一个") }}（←）
+        </el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="cancelForm">
           {{ ct("取消") }}
         </el-button>
-        <el-button type="primary" @click="saveOne">
+        <el-button
+          type="primary"
+          @click="saveOne">
           {{ ct("保存") }}
         </el-button>
         <el-button
           @click="nextOne"
           text
-          :disabled="
-            !isNaN(formDataIndex) && formDataIndex >= dataList.leng - 1
-          "
-          >{{ ct("下一个") }}（→）</el-button
-        >
+          :disabled="!isNaN(formDataIndex) && formDataIndex >= dataList.leng - 1">
+          {{ ct("下一个") }}（→）
+        </el-button>
       </div>
     </template>
   </el-dialog>
@@ -151,7 +160,7 @@ const i18nList = ref();
 const listForm = reactive({
   key: "",
   pageNum: 1,
-  pageSize: 200,
+  pageSize: 10,
   total: 0,
 });
 const listColumns = reactive<any>([]);
@@ -255,9 +264,7 @@ function editOne(item, index) {
   }
   formShow.value = true;
   setTimeout(() => {
-    (
-      document.querySelector("#i18nFormItem1 input") as HTMLInputElement
-    )?.focus();
+    (document.querySelector("#i18nFormItem1 input") as HTMLInputElement)?.focus();
     inputs = Array.from(document.querySelectorAll(".i18n-form-item input"));
   }, 500);
 }
@@ -339,9 +346,7 @@ function delOne(id) {
 
 function delMore() {
   ElMessageBox.confirm("确认删除选中的翻译记录吗？").then(async () => {
-    let ids = i18nList.value
-      ?.getSelectionRows()
-      .map((row) => row.adTranslateId);
+    let ids = i18nList.value?.getSelectionRows().map((row) => row.adTranslateId);
     if (ids && ids.length) {
       let len = ids.length;
       let loading = ElLoadingService({
@@ -448,13 +453,8 @@ onMounted(() => {
         inputs[index].focus();
       } else {
         setTimeout(() => {
-          if (
-            !document.activeElement ||
-            !inputs.includes(document.activeElement as HTMLInputElement)
-          ) {
-            (
-              document.querySelector("#i18nFormItem1 input") as HTMLInputElement
-            )?.focus();
+          if (!document.activeElement || !inputs.includes(document.activeElement as HTMLInputElement)) {
+            (document.querySelector("#i18nFormItem1 input") as HTMLInputElement)?.focus();
           }
         }, 100);
       }

package/package.json

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