Merge remote-tracking branch 'origin/master'

backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java

@@ -158,7 +158,8 @@ public class MsHTTPSamplerProxy extends MsTestElement {
                         if (!path.startsWith("/")) {
                             path = "/" + path;
                         }
-                        path = sampler.getProtocol() + "://" + sampler.getDomain() + ":" + sampler.getPort() + path;
+                        String port = sampler.getPort() != 80 ? ":" + sampler.getPort() : "";
+                        path = sampler.getProtocol() + "://" + sampler.getDomain() + port + path;
                     }
                     sampler.setPath(path);
                 }

backend/src/main/java/io/metersphere/xpack

@@ -1 +1 @@
-Subproject commit a641c1331e1813b5294a1d0e380b8682a78754e1
+Subproject commit 26d36f3f81e889f58eed7c6903252a129b301d98

frontend/src/business/components/api/automation/ApiAutomation.vue

@@ -237,8 +237,18 @@
         this.$refs.apiScenarioList.search(data);
       },
       refresh(data) {
+        this.setTabTitle(data);
         this.$refs.apiScenarioList.search(data);
       },
+      setTabTitle(data) {
+        for (let index in this.tabs) {
+          let tab = this.tabs[index];
+          if (tab.name === this.activeName) {
+            tab.label = data.name;
+            break;
+          }
+        }
+      },
       editScenario(row) {
         this.addTab({name: 'edit', currentScenario: row});
       },

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

@@ -848,7 +848,7 @@
               if (this.currentScenario.tags instanceof String) {
                 this.currentScenario.tags = JSON.parse(this.currentScenario.tags);
               }
-              this.$emit('refresh');
+              this.$emit('refresh',this.currentScenario);
             })
           }
         })

frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsr223.vue

@@ -23,7 +23,7 @@
       </div>
     </el-row>
 
-    <el-dialog :title="$t('api_test.request.assertions.script')" :visible.sync="visible" width="900px">
+    <el-dialog :title="$t('api_test.request.assertions.script')" :visible.sync="visible" width="900px" append-to-body>
       <el-row type="flex" justify="space-between" align="middle" class="quick-script-block">
         <div class="assertion-item input">
           <el-input size="small" v-model="assertion.variable"
@@ -55,11 +55,11 @@
 </template>
 
 <script>
-import {AssertionJSR223} from "../../model/ApiTestModel";
+  import {AssertionJSR223} from "../../model/ApiTestModel";
-import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
+  import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
-import MsJsr233Processor from "../../../automation/scenario/component/Jsr233Processor";
+  import MsJsr233Processor from "../../../automation/scenario/common/Jsr233ProcessorContent";
 
-export default {
+  export default {
     name: "MsApiAssertionJsr223",
     components: {MsJsr233Processor, MsDialogFooter},
     props: {
@@ -219,42 +219,42 @@ export default {
         return !!this.assertion.operator && this.assertion.operator.indexOf("empty") > 0;
       }
     }
-}
+  }
 </script>
 
 <style scoped>
-.assertion-item {
+  .assertion-item {
     display: inline-block;
-}
+  }
 
-.assertion-item + .assertion-item {
+  .assertion-item + .assertion-item {
     margin-left: 10px;
-}
+  }
 
-.assertion-item.input {
+  .assertion-item.input {
     width: 100%;
-}
+  }
 
-.assertion-item.select {
+  .assertion-item.select {
     min-width: 150px;
-}
+  }
 
-.assertion-item.label {
+  .assertion-item.label {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-}
+  }
 
-.assertion-item.btn {
+  .assertion-item.btn {
     min-width: 130px;
-}
+  }
 
-.assertion-item.btn.circle {
+  .assertion-item.btn.circle {
     text-align: right;
     min-width: 80px;
-}
+  }
 
-.quick-script-block {
+  .quick-script-block {
     margin-bottom: 10px;
-}
+  }
 </style>

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

@@ -213,7 +213,7 @@
       },
       copyCase(data) {
         let uuid = getUUID();
-        let obj = {name: "copy_" + data.name, priority: data.priority, active: true, request: data.request, uuid: uuid};
+        let obj = {name: "copy_" + data.name, priority: data.priority, active: true, tags: data.tags, request: data.request, uuid: uuid};
         this.$emit('copyCase', obj);
       },
       selectTestCase(item, $event) {

frontend/src/business/components/api/definition/components/module/ApiModule.vue

@@ -180,10 +180,10 @@
         }
       },
       //创建根目录的模块---供父类使用
-      createRootModel(){
+      createRootModel() {
         let dataArr = this.$refs.nodeTree.extendTreeNodes;
-        if(dataArr.length>0){
+        if (dataArr.length > 0) {
-          this.$refs.nodeTree.append({},dataArr[0]);
+          this.$refs.nodeTree.append({}, dataArr[0]);
         }
       },
       exportAPI() {
@@ -197,7 +197,6 @@
       },
       refresh() {
         this.list();
-        this.$emit("refreshTable");
       },
     }
   }