feat: 接口定义-案例表格增加全部数据批量操作支持

接口定义-案例表格增加全部数据批量操作支持

backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java

@@ -3,10 +3,7 @@ package io.metersphere.api.controller;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.metersphere.api.dto.ApiCaseBatchRequest;
-import io.metersphere.api.dto.definition.ApiTestCaseDTO;
+import io.metersphere.api.dto.definition.*;
-import io.metersphere.api.dto.definition.ApiTestCaseRequest;
-import io.metersphere.api.dto.definition.ApiTestCaseResult;
-import io.metersphere.api.dto.definition.SaveApiTestCaseRequest;
 import io.metersphere.api.service.ApiTestCaseService;
 import io.metersphere.base.domain.ApiTestCaseWithBLOBs;
 import io.metersphere.commons.constants.RoleConstants;
@@ -81,11 +78,22 @@ public class ApiTestCaseController {
         apiTestCaseService.editApiBath(request);
     }
 
+    @PostMapping("/batch/editByParam")
+    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
+    public void editApiBathByParam(@RequestBody ApiTestBatchRequest request) {
+        apiTestCaseService.editApiBathByParam(request);
+    }
+
     @PostMapping("/deleteBatch")
     public void deleteBatch(@RequestBody List<String> ids) {
         apiTestCaseService.deleteBatch(ids);
     }
 
