fix: 接口测试文件上传失败

frontend/src/business/components/api/automation/scenario/ApiComponent.vue

@@ -24,6 +24,10 @@
       <el-tag size="mini" style="margin-left: 20px" v-if="request.referenced==='Deleted'" type="danger">{{$t('api_test.automation.reference_deleted')}}</el-tag>
       <el-tag size="mini" style="margin-left: 20px" v-if="request.referenced==='Copy'">{{ $t('commons.copy') }}</el-tag>
       <el-tag size="mini" style="margin-left: 20px" v-if="request.referenced ==='REF'">{{ $t('api_test.scenario.reference') }}</el-tag>
+
+      <ms-run :debug="false" :reportId="reportId" :run-data="runData"
+              @runRefresh="runRefresh" ref="runTest"/>
+
     </template>
 
     <template v-slot:button>
@@ -56,9 +60,6 @@
       {{$t('commons.save')}}
     </el-button>
 
-    <ms-run :debug="false" :reportId="reportId" :run-data="runData"
-            @runRefresh="runRefresh" ref="runTest"/>
-
   </api-base-component>
 </template>
 

frontend/src/business/components/api/definition/components/Run.vue

@@ -1,5 +1,5 @@
 <template>
-  <div></div>
+  <span></span>
 </template>
 <script>
   import {getUUID, getBodyUploadFiles} from "@/common/js/utils";

frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue

@@ -92,7 +92,7 @@
 </template>
 
 <script>
-  import {getCurrentProjectID, getUUID} from "../../../../../../common/js/utils";
+  import {_getBodyUploadFiles, getCurrentProjectID, getUUID} from "../../../../../../common/js/utils";
   import {PRIORITY, RESULT_MAP} from "../../model/JsonData";
   import MsTag from "../../../../common/components/MsTag";
   import MsTipButton from "../../../../common/components/MsTipButton";
@@ -223,6 +223,7 @@
         if (this.validate(tmp)) {
           return;
         }
+        tmp.request.body = row.request.body;
         let bodyFiles = this.getBodyUploadFiles(tmp);
         tmp.projectId = getCurrentProjectID();
         tmp.active = true;
@@ -278,37 +279,7 @@
       getBodyUploadFiles(row) {
         let bodyUploadFiles = [];
         row.bodyUploadIds = [];
-        let request = row.request;
+        _getBodyUploadFiles(row.request, bodyUploadFiles, row);
-        if (request.body && request.body.kvs) {
-          request.body.kvs.forEach(param => {
-            if (param.files) {
-              param.files.forEach(item => {
-                if (item.file) {
-                  let fileId = getUUID().substring(0, 8);
-                  item.name = item.file.name;
-                  item.id = fileId;
-                  row.bodyUploadIds.push(fileId);
-                  bodyUploadFiles.push(item.file);
-                }
-              });
-            }
-          });
-          if (request.body.binary) {
-            request.body.binary.forEach(param => {
-              if (param.files) {
-                param.files.forEach(item => {
-                  if (item.file) {
-                    let fileId = getUUID().substring(0, 8);
-                    item.name = item.file.name;
-                    item.id = fileId;
-                    row.bodyUploadIds.push(fileId);
-                    bodyUploadFiles.push(item.file);
-                  }
-                });
-              }
-            });
-          }
-        }
         return bodyUploadFiles;
       },
     }

frontend/src/common/js/utils.js

@@ -303,42 +303,56 @@ export function getBodyUploadFiles(obj, runData) {
   let bodyUploadFiles = [];
   obj.bodyUploadIds = [];
   if (runData) {
-    runData.forEach(request => {
+    if (runData instanceof Array) {
-      if (request.body) {
+      runData.forEach(request => {
-        request.body.kvs.forEach(param => {
+        _getBodyUploadFiles(request, bodyUploadFiles, obj);
-          if (param.files) {
+      });
-            param.files.forEach(item => {
+    } else {
-              if (item.file) {
+      _getBodyUploadFiles(runData, bodyUploadFiles, obj);
-                if (!item.id) {
+    }
-                  let fileId = getUUID().substring(0, 12);
-                  item.name = item.file.name;
-                  item.id = fileId;
-                }
-                obj.bodyUploadIds.push(item.id);
-                bodyUploadFiles.push(item.file);
-              }
-            });
-          }
-        });
-        if (request.body.binary) {
-          request.body.binary.forEach(param => {
-            if (param.files) {
-              param.files.forEach(item => {
-                if (item.file) {
-                  if (!item.id) {
-                    let fileId = getUUID().substring(0, 12);
-                    item.name = item.file.name;
-                    item.id = fileId;
-                  }
-                  obj.bodyUploadIds.push(item.id);
-                  bodyUploadFiles.push(item.file);
-                }
-              });
-            }
-          });
-        }
-      }
-    });
   }
   return bodyUploadFiles;
 }
+
+export function _getBodyUploadFiles(request, bodyUploadFiles, obj) {
+  let body = null;
+  if (request.hashTree && request.hashTree.length > 0 && request.hashTree[0].body) {
+    body = request.hashTree[0].body;
+  } else if (request.body) {
+    body = request.body;
+  }
+  if (body) {
+    body.kvs.forEach(param => {
+      if (param.files) {
+        param.files.forEach(item => {
+          if (item.file) {
+            if (!item.id) {
+              let fileId = getUUID().substring(0, 12);
+              item.name = item.file.name;
+              item.id = fileId;
+            }
+            obj.bodyUploadIds.push(item.id);
+            bodyUploadFiles.push(item.file);
+          }
+        });
+      }
+    });
+    if (body.binary) {
+      body.binary.forEach(param => {
+        if (param.files) {
+          param.files.forEach(item => {
+            if (item.file) {
+              if (!item.id) {
+                let fileId = getUUID().substring(0, 12);
+                item.name = item.file.name;
+                item.id = fileId;
+              }
+              obj.bodyUploadIds.push(item.id);
+              bodyUploadFiles.push(item.file);
+            }
+          });
+        }
+      });
+    }
+  }
+}