yh-i18n 1.0.3 → 1.1.0

package/index.js

@@ -3,6 +3,12 @@ import { defineStore } from "pinia";
 import { createI18n } from "vue-i18n";
 import axios from "@/libs/api.request";
 
+// base
+import zhCNBase from "./lang/baseZhCn.js";
+import enUSBase from "./lang/baseEnUS.js";
+import thBase from "./lang/baseTh.js";
+import viBase from "./lang/baseVi.js";
+import trBase from "./lang/baseTr.js";
 // vxe table
 import zhCNVXETable from "vxe-table/lib/locale/lang/zh-CN";
 import enUSVXETable from "vxe-table/lib/locale/lang/en-US";
@@ -24,8 +30,7 @@ const initlang = localStorage.local || localLang || "zh_CN";
 
 export let i18n = null;
 const isDev = import.meta.env.DEV;
-let translateReady = true;
-window.translateReady = translateReady;
+window.translateReady = false;
 function addTranslate(key) {
   if (key.indexOf("vxe") === -1) {
     try {
@@ -43,9 +48,13 @@ function addTranslate(key) {
   }
 }
 const keySet = new Set();
+Object.keys(zhCNBase).forEach((key) => {
+  keySet.add(key);
+});
+
 export const ct = (key, args) => {
   if (isDev) {
-    if (!keySet.has(key) && translateReady) {
+    if (!keySet.has(key) && window.translateReady) {
       keySet.add(key);
       addTranslate(key);
     }
@@ -114,6 +123,7 @@ export const useI18nStore = defineStore("i18nStore", () => {
       }
     });
   }
+
   const title = computed(() => {
     return langList[lang.value];
   });
@@ -150,21 +160,21 @@ async function createMessage(list) {
   list.forEach((item) => {
     switch (item) {
       case "zh_CN":
-        messages["zh_CN"] = Object.assign({}, zhCNVXETable);
+        messages["zh_CN"] = Object.assign(zhCNBase, zhCNVXETable);
         break;
       case "en_US":
-        messages["en_US"] = Object.assign({}, enUSVXETable);
+        messages["en_US"] = Object.assign(enUSBase, enUSVXETable);
         break;
       case "th":
-        messages["th"] = Object.assign({}, thVXETable);
+        messages["th"] = Object.assign(thBase, thVXETable);
         break;
 
       case "vi":
-        messages["vi"] = Object.assign({}, viVXETable);
+        messages["vi"] = Object.assign(viBase, viVXETable);
         break;
 
       case "tr":
-        messages["tr"] = Object.assign({}, trVXETable);
+        messages["tr"] = Object.assign(trBase, trVXETable);
         break;
 
       default:
@@ -191,16 +201,16 @@ async function createMessage(list) {
         }
         Object.entries(itemObj).forEach(([key, val]) => {
           if (list.includes(key)) {
-            messages[key][mKey] = val;
+            if (!messages[key][mKey]) {
+              messages[key][mKey] = val;
+            }
           }
         });
       } catch (err) {
         console.error(err);
       }
     });
-  } catch (error) {
-    translateReady = false;
-  }
+  } catch (error) {}
   return messages;
 }
 

package/lang/baseEnUS.js

@@ -0,0 +1,17 @@
+export default {
+  翻译键名: "Translate key names",
+  翻译管理: "Translation management",
+  键入以筛选键名: "filter key names",
+  搜索: "search",
+  新增: "New addition",
+  批量删除: "Batch deletion",
+  重置: "reset",
+  编辑: "edit",
+  删除: "delete",
+  操作: "operation",
+  中文简体: "Simplified Chinese",
+  English: "English",
+  ไทย: "Thailand.",
+  "Việt nam": "Vietnamese",
+  Türkçe: "Turkish",
+};

package/lang/baseTh.js

@@ -0,0 +1,17 @@
+export default {
+  翻译键名: "ชื่อคีย์การแปล",
+  翻译管理: "การจัดการการแปล",
+  键入以筛选键名: "พิมพ์เพื่อกรองชื่อคีย์",
+  搜索: "ค้นหา",
+  新增: "เพิ่มใหม่",
+  批量删除: "ลบแบทช์",
+  重置: "รีเซ็ต",
+  编辑: "บรรณาธิการ",
+  删除: "ลบ",
+  操作: "การดำเนินงาน",
+  中文简体: "ภาษาจีนตัวย่อ",
+  English: "ภาษาอังกฤษ",
+  ไทย: "ไทย",
+  "Việt nam": "เวียดนาม",
+  Türkçe: "ตุรกี",
+};

package/lang/baseTr.js

@@ -0,0 +1,17 @@
+export default {
+  翻译键名: "Anahtar isimlerini çevir",
+  翻译管理: "Çeviri Yönetimi",
+  键入以筛选键名: "Anahtar isimlerini silmek için yazın",
+  搜索: "arama",
+  新增: "Yeni ekleme",
+  批量删除: "Toplu silme",
+  重置: "Sıfırla",
+  编辑: "edit",
+  删除: "Sil",
+  操作: "operasyon",
+  中文简体: "Basitleştirilmiş Çince",
+  English: "İngilizce",
+  ไทย: "Tayland.",
+  "Việt nam": "Vietnamca",
+  Türkçe: "Türkçe",
+};

package/lang/baseVi.js

@@ -0,0 +1,17 @@
+export default {
+  翻译键名: "Tên khóa dịch",
+  翻译管理: "Quản lý phiên dịch",
+  键入以筛选键名: "Nhập để lọc các tên khóa",
+  搜索: "Tìm kiếm",
+  新增: "Mới",
+  批量删除: "Xóa hàng loạt",
+  重置: "Đặt lại",
+  编辑: "Chỉnh sửa",
+  删除: "Xoá",
+  操作: "Hoạt động",
+  中文简体: "Trung Quốc",
+  English: "Tiếng Việt",
+  ไทย: "Thái Lan.",
+  "Việt nam": "Việt nam",
+  Türkçe: "Thổ Nhĩ Kỳ",
+};

package/lang/baseZhCn.js

@@ -0,0 +1,17 @@
+export default {
+  翻译键名: "翻译键名",
+  翻译管理: "翻译管理",
+  键入以筛选键名: "键入以筛选键名",
+  搜索: "搜索",
+  新增: "新增",
+  批量删除: "批量删除",
+  重置: "重置",
+  编辑: "编辑",
+  删除: "删除",
+  操作: "操作",
+  中文简体: "中文简体",
+  English: "英语",
+  ไทย: "泰语",
+  "Việt nam": "越南语",
+  Türkçe: "土耳其语",
+};

package/language.vue

@@ -14,17 +14,35 @@
       </el-dropdown-menu>
     </template>
   </el-dropdown>
-  <el-link v-if="isDev" type="warning" href="/#/translate">翻译管理</el-link>
+  &nbsp;&nbsp;&nbsp;
+  <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>
 </template>
 
 <script setup>
-import { useI18nStore } from "yh-i18n";
+import { useI18nStore, ct } from "yh-i18n";
 import { storeToRefs } from "pinia";
-import { ref } from "vue";
+import { ref, watch } from "vue";
 
 const isDev = ref(import.meta.env.DEV);
 
 const i18nStore = useI18nStore();
+const isCollect = ref(window.translateReady);
+watch(
+  () => isCollect.value,
+  (val) => {
+    window.translateReady = val;
+  }
+);
 
 const { localList, title } = storeToRefs(i18nStore);
 

package/list.vue

@@ -5,11 +5,16 @@
         <i class="iconfont icon-add"></i>
         {{ ct("新增") }}
       </el-button>
+      <el-button type="danger" @click="delMore">
+        <i class="iconfont icon-delete"></i>
+        {{ ct("批量删除") }}
+      </el-button>
       <div class="yh-i18n-list-conditions">
         <el-form inline>
           <el-form-item :label="ct('翻译键名')">
             <el-input
               v-model="listForm.key"
+              @keyup.enter.stop.prevent="getDataList(true)"
               :placeholder="ct('键入以筛选键名')"
             ></el-input>
           </el-form-item>
@@ -20,7 +25,18 @@
       }}</el-button>
       <el-button @click="resetList">{{ ct("重置") }}</el-button>
     </div>
