refactor: merge v1.2

.gitignore

@@ -30,3 +30,4 @@ target
 .settings
 .project
 .classpath
+.jython_cache

backend/pom.xml

@@ -153,6 +153,12 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.python</groupId>
+            <artifactId>jython</artifactId>
+            <version>2.7.2</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.jmeter</groupId>
             <artifactId>ApacheJMeter_functions</artifactId>

backend/src/main/java/io/metersphere/api/dto/scenario/processor/JSR223PostProcessor.java

@@ -0,0 +1,10 @@
+package io.metersphere.api.dto.scenario.processor;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class JSR223PostProcessor extends JSR223Processor {
+
+}

backend/src/main/java/io/metersphere/api/dto/scenario/processor/JSR223PreProcessor.java

@@ -0,0 +1,10 @@
+package io.metersphere.api.dto.scenario.processor;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class JSR223PreProcessor extends JSR223Processor {
+
+}

backend/src/main/java/io/metersphere/api/dto/scenario/processor/JSR223Processor.java

@@ -0,0 +1,9 @@
+package io.metersphere.api.dto.scenario.processor;
+
+import lombok.Data;
+
+@Data
+public class JSR223Processor {
+    private String script;
+    private String language;
+}

backend/src/main/java/io/metersphere/api/dto/scenario/request/DubboRequest.java

@@ -8,6 +8,8 @@ import io.metersphere.api.dto.scenario.assertions.Assertions;
 import io.metersphere.api.dto.scenario.extract.Extract;
 import io.metersphere.api.dto.scenario.processor.BeanShellPostProcessor;
 import io.metersphere.api.dto.scenario.processor.BeanShellPreProcessor;
+import io.metersphere.api.dto.scenario.processor.JSR223PostProcessor;
+import io.metersphere.api.dto.scenario.processor.JSR223PreProcessor;
 import io.metersphere.api.dto.scenario.request.dubbo.ConfigCenter;
 import io.metersphere.api.dto.scenario.request.dubbo.ConsumerAndService;
 import io.metersphere.api.dto.scenario.request.dubbo.RegistryCenter;
@@ -51,4 +53,8 @@ public class DubboRequest implements Request {
     private BeanShellPostProcessor beanShellPostProcessor;
     @JSONField(ordinal = 14)
     private Boolean enable;
+    @JSONField(ordinal = 15)
+    private JSR223PreProcessor jsr223PreProcessor;
+    @JSONField(ordinal = 16)
+    private JSR223PostProcessor jsr223PostProcessor;
 }

backend/src/main/java/io/metersphere/api/dto/scenario/request/HttpRequest.java

@@ -8,6 +8,8 @@ import io.metersphere.api.dto.scenario.assertions.Assertions;
 import io.metersphere.api.dto.scenario.extract.Extract;
 import io.metersphere.api.dto.scenario.processor.BeanShellPostProcessor;
 import io.metersphere.api.dto.scenario.processor.BeanShellPreProcessor;
+import io.metersphere.api.dto.scenario.processor.JSR223PostProcessor;
+import io.metersphere.api.dto.scenario.processor.JSR223PreProcessor;
 import lombok.Data;
 
 import java.util.List;
@@ -47,4 +49,10 @@ public class HttpRequest implements Request {
     private Long connectTimeout;
     @JSONField(ordinal = 15)
     private Long responseTimeout;
+    @JSONField(ordinal = 16)
+    private Boolean followRedirects;
+    @JSONField(ordinal = 17)
+    private JSR223PreProcessor jsr223PreProcessor;
+    @JSONField(ordinal = 18)
+    private JSR223PostProcessor jsr223PostProcessor;
 }

backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java

@@ -11,6 +11,8 @@ import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.visualizers.backend.BackendListener;
 import org.apache.jorphan.collections.HashTree;
