fix: 批量导出的一些问题

Author: clansty

MaiChartManager/Front/src/global.sass

@@ -81,6 +81,12 @@ pre
 .n-anchor .n-anchor-link
   line-height: 1.7 !important
 
+.n-button__border, .n-button__state-border, .n-base-wave
+  display: none !important
+
+.n-button
+  color: #303133 !important
+
 .absolute-full
   position: absolute
   top: 0
@@ -100,4 +106,4 @@ pre
       transition: background 0.2s
 
       &:hover
-        background: #666
+        background: #666

MaiChartManager/Front/src/locales/en.yaml

@@ -20,6 +20,7 @@ common:
   management: Management
   dismiss: Dismiss
   longMusic: LongMusic
+  error: Error
 assetDir:
   title: Opt Management
   create: Create Directory
@@ -163,6 +164,9 @@ music:
     editFailed: Batch edit failed
     currentProgress: Current Progress
     currentProcessing: Currently Processing
+    exportFailed: Failed to export
+    exportSuccess: Export successful
+    deleteSuccess: Deleted successfully
   delete:
     confirm: Confirm
     confirmDelete: Confirm Delete
@@ -304,6 +308,13 @@ mod:
   loaded: Loaded
   killGameProcess: Kill Game Process
   needInstallOrUpdate: AquaMai not installed or needs update
+  ioKeyMap:
+    disabled: Disabled
+    select: Select
+    select1P: 1P Select
+    select2P: 2P Select
+    service: Service
+    test: Test
   adxHid:
     disabled: Disabled
     select1P: 1P Select
@@ -430,11 +441,16 @@ mod:
     Button2p: 2P Buttons
     Led1p: 1P LEDs
     Led2p: 2P LEDs
+    Touch: Touchscreen
+    Button: Buttons
+    Led: LEDs
     P1: Enable 1P
     P2: Enable 2P
     tip: If mixing Maimoller with other protocols, disable this for the non-Maimoller side
   on: 'On'
   off: 'Off'
+  enable: Enable
+  disable: Disable
   stableChannel: "Stable Channel"
   fastChannel: "Fast Channel"
   mumod: "MuMod"

MaiChartManager/Front/src/locales/zh-TW.yaml

@@ -20,6 +20,7 @@ common:
   management: 管理
   dismiss: 放棄
   longMusic: LongMusic
+  error: 錯誤
 assetDir:
   title: Opt 管理
   create: 建立目錄
@@ -156,6 +157,9 @@ music:
     editFailed: 批次修改失敗
     currentProgress: 目前進度
     currentProcessing: 目前處理
+    exportFailed: 匯出失敗
+    exportSuccess: 匯出成功
+    deleteSuccess: 刪除成功
   delete:
     confirm: 確認
     confirmDelete: 確認刪除
@@ -282,6 +286,13 @@ mod:
   loaded: 已載入
   killGameProcess: 關閉遊戲處理程序
   needInstallOrUpdate: AquaMai 未安裝或需要更新
+  ioKeyMap:
+    disabled: 停用
+    select: 選擇
+    select1P: 1P 選擇
+    select2P: 2P 選擇
+    service: 服務
+    test: 測試
   adxHid:
     disabled: 停用
     select1P: 1P 選擇
@@ -393,11 +404,16 @@ mod:
     Button2p: 2P 按鍵
     Led1p: 1P 燈光
     Led2p: 2P 燈光
+    Touch: 觸屏
+    Button: 按鍵
+    Led: 燈光
     P1: 啟用 1P
     P2: 啟用 2P
     tip: 如果混用 Maimoller 與其他協議，請對不是 Maimoller 的一侧停用
   on: 開
   off: 關
+  enable: 啟用
+  disable: 停用
   stableChannel: "穩定通道"
   fastChannel: "快速通道"
   mumod: "MuMod"
@@ -426,6 +442,9 @@ mod:
     refresh: "重新整理設備狀態"
     unavailable: "PDX 驅動工具不可用"
     selectDevice: "選擇設備"
+    path1P: "1P 設備路徑"
+    path2P: "2P 設備路徑"
+    pathDesc: "USB 連接埠路徑，例如 2.2。請使用設定工具中顯示的路徑。留空則使用第一個偵測到的設備作為 1P"
 tools:
   title: 工具
   audioConvert: 音訊轉換（ACB + AWB）

MaiChartManager/Front/src/locales/zh.yaml

@@ -20,6 +20,7 @@ common:
   management: 管理
   dismiss: 放弃
   longMusic: 长乐曲
+  error: 错误
 assetDir:
   title: Opt 管理
   create: 创建目录
@@ -156,6 +157,9 @@ music:
     editFailed: 批量修改失败
     currentProgress: 当前进度
     currentProcessing: 当前处理
+    exportFailed: 导出失败
+    exportSuccess: 导出成功
+    deleteSuccess: 删除成功
   delete:
     confirm: 确认
     confirmDelete: 确认删除

MaiChartManager/Front/src/views/BatchAction/ChooseAction.tsx

@@ -1,6 +1,6 @@
 import { defineComponent, PropType, ref } from "vue";
 import { MusicXmlWithABJacket } from "@/client/apiGen";
-import { Button, Radio, Select, Popover } from "@munet/ui";
+import { Button, Radio, Select, Popover, addToast } from "@munet/ui";
 import { STEP } from "@/views/BatchAction/index";
 import api, { isWebView } from "@/client/api";
 import { showNeedPurchaseDialog, updateMusicList, version } from "@/store/refs";
@@ -47,19 +47,22 @@ export default defineComponent({
           load.value = true;
           await api.BatchDeleteMusic(props.selectedMusic!);
           await updateMusicList();
-          props.continue(STEP.None);
+          addToast({message: t('music.batch.deleteSuccess'), type: 'success'});
+          props.continue(STEP.Select);
           break;
         case OPTIONS.CreateNewOpt:
         case OPTIONS.CreateNewOptCompatible:
           if (isWebView) {
-            props.continue(STEP.None);
+            props.continue(STEP.Select);
             await api.RequestCopyTo({music: props.selectedMusic, removeEvents: selectedOption.value === OPTIONS.CreateNewOptCompatible, legacyFormat: false});
+            addToast({message: t('music.batch.exportSuccess'), type: 'success'});
             break;
           }
         case OPTIONS.CreateNewOptMa2_103:
           if (isWebView) {
-            props.continue(STEP.None);
+            props.continue(STEP.Select);
             await api.RequestCopyTo({music: props.selectedMusic, removeEvents: true, legacyFormat: true});
+            addToast({message: t('music.batch.exportSuccess'), type: 'success'});
             break;
           }
         case OPTIONS.ConvertToMaidata:

MaiChartManager/Front/src/views/BatchAction/remoteExport.tsx

@@ -123,7 +123,11 @@ export default async (
         const entries = zipReader.getEntriesGenerator();
         for await (const entry of entries) {
           try {
-            if (entry.filename.endsWith("/") || !entry.getData) {
+            if (entry.filename.endsWith("/")) {
+              continue;
+            }
+
+            if (!('getData' in entry)) {
               continue;
             }
 
@@ -185,8 +189,14 @@ export default async (
 
   try {
     await Promise.all(Array.from({ length: workerCount }, () => worker()));
-  } finally {
+    addToast({message: t('music.batch.exportSuccess'), type: 'success'});
+  }
+  catch (e) {
+    console.error(e);
+    addToast({ type: 'error', message: `${t('error.exportFailed')}` });
+  }
+  finally {
     currentProcessItem.value = "";
-    setStep(STEP.None);
+    setStep(STEP.Select);
   }
 };