From 2061cb4851738fbbc0a50fc6ac1e74aa45ff31e9 Mon Sep 17 00:00:00 2001
From: niubility000 <76441520+niubility000@users.noreply.github.com>
Date: Wed, 20 Oct 2021 23:06:50 +0800
Subject: [PATCH] Add files via upload

---
 frontend/src/components/prompts/Copy.vue          | 13 +++++--------
 frontend/src/components/prompts/ReplaceRename.vue |  6 ++++++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/prompts/Copy.vue b/frontend/src/components/prompts/Copy.vue
index 05683a66..1c99108c 100644
--- a/frontend/src/components/prompts/Copy.vue
+++ b/frontend/src/components/prompts/Copy.vue
@@ -83,19 +83,12 @@ export default {
           });
       };
 
-      if (this.$route.path === this.dest) {
-        this.$store.commit("closeHovers");
-        action(false, true);
-
-        return;
-      }
-
       let dstItems = (await api.fetch(this.dest)).items;
       let conflict = upload.checkConflict(items, dstItems);
 
       let overwrite = false;
       let rename = false;
-
+      window.sessionStorage.setItem('destDir', this.dest);
       if (conflict) {
         this.$store.commit("showHover", {
           prompt: "replace-rename",
@@ -113,6 +106,10 @@ export default {
       }
 
       action(overwrite, rename);
+      if (!conflict) { 
+        this.$store.commit("closeHovers");
+        return;
+      }
     },
   },
 };
diff --git a/frontend/src/components/prompts/ReplaceRename.vue b/frontend/src/components/prompts/ReplaceRename.vue
index e6331388..4b97dfe0 100644
--- a/frontend/src/components/prompts/ReplaceRename.vue
+++ b/frontend/src/components/prompts/ReplaceRename.vue
@@ -28,6 +28,7 @@
       <button
         class="button button--flat button--red"
         @click="(event) => showConfirm(event, 'overwrite')"
+        :disabled="$route.path === dest"
         :aria-label="$t('buttons.replace')"
         :title="$t('buttons.replace')"
       >
@@ -42,6 +43,11 @@ import { mapState } from "vuex";
 
 export default {
   name: "replace-rename",
+  data() {
+    return {
+      dest: window.sessionStorage.getItem('destDir'),
+    };
+  },
   computed: mapState(["showConfirm"]),
 };
 </script>