-    <el-table :data="dataList" row-key="adTranslateId">
+    <el-table
+      ref="i18nList"
+      :data="dataList"
+      row-key="adTranslateId"
+      @row-click="rowClickHandler"
+    >
+      <el-table-column
+        type="selection"
+        width="60"
+        align="center"
+        fixed="left"
+      ></el-table-column>
       <el-table-column
         type="index"
         label="#"
@@ -53,12 +69,12 @@
       ></el-table-column>
     </el-table>
     <el-pagination
-      small
       background
-      :page-size="listForm.pageSize"
+      :page-sizes="[100, 200, 1000, 10000]"
+      v-model:page-size="listForm.pageSize"
       :total="listForm.total"
       v-model:current-page="listForm.pageNum"
-      layout="prev,pager,next,total"
+      layout="sizes,prev,pager,next,total"
     ></el-pagination>
   </div>
   <el-dialog
@@ -105,11 +121,10 @@
 </template>
 <script setup lang="ts">
 import { reactive, ref, onMounted, watch } from "vue";
-import { ElMessage, ElMessageBox } from "element-plus";
+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 { nextTick } from "vue";
 
 const i18nStore = useI18nStore();
 const vxeFormRef = ref<VxeFormInstance>();
@@ -118,16 +133,20 @@ const insertUrl = "/translate/insert";
 const updateUrl = "/translate/edit";
 const deleteUrl = "/translate/deleteTranslate";
 
