yh-i18n 2.2.20 → 2.2.21

package/excelTool.ts

@@ -77,8 +77,8 @@ export async function exportExcel(total) {
   sheet.addRow(title);
   sheet.addRows(
     records.map((item) => {
-      let {adTranslateId, key} = item;
-      let row = [adTranslateId, key];
+      let {adTranslateId, tKey} = item;
+      let row = [adTranslateId, tKey];
       Config.i18nList.forEach((valKey) => {
         row.push(item[valKey]);
       });
@@ -215,14 +215,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 tKey = row.getCell(2).value;
         let content: any = {};
         Config.i18nList.forEach((item, index) => {
           content[item] = row.getCell(index + 3).value;
         });
         dataList.push({
           id,
-          key,
+          tKey,
           content: JSON.stringify(content),
         });
       });

package/list.vue

@@ -5,7 +5,7 @@
         <el-form inline>
           <el-form-item :label="ct('翻译键名')">
             <el-input
-              v-model="listForm.key"
+              v-model="listForm.tKey"
               @keyup.enter.stop.prevent="getDataList(true)"
               :placeholder="ct('键入以筛选键名')"></el-input>
           </el-form-item>
@@ -155,7 +155,7 @@ import {exportExcel, importExcel} from './excelTool';
 
 interface TranslateItem {
   adTranslateId?: string;
-  key: string;
+  tKey: string;
   content: string;
   [key: string]: any;
 }
@@ -167,8 +167,8 @@ interface ListColumn {
 }
 
 interface SaveData {
-  key: string;
-  content: Record<string, string>;
+  tKey: string;
+  content: Record<string, string> | string;
   id?: string;
 }
 const i18nStore = useI18nStore();
@@ -180,7 +180,7 @@ const deleteUrl = '/translate/deleteTranslate';
 
 const i18nList = ref();
 const listForm = reactive({
-  key: '',
+  tKey: '',
   pageNum: 1,
   pageSize: 10,
   total: 0,
@@ -188,7 +188,7 @@ const listForm = reactive({
 const listColumns = reactive<ListColumn[]>([]);
 const dataList = ref<TranslateItem[]>([]);
 function getDataList(isReset = false) {
-  let {key, pageNum, pageSize} = listForm;
+  let {tKey, pageNum, pageSize} = listForm;
   if (isReset) {
     pageNum = 1;
   }
@@ -200,7 +200,7 @@ function getDataList(isReset = false) {
       url: '/translate/select',
       method: 'post',
       data: {
-        key,
+        tKey,
         pageNum,
         pageSize,
       },
@@ -253,7 +253,7 @@ function rowClickHandler(row) {
 }
 
 function resetList() {
-  listForm.key = '';
+  listForm.tKey = '';
   listForm.pageNum = 1;
   listForm.total = 0;
   getDataList();
@@ -262,7 +262,7 @@ function resetList() {
 const langList = Object.keys(i18nStore.langList);
 const formDataIndex = ref<number>();
 const formData = reactive<TranslateItem>({
-  key: '',
+  tKey: '',
   content: '',
 });
 const formShow = ref(false);
@@ -316,7 +316,7 @@ function saveOne() {
   vxeFormRef?.value?.validate().then((errMap) => {
     if (!errMap) {
       let data: SaveData = {
-        key: formData.key,
+        key: formData.tkey,
         content: {},
       };
       if (isAdd) {

package/package.json

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