From b1ea71ecfa8792851d70de12f55c9f424c05c45e Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Mon, 15 Apr 2024 17:37:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86&=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=BD=AC=E5=AD=98bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/pure/ms-upload/fileList.vue    |  3 +-
 .../components/bugDetailTab.vue               | 38 ++++++++++++-------
 .../components/caseTemplateDetail.vue         | 37 +++++++++++-------
 .../components/tabContent/tabDetail.vue       | 37 +++++++++++-------
 4 files changed, 74 insertions(+), 41 deletions(-)

diff --git a/frontend/src/components/pure/ms-upload/fileList.vue b/frontend/src/components/pure/ms-upload/fileList.vue
index 1aedeca1b0..1600e9002f 100644
--- a/frontend/src/components/pure/ms-upload/fileList.vue
+++ b/frontend/src/components/pure/ms-upload/fileList.vue
@@ -212,7 +212,6 @@
   watch(
     () => props.fileList,
     (val) => {
-      console.log(props.initFileSaveTips);
       innerFileList.value = val.sort((a, b) => {
         if (a.status === UploadStatus.init && b.status !== UploadStatus.init) {
           return -1; // "init" 排在前面
@@ -383,4 +382,4 @@
     justify-content: space-between;
     padding-bottom: 4px;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/src/views/bug-management/components/bugDetailTab.vue b/frontend/src/views/bug-management/components/bugDetailTab.vue
index de4a33f4f3..f8f38b4247 100644
--- a/frontend/src/views/bug-management/components/bugDetailTab.vue
+++ b/frontend/src/views/bug-management/components/bugDetailTab.vue
@@ -105,21 +105,10 @@
               type="button"
               status="primary"
               class="!mr-[4px]"
-              @click="transferVisible = true"
+              @click="transferHandler(item)"
             >
               {{ t('caseManagement.featureCase.storage') }}
             </MsButton>
-            <TransferModal
-              v-model:visible="transferVisible"
-              :request-fun="transferFileRequest"
-              :params="{
-                projectId: currentProjectId,
-                bugId: bugId,
-                fileId: item.uid,
-                local: true,
-              }"
-              @success="emit('updateSuccess')"
-            />
             <MsButton
               v-if="item.status === 'done'"
               type="button"
@@ -197,6 +186,12 @@
     @save="saveSelectAssociatedFile"
   />
   <a-image-preview v-model:visible="previewVisible" :src="imageUrl" />
+  <TransferModal
+    v-model:visible="transferVisible"
+    :request-fun="transferFileRequest"
+    :params="activeTransferFileParams"
+    @success="emit('updateSuccess')"
+  />
 </template>
 
 <script setup lang="ts">
@@ -235,6 +230,7 @@
   import { findParents, Option } from '@/utils/recursion';
 
   import { BugEditCustomField, BugEditCustomFieldItem, BugEditFormObject } from '@/models/bug-management';
+  import type { OperationFile } from '@/models/caseManagement/featureCase';
   import { AssociatedList, AttachFileInfo } from '@/models/caseManagement/featureCase';
   import { TableQueryParams } from '@/models/common';
 
@@ -540,6 +536,22 @@
     await handleFileFunc(attachments);
     Message.success(t('common.linkSuccess'));
   }
+  const activeTransferFileParams = ref<OperationFile>({
+    projectId: '',
+    bugId: '',
+    fileId: '',
+    local: true,
+  });
+
+  function transferHandler(item: MsFileItem) {
+    activeTransferFileParams.value = {
+      projectId: currentProjectId.value,
+      fileId: item.uid,
+      bugId: props.detailInfo.id,
+      local: true,
+    };
+    transferVisible.value = true;
+  }
 
   watchEffect(() => {
     initCurrentDetail(props.detailInfo);
@@ -571,4 +583,4 @@
   :deep(.arco-form-item-label) {
     font-weight: bold !important;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTemplateDetail.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTemplateDetail.vue
index 5a9b15447a..24b9c83e7a 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseTemplateDetail.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTemplateDetail.vue
@@ -108,21 +108,10 @@
                 type="button"
                 status="primary"
                 class="!mr-[4px]"
-                @click="transferFile"
+                @click="transferFile(item)"
               >
                 {{ t('caseManagement.featureCase.storage') }}
               </MsButton>
-              <TransferModal
-                v-model:visible="transferVisible"
-                :request-fun="transferFileRequest"
-                :params="{
-                  projectId: currentProjectId,
-                  caseId: props.caseId,
-                  fileId: item.uid,
-                  local: true,
-                }"
-                @success="getCaseInfo()"
-              />
               <MsButton
                 v-if="item.status !== 'init'"
                 type="button"
@@ -250,6 +239,12 @@
     @save="saveSelectAssociatedFile"
   />
   <a-image-preview v-model:visible="previewVisible" :src="imageUrl" />
+  <TransferModal
+    v-model:visible="transferVisible"
+    :request-fun="transferFileRequest"
+    :params="activeTransferFileParams"
+    @success="getCaseInfo()"
+  />
 </template>
 
 <script setup lang="ts">
@@ -296,6 +291,7 @@
     CreateOrUpdateCase,
     CustomAttributes,
     DetailCase,
+    OperationFile,
     OptionsFieldId,
     StepList,
   } from '@/models/caseManagement/featureCase';
@@ -695,10 +691,25 @@
   });
 
   const transferVisible = ref<boolean>(false);
+
+  const activeTransferFileParams = ref<OperationFile>({
+    projectId: '',
+    caseId: '',
+    fileId: '',
+    local: true,
+  });
+
   // 转存
-  function transferFile() {
+  function transferFile(item: MsFileItem) {
+    activeTransferFileParams.value = {
+      projectId: currentProjectId.value,
+      caseId: form.value.id,
+      fileId: item.uid,
+      local: true,
+    };
     transferVisible.value = true;
   }
+
   // 下载
   async function downloadFile(item: MsFileItem) {
     try {
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDetail.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDetail.vue
index e7e7ebdbcb..34ca3d0409 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDetail.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDetail.vue
@@ -182,20 +182,9 @@
               >
                 {{ t('ms.upload.preview') }}
               </MsButton>
-              <MsButton type="button" status="primary" class="!mr-[4px]" @click="transferVisible = true">
+              <MsButton type="button" status="primary" class="!mr-[4px]" @click="transferFileHandler(item)">
                 {{ t('caseManagement.featureCase.storage') }}
               </MsButton>
-              <TransferModal
-                v-model:visible="transferVisible"
-                :request-fun="transferFileRequest"
-                :params="{
-                  projectId: currentProjectId,
-                  caseId: detailForm.id,
-                  fileId: item.uid,
-                  local: true,
-                }"
-                @success="emit('updateSuccess')"
-              />
               <MsButton
                 v-if="item.status === 'done'"
                 type="button"
@@ -270,6 +259,12 @@
     />
   </div>
   <a-image-preview v-model:visible="previewVisible" :src="imageUrl" />
+  <TransferModal
+    v-model:visible="transferVisible"
+    :request-fun="transferFileRequest"
+    :params="activeTransferFileParams"
+    @success="emit('updateSuccess')"
+  />
 </template>
 
 <script setup lang="ts">
@@ -308,7 +303,7 @@
   import { downloadByteFile, getGenerateId, sleep } from '@/utils';
   import { scrollIntoView } from '@/utils/dom';
 
-  import type { AssociatedList, DetailCase, StepList } from '@/models/caseManagement/featureCase';
+  import type { AssociatedList, DetailCase, OperationFile, StepList } from '@/models/caseManagement/featureCase';
   import type { TableQueryParams } from '@/models/common';
 
   import { convertToFile } from '../utils';
@@ -674,6 +669,22 @@
     fileListRef.value?.startUpload();
   }
 
+  const activeTransferFileParams = ref<OperationFile>({
+    projectId: '',
+    caseId: '',
+    fileId: '',
+    local: true,
+  });
+  function transferFileHandler(item: MsFileItem) {
+    activeTransferFileParams.value = {
+      projectId: currentProjectId.value,
+      caseId: props.form.id,
+      fileId: item.uid,
+      local: true,
+    };
+    transferVisible.value = true;
+  }
+
   watch(
     () => props.form,
     (val) => {