Merge branch 'main' of https://github.com/metersphere/metersphere

api-test/backend/src/main/java/io/metersphere/service/ApiJMeterFileService.java

@@ -307,6 +307,11 @@ public class ApiJMeterFileService {
         if (CollectionUtils.isNotEmpty(request.getBodyFiles())) {
             for (BodyFile bodyFile : request.getBodyFiles()) {
                 File file = new File(bodyFile.getName());
+                if (!file.exists()) {
+                    // 从MinIO下载
+                    ApiFileUtil.downloadFile(bodyFile.getId(), bodyFile.getName());
+                    file = new File(bodyFile.getName());
+                }
                 if (file != null && file.exists()) {
                     byte[] fileByte = FileUtils.fileToByte(file);
                     if (fileByte != null) {

api-test/frontend/src/business/automation/scenario/component/ApiComponent.vue

@@ -689,6 +689,7 @@ export default {
         let definitionData = this.$router.resolve({
           name: 'ApiDefinitionWithQuery',
           params: {
+            versionId: 'default',
             redirectID: getUUID(),
             dataType: 'api',
             dataSelectRange: 'edit:' + resource.id,

api-test/frontend/src/business/home/ApiHome.vue

@@ -81,7 +81,7 @@ export default {
       showVersionSelector: false,
     };
   },
-  created() {
+  activated() {
     this.initVersions();
     this.$nextTick(() => {
       this.refreshAllCard();

api-test/frontend/src/business/home/components/dashboard/ApiCaseDashboard.vue

@@ -206,9 +206,6 @@ export default {
       },
     };
   },
-  activated() {
-    this.search();
-  },
   methods: {
     search(versionId) {
       this.loading = true;

api-test/frontend/src/business/home/components/dashboard/ScenarioDashboard.vue

@@ -207,9 +207,6 @@ export default {
       },
     };
   },
-  activated() {
-    this.search();
-  },
   methods: {
     search(versionId) {
       this.loading = true;

api-test/frontend/src/business/home/components/dashboard/ScenarioScheduleDashboard.vue

@@ -160,9 +160,6 @@ export default {
       },
     };
   },
-  activated() {
-    this.search();
-  },
   methods: {
     search(versionId) {
       this.loading = true;

framework/sdk-parent/frontend/src/i18n/lang/en-US.js

@@ -1337,7 +1337,7 @@ const message = {
       one_click_sync: "One-click sync",
       change_notification: "Change Notification",
       recipient: "Recipient",
-      recipient_tips: "When the API changes, the associated CASE creator and automation scene creator will receive in-site messages,can go to",
+      recipient_tips: "When the API changes, the associated CASE creator and automation scene creator will receive in-site messages, can go to",
       select_comp: {
         no_data: "No Data",
         add_data: "Add Data"

framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js

@@ -1345,7 +1345,7 @@ const message = {
       one_click_sync: "一键同步",
       change_notification: "变更通知",
       recipient: "接收人",
-      recipient_tips: "当API发生变化时，关联的CASE创建人、自动化场景创建人会收到站内消息,可前往",
+      recipient_tips: "当API发生变化时，关联的CASE创建人、自动化场景创建人会收到站内消息，可前往",
       select_comp: {
         no_data: "无数据",
         add_data: "去添加"