+import org.python.core.Options;
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -30,6 +32,12 @@ public class JMeterService {
         String JMETER_PROPERTIES = JMETER_HOME + "/bin/jmeter.properties";
         JMeterUtils.loadJMeterProperties(JMETER_PROPERTIES);
         JMeterUtils.setJMeterHome(JMETER_HOME);
+        JMeterUtils.setLocale(LocaleContextHolder.getLocale());
+
+
+        //解决无法加载 PyScriptEngineFactory
+        Options.importSite = false;
+
         try {
             Object scriptWrapper = SaveService.loadElement(is);
             HashTree testPlan = getHashTree(scriptWrapper);

backend/src/main/java/io/metersphere/api/parse/JmeterDocumentParser.java

@@ -157,7 +157,7 @@ public class JmeterDocumentParser {
                     u += k + "=" + ScriptEngineUtils.calculate(v);
                     return u;
                 });
-                ele.setTextContent(url + params);
+                ele.setTextContent(url + ((params != null && !params.equals("?")) ? params : ""));
                 break;
             case "Argument.value":
                 String textContent = ele.getTextContent();

backend/src/main/java/io/metersphere/excel/utils/EasyExcelExporter.java

@@ -1,8 +1,11 @@
 package io.metersphere.excel.utils;
 
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
+import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.exception.ExcelException;
+import org.apache.poi.ss.usermodel.IndexedColors;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -29,9 +32,12 @@ public class EasyExcelExporter {
     public void export(HttpServletResponse response, List data, String fileName, String sheetName) {
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
+        WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
+        contentWriteCellStyle.setWrapped(true);
         try {
+            HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(null, contentWriteCellStyle);
             response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8") + ".xlsx");
-            EasyExcel.write(response.getOutputStream(), this.clazz).sheet(sheetName).doWrite(data);
+            EasyExcel.write(response.getOutputStream(), this.clazz).registerWriteHandler(horizontalCellStyleStrategy).sheet(sheetName).doWrite(data);
         } catch (UnsupportedEncodingException e) {
             LogUtil.error(e.getMessage(), e);
             throw new ExcelException("Utf-8 encoding is not supported");

backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java

@@ -34,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.net.Socket;
@@ -42,8 +43,6 @@ import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import javax.annotation.Resource;
-
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class PerformanceTestService {
@@ -381,6 +380,10 @@ public class PerformanceTestService {
         if (!CollectionUtils.isEmpty(loadTestFiles)) {
             loadTestFiles.forEach(loadTestFile -> {
                 FileMetadata fileMetadata = fileService.copyFile(loadTestFile.getFileId());
+                if (fileMetadata == null) {
+                    // 如果性能测试出现文件变更，这里会有 null
+                    return;
+                }
                 loadTestFile.setTestId(copy.getId());
                 loadTestFile.setFileId(fileMetadata.getId());
                 loadTestFileMapper.insert(loadTestFile);

backend/src/main/java/io/metersphere/service/FileService.java

@@ -60,6 +60,10 @@ public class FileService {
         FileContentExample example2 = new FileContentExample();
         example2.createCriteria().andFileIdIn(ids);
         fileContentMapper.deleteByExample(example2);
+
+        LoadTestFileExample example3 = new LoadTestFileExample();
+        example3.createCriteria().andFileIdIn(ids);
+        loadTestFileMapper.deleteByExample(example3);
     }
 
     public FileMetadata saveFile(MultipartFile file) {

backend/src/main/java/io/metersphere/track/service/IssuesService.java

@@ -224,6 +224,10 @@ public class IssuesService {
         String account = object.getString("account");
         String password = object.getString("password");
         String url = object.getString("url");
+        String issuetype = object.getString("issuetype");
+        if (StringUtils.isBlank(issuetype)) {
+            MSException.throwException("Jira 问题类型为空");
+        }
         String auth = EncryptUtils.base64Encoding(account + ":" + password);
 
         String testCaseId = issuesRequest.getTestCaseId();
@@ -252,8 +256,7 @@ public class IssuesService {
                 "        \"summary\":\"" + issuesRequest.getTitle() + "\",\n" +
                 "        \"description\": " + JSON.toJSONString(desc) + ",\n" +
                 "        \"issuetype\":{\n" +
-                "            \"id\":\"10009\",\n" +
+                "            \"name\":\"" + issuetype + "\"\n" +
-                "            \"name\":\"Defect\"\n" +
                 "        }\n" +
                 "    }\n" +
                 "}";

backend/src/main/java/org/apache/jmeter/util/JSR223BeanInfoSupport.java

@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.jmeter.util;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ListResourceBundle;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.ResourceBundle;
+
+import javax.script.ScriptEngineFactory;
+import javax.script.ScriptEngineManager;
+
+import org.apache.jmeter.testbeans.TestBean;
+
+/**
+ *  解决JSR233加载 ScriptEngineFactory 空指针问题
+ */
+public abstract class JSR223BeanInfoSupport extends ScriptingBeanInfoSupport {
+
+    private static final String[] LANGUAGE_TAGS;
+
+    /**
+     * Will be removed in next version following 3.2
+     * @deprecated use {@link JSR223BeanInfoSupport#getLanguageNames()}
+     */
+    @Deprecated
+    public static final String[][] LANGUAGE_NAMES; // NOSONAR Kept for backward compatibility
+
+    private static final String[][] CONSTANT_LANGUAGE_NAMES;
+
+    static {
+        Map<String, ScriptEngineFactory> nameMap = new HashMap<>();
+        ScriptEngineManager sem = new ScriptEngineManager();
+        final List<ScriptEngineFactory> engineFactories = sem.getEngineFactories();
+        for(ScriptEngineFactory fact : engineFactories){
+            List<String> names = fact.getNames();
+            for(String shortName : names) {
+                if (shortName != null) {
+                    nameMap.put(shortName.toLowerCase(Locale.ENGLISH), fact);
+                }
+            }
+        }
+        LANGUAGE_TAGS = nameMap.keySet().toArray(new String[nameMap.size()]);
+        Arrays.sort(LANGUAGE_TAGS);
+        CONSTANT_LANGUAGE_NAMES = new String[nameMap.size()][2];
+        int i = 0;
+        for(Entry<String, ScriptEngineFactory> me : nameMap.entrySet()) {
+            final String key = me.getKey();
+            CONSTANT_LANGUAGE_NAMES[i][0] = key;
+            final ScriptEngineFactory fact = me.getValue();
+            CONSTANT_LANGUAGE_NAMES[i++][1] = key +
+                    "     (" // $NON-NLS-1$
+                    + fact.getLanguageName() + " " + fact.getLanguageVersion()  // $NON-NLS-1$
+                    + " / "  // $NON-NLS-1$
+                    + fact.getEngineName() + " " + fact.getEngineVersion() // $NON-NLS-1$
+                    + ")";   // $NON-NLS-1$
+        }
+
+        LANGUAGE_NAMES = getLanguageNames(); // NOSONAR Kept for backward compatibility
+    }
+
+    private static final ResourceBundle NAME_BUNDLE = new ListResourceBundle() {
+        @Override
+        protected Object[][] getContents() {
+            return CONSTANT_LANGUAGE_NAMES;
+        }
+    };
+
+    protected JSR223BeanInfoSupport(Class<? extends TestBean> beanClass) {
+        super(beanClass, LANGUAGE_TAGS, NAME_BUNDLE);
+    }
+
+    /**
+     * @return String array of 2 columns array containing Script engine short name / Script Language details
+     */
+    public static final String[][] getLanguageNames() {
+        return CONSTANT_LANGUAGE_NAMES.clone();
+    }
+
+}

docker/jmeter-master/run-test.sh

@@ -1,4 +1,3 @@
-export HEAP=$(cat /proc/meminfo | grep MemTotal | awk '{ mem=int($2/1024/1024 * 3/4 + 0.5); metasize=int(mem/4+0.5)"g"; if(mem<1) mem=1; if (metasize == "0g") metasize="256m";  HEAP="-Xms"mem"g -Xmx"mem"g -XX:MaxMetaspaceSize="metasize; print HEAP }')
 for file in ${TESTS_DIR}/*.jmx; do
   jmeter -n -t ${file} -Jserver.rmi.ssl.disable=${SSL_DISABLED}
 done

frontend/src/business/components/api/report/ApiReportView.vue

@@ -171,7 +171,7 @@ export default {
 
 <style scoped>
 .report-container {
-  height: calc(100vh - 150px);
+  height: calc(100vh - 155px);
   min-height: 600px;
   overflow-y: auto;
 }

frontend/src/business/components/api/test/ApiTestConfig.vue

@@ -344,7 +344,7 @@ export default {
 
 <style scoped>
 .test-container {
-  height: calc(100vh - 150px);
+  height: calc(100vh - 155px);
   min-height: 600px;
 }
 

frontend/src/business/components/api/test/ApiTestList.vue

@@ -17,7 +17,7 @@
 
         <el-table border :data="tableData" class="adjust-table table-content" @sort-change="sort"
                   @row-click="handleView"
-                  @filter-change="filter" @select-all="handleSelectAll" @select="selectionChange">
+                  @filter-change="filter" @select-all="select" @select="select">
           <el-table-column
             type="selection"></el-table-column>
           <el-table-column prop="name" :label="$t('commons.name')" width="250" show-overflow-tooltip>
@@ -127,18 +127,7 @@
       create() {
         this.$router.push('/api/test/create');
       },
-
+      select(selection) {
-      handleSelectAll(selection) {
-        this.selectIds.clear()
-        this.selectProjectNames.clear()
-        this.selectProjectId.clear()
-        selection.forEach(s => {
-          this.selectIds.add(s.id)
-          this.selectProjectNames.add(s.projectName)
-          this.selectProjectId.add(s.projectId)
-        })
-      },
-      selectionChange(selection) {
         this.selectIds.clear()
         this.selectProjectNames.clear()
         this.selectProjectId.clear()

frontend/src/business/components/api/test/OneClickOperation.vue

@@ -26,7 +26,7 @@
   import MsApiScenarioConfig from "./components/ApiScenarioConfig";
   import MsApiReportStatus from "../report/ApiReportStatus";
   import MsApiReportDialog from "./ApiReportDialog";
-  import {getUUID} from "../../../../common/js/utils";
+  import {getUUID} from "@/common/js/utils";
 
 
   export default {
@@ -95,13 +95,12 @@
       },
       checkName(callback) {
         for (let i of this.selectProjectId) {
-          this.result = this.$post('/api/checkName', {name: this.ruleForm.testName, projectId: i}, response => {
+          this.result = this.$post('/api/checkName', {name: this.ruleForm.testName, projectId: i}, () => {
             if (callback) callback();
           })
         }
       },
       _getEnvironmentAndRunTest: function (item) {
-        let count = 0;
         this.result = this.$get('/api/environment/list/' + item.projectId, response => {
           let environments = response.data;
           let environmentMap = new Map();
@@ -131,7 +130,6 @@
               scenarioDefinition: JSON.parse(item.scenarioDefinition),
               schedule: {},
             });
-            console.log(test)
             this.test = this.test || test;
             if (this.tests.length > 1) {
               this.test.scenarioDefinition = this.test.scenarioDefinition.concat(test.scenarioDefinition);

frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('api_test.environment.environment_config')" :visible.sync="visible" class="environment-dialog"
+  <el-dialog :close-on-click-modal="false" :title="$t('api_test.environment.environment_config')" :visible.sync="visible" class="environment-dialog"
              @close="close" append-to-body ref="environmentConfig">
     <el-container v-loading="result.loading">
       <ms-aside-item :enable-aside-hidden="false" :title="$t('api_test.environment.environment_list')" :data="environments" :item-operators="environmentOperators" :add-fuc="addEnvironment"

frontend/src/business/components/api/test/components/ApiScenarioConfig.vue

@@ -166,7 +166,12 @@ export default {
             });
             this.scenarios.forEach(scenario => {
               if (scenario.environmentId) {
-                scenario.environment = environmentMap.get(scenario.environmentId);
+                let env = environmentMap.get(scenario.environmentId);
+                if (!env) {
+                  scenario.environmentId = undefined;
+                } else {
+                  scenario.environment = env;
+                }
               }
             });
           });

frontend/src/business/components/api/test/components/ApiVariable.vue

@@ -7,10 +7,11 @@
       <el-row type="flex" :gutter="20" justify="space-between" align="middle">
         <el-col>
 
-          <el-input v-if="!suggestions" :disabled="isReadOnly" v-model="item.name" size="small" maxlength="200" @change="change" :placeholder="keyText" show-word-limit>
+          <el-input v-if="!suggestions" :disabled="isReadOnly" v-model="item.name" size="small" maxlength="200"
+                    @change="change" :placeholder="keyText" show-word-limit>
             <template v-slot:prepend>
               <el-select v-if="type === 'body'" :disabled="isReadOnly" class="kv-type" v-model="item.type">
-                <el-option value="text" />
+                <el-option value="text"/>
                 <el-option value="file"/>
               </el-select>
             </template>
@@ -31,7 +32,7 @@
             value-key="name"
             highlight-first-item
             @select="change">
-            <i slot="suffix" class="el-input__icon el-icon-edit" style="cursor: pointer;" @click="advanced(item)"></i>
+            <i slot="suffix" class="el-input__icon el-icon-edit pointer" @click="advanced(item)"></i>
           </el-autocomplete>
         </el-col>
 
@@ -155,31 +156,36 @@ export default {
 </script>
 
 <style scoped>
-  .kv-description {
+.kv-description {
   font-size: 13px;
-  }
+}
 
-  .kv-row {
+.kv-row {
   margin-top: 10px;
-  }
+}
 
-  .kv-delete {
+.kv-delete {
   width: 60px;
-  }
+}
 
-  .el-autocomplete {
+.el-autocomplete {
   width: 100%;
-  }
+}
 
-  .advanced-item-value >>> .el-dialog__body {
+.advanced-item-value >>> .el-dialog__body {
   padding: 15px 25px;
-  }
+}
 
-  .el-row {
+.el-row {
   margin-bottom: 5px;
-  }
+}
 
-  .kv-type {
+.kv-type {
   width: 70px;
-  }
+}
+
+.pointer {
+  cursor: pointer;
+  color: #1E90FF;
+}
 </style>

frontend/src/business/components/api/test/components/import/ApiImport.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('api_test.api_import.title')" :visible.sync="visible" class="api-import" v-loading="result.loading" @close="close">
+  <el-dialog :close-on-click-modal="false" :title="$t('api_test.api_import.title')" :visible.sync="visible" class="api-import" v-loading="result.loading" @close="close">
 
     <div class="header-bar">
       <div>{{$t('api_test.api_import.data_format')}}</div>

frontend/src/business/components/api/test/components/processor/Jsr233Processor.vue

@@ -2,9 +2,10 @@
   <div >
     <el-row>
       <el-col :span="20" class="script-content">
-        <ms-code-edit v-if="isCodeEditAlive" mode="java" :read-only="isReadOnly" :data.sync="beanShellProcessor.script" theme="eclipse" :modes="['java']" ref="codeEdit"/>
+        <ms-code-edit v-if="isCodeEditAlive" :mode="codeEditModeMap[jsr223Processor.language]" :read-only="isReadOnly" :data.sync="jsr223Processor.script" theme="eclipse" :modes="['java','python']" ref="codeEdit"/>
       </el-col>
       <el-col :span="4" class="script-index">
+        <ms-dropdown :default-command="jsr223Processor.language" :commands="languages" @command="languageChange"/>
         <div class="template-title">{{$t('api_test.request.processor.code_template')}}</div>
         <div v-for="(template, index) in codeTemplates" :key="index" class="code-template">
           <el-link :disabled="template.disabled" @click="addTemplate(template)">{{template.title}}</el-link>
@@ -21,9 +22,13 @@
 <script>
     import MsCodeEdit from "../../../../common/components/MsCodeEdit";
     import MsInstructionsIcon from "../../../../common/components/MsInstructionsIcon";
+    import MsDropdown from "../../../../common/components/MsDropdown";
+
+
+
     export default {
-      name: "MsBeanShellProcessor",
+      name: "MsJsr233Processor",
-      components: {MsInstructionsIcon, MsCodeEdit},
+      components: {MsDropdown, MsInstructionsIcon, MsCodeEdit},
       data() {
         return {
           codeTemplates: [
@@ -51,7 +56,14 @@
               disabled: this.isPreProcessor
             }
           ],
-          isCodeEditAlive: true
+          isCodeEditAlive: true,
+          languages: [
+            'beanshell',"python"
+          ],
+          codeEditModeMap: {
+            beanshell: 'java',
+            python: 'python'
+          }
         }
       },
       props: {
@@ -62,7 +74,7 @@
           type: Boolean,
           default: false
         },
-        beanShellProcessor: {
+        jsr223Processor: {
           type: Object,
         },
         isPreProcessor: {
@@ -72,15 +84,18 @@
       },
       methods: {
         addTemplate(template) {
-          if (!this.beanShellProcessor.script) {
+          if (!this.jsr223Processor.script) {
-            this.beanShellProcessor.script = "";
+            this.jsr223Processor.script = "";
           }
-          this.beanShellProcessor.script += template.value;
+          this.jsr223Processor.script += template.value;
           this.reload();
         },
         reload() {
           this.isCodeEditAlive = false;
           this.$nextTick(() => (this.isCodeEditAlive = true));
+        },
+        languageChange(language) {
+          this.jsr223Processor.language = language;
         }
       }
     }
@@ -100,13 +115,10 @@
    padding: 0 20px;
   }
 
-  .script-index div:first-child {
-    font-weight: bold;
-    font-size: 15px;
-  }
-
   .template-title {
     margin-bottom: 5px;
+    font-weight: bold;
+    font-size: 15px;
   }
 
   .document-url {
@@ -117,4 +129,8 @@
     margin-left: 5px;
   }
 
+  .ms-dropdown {
+    margin-bottom: 20px;
+  }
+
 </style>

frontend/src/business/components/api/test/components/request/ApiDubboRequestForm.vue

@@ -45,10 +45,10 @@
         <ms-api-extract :is-read-only="isReadOnly" :extract="request.extract"/>
       </el-tab-pane>
       <el-tab-pane :label="$t('api_test.request.processor.pre_exec_script')" name="beanShellPreProcessor">
-        <ms-bean-shell-processor :is-read-only="isReadOnly" :bean-shell-processor="request.beanShellPreProcessor"/>
+        <ms-jsr233-processor :is-read-only="isReadOnly" :jsr223-processor="request.jsr223PreProcessor"/>
       </el-tab-pane>
       <el-tab-pane :label="$t('api_test.request.processor.post_exec_script')" name="beanShellPostProcessor">
-        <ms-bean-shell-processor :is-read-only="isReadOnly" :bean-shell-processor="request.beanShellPostProcessor"/>
+        <ms-jsr233-processor :is-read-only="isReadOnly" :jsr223-processor="request.jsr223PostProcessor"/>
       </el-tab-pane>
     </el-tabs>
   </el-form>
@@ -65,12 +65,12 @@
   import MsDubboRegistryCenter from "@/business/components/api/test/components/request/dubbo/RegistryCenter";
   import MsDubboConfigCenter from "@/business/components/api/test/components/request/dubbo/ConfigCenter";
   import MsDubboConsumerService from "@/business/components/api/test/components/request/dubbo/ConsumerAndService";
-  import MsBeanShellProcessor from "../processor/BeanShellProcessor";
+  import MsJsr233Processor from "../processor/Jsr233Processor";
 
   export default {
     name: "MsApiDubboRequestForm",
     components: {
-      MsBeanShellProcessor,
+      MsJsr233Processor,
       MsDubboConsumerService,
       MsDubboConfigCenter,
       MsDubboRegistryCenter,

frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue

@@ -38,6 +38,7 @@
         v-model="request.useEnvironment"
         :active-text="$t('api_test.request.refer_to_environment')" @change="useEnvironmentChange">
       </el-switch>
+      <el-checkbox class="follow-redirects-item" v-model="request.followRedirects">{{$t('api_test.request.follow_redirects')}}</el-checkbox>
     </el-form-item>
 
     <el-button :disabled="!request.enable || !scenario.enable || isReadOnly" class="debug-button" size="small" type="primary" @click="runDebug">{{ $t('api_test.request.debug') }}</el-button>
@@ -67,11 +68,11 @@
       <el-tab-pane :label="$t('api_test.request.extract.label')" name="extract">
         <ms-api-extract :is-read-only="isReadOnly" :extract="request.extract"/>
       </el-tab-pane>
-      <el-tab-pane :label="$t('api_test.request.processor.pre_exec_script')" name="beanShellPreProcessor">
+      <el-tab-pane :label="$t('api_test.request.processor.pre_exec_script')" name="jsr223PreProcessor">
-        <ms-bean-shell-processor :is-pre-processor="true" :is-read-only="isReadOnly" :bean-shell-processor="request.beanShellPreProcessor"/>
+        <ms-jsr233-processor :is-read-only="isReadOnly" :jsr223-processor="request.jsr223PreProcessor"/>
       </el-tab-pane>
-      <el-tab-pane :label="$t('api_test.request.processor.post_exec_script')" name="beanShellPostProcessor">
+      <el-tab-pane :label="$t('api_test.request.processor.post_exec_script')" name="jsr223PostProcessor">
-        <ms-bean-shell-processor :is-read-only="isReadOnly" :bean-shell-processor="request.beanShellPostProcessor"/>
+        <ms-jsr233-processor :is-read-only="isReadOnly" :jsr223-processor="request.jsr223PostProcessor"/>
       </el-tab-pane>
       <el-tab-pane :label="$t('api_test.request.timeout_config')" name="advancedConfig">
         <ms-api-advanced-config :is-read-only="isReadOnly" :request="request"/>
@@ -89,14 +90,14 @@ import MsApiExtract from "../extract/ApiExtract";
 import ApiRequestMethodSelect from "../collapse/ApiRequestMethodSelect";
 import {REQUEST_HEADERS} from "@/common/js/constants";
 import MsApiVariable from "@/business/components/api/test/components/ApiVariable";
-import MsBeanShellProcessor from "../processor/BeanShellProcessor";
+import MsJsr233Processor from "../processor/Jsr233Processor";
 import MsApiAdvancedConfig from "../ApiAdvancedConfig";
 
 export default {
   name: "MsApiHttpRequestForm",
   components: {
+    MsJsr233Processor,
     MsApiAdvancedConfig,
-    MsBeanShellProcessor,
     MsApiVariable, ApiRequestMethodSelect, MsApiExtract, MsApiAssertions, MsApiBody, MsApiKeyValue},
   props: {
     request: HttpRequest,
@@ -221,4 +222,8 @@ export default {
   color: #F56C6C;
 }
 
+.follow-redirects-item {
+  margin-left: 30px;
+}
+
 </style>

frontend/src/business/components/api/test/components/request/ApiRequestForm.vue

@@ -55,6 +55,15 @@ export default {
         this.getReport();
       }
     },
+    mounted() {
+      //兼容旧版本 beanshell
+      if (!this.request.jsr223PreProcessor.script && this.request.beanShellPreProcessor) {
+        this.request.jsr223PreProcessor = this.request.beanShellPreProcessor;
+      }
+      if (!this.request.jsr223PostProcessor.script && this.request.beanShellPostProcessor) {
+        this.request.jsr223PostProcessor = this.request.beanShellPostProcessor;
+      }
+    },
     methods: {
       getReport() {
         if (this.debugReportId) {

frontend/src/business/components/api/test/model/JMX.js

@@ -295,8 +295,10 @@ export class HTTPSamplerProxy extends DefaultTestElement {
     if (options.responseTimeout) {
       this.stringProp('HTTPSampler.response_timeout', options.responseTimeout);
     }
+    if (options.followRedirects) {
+      this.boolProp('HTTPSampler.follow_redirects', options.followRedirects, true);
+    }
 
-    this.boolProp("HTTPSampler.follow_redirects", options.follow, true);
     this.boolProp("HTTPSampler.use_keepalive", options.keepalive, true);
   }
 }
@@ -441,6 +443,30 @@ export class BeanShellProcessor extends DefaultTestElement {
   }
 }
 
+export class JSR223Processor extends DefaultTestElement {
+  constructor(tag, guiclass, testclass, testname, processor) {
+    super(tag, guiclass, testclass, testname);
+    this.processor = processor || {};
+    this.stringProp('cacheKey', 'true');
+    this.stringProp('filename');
+    this.stringProp('parameters');
+    this.stringProp('script', this.processor.script);
+    this.stringProp('scriptLanguage', this.processor.language);
+  }
+}
+
+export class JSR223PreProcessor extends JSR223Processor {
+  constructor(testName, processor) {
+    super('JSR223PreProcessor', 'TestBeanGUI', 'JSR223PreProcessor', testName, processor)
+  }
+}
+
+export class JSR223PostProcessor extends JSR223Processor {
+  constructor(testName, processor) {
+    super('JSR223PostProcessor', 'TestBeanGUI', 'JSR223PostProcessor', testName, processor)
+  }
+}
+
 export class BeanShellPreProcessor extends BeanShellProcessor {
   constructor(testName, processor) {
     super('BeanShellPreProcessor', 'TestBeanGUI', 'BeanShellPreProcessor', testName, processor)

frontend/src/business/components/api/test/model/ScenarioModel.js

@@ -9,7 +9,7 @@ import {
   HTTPSamplerArguments, HTTPsamplerFiles,
   HTTPSamplerProxy,
   JSONPathAssertion,
-  JSONPostProcessor,
+  JSONPostProcessor, JSR223PostProcessor, JSR223PreProcessor,
   RegexExtractor,
   ResponseCodeAssertion,
   ResponseDataAssertion,
@@ -309,9 +309,12 @@ export class HttpRequest extends Request {
     this.debugReport = undefined;
     this.beanShellPreProcessor = undefined;
     this.beanShellPostProcessor = undefined;
+    this.jsr223PreProcessor = undefined;
+    this.jsr223PostProcessor = undefined;
     this.enable = true;
     this.connectTimeout = 60*1000;
     this.responseTimeout = undefined;
+    this.followRedirects = true;
 
     this.set(options);
     this.sets({parameters: KeyValue, headers: KeyValue}, options);
@@ -323,8 +326,8 @@ export class HttpRequest extends Request {
     options.body = new Body(options.body);
     options.assertions = new Assertions(options.assertions);
     options.extract = new Extract(options.extract);
-    options.beanShellPreProcessor = new BeanShellProcessor(options.beanShellPreProcessor);
+    options.jsr223PreProcessor = new JSR223Processor(options.jsr223PreProcessor);
-    options.beanShellPostProcessor = new BeanShellProcessor(options.beanShellPostProcessor);
+    options.jsr223PostProcessor = new JSR223Processor(options.jsr223PostProcessor);
     return options;
   }
 
@@ -393,7 +396,9 @@ export class DubboRequest extends Request {
     this.debugReport = undefined;
     this.beanShellPreProcessor = new BeanShellProcessor(options.beanShellPreProcessor);
     this.beanShellPostProcessor = new BeanShellProcessor(options.beanShellPostProcessor);
-    this.enable = true;
+    this.enable = options.enable == undefined ? true : options.enable;
+    this.jsr223PreProcessor = new JSR223Processor(options.jsr223PreProcessor);
+    this.jsr223PostProcessor = new JSR223Processor(options.jsr223PostProcessor);
 
     this.sets({args: KeyValue, attachmentArgs: KeyValue}, options);
   }
@@ -603,6 +608,16 @@ export class BeanShellProcessor extends BaseConfig {
   }
 }
 
+
+export class JSR223Processor extends BaseConfig {
+  constructor(options) {
+    super();
+    this.script = undefined;
+    this.language = "beanshell";
+    this.set(options);
+  }
+}
+
 export class Text extends AssertionType {
   constructor(options) {
     super(ASSERTION_TYPE.TEXT);
@@ -749,6 +764,7 @@ class JMXHttpRequest {
       }
       this.connectTimeout = request.connectTimeout;
       this.responseTimeout = request.responseTimeout;
+      this.followRedirects = request.followRedirects;
 
     }
   }
@@ -867,11 +883,11 @@ class JMXGenerator {
               }
             }
 
-            this.addBeanShellProcessor(sampler, request);
+            this.addRequestExtractor(sampler, request);
 
             this.addRequestAssertion(sampler, request);
 
-            this.addRequestExtractor(sampler, request);
+            this.addJSR223PreProcessor(sampler, request);
 
             threadGroup.put(sampler);
           }
@@ -938,13 +954,13 @@ class JMXGenerator {
     }
   }
 
-  addBeanShellProcessor(sampler, request) {
+  addJSR223PreProcessor(sampler, request) {
     let name = request.name;
-    if (request.beanShellPreProcessor && request.beanShellPreProcessor.script) {
+    if (request.jsr223PreProcessor && request.jsr223PreProcessor.script) {
-      sampler.put(new BeanShellPreProcessor(name, request.beanShellPreProcessor));
+      sampler.put(new JSR223PreProcessor(name, request.jsr223PreProcessor));
     }
-    if (request.beanShellPostProcessor && request.beanShellPostProcessor.script) {
+    if (request.jsr223PostProcessor && request.jsr223PostProcessor.script) {
-      sampler.put(new BeanShellPostProcessor(name, request.beanShellPostProcessor));
+      sampler.put(new JSR223PostProcessor(name, request.jsr223PostProcessor));
     }
   }
 

frontend/src/business/components/common/components/MsDeleteConfirm.vue

@@ -1,5 +1,6 @@
 <template>
-  <el-dialog :title="title"
+  <el-dialog :close-on-click-modal="false"
+             :title="title"
              :visible.sync="dialogVisible"
              class="delete-confirm" >
 

frontend/src/business/components/common/components/MsDropdown.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dropdown @command="handleCommand">
+  <el-dropdown @command="handleCommand" class="ms-dropdown">
     <slot>
       <span class="el-dropdown-link">
         {{currentCommand}}

frontend/src/business/components/performance/report/PerformanceReportView.vue

@@ -82,19 +82,17 @@
 </template>
 
 <script>
-  import MsReportErrorLog from './components/ErrorLog';
+import MsReportErrorLog from './components/ErrorLog';
-  import MsReportLogDetails from './components/LogDetails';
+import MsReportLogDetails from './components/LogDetails';
-  import MsReportRequestStatistics from './components/RequestStatistics';
+import MsReportRequestStatistics from './components/RequestStatistics';
-  import MsReportTestOverview from './components/TestOverview';
+import MsReportTestOverview from './components/TestOverview';
-  import MsPerformancePressureConfig from "./components/PerformancePressureConfig";
+import MsPerformancePressureConfig from "./components/PerformancePressureConfig";
-  import MsContainer from "../../common/components/MsContainer";
+import MsContainer from "../../common/components/MsContainer";
-  import MsMainContainer from "../../common/components/MsMainContainer";
+import MsMainContainer from "../../common/components/MsMainContainer";
 
-  import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
+import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
-  import writer from "file-writer";
-  import ResumeCss from "../../../../common/css/main.css";
 
-  export default {
+export default {
   name: "PerformanceReportView",
   components: {
     MsReportErrorLog,
@@ -129,7 +127,7 @@
     }
   },
   methods: {
-      initBreadcrumb() {
+    initBreadcrumb(callback) {
       if (this.reportId) {
         this.result = this.$get("/performance/report/test/pro/info/" + this.reportId, res => {
           let data = res.data;
@@ -139,11 +137,19 @@
             this.testName = data.testName;
             this.projectId = data.projectId;
             this.projectName = data.projectName;
+            //
+            if (callback) callback(res);
+          } else {
+            this.$error(this.$t('report.not_exist'));
           }
         })
       }
     },
     initReportTimeInfo() {
+      if (this.status === 'Starting') {
+        this.clearData();
+        return;
+      }
       if (this.reportId) {
         this.result = this.$get("/performance/report/content/report_time/" + this.reportId)
           .then(res => {
@@ -157,7 +163,7 @@
             }
           }).catch(() => {
             this.clearData();
-            })
+          });
       }
     },
     initWebSocket() {
@@ -228,10 +234,15 @@
     onMessage(e) {
       this.$set(this.report, "refresh", e.data); // 触发刷新
       this.$set(this.report, "status", 'Running');
+      this.status = 'Running';
       this.initReportTimeInfo();
       window.console.log('receive a message:', e.data);
     },
     onClose(e) {
+      if (e.code === 1005) {
+        // 强制删除之后关闭socket，不用刷新report
+        return;
+      }
       this.$set(this.report, "refresh", Math.random()); // 触发刷新
       this.$set(this.report, "status", 'Completed');
       this.initReportTimeInfo();
@@ -264,9 +275,6 @@
     });
 
   },
-    beforeDestroy() {
-      this.websocket.close() //离开路由之后断开websocket连接
-    },
   watch: {
     '$route'(to) {
       if (to.name === "perReportView") {
@@ -276,58 +284,35 @@
         }
         let reportId = to.path.split('/')[4];
         this.reportId = reportId;
-          if (reportId) {
+        this.initBreadcrumb((response) => {
-            this.$get("/performance/report/test/pro/info/" + reportId, response => {
           let data = response.data;
-              if (data) {
-                this.status = data.status;
-                this.reportName = data.name;
-                this.testName = data.testName;
-                this.testId = data.testId;
-                this.projectName = data.projectName;
 
           this.$set(this.report, "id", reportId);
           this.$set(this.report, "status", data.status);
 
           this.checkReportStatus(data.status);
-                if (this.status === "Completed") {
+          this.initReportTimeInfo();
-                  this.result = this.$get("/performance/report/content/report_time/" + this.reportId).then(res => {
-                    let data = res.data.data;
-                    if (data) {
-                      this.startTime = data.startTime;
-                      this.endTime = data.endTime;
-                      let duration = data.duration;
-                      this.minutes = Math.floor(duration / 60);
-                      this.seconds = duration % 60;
-                    }
-                  }).catch(() => {
-                    this.clearData();
-                  })
-                } else {
-                  this.clearData();
-                }
-              } else {
-                this.$error(this.$t('report.not_exist'));
-              }
         });
-
+        this.initWebSocket();
-          }
+      } else {
-        }
+        console.log("close socket.");
+        this.websocket.close() //离开路由之后断开websocket连接
       }
     }
   }
+}
 </script>
 
 <style scoped>
 
-  .ms-report-view-btns {
+.ms-report-view-btns {
   margin-top: 15px;
-  }
+}
 
-  .ms-report-time-desc {
+.ms-report-time-desc {
   text-align: left;
   display: block;
   color: #5C7878;
-  }
+}
 
 </style>

frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue

@@ -58,7 +58,7 @@ import PerformancePressureConfig from "./components/PerformancePressureConfig";
 import PerformanceAdvancedConfig from "./components/PerformanceAdvancedConfig";
 import MsContainer from "../../common/components/MsContainer";
 import MsMainContainer from "../../common/components/MsMainContainer";
-import {checkoutTestManagerOrTestUser} from "../../../../common/js/utils";
+import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
 import MsScheduleConfig from "../../common/components/MsScheduleConfig";
 import {LIST_CHANGE, PerformanceEvent} from "@/business/components/common/head/ListEvent";
 

frontend/src/business/components/performance/test/components/PerformanceBasicConfig.vue

@@ -4,7 +4,7 @@
       accept=".jmx,.csv"
       drag
       action=""
-      :limit="2"
+      :limit="5"
       multiple
       :show-file-list="false"
       :before-upload="beforeUpload"

frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue

@@ -164,6 +164,7 @@ export default {
       } else {
         this.calculateChart();
       }
+      this.getResourcePools();
     },
   },
   methods: {

frontend/src/business/components/project/MsProject.vue

@@ -49,7 +49,7 @@
       </el-card>
     </ms-main-container>
 
-    <el-dialog :title="title" :visible.sync="createVisible" destroy-on-close @close="handleClose">
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="createVisible" destroy-on-close @close="handleClose">
       <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="100px" size="small">
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off"></el-input>

frontend/src/business/components/settings/organization/IssuesManagement.vue

@@ -25,6 +25,9 @@
         <el-form-item :label="$t('organization.integration.jira_url')" prop="url" v-if="platform === 'Jira'">
           <el-input v-model="form.url" :placeholder="$t('organization.integration.input_jira_url')"/>
         </el-form-item>
+        <el-form-item :label="$t('organization.integration.jira_issuetype')" prop="issuetype" v-if="platform === 'Jira'">
+          <el-input v-model="form.issuetype" :placeholder="$t('organization.integration.input_jira_issuetype')"/>
+        </el-form-item>
       </el-form>
     </div>
 
@@ -43,10 +46,13 @@
     <div class="defect-tip">
       <div>{{$t('organization.integration.use_tip')}}</div>
       <div>
-        1. {{$t('organization.integration.use_tip_one')}}
+        1. {{$t('organization.integration.use_tip_tapd')}}
       </div>
       <div>
-        2. {{$t('organization.integration.use_tip_two')}}
+        2. {{$t('organization.integration.use_tip_jira')}}
+      </div>
+      <div>
+        3. {{$t('organization.integration.use_tip_two')}}
         <router-link to="/track/project/all" style="margin-left: 5px">
           {{$t('organization.integration.link_the_project_now')}}
         </router-link>
@@ -85,6 +91,11 @@
             required: true,
             message: this.$t('organization.integration.input_jira_url'),
             trigger: ['change', 'blur']
+          },
+          issuetype: {
+            required: true,
+            message: this.$t('organization.integration.input_jira_issuetype'),
+            trigger: ['change', 'blur']
           }
         },
       }
@@ -105,6 +116,7 @@
             this.$set(this.form, 'account', config.account);
             this.$set(this.form, 'password', config.password);
             this.$set(this.form, 'url', config.url);
+            this.$set(this.form, 'issuetype', config.issuetype);
           } else {
             this.clear();
           }
@@ -149,17 +161,26 @@
           this.$warning(this.$t('organization.integration.choose_platform'));
           return;
         }
+
+        this.$refs[form].validate(valid => {
+          if (valid) {
+
+            let formatUrl = this.form.url;
+            if (!formatUrl.endsWith('/')) {
+              formatUrl = formatUrl + '/';
+            }
+
             let param = {};
             let auth = {
               account: this.form.account,
               password: this.form.password,
-          url: this.form.url
+              url: formatUrl,
+              issuetype: this.form.issuetype
             };
             param.organizationId = getCurrentUser().lastOrganizationId;
             param.platform = this.platform;
             param.configuration = JSON.stringify(auth);
-        this.$refs[form].validate(valid => {
+
-          if (valid) {
             this.result = this.$post("service/integration/save", param, () => {
               this.show = true;
               this.showEdit = true;
@@ -188,6 +209,7 @@
             this.$set(this.form, 'account', config.account);
             this.$set(this.form, 'password', config.password);
             this.$set(this.form, 'url', config.url);
+            this.$set(this.form, 'issuetype', config.issuetype);
           } else {
             this.clear();
           }
@@ -197,6 +219,7 @@
         this.$set(this.form, 'account', '');
         this.$set(this.form, 'password', '');
         this.$set(this.form, 'url', '');
+        this.$set(this.form, 'issuetype', '');
         this.$nextTick(() => {
           this.$refs.form.clearValidate();
         });

frontend/src/business/components/settings/organization/OrganizationMember.vue

@@ -25,7 +25,7 @@
                            :total="total"/>
     </el-card>
 
-    <el-dialog :title="$t('member.create')" :visible.sync="createVisible" width="30%" :destroy-on-close="true"
+    <el-dialog :close-on-click-modal="false" :title="$t('member.create')" :visible.sync="createVisible" width="30%" :destroy-on-close="true"
                @close="handleClose">
       <el-form :model="form" ref="form" :rules="rules" label-position="right" label-width="100px" size="small">
         <el-form-item :label="$t('commons.member')" prop="ids"
@@ -73,7 +73,7 @@
       </template>
     </el-dialog>
 
-    <el-dialog :title="$t('member.modify')" :visible.sync="updateVisible" width="30%" :destroy-on-close="true"
+    <el-dialog :close-on-click-modal="false" :title="$t('member.modify')" :visible.sync="updateVisible" width="30%" :destroy-on-close="true"
                @close="handleClose">
       <el-form :model="form" label-position="right" label-width="100px" size="small" ref="updateUserForm">
         <el-form-item label="ID" prop="id">

frontend/src/business/components/settings/organization/OrganizationWorkspace.vue

@@ -24,7 +24,7 @@
                            :total="total"/>
     </el-card>
 
-    <el-dialog :title="$t('workspace.create')" :visible.sync="dialogWsAddVisible" width="30%" @close="close">
+    <el-dialog :close-on-click-modal="false" :title="$t('workspace.create')" :visible.sync="dialogWsAddVisible" width="30%" @close="close">
       <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="100px" size="small">
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off"/>
@@ -39,7 +39,7 @@
           @confirm="submit('form')"/>
       </template>
     </el-dialog>
-    <el-dialog :title="$t('workspace.update')" :visible.sync="dialogWsUpdateVisible" width="30%">
+    <el-dialog :close-on-click-modal="false" :title="$t('workspace.update')" :visible.sync="dialogWsUpdateVisible" width="30%">
       <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="100px" size="small">
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off"/>
@@ -56,7 +56,7 @@
     </el-dialog>
 
     <!-- dialog of workspace member -->
-    <el-dialog :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="close"
+    <el-dialog :close-on-click-modal="false" :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="close"
                class="dialog-css">
       <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
                        :create-tip="$t('member.create')" :title="$t('commons.member')"/>
@@ -82,7 +82,7 @@
     </el-dialog>
 
     <!-- add workspace member dialog -->
-    <el-dialog :title="$t('member.create')" :visible.sync="dialogWsMemberAddVisible" width="30%"
+    <el-dialog :close-on-click-modal="false" :title="$t('member.create')" :visible.sync="dialogWsMemberAddVisible" width="30%"
                :destroy-on-close="true"
                @close="closeFunc">
       <el-form :model="memberForm" ref="form" :rules="wsMemberRule" label-position="right" label-width="100px"
@@ -125,7 +125,7 @@
     </el-dialog>
 
     <!-- update workspace member dialog -->
-    <el-dialog :title="$t('member.modify')" :visible.sync="dialogWsMemberUpdateVisible" width="30%"
+    <el-dialog :close-on-click-modal="false" :title="$t('member.modify')" :visible.sync="dialogWsMemberUpdateVisible" width="30%"
                :destroy-on-close="true"
                @close="closeFunc">
       <el-form :model="memberForm" label-position="right" label-width="100px" size="small" ref="updateUserForm">

frontend/src/business/components/settings/personal/PersonSetting.vue

@@ -32,7 +32,7 @@
     </el-card>
 
     <!--Modify personal details-->
-    <el-dialog :title="$t('member.modify_personal_info')" :visible.sync="updateVisible" width="30%"
+    <el-dialog :close-on-click-modal="false" :title="$t('member.modify_personal_info')" :visible.sync="updateVisible" width="30%"
                :destroy-on-close="true" @close="handleClose">
       <el-form :model="form" label-position="right" label-width="100px" size="small" :rules="rule"
                ref="updateUserForm">
@@ -57,7 +57,7 @@
     </el-dialog>
 
     <!--Change personal password-->
-    <el-dialog :title="$t('member.edit_password')" :visible.sync="editPasswordVisible" width="35%"
+    <el-dialog :close-on-click-modal="false" :title="$t('member.edit_password')" :visible.sync="editPasswordVisible" width="35%"
                :destroy-on-close="true" @close="handleClose" left>
       <el-form :model="ruleForm" :rules="rules" ref="editPasswordForm" label-width="120px" class="demo-ruleForm">
         <el-form-item :label="$t('member.old_password')" prop="password" style="margin-bottom: 29px">

frontend/src/business/components/settings/system/Organization.vue

@@ -28,7 +28,7 @@
     </el-card>
 
     <!-- dialog of organization member -->
-    <el-dialog :visible.sync="dialogOrgMemberVisible" width="70%" :destroy-on-close="true" @close="closeFunc"
+    <el-dialog :close-on-click-modal="false" :visible.sync="dialogOrgMemberVisible" width="70%" :destroy-on-close="true" @close="closeFunc"
                class="dialog-css">
       <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
                        :create-tip="$t('member.create')" :title="$t('commons.member')"/>
@@ -56,7 +56,7 @@
     </el-dialog>
 
     <!-- add organization form -->
-    <el-dialog :title="$t('organization.create')" :visible.sync="dialogOrgAddVisible" width="30%" @closed="closeFunc"
+    <el-dialog :close-on-click-modal="false" :title="$t('organization.create')" :visible.sync="dialogOrgAddVisible" width="30%" @closed="closeFunc"
                :destroy-on-close="true">
       <el-form :model="form" label-position="right" label-width="100px" size="small" :rules="rule"
                ref="createOrganization">
@@ -75,7 +75,7 @@
     </el-dialog>
 
     <!-- update organization form -->
-    <el-dialog :title="$t('organization.modify')" :visible.sync="dialogOrgUpdateVisible" width="30%"
+    <el-dialog :close-on-click-modal="false" :title="$t('organization.modify')" :visible.sync="dialogOrgUpdateVisible" width="30%"
                :destroy-on-close="true"
                @close="closeFunc">
       <el-form :model="form" label-position="right" label-width="100px" size="small" :rules="rule"
@@ -95,7 +95,7 @@
     </el-dialog>
 
     <!-- add organization member form -->
-    <el-dialog :title="$t('member.create')" :visible.sync="dialogOrgMemberAddVisible" width="30%"
+    <el-dialog :close-on-click-modal="false" :title="$t('member.create')" :visible.sync="dialogOrgMemberAddVisible" width="30%"
                :destroy-on-close="true"
                @close="closeFunc">
       <el-form :model="memberForm" ref="form" :rules="orgMemberRule" label-position="right" label-width="100px"
@@ -133,7 +133,7 @@
     </el-dialog>
 
     <!-- update organization member form -->
-    <el-dialog :title="$t('member.modify')" :visible.sync="dialogOrgMemberUpdateVisible" width="30%"
+    <el-dialog :close-on-click-modal="false" :title="$t('member.modify')" :visible.sync="dialogOrgMemberUpdateVisible" width="30%"
                :destroy-on-close="true"
                @close="closeFunc">
       <el-form :model="memberForm" label-position="right" label-width="100px" size="small" ref="updateUserForm">

frontend/src/business/components/settings/system/SystemWorkspace.vue

@@ -28,7 +28,7 @@
     </el-card>
 
     <!-- add workspace dialog -->
-    <el-dialog :title="$t('workspace.create')" :visible.sync="dialogWsAddVisible" width="30%" @close="close">
+    <el-dialog :close-on-click-modal="false" :title="$t('workspace.create')" :visible.sync="dialogWsAddVisible" width="30%" @close="close">
       <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="100px" size="small">
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off"/>
@@ -56,7 +56,7 @@
     </el-dialog>
 
     <!-- update workspace dialog -->
-    <el-dialog :title="$t('workspace.update')" :visible.sync="dialogWsUpdateVisible" width="30%" @close="close">
+    <el-dialog :close-on-click-modal="false" :title="$t('workspace.update')" :visible.sync="dialogWsUpdateVisible" width="30%" @close="close">
       <el-form :model="form" :rules="rules" ref="updateForm" label-position="right" label-width="100px" size="small">
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off"/>
@@ -85,7 +85,7 @@
     </el-dialog>
 
     <!-- dialog of workspace member -->
-    <el-dialog :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="closeWsMemberDialog" class="dialog-css">
+    <el-dialog :close-on-click-modal="false" :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="closeWsMemberDialog" class="dialog-css">
       <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
                        :create-tip="$t('member.create')" :title="$t('commons.member')"/>
       <!-- organization member table -->
@@ -111,7 +111,7 @@
     </el-dialog>
 
     <!-- add workspace member dialog -->
-    <el-dialog :title="$t('member.create')" :visible.sync="dialogWsMemberAddVisible" width="30%"
+    <el-dialog :close-on-click-modal="false" :title="$t('member.create')" :visible.sync="dialogWsMemberAddVisible" width="30%"
                :destroy-on-close="true"
                @close="handleClose">
       <el-form :model="memberForm" ref="form" :rules="wsMemberRule" label-position="right" label-width="100px"
@@ -149,7 +149,7 @@
     </el-dialog>
 
     <!-- update workspace member dialog -->
-    <el-dialog :title="$t('member.modify')" :visible.sync="dialogWsMemberUpdateVisible" width="30%"
+    <el-dialog :close-on-click-modal="false" :title="$t('member.modify')" :visible.sync="dialogWsMemberUpdateVisible" width="30%"
                :destroy-on-close="true"
                @close="handleClose">
       <el-form :model="memberForm" label-position="right" label-width="100px" size="small" ref="updateUserForm">

frontend/src/business/components/settings/system/TestResourcePool.vue

@@ -45,6 +45,7 @@
     </el-card>
 
     <el-dialog
+      :close-on-click-modal="false"
       :title="$t('test_resource_pool.create_resource_pool')"
       :visible.sync="createVisible" width="70%"
       @closed="closeFunc"
@@ -109,6 +110,7 @@
     </el-dialog>
 
     <el-dialog
+      :close-on-click-modal="false"
       v-loading="result.loading"
       :title="$t('test_resource_pool.update_resource_pool')" :visible.sync="updateVisible" width="70%"
       :destroy-on-close="true"

frontend/src/business/components/settings/system/User.vue

@@ -50,7 +50,7 @@
     </el-card>
 
     <!--Create user-->
-    <el-dialog :title="$t('user.create')" :visible.sync="createVisible" width="35%" @closed="handleClose"
+    <el-dialog :close-on-click-modal="false" :title="$t('user.create')" :visible.sync="createVisible" width="35%" @closed="handleClose"
                :destroy-on-close="true">
       <el-form :model="form" label-position="right" label-width="120px" size="small" :rules="rule" ref="createUserForm">
         <el-form-item label="ID" prop="id">
@@ -163,7 +163,7 @@
     </el-dialog>
 
     <!--Modify user information in system settings-->
-    <el-dialog :title="$t('user.modify')" :visible.sync="updateVisible" width="35%" :destroy-on-close="true"
+    <el-dialog :close-on-click-modal="false" :title="$t('user.modify')" :visible.sync="updateVisible" width="35%" :destroy-on-close="true"
                @close="handleClose" v-loading="result.loading">
       <el-form :model="form" label-position="right" label-width="120px" size="small" :rules="rule" ref="updateUserForm">
         <el-form-item label="ID" prop="id">
@@ -268,7 +268,7 @@
       </template>
     </el-dialog>
     <!--Changing user password in system settings-->
-    <el-dialog :title="$t('member.edit_password')" :visible.sync="editPasswordVisible" width="30%"
+    <el-dialog :close-on-click-modal="false" :title="$t('member.edit_password')" :visible.sync="editPasswordVisible" width="30%"
                :destroy-on-close="true" @close="handleClose" left>
       <el-form :model="ruleForm" label-position="right" label-width="120px" size="small" :rules="rule"
                ref="editPasswordForm" class="demo-ruleForm">

frontend/src/business/components/settings/workspace/WorkspaceMember.vue

@@ -26,7 +26,7 @@
                            :total="total"/>
     </el-card>
 
-    <el-dialog :title="$t('member.create')" :visible.sync="createVisible" width="30%" :destroy-on-close="true"
+    <el-dialog :close-on-click-modal="false" :title="$t('member.create')" :visible.sync="createVisible" width="30%" :destroy-on-close="true"
                @close="handleClose">
       <el-form :model="form" ref="form" :rules="rules" label-position="right" label-width="100px" size="small">
         <el-form-item :label="$t('commons.member')" prop="memberSign" :rules="{required: true, message: $t('member.input_id_or_email'), trigger: 'change'}">
@@ -65,7 +65,7 @@
       </template>
     </el-dialog>
 
-    <el-dialog :title="$t('member.modify')" :visible.sync="updateVisible" width="30%" :destroy-on-close="true"
+    <el-dialog :close-on-click-modal="false" :title="$t('member.modify')" :visible.sync="updateVisible" width="30%" :destroy-on-close="true"
                @close="handleClose">
       <el-form :model="form" label-position="right" label-width="100px" size="small" ref="updateUserForm">
         <el-form-item label="ID" prop="id">

frontend/src/business/components/track/case/components/TestCaseEdit.vue

@@ -2,9 +2,10 @@
 
   <div>
 
-    <el-dialog @close="close"
+    <el-dialog :close-on-click-modal="false"
+               @close="close"
                :title="operationType == 'edit' ? ( readOnly ? $t('test_track.case.view_case') : $t('test_track.case.edit_case')) : $t('test_track.case.create')"
-               :visible.sync="dialogFormVisible" width="65%" :close-on-click-modal="false">
+               :visible.sync="dialogFormVisible" width="65%">
 
       <el-form :model="form" :rules="rules" ref="caseFrom" v-loading="result.loading">
 
@@ -268,8 +269,8 @@ export default {
         type: [{required: true, message: this.$t('test_track.case.input_type'), trigger: 'change'}],
         testId: [{required: true, message: this.$t('commons.please_select'), trigger: 'change'}],
         method: [{required: true, message: this.$t('test_track.case.input_method'), trigger: 'change'}],
-        prerequisite: [{max: 300, message: this.$t('test_track.length_less_than') + '300', trigger: 'blur'}],
+        prerequisite: [{max: 500, message: this.$t('test_track.length_less_than') + '500', trigger: 'blur'}],
-        remark: [{max: 300, message: this.$t('test_track.length_less_than') + '300', trigger: 'blur'}]
+        remark: [{max: 500, message: this.$t('test_track.length_less_than') + '500', trigger: 'blur'}]
       },
       formLabelWidth: "120px",
       operationType: '',
@@ -351,8 +352,8 @@ export default {
     handleAddStep(index, data) {
       let step = {};
       step.num = data.num + 1;
-      step.desc = null;
+      step.desc = "";
-      step.result = null;
+      step.result = "";
       this.form.steps.forEach(step => {
         if (step.num > data.num) {
           step.num++;

frontend/src/business/components/track/home/TrackHome.vue

@@ -1,7 +1,7 @@
 <template>
   <ms-container>
     <ms-main-container>
-      <el-row>
+      <el-row :gutter="20">
         <el-col :span="15">
           <related-test-plan-list ref="relatedTestPlanList"/>
         </el-col>
@@ -14,15 +14,16 @@
 </template>
 
 <script>
-    import RelatedTestPlanList from "./components/RelatedTestPlanList";
+import RelatedTestPlanList from "./components/RelatedTestPlanList";
-    import TestCaseSideList from "./components/TestCaseSideList";
+import TestCaseSideList from "./components/TestCaseSideList";
-    import MsContainer from "../../common/components/MsContainer";
+import MsContainer from "../../common/components/MsContainer";
-    import MsMainContainer from "../../common/components/MsMainContainer";
+import MsMainContainer from "../../common/components/MsMainContainer";
-    export default {
+
+export default {
   name: "TrackHome",
   components: {MsMainContainer, MsContainer, TestCaseSideList, RelatedTestPlanList},
   watch: {
-        '$route'(to,from) {
+    '$route'(to, from) {
       if (to.path.indexOf('/track/home') > -1) {
         this.innitData();
       }
@@ -34,13 +35,13 @@
       this.$refs.testCaseRecentList.initTableData();
     }
   }
-    }
+}
 </script>
 
 <style scoped>
 
-  .ms-main-container >>> .el-table {
+.ms-main-container >>> .el-table {
-    cursor:pointer;
+  cursor: pointer;
-  }
+}
 
 </style>

frontend/src/business/components/track/home/components/HomeBaseComponent.vue

@@ -1,8 +1,8 @@
 <template>
-  <div class="track-home-component">
+  <div>
     <el-card>
       <template v-slot:header>
-        <span class="title">{{title}}</span>
+        <span class="title">{{ title }}</span>
       </template>
       <slot></slot>
     </el-card>
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-    export default {
+export default {
   name: "HomeBaseComponent",
   props: {
     title: {
@@ -20,17 +20,9 @@
       }
     }
   }
-    }
+}
 </script>
 
 <style scoped>
 
-  .el-card {
-    padding: 15px;
-  }
-
-  .track-home-component {
-    padding: 0 15px 15px;
-  }
-
 </style>

frontend/src/business/components/track/plan/components/TestPlanEdit.vue

@@ -2,7 +2,8 @@
 
   <div>
 
-    <el-dialog :title="operationType == 'edit' ? $t('test_track.plan.edit_plan') : $t('test_track.plan.create_plan')"
+    <el-dialog :close-on-click-modal="false"
+               :title="operationType == 'edit' ? $t('test_track.plan.edit_plan') : $t('test_track.plan.create_plan')"
                :visible.sync="dialogFormVisible"
                @close="close"
                width="65%">

frontend/src/business/components/track/plan/view/comonents/test/ApiTestDetail.vue

@@ -23,12 +23,12 @@
 </template>
 
 <script>
-  import {Test} from "../../../../../api/test/model/ScenarioModel"
+import {Test} from "../../../../../api/test/model/ScenarioModel"
-  import MsApiScenarioConfig from "../../../../../api/test/components/ApiScenarioConfig";
+import MsApiScenarioConfig from "../../../../../api/test/components/ApiScenarioConfig";
-  import MsContainer from "../../../../../common/components/MsContainer";
+import MsContainer from "../../../../../common/components/MsContainer";
-  import MsMainContainer from "../../../../../common/components/MsMainContainer";
+import MsMainContainer from "../../../../../common/components/MsMainContainer";
 
-  export default {
+export default {
   name: "ApiTestDetail",
   components: {MsMainContainer, MsContainer, MsApiScenarioConfig},
   props: {
@@ -92,7 +92,7 @@
 
 <style scoped>
   .test-container {
-    height: calc(100vh - 150px);
+    height: calc(100vh - 155px);
     min-height: 600px;
     padding: 15px;
   }

frontend/src/business/components/track/plan/view/comonents/test/ApiTestResult.vue

@@ -30,14 +30,14 @@
 
 <script>
 
-  import MsScenarioResult from "../../../../../api/report/components/ScenarioResult";
+import MsScenarioResult from "../../../../../api/report/components/ScenarioResult";
-  import MsMetricChart from "../../../../../api/report/components/MetricChart";
+import MsMetricChart from "../../../../../api/report/components/MetricChart";
-  import MsScenarioResults from "../../../../../api/report/components/ScenarioResults";
+import MsScenarioResults from "../../../../../api/report/components/ScenarioResults";
-  import MsRequestResult from "../../../../../api/report/components/RequestResult";
+import MsRequestResult from "../../../../../api/report/components/RequestResult";
-  import MsContainer from "../../../../../common/components/MsContainer";
+import MsContainer from "../../../../../common/components/MsContainer";
-  import MsMainContainer from "../../../../../common/components/MsMainContainer";
+import MsMainContainer from "../../../../../common/components/MsMainContainer";
 
-  export default {
+export default {
   name: "ApiTestResult",
   components: {MsMainContainer, MsContainer, MsRequestResult, MsScenarioResults, MsMetricChart, MsScenarioResult},
   data() {
@@ -108,7 +108,7 @@
 
 <style scoped>
   .report-container {
-    height: calc(100vh - 150px);
+    height: calc(100vh - 155px);
     min-height: 600px;
     overflow-y: auto;
   }

frontend/src/i18n/en-US.js

@@ -187,11 +187,14 @@ export default {
       api_account: 'API account',
       api_password: 'API password',
       jira_url: 'JIRA url',
+      jira_issuetype: 'JIRA issuetype',
       input_api_account: 'please enter account',
       input_api_password: 'Please enter password',
       input_jira_url: 'Please enter Jira address, for example: https://metersphere.atlassian.net/',
+      input_jira_issuetype: 'Please enter the question type',
       use_tip: 'Usage guidelines:',
-      use_tip_one: 'Basic Auth account information is queried in "Company Management-Security and Integration-Open Platform"',
+      use_tip_tapd: 'Basic Auth account information is queried in "Company Management-Security and Integration-Open Platform"',
+      use_tip_jira: 'Jira software server authentication information is account password, Jira software cloud authentication information is account + token (account settings-security-create API token)',
       use_tip_two: 'After saving the Basic Auth account information, you need to manually associate the ID/key in the Metersphere project',
       link_the_project_now: 'Link the project now',
       cancel_edit: 'Cancel edit',
@@ -446,6 +449,7 @@ export default {
       timeout_config: "Timeout Config",
       connect_timeout: "Connect Timeout",
       response_timeout: "Response Timeout",
+      follow_redirects: "Follow Redirects",
       body_upload_limit_size: "The file size does not exceed 500 MB",
       assertions: {
         label: "Assertion",

frontend/src/i18n/zh-CN.js

@@ -188,11 +188,14 @@ export default {
       api_account: 'API 账号',
       api_password: 'API 口令',
       jira_url: 'JIRA 地址',
+      jira_issuetype: '问题类型',
       input_api_account: '请输入账号',
       input_api_password: '请输入口令',
       input_jira_url: '请输入Jira地址，例：https://metersphere.atlassian.net/',
+      input_jira_issuetype: '请输入问题类型',
       use_tip: '使用指引：',
-      use_tip_one: 'Basic Auth 账号信息在"公司管理-安全与集成-开放平台"中查询',
+      use_tip_tapd: 'Tapd Basic Auth 账号信息在"公司管理-安全与集成-开放平台"中查询',
+      use_tip_jira: 'Jira software server 认证信息为 账号密码，Jira software cloud 认证信息为 账号+令牌(账户设置-安全-创建API令牌)',
       use_tip_two: '保存 Basic Auth 账号信息后，需要在 Metersphere 项目中手动关联 ID/key',
       link_the_project_now: '马上关联项目',
       cancel_edit: '取消编辑',
@@ -447,6 +450,7 @@ export default {
       timeout_config: "超时设置",
       connect_timeout: "连接超时",
       response_timeout: "响应超时",
+      follow_redirects: "跟随重定向",
       body_upload_limit_size: "上传文件大小不能超过 500 MB!",
       assertions: {
         label: "断言",

frontend/src/i18n/zh-TW.js

@@ -186,11 +186,14 @@ export default {
       api_account: 'API 賬號',
       api_password: 'API 口令',
       jira_url: 'JIRA 地址',
+      jira_issuetype: '問題類型',
       input_api_account: '請輸入賬號',
       input_api_password: '請輸入口令',
       input_jira_url: '請輸入Jira地址，例：https://metersphere.atlassian.net/',
+      input_jira_issuetype: '請輸入問題類型',
       use_tip: '使用指引：',
-      use_tip_one: 'Basic Auth 賬號信息在"公司管理-安全與集成-開放平台"中查詢',
+      use_tip_tapd: 'Basic Auth 賬號信息在"公司管理-安全與集成-開放平台"中查詢',
+      use_tip_jira: 'Jira software server 認證信息為 賬號密碼，Jira software cloud 認證信息為 賬號+令牌(賬戶設置-安全-創建API令牌)',
       use_tip_two: '保存 Basic Auth 賬號信息後，需要在 Metersphere 項目中手動關聯 ID/key',
       link_the_project_now: '馬上關聯項目',
       cancel_edit: '取消編輯',