yh-i18n 2.3.2 → 2.3.4

package/language.vue

@@ -3,7 +3,7 @@
     split-button
     class="language-dropdown"
     trigger="click"
-    @command="setLang">
+    @command="(cmd) => { if (cmd !== 'link' && cmd !== 'switch') setLang(cmd) }">
     {{ title }}
     <template #dropdown>
       <el-dropdown-menu>
@@ -12,23 +12,24 @@
           :command="lo.value">
           {{ lo.label }}
         </el-dropdown-item>
+        <el-dropdown-item divided disabled v-if="isDev">
+          {{ct('翻译工具')}}
+        </el-dropdown-item>
+        <el-dropdown-item command="link" v-if="isDev">
+          <el-link type="warning" href="/#/translate">
+            {{ ct("翻译") }}
+          </el-link>
+        </el-dropdown-item>
+        <el-dropdown-item  command="switch" 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,7 +2,7 @@
   <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.name"
@@ -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);
@@ -360,18 +361,31 @@ function delMore() {
       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();
     }
   });

package/package.json

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