From d2b2ca1aa5fe0cce80a7c6b820cf0e141134ed73 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Thu, 16 Feb 2023 17:58:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E7=BC=96=E8=BE=91=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1023038 --user=宋昌昌 【测试跟踪】功能用例，添加缺陷-上传本地附件，上传后页面卡住 https://www.tapd.cn/55049933/s/1336520
---
 .../business/case/components/TestCaseList.vue |   2 +-
 .../components/case/CaseAttachmentItem.vue    |  15 +-
 .../components/case/CaseIssueEditDetail.vue   | 304 +-----------------
 .../case/components/case/CaseIssueRelate.vue  |   2 +-
 test-track/frontend/src/i18n/lang/en-US.js    |   5 +-
 test-track/frontend/src/i18n/lang/zh-CN.js    |   5 +-
 test-track/frontend/src/i18n/lang/zh-TW.js    |   5 +-
 7 files changed, 25 insertions(+), 313 deletions(-)

diff --git a/test-track/frontend/src/business/case/components/TestCaseList.vue b/test-track/frontend/src/business/case/components/TestCaseList.vue
index 66d128ed3e..8d67d1ab40 100644
--- a/test-track/frontend/src/business/case/components/TestCaseList.vue
+++ b/test-track/frontend/src/business/case/components/TestCaseList.vue
@@ -143,7 +143,7 @@
           prop="tags"
           :field="item"
           :fields-width="fieldsWidth"
-          max-width="180px"
+          min-width="180"
           :show-overflow-tooltip="false"
           :label="$t('commons.tag')">
           <template v-slot:default="scope">
diff --git a/test-track/frontend/src/business/case/components/case/CaseAttachmentItem.vue b/test-track/frontend/src/business/case/components/case/CaseAttachmentItem.vue
index 2dd3a37fe2..eed31103ff 100644
--- a/test-track/frontend/src/business/case/components/case/CaseAttachmentItem.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseAttachmentItem.vue
@@ -6,11 +6,7 @@
       </div>
       <div class="detail">
         <div class="filename">
-          <div
-            :class="
-              fileItem.diffStatus == 2 ? ['content', 'line-through'] : 'content'
-            "
-          >
+          <div :class="fileItem.diffStatus == 2 ? ['content', 'line-through'] : 'content'">
             {{ fileItem.name }}
           </div>
           <case-diff-status
@@ -31,11 +27,10 @@
           <div class="split">/</div>
           <div class="size">{{ fileItem.size }}</div>
         </div>
-        <div class="error-msg" v-else-if="isError">上传失败</div>
-        <div class="error-msg" v-else-if="isExpired">
-          该文件不存在
-        </div>
-        <div class="wait-upload" v-else-if="isToUpload">等待上传</div>
+        <div class="error-msg" v-else-if="isError">{{$t("attachment.upload_error")}}</div>
+        <div class="error-msg" v-else-if="isExpired">{{$t("attachment.not_exits")}}</div>
+        <div class="wait-upload" v-else-if="isToUpload">{{$t("attachment.waiting_upload")}}</div>
+        <div class="wait-upload" v-else-if="isToRelate">{{$t("attachment.waiting_relate")}}</div>
       </div>
       <div class="options">
         <!-- 预览 -->
diff --git a/test-track/frontend/src/business/case/components/case/CaseIssueEditDetail.vue b/test-track/frontend/src/business/case/components/case/CaseIssueEditDetail.vue
index c0c3230619..b522e02f4f 100644
--- a/test-track/frontend/src/business/case/components/case/CaseIssueEditDetail.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseIssueEditDetail.vue
@@ -101,6 +101,7 @@
     <!-- 附件 -->
     <div class="atta-wrap">
       <case-attachment-component
+        :editable="true"
         :caseId="caseId"
         type="add"
         :isCopy="type === 'copy'"
@@ -276,11 +277,6 @@ export default {
       tableData: [],
       readOnly: false,
       isDelete: true,
-      cancelFileToken: [],
-      uploadFiles: [],
-      relateFiles: [],
-      unRelateFiles: [],
-      dumpFile: {},
       enableThirdPartTemplate: false,
     };
   },
