Merge remote-tracking branch 'origin/dev' into dev

backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java

@@ -5,6 +5,7 @@ import io.metersphere.controller.request.ReportRequest;
 import io.metersphere.controller.request.testcase.QueryTestCaseRequest;
 import io.metersphere.controller.request.testplancase.QueryTestPlanCaseRequest;
 import io.metersphere.dto.ReportDTO;
+import io.metersphere.dto.TestCaseDTO;
 import io.metersphere.dto.TestPlanCaseDTO;
 import org.apache.ibatis.annotations.Param;
 
@@ -14,5 +15,5 @@ public interface ExtTestCaseMapper {
 
     List<TestCase> getTestCaseNames(@Param("request") QueryTestCaseRequest request);
 
-    List<TestPlanCaseDTO> getTestPlanTestCases(@Param("request") QueryTestPlanCaseRequest request);
+    List<TestCaseDTO> list(@Param("request") QueryTestCaseRequest request);
 }

backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml

@@ -20,25 +20,37 @@
         ORDER BY test_case.update_time DESC
     </select>
 
-    <select id="getTestPlanTestCases" resultType="io.metersphere.dto.TestPlanCaseDTO">
+    <select id="list" resultType="io.metersphere.dto.TestCaseDTO">
-        select t1.id as id, t1.plan_id as planId, t1.executor as executor, t1.status as status, t1.results as results, t1.create_time as createTime, t1.update_time updateTime,
+        select test_case.* from test_case
-        t2.id as caseId, t2.node_id as nodeId, t2.node_path as nodePath, t2.project_id as projectId, t2.name as name, t2.remark remark, t2.steps steps,
+        <where>
-        t2.type as type, t2.maintainer as maintainer, t2.priority as priority, t2.method as method, t2.prerequisite as prerequisite
+            <if test="request.name != null">
-        from test_plan_test_case as t1
+                and test_case.name like CONCAT('%', #{request.name},'%')
-        inner join test_case as t2 on
+            </if>
-        t1.plan_id = #{request.planId}
+            <if test="request.nodeIds != null and request.nodeIds.size() > 0">
-        <if test="request.nodeIds != null and request.nodeIds.size() > 0">
+                and test_case.node_id in
-            and t2.node_id in
+                <foreach collection="request.nodeIds" item="nodeId" separator="," open="(" close=")">
-            <foreach collection="request.nodeIds" open="(" close=")" separator="," item="nodeId">
+                    #{nodeId}
-                #{nodeId}
+                </foreach>
+            </if>
+            <if test="request.projectId != null">
+                and test_case.project_id = #{request.projectId}
+            </if>
+            <if test="request.filters != null and request.filters.size() > 0">
+                <foreach collection="request.filters.entrySet()" index="key" item="values">
+                    <if test="values != null and values.size() > 0">
+                        and test_case.${key} in
+                        <foreach collection="values" item="value" separator="," open="(" close=")">
+                           #{value}
+                        </foreach>
+                    </if>
+                </foreach>
+            </if>
+        </where>
+        <if test="request.orders != null and request.orders.size() > 0">
+            order by
+            <foreach collection="request.orders" separator="," item="order">
+                ${order.name} ${order.type}
             </foreach>
         </if>
-          and t1.case_id = t2.id
-        <if test="request.name != null">
-          and t2.name like CONCAT('%', #{request.name},'%')
-        </if>
-        <if test="request.executor != null">
-          and t1.executor = #{request.executor}
-        </if>
     </select>
 </mapper>

backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java

@@ -1,6 +1,8 @@
 package io.metersphere.base.mapper.ext;
 
+import io.metersphere.controller.request.testplancase.QueryTestPlanCaseRequest;
 import io.metersphere.dto.TestCaseReportStatusResultDTO;
+import io.metersphere.dto.TestPlanCaseDTO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -10,4 +12,7 @@ public interface ExtTestPlanTestCaseMapper {
     List<TestCaseReportStatusResultDTO> getReportMetric(@Param("planId") String planId);
 
     List<String> getExecutors(@Param("planId") String planId);
+
+    List<TestPlanCaseDTO> list(@Param("request") QueryTestPlanCaseRequest request);
+
 }

backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml

@@ -19,5 +19,41 @@
         and plan_id = #{planId};
     </select>
 
+    <select id="list" resultType="io.metersphere.dto.TestPlanCaseDTO">
+        select test_plan_test_case.*, test_case.*
+        from test_plan_test_case
+        inner join test_case on test_plan_test_case.case_id = test_case.id
+        <where>
+            <if test="request.name != null">
+                and test_plan_test_case.name like CONCAT('%', #{request.name},'%')
+            </if>
+            <if test="request.nodeIds != null and request.nodeIds.size() > 0">
+                and test_plan_test_case.node_id in
+                <foreach collection="request.nodeIds" item="nodeId" separator="," open="(" close=")">
+                    #{nodeId}
+                </foreach>
+            </if>
+            <if test="request.planId != null">
+                and test_plan_test_case.plan_id = #{request.planId}
+            </if>
+            <if test="request.filters != null and request.filters.size() > 0">
+                <foreach collection="request.filters.entrySet()" index="key" item="values">
+                    <if test="values != null and values.size() > 0">
+                        and ${key} in
+                        <foreach collection="values" item="value" separator="," open="(" close=")">
+                            #{value}
+                        </foreach>
+                    </if>
+                </foreach>
+            </if>
+        </where>
+        <if test="request.orders != null and request.orders.size() > 0">
+            order by
+            <foreach collection="request.orders" separator="," item="order">
+                test_plan_test_case.${order.name} ${order.type}
+            </foreach>
+        </if>
+    </select>
+
 
 </mapper>

backend/src/main/java/io/metersphere/config/JmeterProperties.java

@@ -1,9 +1,13 @@
 package io.metersphere.config;
 
 
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = JmeterProperties.JMETER_PREFIX)
+@Setter
+@Getter
 public class JmeterProperties {
 
     public static final String JMETER_PREFIX = "jmeter";
@@ -12,19 +16,4 @@ public class JmeterProperties {
 
     private String home;
 
-    public String getImage() {
-        return image;
-    }
-
-    public void setImage(String image) {
-        this.image = image;
-    }
-
-    public String getHome() {
-        return home;
-    }
-
-    public void setHome(String home) {
-        this.home = home;
-    }
 }

backend/src/main/java/io/metersphere/config/KafkaProperties.java

@@ -1,8 +1,12 @@
 package io.metersphere.config;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = KafkaProperties.KAFKA_PREFIX)
+@Getter
+@Setter
 public class KafkaProperties {
     public static final String KAFKA_PREFIX = "kafka";
 
@@ -22,112 +26,8 @@ public class KafkaProperties {
     private KafkaProperties.Ssl ssl = new KafkaProperties.Ssl();
     private KafkaProperties.Log log = new KafkaProperties.Log();
 
-    public String getAcks() {
+    @Getter
-        return acks;
+    @Setter
-    }
-
-    public void setAcks(String acks) {
-        this.acks = acks;
-    }
-
-    public String getTopic() {
-        return topic;
-    }
-
-    public void setTopic(String topic) {
-        this.topic = topic;
-    }
-
-    public String getFields() {
-        return fields;
-    }
-
-    public void setFields(String fields) {
-        this.fields = fields;
-    }
-
-    public String getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(String timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    public String getBootstrapServers() {
-        return bootstrapServers;
-    }
-
-    public void setBootstrapServers(String bootstrapServers) {
-        this.bootstrapServers = bootstrapServers;
-    }
-
-    public String getSampleFilter() {
-        return sampleFilter;
-    }
-
-    public void setSampleFilter(String sampleFilter) {
-        this.sampleFilter = sampleFilter;
-    }
-
-    public String getTestMode() {
-        return testMode;
-    }
-
-    public void setTestMode(String testMode) {
-        this.testMode = testMode;
-    }
-
-
-    public String getCompressionType() {
-        return compressionType;
-    }
-
-    public void setCompressionType(String compressionType) {
-        this.compressionType = compressionType;
-    }
-
-
-    public String getClientId() {
-        return clientId;
-    }
-
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
-
-    public String getParseAllReqHeaders() {
-        return parseAllReqHeaders;
-    }
-
-    public void setParseAllReqHeaders(String parseAllReqHeaders) {
-        this.parseAllReqHeaders = parseAllReqHeaders;
-    }
-
-    public String getParseAllResHeaders() {
-        return parseAllResHeaders;
-    }
-
-    public void setParseAllResHeaders(String parseAllResHeaders) {
-        this.parseAllResHeaders = parseAllResHeaders;
-    }
-
-    public String getBatchSize() {
-        return batchSize;
-    }
-
-    public void setBatchSize(String batchSize) {
-        this.batchSize = batchSize;
-    }
-
-    public String getConnectionsMaxIdleMs() {
-        return connectionsMaxIdleMs;
-    }
-
-    public void setConnectionsMaxIdleMs(String connectionsMaxIdleMs) {
-        this.connectionsMaxIdleMs = connectionsMaxIdleMs;
-    }
-
     public static class Ssl {
         private String enabled = "false";
         private String keyPassword;
@@ -140,124 +40,11 @@ public class KafkaProperties {
         private String protocol;
         private String enabledProtocols;
         private String provider;
-
-        public Ssl() {
-        }
-
-        public String getEnabled() {
-            return enabled;
-        }
-
-        public void setEnabled(String enabled) {
-            this.enabled = enabled;
-        }
-
-        public String getKeyPassword() {
-            return keyPassword;
-        }
-
-        public void setKeyPassword(String keyPassword) {
-            this.keyPassword = keyPassword;
-        }
-
-        public String getKeystoreLocation() {
-            return keystoreLocation;
-        }
-
-        public void setKeystoreLocation(String keystoreLocation) {
-            this.keystoreLocation = keystoreLocation;
-        }
-
-        public String getKeystorePassword() {
-            return keystorePassword;
-        }
-
-        public void setKeystorePassword(String keystorePassword) {
-            this.keystorePassword = keystorePassword;
-        }
-
-        public String getKeystoreType() {
-            return keystoreType;
-        }
-
-        public void setKeystoreType(String keystoreType) {
-            this.keystoreType = keystoreType;
-        }
-
-        public String getTruststoreLocation() {
-            return truststoreLocation;
-        }
-
-        public void setTruststoreLocation(String truststoreLocation) {
-            this.truststoreLocation = truststoreLocation;
-        }
-
-        public String getTruststorePassword() {
-            return truststorePassword;
-        }
-
-        public void setTruststorePassword(String truststorePassword) {
-            this.truststorePassword = truststorePassword;
-        }
-
-        public String getTruststoreType() {
-            return truststoreType;
-        }
-
-        public void setTruststoreType(String truststoreType) {
-            this.truststoreType = truststoreType;
-        }
-
-        public String getProtocol() {
-            return protocol;
-        }
-
-        public void setProtocol(String protocol) {
-            this.protocol = protocol;
-        }
-
-        public String getEnabledProtocols() {
-            return enabledProtocols;
-        }
-
-        public void setEnabledProtocols(String enabledProtocols) {
-            this.enabledProtocols = enabledProtocols;
-        }
-
-        public String getProvider() {
-            return provider;
-        }
-
-        public void setProvider(String provider) {
-            this.provider = provider;
-        }
-    }
-
-    public Ssl getSsl() {
-        return ssl;
-    }
-
-    public void setSsl(Ssl ssl) {
-        this.ssl = ssl;
     }
 
+    @Getter
+    @Setter
     public static class Log {
         private String topic;
-
-        public String getTopic() {
-            return topic;
-        }
-
-        public void setTopic(String topic) {
-            this.topic = topic;
-        }
-    }
-
-    public Log getLog() {
-        return log;
-    }
-
-    public void setLog(Log log) {
-        this.log = log;
     }
 }

backend/src/main/java/io/metersphere/controller/TestCaseController.java

@@ -8,6 +8,7 @@ import io.metersphere.commons.utils.Pager;
 import io.metersphere.controller.request.testcase.QueryTestCaseRequest;
 import io.metersphere.controller.request.testcase.TestCaseBatchRequest;
 import io.metersphere.controller.request.testcase.TestPlanCaseBatchRequest;
+import io.metersphere.dto.TestCaseDTO;
 import io.metersphere.excel.domain.ExcelResponse;
 import io.metersphere.service.TestCaseService;
 import io.metersphere.user.SessionUtils;
@@ -16,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
 
 @RequestMapping("/test/case")
@@ -26,7 +28,7 @@ public class TestCaseController {
     TestCaseService testCaseService;
 
     @PostMapping("/list/{goPage}/{pageSize}")
-    public Pager<List<TestCaseWithBLOBs>> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryTestCaseRequest request) {
+    public Pager<List<TestCaseDTO>> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryTestCaseRequest request) {
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
         return PageUtils.setPageInfo(page, testCaseService.listTestCase(request));
     }

backend/src/main/java/io/metersphere/controller/request/OrderRequest.java

@@ -0,0 +1,9 @@
+package io.metersphere.controller.request;
+
+import lombok.Data;
+
+@Data
+public class OrderRequest {
+    private String name;
+    private String type;
+}

backend/src/main/java/io/metersphere/controller/request/testcase/QueryTestCaseRequest.java

@@ -1,15 +1,21 @@
 package io.metersphere.controller.request.testcase;
 
 import io.metersphere.base.domain.TestCase;
+import io.metersphere.controller.request.OrderRequest;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 @Data
 public class QueryTestCaseRequest extends TestCase {
 
     private List<String> nodeIds;
 
+    private List<OrderRequest> orders;
+
+    private Map<String, List<String>> filters;
+
     private String planId;
 
     private String workspaceId;

backend/src/main/java/io/metersphere/controller/request/testplancase/QueryTestPlanCaseRequest.java

@@ -1,18 +1,22 @@
 package io.metersphere.controller.request.testplancase;
 
-import io.metersphere.base.domain.TestCase;
 import io.metersphere.base.domain.TestPlanTestCase;
+import io.metersphere.controller.request.OrderRequest;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 @Data
 public class QueryTestPlanCaseRequest extends TestPlanTestCase {
 
     private List<String> nodeIds;
 
+    private List<OrderRequest> orders;
+
+    private Map<String, List<String>> filters;
+
     private String workspaceId;
 
     private String name;
-
 }

backend/src/main/java/io/metersphere/dto/TestCaseDTO.java

@@ -0,0 +1,18 @@
+package io.metersphere.dto;
+
+import io.metersphere.base.domain.TestCaseWithBLOBs;
+import lombok.Data;
+
+@Data
+public class TestCaseDTO extends TestCaseWithBLOBs{
+
+    private String maintainerName;
+
+    public String getMaintainerName() {
+        return maintainerName;
+    }
+
+    public void setMaintainerName(String maintainerName) {
+        this.maintainerName = maintainerName;
+    }
+}

backend/src/main/java/io/metersphere/dto/TestPlanCaseDTO.java

@@ -1,35 +1,13 @@
 package io.metersphere.dto;
 
-import io.metersphere.base.domain.TestCase;
 import io.metersphere.base.domain.TestCaseWithBLOBs;
+import lombok.Data;
 
+@Data
 public class TestPlanCaseDTO extends TestCaseWithBLOBs {
 
     private String executor;
+    private String executorName;
     private String status;
     private String results;
-
-    public String getExecutor() {
-        return executor;
-    }
-
-    public void setExecutor(String executor) {
-        this.executor = executor;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getResults() {
-        return results;
-    }
-
-    public void setResults(String results) {
-        this.results = results;
-    }
 }

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

@@ -311,6 +311,7 @@ public class TestCaseNodeService {
         } else {
             pid = insertTestCaseNode(nodeName, pNode == null ? null : pNode.getId(), projectId, level);
             pathMap.put(path.toString(), pid);
+            level++;
         }
 
         while (pathIterator.hasNext()) {
@@ -322,6 +323,7 @@ public class TestCaseNodeService {
             } else {
                 pid = insertTestCaseNode(nextNodeName, pid, projectId, level);
                 pathMap.put(path.toString(), pid);
+                level++;
             }
         }
     }

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

@@ -112,7 +112,7 @@ public class TestCaseReportService {
 
         QueryTestPlanCaseRequest request = new QueryTestPlanCaseRequest();
         request.setPlanId(planId);
-        List<TestPlanCaseDTO> testPlanTestCases = extTestCaseMapper.getTestPlanTestCases(request);
+        List<TestPlanCaseDTO> testPlanTestCases = extTestPlanTestCaseMapper.list(request);
 
         Map<String, TestCaseReportModuleResultDTO> moduleResultMap = new HashMap<>();
 

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

@@ -12,6 +12,7 @@ import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.controller.request.testcase.QueryTestCaseRequest;
 import io.metersphere.controller.request.testcase.TestCaseBatchRequest;
 import io.metersphere.controller.request.testcase.TestPlanCaseBatchRequest;
+import io.metersphere.dto.TestCaseDTO;
 import io.metersphere.excel.domain.ExcelErrData;
 import io.metersphere.excel.domain.ExcelResponse;
 import io.metersphere.excel.domain.TestCaseExcelData;
@@ -101,19 +102,8 @@ public class TestCaseService {
         return testCaseMapper.deleteByPrimaryKey(testCaseId);
     }
 
-    public List<TestCaseWithBLOBs> listTestCase(QueryTestCaseRequest request) {
+    public List<TestCaseDTO> listTestCase(QueryTestCaseRequest request) {
-        TestCaseExample testCaseExample = new TestCaseExample();
+        return extTestCaseMapper.list(request);
-        TestCaseExample.Criteria criteria = testCaseExample.createCriteria();
-        if ( StringUtils.isNotBlank(request.getName()) ) {
-            criteria.andNameLike("%" + request.getName() + "%");
-        }
-        if ( StringUtils.isNotBlank(request.getProjectId()) ) {
-            criteria.andProjectIdEqualTo(request.getProjectId());
-        }
-        if ( request.getNodeIds() != null && request.getNodeIds().size() > 0) {
-            criteria.andNodeIdIn(request.getNodeIds());
-        }
-        return testCaseMapper.selectByExampleWithBLOBs(testCaseExample);
     }
 
     /**

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

@@ -2,19 +2,25 @@ package io.metersphere.service;
 
 import io.metersphere.base.domain.TestPlanTestCase;
 import io.metersphere.base.domain.TestPlanTestCaseExample;
+import io.metersphere.base.domain.User;
 import io.metersphere.base.mapper.TestPlanTestCaseMapper;
 import io.metersphere.base.mapper.ext.ExtTestCaseMapper;
+import io.metersphere.base.mapper.ext.ExtTestPlanTestCaseMapper;
 import io.metersphere.commons.constants.TestPlanTestCaseStatus;
 import io.metersphere.commons.utils.BeanUtils;
+import io.metersphere.controller.request.member.QueryMemberRequest;
 import io.metersphere.controller.request.testcase.TestPlanCaseBatchRequest;
 import io.metersphere.controller.request.testplancase.QueryTestPlanCaseRequest;
 import io.metersphere.dto.TestPlanCaseDTO;
+import io.metersphere.user.SessionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -24,10 +30,21 @@ public class TestPlanTestCaseService {
     TestPlanTestCaseMapper testPlanTestCaseMapper;
 
     @Resource
-    ExtTestCaseMapper extTestCaseMapper;
+    UserService userService;
+
+    @Resource
+    ExtTestPlanTestCaseMapper extTestPlanTestCaseMapper;
 
     public List<TestPlanCaseDTO> getTestPlanCases(QueryTestPlanCaseRequest request) {
-        return extTestCaseMapper.getTestPlanTestCases(request);
+        List<TestPlanCaseDTO> list = extTestPlanTestCaseMapper.list(request);
+        QueryMemberRequest queryMemberRequest = new QueryMemberRequest();
+        queryMemberRequest.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
+        Map<String, String> userMap = userService.getMemberList(queryMemberRequest)
+                .stream().collect(Collectors.toMap(User::getId, User::getName));
+        list.forEach(item -> {
+            item.setExecutorName(userMap.get(item.getExecutor()));
+        });
+        return list;
     }
 
     public void editTestCase(TestPlanTestCase testPlanTestCase) {

backend/src/main/resources/application.properties

@@ -21,6 +21,7 @@ mybatis.configuration.multiple-result-sets-enabled=true
 mybatis.configuration.use-column-label=true
 mybatis.configuration.auto-mapping-behavior=full
 mybatis.configuration.default-statement-timeout=25000
+mybatis.configuration.map-underscore-to-camel-case=true
 
 logging.file.path=/opt/metersphere/logs/${spring.application.name}
 

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

@@ -2,9 +2,10 @@
 
   <div>
 
-    <el-dialog :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%">
+    <el-dialog :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%">
 
-      <el-form :model="form" :rules="rules" ref="caseFrom">
+      <el-form :model="form" :rules="rules" ref="caseFrom" v-loading="result.loading">
 
         <el-row>
           <el-col :span="8" :offset="1">
@@ -13,13 +14,12 @@
               :label="$t('test_track.case.name')"
               :label-width="formLabelWidth"
               prop="name">
-              <el-input :disabled="readOnly" v-model="form.name"></el-input>
+              <el-input class="case-name" :disabled="readOnly" v-model="form.name"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="11" :offset="2">
             <el-form-item :label="$t('test_track.case.module')" :label-width="formLabelWidth" prop="module">
-
               <el-select
                 v-model="form.module"
                 :disabled="readOnly"
@@ -43,7 +43,7 @@
                 <el-option
                   v-for="item in maintainerOptions"
                   :key="item.id"
-                  :label="item.id"
+                  :label="item.name"
                   :value="item.id">
                 </el-option>
               </el-select>
@@ -173,6 +173,10 @@
       </el-form>
 
       <template v-slot:footer>
+        <el-switch
+          v-model="isCreateContinue"
+          active-text="保存并继续创建">
+        </el-switch>
         <ms-dialog-footer v-if="!readOnly"
           @cancel="dialogFormVisible = false"
           @confirm="saveCase"/>
@@ -196,6 +200,7 @@
     components: {MsDialogFooter},
     data() {
       return {
+        result: {},
         dialogFormVisible: false,
         form: {
           name: '',
@@ -227,7 +232,8 @@
           method :[{required: true, message: this.$t('test_track.case.input_method'), trigger: 'change'}]
         },
         formLabelWidth: "120px",
-        operationType: ''
+        operationType: '',
+        isCreateContinue: false
       };
     },
     props: {
@@ -318,8 +324,12 @@
               this.$warning(this.$t('test_track.case.input_name'));
               return;
             }
-            this.$post('/test/case/' + this.operationType, param, () => {
+            this.result = this.$post('/test/case/' + this.operationType, param, () => {
               this.$success(this.$t('commons.save_success'));
+              if (this.operationType == 'add' && this.isCreateContinue) {
+                this.form.name = '';
+                return;
+              }
               this.dialogFormVisible = false;
               this.$emit("refresh");
             });
@@ -394,4 +404,12 @@
     display: none;
   }
 
+  .el-switch {
+    margin-bottom: 10px;
+  }
+
+  .case-name {
+    width: 194px;
+  }
+
 </style>

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

@@ -8,18 +8,20 @@
       <el-row>
         <el-link type="primary" class="download-template"
                  href="/test/case/export/template">{{$t('test_track.case.import.download_template')}}</el-link></el-row>
-
       <el-row>
         <el-upload
+          v-loading="isLoading"
+          element-loading-text="导入中"
+          element-loading-spinner="el-icon-loading"
           class="upload-demo"
           :action="'/test/case/import/' + projectId"
-          :on-preview="handlePreview"
           multiple
           :limit="1"
           :on-exceed="handleExceed"
           :beforeUpload="UploadValidate"
           :on-success="handleSuccess"
           :on-error="handleError"
+          :show-file-list="false"
           :file-list="fileList">
           <template v-slot:trigger>
             <el-button size="mini" type="success" plain>{{$t('test_track.case.import.click_upload')}}</el-button>
@@ -27,7 +29,8 @@
           <template v-slot:tip>
             <div class="el-upload__tip">{{$t('test_track.case.import.upload_limit')}}</div>
           </template>
-        </el-upload></el-row>
+        </el-upload>
+      </el-row>
 
       <el-row>
         <ul>
@@ -46,7 +49,6 @@
     import ElUploadList from "element-ui/packages/upload/src/upload-list";
     import MsTableButton from '../../../../components/common/components/MsTableButton';
 
-
     export default {
       name: "TestCaseImport",
       components: {ElUploadList, MsTableButton},
@@ -54,7 +56,8 @@
         return {
           dialogVisible: false,
           fileList: [],
-          errList: []
+          errList: [],
+          isLoading: false
         }
       },
       props: {
@@ -63,9 +66,6 @@
         }
       },
       methods: {
-        handlePreview(file) {
-          this.init();
-        },
         handleExceed(files, fileList) {
           this.$warning(this.$t('test_track.case.import.upload_limit_count'));
         },
@@ -80,9 +80,12 @@
             this.$warning(this.$t('test_track.case.import.upload_limit_size'));
             return false;
           }
+          this.isLoading = true;
+          this.errList = [];
           return true;
         },
         handleSuccess(response) {
+          this.isLoading = false;
           let res = response.data;
           if (res.success) {
             this.$success(this.$t('test_track.case.import.success'));
@@ -94,6 +97,7 @@
           this.fileList = [];
         },
         handleError(err, file, fileList) {
+          this.isLoading = false;
           this.$error(err.message);
         },
         init() {
@@ -102,7 +106,7 @@
         },
         open() {
           this.dialogVisible = true;
-        }
+        },
       }
     }
 </script>

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

@@ -22,6 +22,8 @@
 
       <el-table
         :data="tableData"
+        @sort-change="sort"
+        @filter-change="filter"
         @select-all="handleSelectAll"
         @select="handleSelectionChange"
         @row-click="showDetail"
@@ -37,7 +39,7 @@
         <el-table-column
           prop="priority"
           :filters="priorityFilters"
-          :filter-method="filter"
+          column-key="priority"
           :label="$t('test_track.case.priority')"
           show-overflow-tooltip>
           <template v-slot:default="scope">
@@ -47,7 +49,7 @@
         <el-table-column
           prop="type"
           :filters="typeFilters"
-          :filter-method="filter"
+          column-key="type"
           :label="$t('test_track.case.type')"
           show-overflow-tooltip>
           <template v-slot:default="scope">
@@ -56,8 +58,8 @@
         </el-table-column>
         <el-table-column
           prop="method"
+          column-key="method"
           :filters="methodFilters"
-          :filter-method="filter"
           :label="$t('test_track.case.method')"
           show-overflow-tooltip>
           <template v-slot:default="scope">
@@ -72,7 +74,7 @@
 
         <el-table-column
           prop="updateTime"
-          sortable
+          sortable="custom"
           :label="$t('commons.update_time')"
           show-overflow-tooltip>
           <template v-slot:default="scope">
@@ -113,6 +115,7 @@
   import MsTableOperator from "../../../common/components/MsTableOperator";
   import MsTableOperatorButton from "../../../common/components/MsTableOperatorButton";
   import MsTableButton from "../../../common/components/MsTableButton";
+  import {humpToLine} from "../../../../../common/js/utils";
 
   export default {
     name: "TestCaseList",
@@ -222,9 +225,18 @@
           this.selectIds.clear();
           this.$emit('refresh');
         },
-        filter(value, row, column) {
+        filter(filters) {
-          const property = column['property'];
+          if (!this.condition.filters) {
-          return row[property] === value;
+            this.condition.filters = {};
+          }
+          for(let filter in filters) {
+            if (filters[filter] && filters[filter].length > 0) {
+              this.condition.filters[filter] = filters[filter];
+            } else {
+              this.condition.filters[filter] = null;
+            }
+          }
+          this.initTableData();
         },
         showDetail(row, event, column) {
           this.$emit('testCaseDetail', row);
@@ -250,6 +262,29 @@
         },
         moveToNode() {
           this.$emit('moveToNode', this.selectIds);
+        },
+        sort(column) {
+          column.prop = humpToLine(column.prop);
+          if (column.order == 'descending') {
+            column.order = 'desc';
+          } else {
+            column.order = 'asc';
+          }
+          if (!this.condition.orders) {
+            this.condition.orders = [];
+          }
+          let hasProp = false;
+          this.condition.orders.forEach(order => {
+            if (order.name == column.prop) {
+              order.type = column.order;
+              hasProp = true;
+              return;
+            }
+          });
+          if (!hasProp) {
+            this.condition.orders.push({name: column.prop, type: column.order});
+          }
+          this.initTableData();
         }
       }
     }

frontend/src/business/components/track/plan/view/comonents/ExecutorEdit.vue

@@ -5,7 +5,7 @@
              width="20%">
     <el-select v-model="executor" :placeholder="$t('test_track.plan_view.select_executor')">
       <el-option v-for="item in executorOptions" :key="item.id"
-                 :label="item.id" :value="item.id"></el-option>
+                 :label="item.name" :value="item.id"></el-option>
     </el-select>
 
     <template v-slot:footer>

frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue

@@ -22,6 +22,8 @@
 
     <el-table
       @select-all="handleSelectAll"
+      @filter-change="filter"
+      @sort-change="sort"
       @select="handleSelectionChange"
       row-key="id"
       :data="tableData">
@@ -37,7 +39,7 @@
       <el-table-column
         prop="priority"
         :filters="priorityFilters"
-        :filter-method="filter"
+        column-key="priority"
         :label="$t('test_track.case.priority')">
         <template v-slot:default="scope">
           <priority-table-item :value="scope.row.priority" ref="priority"/>
@@ -47,7 +49,7 @@
       <el-table-column
         prop="type"
         :filters="typeFilters"
-        :filter-method="filter"
+        column-key="type"
         :label="$t('test_track.case.type')"
         show-overflow-tooltip>
         <template v-slot:default="scope">
@@ -58,7 +60,7 @@
       <el-table-column
         prop="method"
         :filters="methodFilters"
-        :filter-method="filter"
+        column-key="method"
         :label="$t('test_track.case.method')"
         show-overflow-tooltip>
         <template v-slot:default="scope">
@@ -67,14 +69,14 @@
       </el-table-column>
 
       <el-table-column
-        prop="executor"
+        prop="executorName"
         :label="$t('test_track.plan_view.executor')">
       </el-table-column>
 
       <el-table-column
         prop="status"
         :filters="statusFilters"
-        :filter-method="filter"
+        column-key="status"
         :label="$t('test_track.plan_view.execute_result')">
         <template v-slot:default="scope">
           <status-table-item :value="scope.row.status"/>
@@ -125,7 +127,7 @@
   import NodeBreadcrumb from '../../../common/NodeBreadcrumb';
 
   import {TokenKey} from '../../../../../../common/js/constants';
-  import {tableFilter} from '../../../../../../common/js/utils';
+  import {humpToLine, tableFilter} from '../../../../../../common/js/utils';
   import PriorityTableItem from "../../../common/tableItems/planview/PriorityTableItem";
   import StatusTableItem from "../../../common/tableItems/planview/StatusTableItem";
   import TypeTableItem from "../../../common/tableItems/planview/TypeTableItem";
@@ -295,10 +297,6 @@
           }
           this.initTableData();
         },
-        filter(value, row, column) {
-          const property = column['property'];
-          return row[property] === value;
-        },
         openTestReport() {
           this.$refs.testReporTtemplateList.open();
         },
@@ -316,6 +314,42 @@
             id = this.testPlan.reportId;
           }
           this.$refs.testCaseReportView.open(id);
+        },
+        filter(filters) {
+          if (!this.condition.filters) {
+            this.condition.filters = {};
+          }
+          for(let filter in filters) {
+            if (filters[filter] && filters[filter].length > 0) {
+              this.condition.filters[filter] = filters[filter];
+            } else {
+              this.condition.filters[filter] = null;
+            }
+          }
+          this.initTableData();
+        },
+        sort(column) {
+          column.prop = humpToLine(column.prop);
+          if (column.order == 'descending') {
+            column.order = 'desc';
+          } else {
+            column.order = 'asc';
+          }
+          if (!this.condition.orders) {
+            this.condition.orders = [];
+          }
+          let hasProp = false;
+          this.condition.orders.forEach(order => {
+            if (order.name == column.prop) {
+              order.type = column.order;
+              hasProp = true;
+              return;
+            }
+          });
+          if (!hasProp) {
+            this.condition.orders.push({name: column.prop, type: column.order});
+          }
+          this.initTableData();
         }
       }
     }

frontend/src/common/js/utils.js

@@ -55,3 +55,8 @@ export function mapToJson(strMap){
   }
   return JSON.stringify(obj);
 }
+
+// 驼峰转换下划线
+export function humpToLine(name) {
+  return name.replace(/([A-Z])/g,"_$1").toLowerCase();
+}