yh-i18n 2.3.1 → 2.3.3

package/excelTool.ts

@@ -78,8 +78,8 @@ export async function exportExcel(total) {
   sheet.addRow(title);
   sheet.addRows(
     records.map((item) => {
-      let {adTranslateId, key} = item;
-      let row = [adTranslateId, key];
+      let {id, name} = item;
+      let row = [id, name];
       Config.i18nList.forEach((valKey) => {
         row.push(item[valKey]);
       });
@@ -216,14 +216,14 @@ export async function importExcel(e, getDataList) {
       let dataList: any[] = [];
       sheet.getRows(2, len)?.forEach((row) => {
         let id = row.getCell(1).value;
-        let key = row.getCell(2).value;
+        let name = row.getCell(2).value;
         let content: any = {};
         Config.i18nList.forEach((item, index) => {
           content[item] = row.getCell(index + 3).value;
         });
         dataList.push({
           id,
-          key,
+          name,
           content: JSON.stringify(content),
         });
       });

package/index.js

@@ -50,15 +50,15 @@ Object.keys(zhCNBase).forEach((key) => {
 
 const unHandle = [];
 
-function addTranslate (key) {
-  if (key && key.indexOf("vxe") === -1) {
+function addTranslate (name) {
+  if (name && name.indexOf("vxe") === -1) {
     try {
       axios.request({
         url: "/translate/insert",
         method: "POST",
         data: {
-          key,
-          content: `{"zh_CN":"${key}"}`,
+          name,
+          content: `{"zh_CN":"${name}"}`,
         },
       });
     } catch (error) {

package/language.vue

@@ -12,23 +12,24 @@
           :command="lo.value">
           {{ lo.label }}
         </el-dropdown-item>
+        <el-dropdown-item divided disabled v-if="isDev">
+          开发工具
+        </el-dropdown-item>
+        <el-dropdown-item v-if="isDev">
+          <el-link type="warning" href="/#/translate">
+            {{ ct("翻译") }}
+          </el-link>
+        </el-dropdown-item>
+        <el-dropdown-item v-if="isDev" @click.prevent>
+          <el-switch
+            :active-text="ct('收集')"
+            :inactive-text="ct('不收集')"
+            inline-prompt
+            v-model="isCollect" />
+        </el-dropdown-item>
       </el-dropdown-menu>
     </template>
   </el-dropdown>
-  &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>

package/list.vue

@@ -2,10 +2,10 @@
   <div class="yh-i18n-list-container">
     <div class="yh-i18n-list-actions">
       <div class="yh-i18n-list-conditions">
-        <el-form inline>
+        <el-form inline @submit.prevent>
           <el-form-item :label="ct('翻译键名')">
             <el-input
-              v-model="listForm.key"
+              v-model="listForm.name"
               @keyup.enter.stop.prevent="getDataList(true)"
               :placeholder="ct('键入以筛选键名')"></el-input>
           </el-form-item>
@@ -48,7 +48,7 @@
       ref="i18nList"
       stripe
       :data="dataList"
-      row-key="adTranslateId"
+      row-key="id"
       @row-click="rowClickHandler">
       <el-table-column
         type="selection"
@@ -76,13 +76,13 @@
           <el-button
             link
             type="danger"
-            @click="delOne(row.adTranslateId)">
+            @click="delOne(row.id)">
             {{ ct('删除') }}
           </el-button>
         </template>
       </el-table-column>
       <el-table-column
-        prop="key"
+        prop="name"
         min-width="140"
         fixed="left"
         :label="ct('翻译键名')"></el-table-column>
@@ -106,7 +106,7 @@
     v-model="formShow"
     @close="cancelForm"
     draggable
-    :title="formData.adTranslateId ? ct('编辑翻译') : ct('新增翻译')">
+    :title="formData.id ? ct('编辑翻译') : ct('新增翻译')">
     <vxe-form
       title-align="right"
       title-width="100px"
@@ -114,7 +114,7 @@
       title-colon
       :data="formData"
       :items="formItems"
-      :rules="fromRules"></vxe-form>
+      :rules="formRules"></vxe-form>
     <template #footer>
       <div class="yh-i18n-form-actions">
         <el-button
@@ -160,7 +160,7 @@ const deleteUrl = '/translate/deleteTranslate';
 
 const i18nList = ref();
 const listForm = reactive({
-  key: '',
+  name: '',
   pageNum: 1,
   pageSize: 10,
   total: 0,
@@ -168,7 +168,7 @@ const listForm = reactive({
 const listColumns = reactive<any>([]);
 const dataList = ref<any>([]);
 function getDataList(isReset = false) {
-  let {key, pageNum, pageSize} = listForm;
+  let {name, pageNum, pageSize} = listForm;
   if (isReset) {
     pageNum = 1;
   }
@@ -180,7 +180,7 @@ function getDataList(isReset = false) {
       url: '/translate/select',
       method: 'post',
       data: {
-        key,
+        name,
         pageNum,
         pageSize,
       },
@@ -231,7 +231,7 @@ function rowClickHandler(row) {
 }
 
 function resetList() {
-  listForm.key = '';
+  listForm.name = '';
   listForm.pageNum = 1;
   listForm.total = 0;
   getDataList();
@@ -286,21 +286,21 @@ function nextOne() {
 }
 
 function saveOne() {
-  let isAdd = !!formData.adTranslateId;
+  let isAdd = !!formData.id;
   let url = updateUrl;
   vxeFormRef?.value?.validate().then((errMap) => {
     if (!errMap) {
       let data: any = {
-        key: formData.key,
+        name: formData.name,
         content: {},
       };
       if (isAdd) {
         url = insertUrl;
       } else {
-        data.id = formData.adTranslateId;
+        data.id = formData.id;
       }
       for (const key in formData) {
-        if (key !== 'key' && langList.includes(key)) {
+        if (key !== 'name' && langList.includes(key)) {
           const val = formData[key];
           data.content[key] = val;
         }
@@ -315,13 +315,14 @@ function saveOne() {
         .then((res) => {
           if (res?.data?.status === 200) {
             ElMessage.success(res.data.msg);
-            if (!isAdd) {
+            if (isAdd) {
               dataList.value[formDataIndex.value] = {
                 ...formData,
               };
               nextOne();
             } else {
               cancelForm();
+              getDataList();
             }
           } else {
             ElMessage.error(res.data.msg);
@@ -354,24 +355,37 @@ 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.id);
     if (ids && ids.length) {
       let len = ids.length;
       let loading = ElLoadingService({
         text: '正在删除选中的翻译……',
       });
+      let failCount = 0;
       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,
-          },
-        });
+        try {
+          let res = await http.request({
+            url: deleteUrl,
+            method: 'POST',
+            data: {
+              id,
+            },
+          });
+          if (res?.data?.status !== 200) {
+            failCount++;
+          }
+        } catch {
+          failCount++;
+        }
       }
       loading.close();
+      if (failCount === 0) {
+        ElMessage.success(`成功删除 ${len} 条`);
+      } else {
+        ElMessage.warning(`删除 ${len - failCount}/${len} 条，失败 ${failCount} 条`);
+      }
       getDataList();
     }
   });
@@ -379,7 +393,7 @@ function delMore() {
 
 const formItems = reactive<VxeFormPropTypes.Items>([
   {
-    field: 'key',
+    field: 'name',
     span: 24,
     title: '翻译键值',
     itemRender: {
@@ -389,8 +403,8 @@ const formItems = reactive<VxeFormPropTypes.Items>([
   },
 ]);
 
-const fromRules = reactive<VxeFormPropTypes.Rules>({
-  key: [{required: true, type: 'string', message: '请输入翻译键值'}],
+const formRules = reactive<VxeFormPropTypes.Rules>({
+  name: [{required: true, type: 'string', message: '请输入翻译键值'}],
 });
 
 let needInit = true;

package/package.json

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