diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index b1a8bff38a..960fe3f3a3 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -38,6 +38,7 @@ spring.flyway.table=metersphere_version
 spring.flyway.baseline-version=0
 spring.flyway.encoding=UTF-8
 spring.flyway.validate-on-migrate=false
+spring.kafka.listener.missing-topics-fatal=false
 
 spring.messages.basename=i18n/messages
 
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index 065c8b1358..89941f879d 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/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>
 
diff --git a/frontend/src/business/components/api/definition/components/Run.vue b/frontend/src/business/components/api/definition/components/Run.vue
index 5112222c74..51569d2119 100644
--- a/frontend/src/business/components/api/definition/components/Run.vue
+++ b/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";
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
index cc381d67ef..5542a04283 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/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;
-        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);
-                  }
-                });
-              }
-            });
-          }
-        }
+        _getBodyUploadFiles(row.request, bodyUploadFiles, row);
         return bodyUploadFiles;
       },
     }
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
index 28959073c6..6ec4ce64eb 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
@@ -20,24 +20,24 @@
 
                   <el-row type="flex" class="head-bar">
 
-                    <el-col :span="12">
+                    <el-col>
                       <el-button plain size="mini"
                                  icon="el-icon-back"
                                  @click="cancel">{{ $t('test_track.return') }}
                       </el-button>
                     </el-col>
 
-                    <el-col :span="11" class="head-right">
-                <span class="head-right-tip" v-if="index + 1 === testCases.length">
-                  {{ $t('test_track.plan_view.pre_case') }} : {{
-                    testCases[index - 1] ? testCases[index - 1].name : ''
-                  }}
-                </span>
-                      <span class="head-right-tip" v-if="index + 1 !== testCases.length">
-                  {{ $t('test_track.plan_view.next_case') }} : {{
-                          testCases[index + 1] ? testCases[index + 1].name : ''
+                    <el-col class="head-right">
+                      <span class="head-right-tip" v-if="index + 1 === testCases.length">
+                        {{ $t('test_track.plan_view.pre_case') }} : {{
+                          testCases[index - 1] ? testCases[index - 1].name : ''
                         }}
-                </span>
+                      </span>
+                            <span class="head-right-tip" v-if="index + 1 !== testCases.length">
+                        {{ $t('test_track.plan_view.next_case') }} : {{
+                                testCases[index + 1] ? testCases[index + 1].name : ''
+                              }}
+                      </span>
 
                       <el-button plain size="mini" icon="el-icon-arrow-up"
                                  :disabled="index + 1 <= 1"
diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css
index 4b3a23ab1e..1fd8c090e6 100644
--- a/frontend/src/common/css/main.css
+++ b/frontend/src/common/css/main.css
@@ -138,7 +138,7 @@ html,body {
 }
 
 /* <-- 表格全选样式 */
-.ms-select-all th:first-child {
+.ms-select-all th:first-child.el-table-column--selection {
   border: 1px solid #DCDFE6;
   border-radius:5px;
   padding: 0px;
@@ -152,7 +152,7 @@ html,body {
   overflow: visible;
 }
 
-.ms-select-all th:first-child>.cell {
+.ms-select-all th:first-child.el-table-column--selection>.cell {
   padding: 5px;
   width: 35px;
 }
diff --git a/frontend/src/common/js/utils.js b/frontend/src/common/js/utils.js
index 8f2cd243ac..38de23f333 100644
--- a/frontend/src/common/js/utils.js
+++ b/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 (request.body) {
-        request.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 (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);
-                }
-              });
-            }
-          });
-        }
-      }
-    });
+    if (runData instanceof Array) {
+      runData.forEach(request => {
+        _getBodyUploadFiles(request, bodyUploadFiles, obj);
+      });
+    } else {
+      _getBodyUploadFiles(runData, bodyUploadFiles, obj);
+    }
   }
   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);
+            }
+          });
+        }
+      });
+    }
+  }
+}