diff --git a/backend/src/main/java/io/metersphere/track/dto/TestPlanScenarioCaseDTO.java b/backend/src/main/java/io/metersphere/track/dto/TestPlanScenarioCaseDTO.java new file mode 100644 index 0000000000..8fb1c6f621 --- /dev/null +++ b/backend/src/main/java/io/metersphere/track/dto/TestPlanScenarioCaseDTO.java @@ -0,0 +1,18 @@ +package io.metersphere.track.dto; + +import lombok.Getter; +import lombok.Setter; + +/** + * @author song.tianyang + * @Date 2021/4/26 5:06 下午 + * @Description + */ +@Getter +@Setter +public class TestPlanScenarioCaseDTO { + private String id; + private String projectId; + private String testPlanId; + private String apiScenarioId; +} diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue index 4e420cd68d..0456893795 100644 --- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue +++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue @@ -257,7 +257,8 @@ export default { setTimeout(this.$refs.scenarioTable.doLayout, 200); } this.$nextTick(() => { - checkTableRowIsSelect(this,this.condition,this.tableData,this.$refs.scenarioTable,this.selectRows); + checkTableRowIsSelect(this, this.condition, this.tableData, this.$refs.scenarioTable, this.selectRows); + this.selectDataCounts = getSelectDataCounts(this.condition, this.total, this.selectRows); }) }); } @@ -278,7 +279,8 @@ export default { setTimeout(this.$refs.scenarioTable.doLayout, 200); } this.$nextTick(() => { - checkTableRowIsSelect(this,this.condition,this.tableData,this.$refs.scenarioTable,this.selectRows); + checkTableRowIsSelect(this, this.condition, this.tableData, this.$refs.scenarioTable, this.selectRows); + this.selectDataCounts = getSelectDataCounts(this.condition, this.total, this.selectRows); }) }); } @@ -294,18 +296,7 @@ export default { }) }, handleBatchExecute() { - if(this.condition != null && this.condition.selectAll) { - this.$alert(this.$t('commons.option_cannot_spread_pages'), '', { - confirmButtonText: this.$t('commons.confirm'), - callback: (action) => { - if (action === 'confirm') { - this.$refs.runMode.open(); - } - } - }) - }else { - this.$refs.runMode.open(); - } + this.$refs.runMode.open(); }, orderBySelectRows(rows){ let selectIds = Array.from(rows).map(row => row.id);