fix(场景自动化) 增加数组数据处理

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

@@ -126,7 +126,7 @@ public class MsHTTPSamplerProxy extends MsTestElement {
 
     @JSONField(ordinal = 38)
     private String alias;
-  
+
     @JSONField(ordinal = 39)
     private boolean customizeReq;
 
@@ -274,27 +274,8 @@ public class MsHTTPSamplerProxy extends MsTestElement {
         addCertificate(config, httpSamplerTree);
 
         //增加全局前后至脚本
-        MsJSR223PreProcessor preProcessor = httpConfig.getPreProcessor();
+        if (httpConfig != null) {
-        MsJSR223PostProcessor postProcessor = httpConfig.getPostProcessor();
+            this.setScript(httpConfig, httpSamplerTree, config);
-        if(preProcessor != null){
-            if (preProcessor.getEnvironmentId() == null) {
-                if (this.getEnvironmentId() == null) {
-                    preProcessor.setEnvironmentId(useEnvironment);
-                } else {
-                    preProcessor.setEnvironmentId(this.getEnvironmentId());
-                }
-            }
-            preProcessor.toHashTree(httpSamplerTree, preProcessor.getHashTree(), config);
-        }
-        if(postProcessor != null){
-            if (postProcessor.getEnvironmentId() == null) {
-                if (this.getEnvironmentId() == null) {
-                    postProcessor.setEnvironmentId(useEnvironment);
-                } else {
-                    postProcessor.setEnvironmentId(this.getEnvironmentId());
-                }
-            }
-            postProcessor.toHashTree(httpSamplerTree, postProcessor.getHashTree(), config);
         }
         if (CollectionUtils.isNotEmpty(hashTree)) {
             for (MsTestElement el : hashTree) {
@@ -311,21 +292,46 @@ public class MsHTTPSamplerProxy extends MsTestElement {
 
     }
 
+    private void setScript(HttpConfig httpConfig, HashTree httpSamplerTree, ParameterConfig config) {
+        MsJSR223PreProcessor preProcessor = httpConfig.getPreProcessor();
+        MsJSR223PostProcessor postProcessor = httpConfig.getPostProcessor();
+        if (preProcessor != null) {
+            if (preProcessor.getEnvironmentId() == null) {
+                if (this.getEnvironmentId() == null) {
+                    preProcessor.setEnvironmentId(useEnvironment);
+                } else {
+                    preProcessor.setEnvironmentId(this.getEnvironmentId());
+                }
+            }
+            preProcessor.toHashTree(httpSamplerTree, preProcessor.getHashTree(), config);
+        }
+        if (postProcessor != null) {
+            if (postProcessor.getEnvironmentId() == null) {
+                if (this.getEnvironmentId() == null) {
+                    postProcessor.setEnvironmentId(useEnvironment);
+                } else {
+                    postProcessor.setEnvironmentId(this.getEnvironmentId());
+                }
+            }
+            postProcessor.toHashTree(httpSamplerTree, postProcessor.getHashTree(), config);
+        }
+    }
+
     private void initConnectAndResponseTimeout(ParameterConfig config) {
         if (config.isEffective(this.getProjectId())) {
             String useEvnId = config.getConfig().get(this.getProjectId()).getApiEnvironmentid();
             if (StringUtils.isNotEmpty(useEvnId) && !StringUtils.equals(useEvnId, this.getEnvironmentId())) {
                 this.setEnvironmentId(useEvnId);
             }
-            CommonConfig commonConfig  = config.getConfig().get(this.getProjectId()).getCommonConfig();
+            CommonConfig commonConfig = config.getConfig().get(this.getProjectId()).getCommonConfig();
-            if(commonConfig != null){
+            if (commonConfig != null) {
-                if(this.getConnectTimeout() == null || StringUtils.equals(this.getConnectTimeout(),"60000")){
+                if (this.getConnectTimeout() == null || StringUtils.equals(this.getConnectTimeout(), "60000")) {
-                    if(commonConfig.getRequestTimeout() != 0){
+                    if (commonConfig.getRequestTimeout() != 0) {
                         this.setConnectTimeout(String.valueOf(commonConfig.getRequestTimeout()));
                     }
                 }
-                if(this.getResponseTimeout() == null || StringUtils.equals(this.getResponseTimeout(),"60000")){
+                if (this.getResponseTimeout() == null || StringUtils.equals(this.getResponseTimeout(), "60000")) {
-                    if(commonConfig.getResponseTimeout() != 0){
+                    if (commonConfig.getResponseTimeout() != 0) {
                         this.setResponseTimeout(String.valueOf(commonConfig.getResponseTimeout()));
                     }
                 }
@@ -340,15 +346,16 @@ public class MsHTTPSamplerProxy extends MsTestElement {
     private HttpConfig getHttpConfig(ParameterConfig config) {
         if (config.isEffective(this.getProjectId())) {
             EnvironmentConfig environmentConfig = config.getConfig().get(this.getProjectId());
-            if (environmentConfig != null){
+            if (environmentConfig != null) {
                 String useEvnId = environmentConfig.getApiEnvironmentid();
-                if(this.authManager == null && environmentConfig.getAuthManager() != null && environmentConfig.getAuthManager().containsKey("hashTree") ){
+                if (this.authManager == null && environmentConfig.getAuthManager() != null && environmentConfig.getAuthManager().containsKey("hashTree")) {
                     try {
                         JSONArray jsonArray = environmentConfig.getAuthManager().getJSONArray("hashTree");
-                        if(jsonArray.size() > 0){
+                        if (jsonArray.size() > 0) {
                             this.authManager = jsonArray.getJSONObject(0).toJavaObject(MsAuthManager.class);
                         }
-                    }catch (Exception e){}
+                    } catch (Exception e) {
+                    }
                 }
                 if (StringUtils.isNotEmpty(useEvnId) && !StringUtils.equals(useEvnId, this.getEnvironmentId())) {
                     this.setEnvironmentId(useEvnId);
@@ -702,18 +709,18 @@ public class MsHTTPSamplerProxy extends MsTestElement {
         for (KeyValue keyValue : keyValues) {
             boolean hasHead = false;
             //检查是否已经有重名的Head。如果Header重复会导致执行报错
-            if(headerManager.getHeaders() != null){
+            if (headerManager.getHeaders() != null) {
-                for(int i = 0; i < headerManager.getHeaders().size(); i ++){
+                for (int i = 0; i < headerManager.getHeaders().size(); i++) {
                     Header header = headerManager.getHeader(i);
                     String headName = header.getName();
-                    if(StringUtils.equals(headName,keyValue.getName())){
+                    if (StringUtils.equals(headName, keyValue.getName())) {
                         hasHead = true;
                         break;
                     }
                 }
             }
 
-            if(!hasHead){
+            if (!hasHead) {
                 headerManager.add(new Header(keyValue.getName(), ScriptEngineUtils.buildFunctionCallString(keyValue.getValue())));
             }
         }

backend/src/main/java/io/metersphere/api/dto/scenario/HttpConfig.java

@@ -63,19 +63,29 @@ public class HttpConfig {
         }
     }
 
-    public HttpConfig getModuleCondition(String moduleId, HttpConfigCondition configCondition) {
+//    public HttpConfig getModuleCondition(String moduleId, HttpConfigCondition configCondition) {
-        List<String> moduleIds = new ArrayList<>();
+//        List<String> moduleIds = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(configCondition.getDetails())) {
+//        if (CollectionUtils.isNotEmpty(configCondition.getDetails())) {
-            if (CollectionUtils.isEmpty(configCondition.getModuleIds())) {
+//            if (CollectionUtils.isEmpty(configCondition.getModuleIds())) {
-                for (KeyValue keyValue : configCondition.getDetails()) {
+//                for (KeyValue keyValue : configCondition.getDetails()) {
-                    getAllChild(keyValue.getValue(), moduleIds);
+//                    getAllChild(keyValue.getValue(), moduleIds);
-                }
+//                }
-                configCondition.setModuleIds(moduleIds);
+//                configCondition.setModuleIds(moduleIds);
-            } else {
+//            } else {
-                moduleIds = configCondition.getModuleIds();
+//                moduleIds = configCondition.getModuleIds();
-            }
+//            }
+//
+//            if (moduleIds.contains(moduleId)) {
+//                return initHttpConfig(configCondition);
+//            }
+//        }
+//        return null;
+//    }
 
-            if (moduleIds.contains(moduleId)) {
+    public HttpConfig getModuleCondition(String moduleId, HttpConfigCondition configCondition) {
+        if (CollectionUtils.isNotEmpty(configCondition.getDetails())) {
+            List<KeyValue> details = configCondition.getDetails().stream().filter(detail -> StringUtils.contains(detail.getValue(), moduleId)).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(details)) {
                 return initHttpConfig(configCondition);
             }
         }

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

@@ -1 +1 @@
-Subproject commit 6e2b1d3d7d79f985e6edf81eb593670b8da87465
+Subproject commit a6a66f87a57346cdd7da22086bac5e82a7e47bdb

frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue

@@ -69,7 +69,7 @@
             </el-tab-pane>
             <el-tab-pane name="create" v-if="hasPermission('PROJECT_API_DEFINITION:READ+CREATE_API') && hasLicense() && definitionTest">
               <template v-slot:label>
-                <el-button size="mini" type="primary" @click.stop @click="generate">{{$t('commons.generate_test_data')}}</el-button>
+                <el-button size="mini" type="primary" @click.stop @click="generate">{{ $t('commons.generate_test_data') }}</el-button>
               </template>
             </el-tab-pane>
           </el-tabs>
@@ -83,246 +83,257 @@
 </template>
 
 <script>
-  import MsApiKeyValue from "../../ApiKeyValue";
+import MsApiKeyValue from "../../ApiKeyValue";
-  import MsApiBody from "../../body/ApiBody";
+import MsApiBody from "../../body/ApiBody";
-  import MsApiAuthConfig from "../../auth/ApiAuthConfig";
+import MsApiAuthConfig from "../../auth/ApiAuthConfig";
-  import ApiRequestMethodSelect from "../../collapse/ApiRequestMethodSelect";
+import ApiRequestMethodSelect from "../../collapse/ApiRequestMethodSelect";
-  import {REQUEST_HEADERS} from "@/common/js/constants";
+import {REQUEST_HEADERS} from "@/common/js/constants";
-  import MsApiVariable from "../../ApiVariable";
+import MsApiVariable from "../../ApiVariable";
-  import MsApiAssertions from "../../assertion/ApiAssertions";
+import MsApiAssertions from "../../assertion/ApiAssertions";
-  import MsApiExtract from "../../extract/ApiExtract";
+import MsApiExtract from "../../extract/ApiExtract";
-  import {Body, KeyValue} from "../../../model/ApiTestModel";
+import {Body, KeyValue} from "../../../model/ApiTestModel";
-  import {hasLicense, getUUID} from "@/common/js/utils";
+import {hasLicense, getUUID} from "@/common/js/utils";
-  import BatchAddParameter from "../../basis/BatchAddParameter";
+import BatchAddParameter from "../../basis/BatchAddParameter";
-  import MsApiAdvancedConfig from "./ApiAdvancedConfig";
+import MsApiAdvancedConfig from "./ApiAdvancedConfig";
-  import MsJsr233Processor from "../../../../automation/scenario/component/Jsr233Processor";
+import MsJsr233Processor from "../../../../automation/scenario/component/Jsr233Processor";
-  import ApiDefinitionStepButton from "../components/ApiDefinitionStepButton";
+import ApiDefinitionStepButton from "../components/ApiDefinitionStepButton";
-  import {hasPermission} from '@/common/js/utils';
+import {hasPermission} from '@/common/js/utils';
-  import Convert from "@/business/components/common/json-schema/convert/convert";
+import Convert from "@/business/components/common/json-schema/convert/convert";
-  export default {
-    name: "MsApiHttpRequestForm",
-    components: {
-      ApiDefinitionStepButton,
-      MsJsr233Processor,
-      MsApiAdvancedConfig,
-      BatchAddParameter,
-      MsApiVariable,
-      ApiRequestMethodSelect,
-      MsApiExtract,
-      MsApiAuthConfig,
-      MsApiBody,
-      MsApiKeyValue,
-      MsApiAssertions
-    },
-    props: {
-      method: String,
-      request: {},
-      response: {},
-      definitionTest:{
-        type:Boolean,
-        default() {
-          return false;
-        }
-      },
-      showScript: {
-        type: Boolean,
-        default: true,
-      },
-      headers: {
-        type: Array,
-        default() {
-          return [];
-        }
-      },
-      referenced: {
-        type: Boolean,
-        default: false,
-      },
-      isShowEnable: Boolean,
-      jsonPathList: Array,
-      isReadOnly: {
-        type: Boolean,
-        default: false
-      },
-      type: String,
-    },
-    data() {
-      let validateURL = (rule, value, callback) => {
-        try {
-          new URL(this.addProtocol(this.request.url));
-        } catch (e) {
-          callback(this.$t('api_test.request.url_invalid'));
-        }
-      };
-      return {
-        activeName: this.request.method === "POST" ? "body" : "parameters",
-        rules: {
-          name: [
-            {max: 300, message: this.$t('commons.input_limit', [1, 300]), trigger: 'blur'}
-          ],
-          url: [
-            {max: 500, required: true, message: this.$t('commons.input_limit', [1, 500]), trigger: 'blur'},
-            {validator: validateURL, trigger: 'blur'}
-          ],
-          path: [
-            {max: 500, message: this.$t('commons.input_limit', [0, 500]), trigger: 'blur'},
-          ]
-        },
-        spanCount: 21,
-        headerSuggestions: REQUEST_HEADERS,
-        isReloadData: false,
-        isBodyShow: true,
-        dialogVisible: false
-      }
-    },
-    created() {
-      if (!this.referenced && this.showScript) {
-        this.spanCount = 21;
-      } else {
-        this.spanCount = 24;
-      }
-      this.init();
-    },
-    methods: {
-      hasPermission,
-      hasLicense,
-      generate() {
-        if (this.request.body && (this.request.body.jsonSchema || this.request.body.raw)) {
-          if (!this.request.body.jsonSchema) {
-            const MsConvert = new Convert();
-            this.request.body.jsonSchema = MsConvert.format(JSON.parse(this.request.body.raw));
-          }
-          this.$post('/api/test/data/generator', this.request.body.jsonSchema, response => {
-            if (response.data) {
-              if (this.request.body.format !== 'JSON-SCHEMA') {
-                this.request.body.raw = response.data;
-              } else {
-                const MsConvert = new Convert();
-                this.request.body.jsonSchema = MsConvert.format(JSON.parse(response.data));
-              }
-              this.reloadBody();
-            }
-          });
-        }
-      },
-      remove(row) {
-        let index = this.request.hashTree.indexOf(row);
-        this.request.hashTree.splice(index, 1);
-        this.reload();
-      },
-      copyRow(row) {
-        let obj = JSON.parse(JSON.stringify(row));
-        obj.id = getUUID();
-        this.request.hashTree.push(obj);
-        this.reload();
-      },
-      reload() {
-        this.isReloadData = true
-        this.$nextTick(() => {
-          this.isReloadData = false
-        })
-      },
-      init() {
-        if (!this.request.body) {
-          this.request.body = new Body();
-        }
-        if (!this.request.body.kvs) {
-          this.request.body.kvs = [];
-        }
-        if (!this.request.rest) {
-          this.request.rest = [];
-        }
-        if (!this.request.arguments) {
-          this.request.arguments = [];
-        }
-      },
-      // 解决修改请求头后 body 显示错位
-      reloadBody() {
-        this.isBodyShow = false;
-        this.$nextTick(() => {
-          this.isBodyShow = true;
-        });
-      },
-      batchAdd() {
-        this.$refs.batchAddParameter.open();
-      },
-      format(array, obj) {
-        if (array) {
-          let isAdd = true;
-          for (let i in array) {
-            let item = array[i];
-            if (item.name === obj.name) {
-              item.value = obj.value;
-              isAdd = false;
-            }
-          }
-          if (isAdd) {
-            this.request.arguments.unshift(obj);
-          }
-        }
-      },
-      batchSave(data) {
-        if (data) {
-          let params = data.split("\n");
-          let keyValues = [];
-          params.forEach(item => {
-            let line = item.split(/：|:/);
-            let required = false;
-            keyValues.unshift(new KeyValue({
-              name: line[0],
-              required: required,
-              value: line[1],
-              description: line[2],
-              type: "text",
-              valid: false,
-              file: false,
-              encode: true,
-              enable: true,
-              contentType: "text/plain"
-            }));
-          })
 
-          keyValues.forEach(item => {
+export default {
-            switch (this.activeName) {
+  name: "MsApiHttpRequestForm",
-              case "parameters":
+  components: {
-                this.format(this.request.arguments,item);
+    ApiDefinitionStepButton,
-                break;
+    MsJsr233Processor,
-              case "rest":
+    MsApiAdvancedConfig,
-                this.format(this.request.rest,item);
+    BatchAddParameter,
-                break;
+    MsApiVariable,
-              case "headers":
+    ApiRequestMethodSelect,
-                this.format(this.request.headers,item);
+    MsApiExtract,
-                break;
+    MsApiAuthConfig,
-              default:
+    MsApiBody,
-                break;
+    MsApiKeyValue,
-            }
+    MsApiAssertions
-          })
+  },
-        }
+  props: {
+    method: String,
+    request: {},
+    response: {},
+    definitionTest: {
+      type: Boolean,
+      default() {
+        return false;
       }
-
+    },
+    showScript: {
+      type: Boolean,
+      default: true,
+    },
+    headers: {
+      type: Array,
+      default() {
+        return [];
+      }
+    },
+    referenced: {
+      type: Boolean,
+      default: false,
+    },
+    isShowEnable: Boolean,
+    jsonPathList: Array,
+    isReadOnly: {
+      type: Boolean,
+      default: false
+    },
+    type: String,
+  },
+  data() {
+    let validateURL = (rule, value, callback) => {
+      try {
+        new URL(this.addProtocol(this.request.url));
+      } catch (e) {
+        callback(this.$t('api_test.request.url_invalid'));
+      }
+    };
+    return {
+      activeName: this.request.method === "POST" ? "body" : "parameters",
+      rules: {
+        name: [
+          {max: 300, message: this.$t('commons.input_limit', [1, 300]), trigger: 'blur'}
+        ],
+        url: [
+          {max: 500, required: true, message: this.$t('commons.input_limit', [1, 500]), trigger: 'blur'},
+          {validator: validateURL, trigger: 'blur'}
+        ],
+        path: [
+          {max: 500, message: this.$t('commons.input_limit', [0, 500]), trigger: 'blur'},
+        ]
+      },
+      spanCount: 21,
+      headerSuggestions: REQUEST_HEADERS,
+      isReloadData: false,
+      isBodyShow: true,
+      dialogVisible: false
     }
+  },
+  created() {
+    if (!this.referenced && this.showScript) {
+      this.spanCount = 21;
+    } else {
+      this.spanCount = 24;
+    }
+    this.init();
+  },
+  methods: {
+    hasPermission,
+    hasLicense,
+    generate() {
+      if (this.request.body && (this.request.body.jsonSchema || this.request.body.raw)) {
+        if (!this.request.body.jsonSchema) {
+          const MsConvert = new Convert();
+          this.request.body.jsonSchema = MsConvert.format(JSON.parse(this.request.body.raw));
+        }
+        this.$post('/api/test/data/generator', this.request.body.jsonSchema, response => {
+          if (response.data) {
+            if (this.request.body.format !== 'JSON-SCHEMA') {
+              this.request.body.raw = response.data;
+            } else {
+              const MsConvert = new Convert();
+              this.request.body.jsonSchema = MsConvert.format(JSON.parse(response.data));
+            }
+            this.reloadBody();
+          }
+        });
+      }
+    },
+    remove(row) {
+      let index = this.request.hashTree.indexOf(row);
+      this.request.hashTree.splice(index, 1);
+      this.reload();
+    }
+    ,
+    copyRow(row) {
+      let obj = JSON.parse(JSON.stringify(row));
+      obj.id = getUUID();
+      this.request.hashTree.push(obj);
+      this.reload();
+    }
+    ,
+    reload() {
+      this.isReloadData = true
+      this.$nextTick(() => {
+        this.isReloadData = false
+      })
+    }
+    ,
+    init() {
+      if (!this.request.body) {
+        this.request.body = new Body();
+      }
+      if (!this.request.body.kvs) {
+        this.request.body.kvs = [];
+      }
+      if (!this.request.rest) {
+        this.request.rest = [];
+      }
+      if (!this.request.arguments) {
+        this.request.arguments = [];
+      }
+    }
+    ,
+// 解决修改请求头后 body 显示错位
+    reloadBody() {
+      this.isBodyShow = false;
+      this.$nextTick(() => {
+        this.isBodyShow = true;
+      });
+    }
+    ,
+    batchAdd() {
+      this.$refs.batchAddParameter.open();
+    }
+    ,
+    format(array, obj) {
+      if (array) {
+        let isAdd = true;
+        for (let i in array) {
+          let item = array[i];
+          if (item.name === obj.name) {
+            item.value = obj.value;
+            isAdd = false;
+          }
+        }
+        if (isAdd) {
+          this.request.arguments.unshift(obj);
+        }
+      }
+    }
+    ,
+    batchSave(data) {
+      if (data) {
+        let params = data.split("\n");
+        let keyValues = [];
+        params.forEach(item => {
+          let line = item.split(/：|:/);
+          let required = false;
+          keyValues.unshift(new KeyValue({
+            name: line[0],
+            required: required,
+            value: line[1],
+            description: line[2],
+            type: "text",
+            valid: false,
+            file: false,
+            encode: true,
+            enable: true,
+            contentType: "text/plain"
+          }));
+        })
+
+        keyValues.forEach(item => {
+          switch (this.activeName) {
+            case "parameters":
+              this.format(this.request.arguments, item);
+              break;
+            case "rest":
+              this.format(this.request.rest, item);
+              break;
+            case "headers":
+              this.format(this.request.headers, item);
+              break;
+            default:
+              break;
+          }
+        })
+      }
+    }
+
   }
+}
 </script>
 
 <style scoped>
-  .ms-query {
+.ms-query {
-    background: #783887;
+  background: #783887;
-    color: white;
+  color: white;
-    height: 18px;
+  height: 18px;
-    border-radius: 42%;
+  border-radius: 42%;
-  }
+}
-  .ms-header {
+
-    background: #783887;
+.ms-header {
-    color: white;
+  background: #783887;
-    height: 18px;
+  color: white;
-    border-radius: 42%;
+  height: 18px;
-  }
+  border-radius: 42%;
-  .request-tabs {
+}
-    margin: 20px;
+
-    min-height: 200px;
+.request-tabs {
-  }
+  margin: 20px;
-  .ms-el-link {
+  min-height: 200px;
-    float: right;
+}
-    margin-right: 45px;
+
-  }
+.ms-el-link {
+  float: right;
+  margin-right: 45px;
+}
 </style>