From 49bd060cad7f8399904b44939f55955ec2e22365 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 21 Oct 2020 13:41:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack                    | 2 +-
 .../components/track/case/components/TestCaseEdit.vue         | 4 ++--
 frontend/src/business/components/xpack                        | 2 +-
 frontend/src/i18n/en-US.js                                    | 1 +
 frontend/src/i18n/zh-CN.js                                    | 1 +
 frontend/src/i18n/zh-TW.js                                    | 1 +
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index cf6b065263..ee74568be0 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit cf6b06526324326a563d933e07118fac014a63b4
+Subproject commit ee74568be0beba46da19616f5832e83f9164c688
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 47534ead9f..ac1a3d9511 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -243,7 +243,7 @@
                 :label="$t('load_test.file_type')">
               </el-table-column>
               <el-table-column
-                :label="$t('load_test.last_modify_time')">
+                :label="$t('test_track.case.upload_time')">
                 <template v-slot:default="scope">
                   <i class="el-icon-time"/>
                   <span class="last-modified">{{ scope.row.updateTime | timestampFormatDate }}</span>
@@ -664,7 +664,7 @@ export default {
         name: file.name,
         size: file.size + ' Bytes', /// todo: 按照大小显示Byte、KB、MB等
         type: type.toUpperCase(),
-        updateTime: file.lastModified,
+        updateTime: new Date().getTime(),
       });
 
       return true;
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 06d935cd1d..cc38137a69 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1
+Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 5a72e569ac..d02e74bdc2 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -748,6 +748,7 @@ export default {
       pdf_loading_fail: "PDF loading failed",
       upload_tip: "Only jpg, jpeg, png, docx, doc, pdf, xlsx files can be uploaded",
       attachment: "Attachment",
+      upload_time: "Upload Time",
       import: {
         import: "Import test case",
         case_import: "Import test case",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 2e2241f7c5..292d9834fe 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -752,6 +752,7 @@ export default {
       pdf_loading_fail: "PDF加载失败",
       upload_tip: "只能上传jpg、jpeg、png、docx、doc、pdf、xlsx文件",
       attachment: "附件",
+      upload_time: "上传时间",
       import: {
         import: "导入用例",
         case_import: "导入测试用例",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 163c5d4a14..0e41ab3677 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -752,6 +752,7 @@ export default {
       pdf_loading_fail: "PDF加載失敗",
       upload_tip: "只能上傳jpg、jpeg、png、docx、doc、pdf、xlsx文件",
       attachment: "附件",
+      upload_time: "上傳時間",
       import: {
         import: "導入用例",
         case_import: "導入測試用例",