@@ -332,7 +328,6 @@ export default {
       this.$refs.form.clearValidate();
     },
     open(data, type) {
-      this.uploadFiles = [];
       this.tabActiveName = "relateTestCase";
       this.showFollow = false;
       this.result.loading = true;
@@ -511,8 +506,8 @@ export default {
 
       param.withoutTestCaseIssue = this.isMinder;
       param.thirdPartPlatform = this.enableThirdPartTemplate;
-      if (this.relateFiles.length > 0) {
-        param.relateFileMetaIds = this.relateFiles;
+      if (this.$refs.attachmentComp.relateFiles.length > 0) {
+        param.relateFileMetaIds = this.$refs.attachmentComp.relateFiles;
       }
       return param;
     },
@@ -546,9 +541,8 @@ export default {
       let requestJson = JSON.stringify(param, function (key, value) {
         return key === "file" ? undefined : value;
       });
-
-      if (this.uploadFiles.length > 0) {
-        this.uploadFiles.forEach((f) => {
+      if (this.$refs.attachmentComp.uploadFiles.length > 0) {
+        this.$refs.attachmentComp.uploadFiles.forEach((f) => {
           formData.append("file", f);
         });
       }
@@ -567,293 +561,7 @@ export default {
           "Content-Type": undefined,
         },
       };
-    },
-    fileValidator(file) {
-      return file.size < 500 * 1024 * 1024;
-    },
-    beforeUpload(file) {
-      if (!this.fileValidator(file)) {
-        this.$error(this.$t("load_test.file_size_out_of_bounds") + file.name);
-        return false;
-      }
-
-      if (this.tableData.filter((f) => f.name === file.name).length > 0) {
-        this.$error(this.$t("load_test.delete_file") + ", name: " + file.name);
-        return false;
-      }
-    },
-    handleUpload(e) {
-      // 表格生成上传文件数据
-      let file = e.file;
-      let user = JSON.parse(localStorage.getItem(TokenKey));
-      this.tableData.push({
-        name: file.name,
-        size: byteToSize(file.size),
-        updateTime: new Date().getTime(),
-        progress: this.type === "add" || this.isCaseEdit ? 100 : 0,
-        status: this.type === "add" || this.isCaseEdit ? "toUpload" : 0,
-        creator: user.name,
-        type: getTypeByFileName(file.name),
-        isLocal: true,
-      });
-
-      if (this.type === "add" || this.isCaseEdit) {
-        // 新增上传
-        this.uploadFiles.push(file);
-        return false;
-      }
-      this.uploadFile(e, (param) => {
-        this.showProgress(e.file, param);
-      });
-    },
-    async uploadFile(param, progressCallback) {
-      let progress = 0;
-      let file = param.file;
-      let data = { belongId: this.issueId, belongType: "issue" };
-      let CancelToken = axios.CancelToken;
-      let self = this;
-      uploadIssueAttachment(
-        file,
-        data,
-        CancelToken,
-        self.cancelFileToken,
-        progressCallback
-      )
-        .then((response) => {
-          // 成功回调
-          progress = 100;
-          param.onSuccess(response);
-          progressCallback({ progress, status: "success" });
-          self.cancelFileToken.forEach((token, index, array) => {
-            if (token.name == file.name) {
-              array.splice(token, 1);
-            }
-          });
-        })
-        .catch(({ error }) => {
-          // 失败回调
-          progress = 100;
-          progressCallback({ progress, status: "error" });
-          self.cancelFileToken.forEach((token, index, array) => {
-            if (token.name == file.name) {
-              array.splice(token, 1);
-            }
-          });
-        });
-    },
-    showProgress(file, params) {
-      const { progress, status } = params;
-      const arr = [...this.tableData].map((item) => {
-        if (item.name === file.name) {
-          item.progress = progress;
-          item.status = status;
-        }
-        return item;
-      });
-      this.tableData = [...arr];
-    },
-    handleExceed(files, fileList) {
-      this.$error(this.$t("load_test.file_size_limit"));
-    },
-    handleSuccess(response, file, fileList) {
-      let readyFiles = fileList.filter((item) => item.status === "success");
-      if (readyFiles.length === fileList.length) {
-        this.getFileMetaData(this.issueId);
-      }
-    },
-    handleError(err, file, fileList) {
-      let readyFiles = fileList.filter((item) => item.status === "success");
-      if (readyFiles.length === fileList.length) {
-        this.getFileMetaData(this.issueId);
-      }
-    },
-    handleDelete(file, index) {
-      this.$alert(
-        (this.cancelFileToken.length > 0
-          ? this.$t("load_test.delete_file_when_uploading") + "<br/>"
-          : "") +
-          this.$t("load_test.delete_file_confirm") +
-          file.name +
-          "?",
-        "",
-        {
-          confirmButtonText: this.$t("commons.confirm"),
-          dangerouslyUseHTMLString: true,
-          callback: (action) => {
-            if (action === "confirm") {
-              this._handleDelete(file, index);
-            }
-          },
-        }
-      );
-    },
-    _handleDelete(file, index) {
-      // 中断所有正在上传的文件
-      if (this.cancelFileToken && this.cancelFileToken.length >= 1) {
-        this.cancelFileToken.forEach((cacelToken) => {
-          cacelToken.cancelFunc();
-        });
-      }
-      this.fileList.splice(index, 1);
-      this.tableData.splice(index, 1);
-      if (this.type === "add" || this.isCaseEdit) {
-        let delIndex = this.uploadFiles.findIndex(
-          (uploadFile) => uploadFile.name === file.name
-        );
-        this.uploadFiles.splice(delIndex, 1);
-      } else {
-        deleteIssueAttachment(file.id).then(() => {
-          this.$success(this.$t("commons.delete_success"));
-          this.getFileMetaData(this.issueId);
-        });
-      }
-    },
-    handleUnRelate(file, index) {
-      // 取消关联
-      this.$alert(
-        this.$t("load_test.unrelated_file_confirm") + file.name + "?",
-        "",
-        {
-          confirmButtonText: this.$t("commons.confirm"),
-          dangerouslyUseHTMLString: true,
-          callback: (action) => {
-            if (action === "confirm") {
-              let unRelateFileIndex = this.tableData.findIndex(
-                (f) => f.name === file.name
-              );
-              this.tableData.splice(unRelateFileIndex, 1);
-              if (file.status === "toRelate") {
-                // 待关联的记录, 直接移除
-                let unRelateId = this.relateFiles.findIndex(
-                  (f) => f === file.id
-                );
-                this.relateFiles.splice(unRelateId, 1);
-              } else {
-                // 已经关联的记录
-                this.unRelateFiles.push(file.id);
-                let data = {
-                  belongType: "issue",
-                  belongId: this.issueId,
-                  metadataRefIds: this.unRelateFiles,
-                };
-                this.result.loading = true;
-                unrelatedAttachment(data).then(() => {
-                  this.$success(this.$t("commons.unrelated_success"));
-                  this.result.loading = false;
-                  this.getFileMetaData(this.issueId);
-                });
-              }
-            }
-          },
-        }
-      );
-    },
-    handleDump(file) {
-      this.$refs.module.init();
-      this.dumpFile = file;
-    },
-    handleCancel(file, index) {
-      this.fileList.splice(index, 1);
-      let cancelToken = this.cancelFileToken.filter(
-        (f) => f.name === file.name
-      )[0];
-      cancelToken.cancelFunc();
-      let cancelFile = this.tableData.filter((f) => f.name === file.name)[0];
-      cancelFile.progress = 100;
-      cancelFile.status = "error";
-    },
-    associationFile() {
-      this.$refs.metadataList.open();
-    },
-    checkRows(rows) {
-      let repeatRecord = false;
-      for (let row of rows) {
-        let rowIndex = this.tableData.findIndex(
-          (item) => item.name === row.name
-        );
-        if (rowIndex >= 0) {
-          this.$error(
-            this.$t("load_test.exist_related_file") + ": " + row.name
-          );
-          repeatRecord = true;
-          break;
-        }
-      }
-      if (!repeatRecord) {
-        if (this.type === "add" || this.isCaseEdit) {
-          // 新增
-          rows.forEach((row) => {
-            this.relateFiles.push(row.id);
-            this.tableData.push({
-              id: row.id,
-              name: row.name,
-              size: byteToSize(row.size),
-              updateTime: row.createTime,
-              progress: 100,
-              status: "toRelate",
-              creator: row.createUser,
-              type: row.type,
-              isLocal: false,
-            });
-          });
-        } else {
-          // 编辑
-          let metadataRefIds = [];
-          rows.forEach((row) => metadataRefIds.push(row.id));
-          let data = {
-            belongType: "issue",
-            belongId: this.issueId,
-            metadataRefIds: metadataRefIds,
-          };
-          this.result.loading = true;
-          relatedAttachment(data).then(() => {
-            this.$success(this.$t("commons.relate_success"));
-            this.result.loading = false;
-            this.getFileMetaData(this.issueId);
-          });
-        }
-      }
-    },
-    setModuleId(moduleId) {
-      let data = {
-        id: getUUID(),
-        resourceId: getCurrentProjectID(),
-        moduleId: moduleId,
-        projectId: getCurrentProjectID(),
-        fileName: this.dumpFile.name,
-        attachmentId: this.dumpFile.id,
-      };
-      dumpAttachment(data).then(() => {
-        this.$success(this.$t("organization.integration.successful_operation"));
-      });
-    },
-    getFileMetaData(id) {
-      if (this.type === "edit") {
-        this.uploadFiles = [];
-        this.relateFiles = [];
-        this.unRelateFiles = [];
-      }
-      // 保存用例后传入用例id，刷新文件列表，可以预览和下载
-      this.fileList = [];
-      this.tableData = [];
-      if (id) {
-        let data = { belongType: "issue", belongId: id };
-        attachmentList(data).then((response) => {
-          let files = response.data;
-          if (!files) {
-            return;
-          }
-          // deep copy
-          this.fileList = JSON.parse(JSON.stringify(files));
-          this.tableData = JSON.parse(JSON.stringify(files));
-          this.tableData.map((f) => {
-            f.size = byteToSize(f.size);
-            f.status = "success";
-            f.progress = 100;
-          });
-        });
-      }
-    },
+    }
   },
 };
 </script>
diff --git a/test-track/frontend/src/business/case/components/case/CaseIssueRelate.vue b/test-track/frontend/src/business/case/components/case/CaseIssueRelate.vue
index f5b140a8b0..c182589213 100644
--- a/test-track/frontend/src/business/case/components/case/CaseIssueRelate.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseIssueRelate.vue
@@ -327,7 +327,7 @@ export default {
         return;
       }
       if (!this.caseId || this.isCopy) {
-        this.$warning(this.$t("api_test.automation.save_case_info"));
+        this.$warning(this.$t("api_test.automation.save_case_info"), false);
         return;
       }
       this.$refs.issueRelate.open();
diff --git a/test-track/frontend/src/i18n/lang/en-US.js b/test-track/frontend/src/i18n/lang/en-US.js
index bcb96fd52e..a3c3fa2b6b 100644
--- a/test-track/frontend/src/i18n/lang/en-US.js
+++ b/test-track/frontend/src/i18n/lang/en-US.js
@@ -152,7 +152,10 @@ const message = {
     delete: "Delete",
     delete_confirm_tips: "Delete This Item ?",
     upload_success: "Upload success",
-    upload_error: "Upload error"
+    upload_error: "Upload error",
+    not_exits: "File not exits",
+    waiting_upload: "Waiting upload",
+    waiting_relate: "Waiting relate",
   }
 }
 export default {
diff --git a/test-track/frontend/src/i18n/lang/zh-CN.js b/test-track/frontend/src/i18n/lang/zh-CN.js
index bc8b04388f..d0444717e9 100644
--- a/test-track/frontend/src/i18n/lang/zh-CN.js
+++ b/test-track/frontend/src/i18n/lang/zh-CN.js
@@ -152,7 +152,10 @@ const message = {
     delete: "删除",
     delete_confirm_tips: "是否删除此项?",
     upload_success: "上传成功",
-    upload_error: "上传失败"
+    upload_error: "上传失败",
+    not_exits: "该文件不存在",
+    waiting_upload: "等待上传",
+    waiting_relate: "等待关联",
   }
 };
 
diff --git a/test-track/frontend/src/i18n/lang/zh-TW.js b/test-track/frontend/src/i18n/lang/zh-TW.js
index 389c199521..16ac28458b 100644
--- a/test-track/frontend/src/i18n/lang/zh-TW.js
+++ b/test-track/frontend/src/i18n/lang/zh-TW.js
@@ -152,7 +152,10 @@ const message = {
     delete: "刪除",
     delete_confirm_tips: "是否刪除此項?",
     upload_success: "上傳成功",
-    upload_error: "上傳失敗"
+    upload_error: "上傳失敗",
+    not_exits: "該文件不存在",
+    waiting_upload: "等待上傳",
+    waiting_relate: "等待關聯",
   }
 }