+    @PostMapping("/deleteBatchByParam")
+    public void deleteBatchByParam(@RequestBody ApiTestBatchRequest request) {
+        apiTestCaseService.deleteBatchByParam(request);
+    }
+
     @PostMapping("/relevance")
     public void testPlanRelevance(@RequestBody ApiCaseRelevanceRequest request) {
         apiTestCaseService.relevanceByCase(request);

backend/src/main/java/io/metersphere/api/dto/definition/ApiTestBatchRequest.java

@@ -0,0 +1,51 @@
+package io.metersphere.api.dto.definition;
+
+import io.metersphere.base.domain.ApiDefinitionWithBLOBs;
+import io.metersphere.base.domain.ApiTestCaseWithBLOBs;
+import io.metersphere.controller.request.OrderRequest;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Getter
+@Setter
+public class ApiTestBatchRequest extends ApiTestCaseWithBLOBs {
+    private List<String> ids;
+    private List<OrderRequest> orders;
+    private String projectId;
+
+    /**
+     * isSelectAllDate：选择的数据是否是全部数据（全部数据是不受分页影响的数据）
+     * filters: 数据状态
+     * name：如果是全部数据，那么表格如果历经查询，查询参数是什么
+     * moduleIds： 哪些模块的数据
+     * unSelectIds：是否在页面上有未勾选的数据，有的话他们的ID是哪些。
+     * filters/name/moduleIds/unSeelctIds 只在isSelectAllDate为true时需要。为了让程序能明确批量的范围。
+     */
+    private boolean isSelectAllDate;
+
+    private Map<String, List<String>> filters;
+
+    private String name;
+
+    private List<String> moduleIds;
+
+    private List<String> unSelectIds;
+
+    private String protocol;
+
+    private String status;
+
+    public void cleanSelectParam() {
+        filters = new HashMap<>();
+        name = null;
+        moduleIds = new ArrayList<>();
+        protocol = null;
+        status = null;
+    }
+
+}

backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java

@@ -385,6 +385,7 @@ public class ApiAutomationService {
         selectRequest.setName(name);
         selectRequest.setProjectId(projectId);
         selectRequest.setFilters(filters);
+        selectRequest.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
         List<ApiScenarioDTO> list = extApiScenarioMapper.list(selectRequest);
         List<String> allIds = list.stream().map(ApiScenarioDTO::getId).collect(Collectors.toList());
         List<String> ids = allIds.stream().filter(id -> !unSelectIds.contains(id)).collect(Collectors.toList());

backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java

@@ -485,6 +485,7 @@ public class ApiDefinitionService {
         request.setName(name);
         request.setModuleIds(moduleIds);
         request.setProjectId(projectId);
+        request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
         List<ApiDefinitionResult> resList = extApiDefinitionMapper.list(request);
         List<String> ids = new ArrayList<>(0);
         if (!resList.isEmpty()) {

backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java

@@ -1,12 +1,11 @@
 package io.metersphere.api.service;
 
 import com.alibaba.fastjson.JSONObject;
+import io.metersphere.api.dto.automation.ApiScenarioDTO;
+import io.metersphere.api.dto.automation.ApiScenarioRequest;
 import io.metersphere.api.dto.datacount.ApiDataCountResult;
-import io.metersphere.api.dto.definition.ApiTestCaseRequest;
+import io.metersphere.api.dto.definition.*;
-import io.metersphere.api.dto.definition.ApiTestCaseResult;
-import io.metersphere.api.dto.definition.SaveApiTestCaseRequest;
 import io.metersphere.api.dto.ApiCaseBatchRequest;
-import io.metersphere.api.dto.definition.ApiTestCaseDTO;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ApiDefinitionMapper;
 import io.metersphere.base.mapper.ApiTestCaseMapper;
@@ -26,6 +25,7 @@ import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.aspectj.util.FileUtil;
+import org.python.antlr.ast.Str;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -348,4 +348,41 @@ public class ApiTestCaseService {
         List<ApiTestCaseWithBLOBs> list = extApiTestCaseMapper.getRequest(request);
         return list.stream().collect(Collectors.toMap(ApiTestCaseWithBLOBs::getId, ApiTestCaseWithBLOBs::getRequest));
     }
+
+    public void deleteBatchByParam(ApiTestBatchRequest request) {
+        List<String> ids = request.getIds();
+        if(request.isSelectAllDate()){
+            ids = this.getAllApiCaseIdsByFontedSelect(request.getFilters(),request.getModuleIds(),request.getName(),request.getProjectId(),request.getProtocol(),request.getUnSelectIds(),request.getStatus());
+        }
+        this.deleteBatch(ids);
+    }
+
+    public void editApiBathByParam(ApiTestBatchRequest request) {
+        List<String> ids = request.getIds();
+        if(request.isSelectAllDate()){
+            ids = this.getAllApiCaseIdsByFontedSelect(request.getFilters(),request.getModuleIds(),request.getName(),request.getProjectId(),request.getProtocol(),request.getUnSelectIds(),request.getStatus());
+        }
+        request.cleanSelectParam();
+        ApiTestCaseExample apiDefinitionExample = new ApiTestCaseExample();
+        apiDefinitionExample.createCriteria().andIdIn(ids);
+        ApiTestCaseWithBLOBs apiDefinitionWithBLOBs = new ApiTestCaseWithBLOBs();
+        BeanUtils.copyBean(apiDefinitionWithBLOBs, request);
+        apiDefinitionWithBLOBs.setUpdateTime(System.currentTimeMillis());
+        apiTestCaseMapper.updateByExampleSelective(apiDefinitionWithBLOBs, apiDefinitionExample);
+    }
+
+    private List<String> getAllApiCaseIdsByFontedSelect(Map<String, List<String>> filters,List<String>moduleIds, String name, String projectId, String protocol,List<String> unSelectIds,String status) {
+        ApiTestCaseRequest selectRequest = new ApiTestCaseRequest();
+        selectRequest.setFilters(filters);
+        selectRequest.setModuleIds(moduleIds);
+        selectRequest.setName(name);
+        selectRequest.setProjectId(projectId);
+        selectRequest.setProtocol(protocol);
+        selectRequest.setStatus(status);
+        selectRequest.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
+        List<ApiTestCaseResult> list = extApiTestCaseMapper.list(selectRequest);
+        List<String> allIds = list.stream().map(ApiTestCaseResult::getId).collect(Collectors.toList());
+        List<String> ids = allIds.stream().filter(id -> !unSelectIds.contains(id)).collect(Collectors.toList());
+        return  ids;
+    }
 }

frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue

@@ -7,6 +7,7 @@
       <el-input placeholder="搜索" @blur="search" @keyup.enter.native="search" class="search-input" size="small" v-model="condition.name"/>
 
       <el-table v-loading="result.loading"
+                ref="caseTable"
                 border
                 :data="tableData" row-key="id" class="test-content adjust-table"
                 @select-all="handleSelectAll"
@@ -15,8 +16,21 @@
                 @select="handleSelect" :height="screenHeight">
         <el-table-column type="selection"/>
         <el-table-column width="40" :resizable="false" align="center">
+          <el-dropdown slot="header" style="width: 14px">
+            <span class="el-dropdown-link" style="width: 14px">
+              <i class="el-icon-arrow-down el-icon--right" style="margin-left: 0px"></i>
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item @click.native.stop="isSelectDataAll(true)">
+                {{$t('api_test.batch_menus.select_all_data',[total])}}
+              </el-dropdown-item>
+              <el-dropdown-item @click.native.stop="isSelectDataAll(false)">
+                {{$t('api_test.batch_menus.select_show_data',[tableData.length])}}
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
           <template v-slot:default="scope">
-            <show-more-btn :is-show="scope.row.showMore && !isReadOnly" :buttons="buttons" :size="selectRows.size"/>
+            <show-more-btn :is-show="scope.row.showMore && !isReadOnly" :buttons="buttons" :size="selectDataCounts"/>
           </template>
         </el-table-column>
 
@@ -143,7 +157,10 @@
         pageSize: 10,
         total: 0,
         screenHeight: document.documentElement.clientHeight - 330,//屏幕高度
-        environmentId: undefined
+        environmentId: undefined,
+        selectAll: false,
+        unSelection:[],
+        selectDataCounts:0,
       }
     },
     props: {
@@ -216,7 +233,9 @@
           this.condition.status = "Trash";
           this.condition.moduleIds = [];
         }
-
+        this.selectAll  = false;
+        this.unSelection = [];
+        this.selectDataCounts = 0;
         this.condition.projectId = getCurrentProjectID();
 
         if (this.currentProtocol != null) {
@@ -226,6 +245,7 @@
           this.result = this.$post('/api/testcase/list/' + this.currentPage + "/" + this.pageSize, this.condition, response => {
             this.total = response.data.itemCount;
             this.tableData = response.data.listObject;
+            this.unSelection = response.data.listObject.map(s=>s.id);
           });
         }
       },