+const i18nList = ref();
 const listForm = reactive({
   key: "",
   pageNum: 1,
-  pageSize: 100,
+  pageSize: 200,
   total: 0,
 });
 const listColumns = reactive<any>([]);
 const dataList = ref<any>([]);
-function getDataList() {
+function getDataList(isReset = false) {
   let { key, pageNum, pageSize } = listForm;
+  if (isReset) {
+    pageNum = 1;
+  }
   http
     .request({
       url: "/translate/select",
@@ -162,6 +181,17 @@ function getDataList() {
       listForm.total = total;
     });
 }
+
+watch(
+  () => listForm.pageNum,
+  () => {
+    getDataList();
+  }
+);
+
+function rowClickHandler(row) {
+  i18nList.value?.toggleRowSelection(row);
+}
 function resetList() {
   listForm.key = "";
   listForm.pageNum = 1;
@@ -263,13 +293,39 @@ function delOne(id) {
       .then((res) => {
         if (res?.data?.status === 200) {
           ElMessage.success(res.data.msg);
-          resetList();
+          getDataList();
         } else {
           ElMessage.error(res.data.msg);
         }
       });
   });
 }
+function delMore() {
+  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: "正在删除选中的翻译……",
+      });
+      for (let i = 0; i < ids.length; i++) {
+        const id = ids[i];
+        loading.setText(`正在删除... ${i + 1}/${len}`);
+        await http.request({
+          url: deleteUrl,
+          method: "POST",
+          data: {
+            id,
+          },
+        });
+      }
+      loading.close();
+      getDataList();
+    }
+  });
+}
 
 const formItems = reactive<VxeFormPropTypes.Items>([
   {
@@ -307,9 +363,6 @@ watch(
             props: { class: "i18n-form-item", id: `i18nFormItem${index + 2}` },
           },
         });
-        fromRules[item.value] = [
-          { required: true, type: "string", message: `请输入${item.label}` },
-        ];
       });
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yh-i18n",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "对于国际化的封装",
   "main": "index.js",
   "scripts": {
@@ -12,7 +12,6 @@
   },
   "peerDependencies": {
     "vue": "3.2.47",
-    "pinia": "2.0.35",
     "vxe-table": "4.3.10",
     "element-plus": "2.4.4"
   },