Răsfoiți Sursa

fix: 取消下载后再次下载校验问题

zhangjie 1 an în urmă
părinte
comite
c447cba0fa
3 a modificat fișierele cu 15 adăugiri și 6 ștergeri
  1. 3 3
      components.d.ts
  2. 1 1
      package.json
  3. 11 2
      src/views/base/track-export/index.vue

+ 3 - 3
components.d.ts

@@ -5,11 +5,11 @@
 // Read more: https://github.com/vuejs/core/pull/3399
 import '@vue/runtime-core'
 
-export {};
+export {}
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    RouterLink: typeof import('vue-router')['RouterLink'];
-    RouterView: typeof import('vue-router')['RouterView'];
+    RouterLink: typeof import('vue-router')['RouterLink']
+    RouterView: typeof import('vue-router')['RouterView']
   }
 }

+ 1 - 1
package.json

@@ -19,7 +19,7 @@
     "postinstall": "electron-builder install-app-deps",
     "build": "npm run typecheck && electron-vite build",
     "build:unpack": "npm run build && electron-builder --dir",
-    "build:win": "npm run build && electron-builder --win --x64 --arm64",
+    "build:win": "npm run build && electron-builder --win --x64",
     "build:mac": "npm run build && electron-builder --mac",
     "build:linux": "npm run build && electron-builder --linux"
   },

+ 11 - 2
src/views/base/track-export/index.vue

@@ -190,6 +190,9 @@
       return false;
     }
 
+    const continueRun = await confirmUnfinishTaskContinue();
+    if (continueRun) return false;
+
     if (!appStore.trackConfig.outputDirIsDefault) {
       const result = await window.electron.dialogSelectFile({
         title: '选择保存目录',
@@ -316,10 +319,15 @@
       appStore.setInfo({ trackConfig });
     }
 
+    await confirmUnfinishTaskContinue();
+  }
+
+  // 判断是否继续进行未完成任务
+  async function confirmUnfinishTaskContinue() {
     const unfinishTask = await window.db.getUnfinishTrackTask(
       userStore.curSchoolInfo.id
     );
-    if (!unfinishTask) return;
+    if (!unfinishTask) return false;
 
     const confirmRes = await modalConfirm(
       '提示',
@@ -327,10 +335,11 @@
     ).catch(() => false);
     if (confirmRes === 'confirm') {
       taskProgressRef.value?.open();
-      return;
+      return true;
     }
 
     await window.db.finishAllUnfinishTask(userStore.curSchoolInfo.id);
+    return false;
   }
 
   onMounted(() => {