@@ -237,6 +257,7 @@
       // },
       handleSelect(selection, row) {
         _handleSelect(this, selection, row, this.selectRows);
+        this.selectRowsCount(this.selectRows)
       },
       showExecResult(row) {
         this.visible = false;
@@ -256,6 +277,7 @@
       },
       handleSelectAll(selection) {
         _handleSelectAll(this, selection, this.tableData, this.selectRows);
+        this.selectRowsCount(this.selectRows)
       },
       search() {
         this.initTable();
@@ -294,7 +316,13 @@
             confirmButtonText: this.$t('commons.confirm'),
             callback: (action) => {
               if (action === 'confirm') {
-                this.$post('/api/testcase/deleteBatch/',  Array.from(this.selectRows).map(row => row.id), () => {
+                let obj = {};
+                obj.projectId = getCurrentProjectID();
+                obj.selectAllDate = this.isSelectAllDate;
+                obj.unSelectIds = this.unSelection;
+                obj.ids = Array.from(this.selectRows).map(row => row.id);
+                obj = Object.assign(obj, this.condition);
+                this.$post('/api/testcase/deleteBatchByParam/', obj , () => {
                   this.selectRows.clear();
                   this.initTable();
                   this.$success(this.$t('commons.delete_success'));
@@ -327,7 +355,12 @@
         let param = {};
         param[form.type] = form.value;
         param.ids = ids;
-        this.$post('/api/testcase/batch/edit', param, () => {
+
+        param.projectId = getCurrentProjectID();
+        param.selectAllDate = this.isSelectAllDate;
+        param.unSelectIds = this.unSelection;
+        param = Object.assign(param, this.condition);
+        this.$post('/api/testcase/batch/editByParam', param, () => {
           this.$success(this.$t('commons.save_success'));
           this.initTable();
         });
@@ -355,6 +388,31 @@
       },
       setEnvironment(data) {
         this.environmentId = data.id;
+      },
+      selectRowsCount(selection){
+        let selectedIDs = this.getIds(selection);
+        let allIDs = this.tableData.map(s=>s.id);
+        this.unSelection = allIDs.filter(function (val) {
+          return selectedIDs.indexOf(val) === -1
+        });
+        if(this.isSelectAllDate){
+          this.selectDataCounts =this.total - this.unSelection.length;
+        }else {
+          this.selectDataCounts =selection.size;
+        }
+      },
+      isSelectDataAll(dataType) {
+        this.isSelectAllDate = dataType;
+        this.selectRowsCount(this.selectRows)
+        //如果已经全选，不需要再操作了
+        if (this.selectRows.size != this.tableData.length) {
+          this.$refs.caseTable.toggleAllSelection(true);
+        }
+      },
+      getIds(rowSets){
+        let rowArray = Array.from(rowSets)
+        let ids =  rowArray.map(s=>s.id);
+        return ids;
       }
     },
   }