From e62d0809b3a6d2910aead5368139d3da21e465db Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sat, 14 Oct 2023 14:15:38 +0800
Subject: [PATCH] fix ui

---
 src/components/filebrowser/List.vue          |  2 +-
 src/components/form/ReorganizeForm.vue       | 71 +++++++++++---------
 src/views/reorganize/TransferHistoryView.vue |  7 +-
 3 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/src/components/filebrowser/List.vue b/src/components/filebrowser/List.vue
index a55921d4..f9ccd4f9 100644
--- a/src/components/filebrowser/List.vue
+++ b/src/components/filebrowser/List.vue
@@ -524,7 +524,7 @@ onMounted(() => {
   <ReorganizeForm
     v-model="transferPopper"
     :path="currentItem?.path"
-    @done="load"
+    @done="transferPopper = false; load()"
     @close="transferPopper = false"
   />
   <!-- 手动整理进度框 -->
diff --git a/src/components/form/ReorganizeForm.vue b/src/components/form/ReorganizeForm.vue
index fe5b9be3..2183ae81 100644
--- a/src/components/form/ReorganizeForm.vue
+++ b/src/components/form/ReorganizeForm.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { useToast } from 'vue-toast-notification'
+import TmdbSelectorCard from '../cards/TmdbSelectorCard.vue'
 import store from '@/store'
 import api from '@/api'
 import { numberValidator } from '@/@validators'
@@ -60,6 +61,8 @@ const transferForm = reactive({
 watchEffect(() => {
   if (props.path)
     transferForm.path = props.path
+  if (props.target)
+    transferForm.target = props.target
 })
 
 // 使用SSE监听加载进度
@@ -123,9 +126,11 @@ async function transfer() {
     for (const logid of props.logids) {
       transferForm.logid = logid
       try {
-        await api.post('transfer/manual', {}, {
+        const result: { [key: string]: any } = await api.post('transfer/manual', {}, {
           params: transferForm,
         })
+        if (!result.success)
+          $toast.error(`历史记录 ${logid} 重新整理失败：${result.message}！`)
       }
       catch (e) {
         console.log(e)
@@ -148,7 +153,7 @@ async function transfer() {
     inset
   >
     <VCard
-      :title="`${props.path ? `整理 - ${props.path}` : `整理 - ${props.logids?.length} 条记录`}`"
+      :title="`${props.path ? `整理 - ${props.path}` : `整理 - 共 ${props.logids?.length} 条记录`}`"
       class="rounded-t"
     >
       <DialogCloseBtn @click="emit('close')" />
@@ -274,36 +279,36 @@ async function transfer() {
         </VBtn>
       </VCardActions>
     </VCard>
-  </VBottomSheet>
-  <!-- 手动整理进度框 -->
-  <VDialog
-    v-model="progressDialog"
-    :scrim="false"
-    width="25rem"
-  >
-    <VCard
-      color="primary"
+    <!-- 手动整理进度框 -->
+    <VDialog
+      v-model="progressDialog"
+      :scrim="false"
+      width="25rem"
     >
-      <VBottomSheetCardText class="text-center">
-        {{ progressText }}
-        <VProgressLinear
-          v-if="progressValue"
-          color="white"
-          class="mb-0 mt-1"
-          :model-value="progressValue"
-        />
-      </VBottomSheetCardText>
-    </VCard>
-  </VDialog>
-  <!-- TMDB ID搜索框 -->
-  <VDialog
-    v-model="tmdbSelectorDialog"
-    width="40rem"
-    scrollable
-  >
-    <TmdbSelectorCard
-      v-model="transferForm.tmdbid"
-      @close="tmdbSelectorDialog = false"
-    />
-  </VDialog>
+      <VCard
+        color="primary"
+      >
+        <VCardText class="text-center">
+          {{ progressText }}
+          <VProgressLinear
+            v-if="progressValue"
+            color="white"
+            class="mb-0 mt-1"
+            :model-value="progressValue"
+          />
+        </VCardText>
+      </VCard>
+    </VDialog>
+    <!-- TMDB ID搜索框 -->
+    <VDialog
+      v-model="tmdbSelectorDialog"
+      width="40rem"
+      scrollable
+    >
+      <TmdbSelectorCard
+        v-model="transferForm.tmdbid"
+        @close="tmdbSelectorDialog = false"
+      />
+    </VDialog>
+  </VBottomSheet>
 </template>
diff --git a/src/views/reorganize/TransferHistoryView.vue b/src/views/reorganize/TransferHistoryView.vue
index c36d5c44..8dbafcc2 100644
--- a/src/views/reorganize/TransferHistoryView.vue
+++ b/src/views/reorganize/TransferHistoryView.vue
@@ -235,7 +235,8 @@ const dropdownItems = ref([
     props: {
       prependIcon: 'mdi-redo-variant',
       click: (item: TransferHistory) => {
-        currentHistory.value = item
+        redoIds.value = [item.id]
+        redoTarget.value = item.dest ?? ''
         redoDialog.value = true
       },
     },
@@ -427,6 +428,10 @@ const dropdownItems = ref([
     :logids="redoIds"
     :target="redoTarget"
     @done="() => {
+      redoDialog = false
+      // 清空当前操作记录
+      currentHistory = undefined
+      selected = []
       // 刷新
       fetchData({
         page: currentPage,