diff --git a/frontend/src/business/components/common/components/MsDialogHeader.vue b/frontend/src/business/components/common/components/MsDialogHeader.vue index bbe025c62c..011534c0ce 100644 --- a/frontend/src/business/components/common/components/MsDialogHeader.vue +++ b/frontend/src/business/components/common/components/MsDialogHeader.vue @@ -8,7 +8,7 @@
- {{ $t('commons.cancel') }} + {{ $t('commons.cancel') }} {{ $t('commons.confirm') }} @@ -29,7 +29,8 @@ export default { default() { return 'small'; } - } + }, + enableCancel: Boolean }, methods: { cancel() { diff --git a/frontend/src/business/components/track/case/components/TestCaseApiRelate.vue b/frontend/src/business/components/track/case/components/TestCaseApiRelate.vue index 05c4e6a8a7..53127c91f8 100644 --- a/frontend/src/business/components/track/case/components/TestCaseApiRelate.vue +++ b/frontend/src/business/components/track/case/components/TestCaseApiRelate.vue @@ -22,6 +22,7 @@ :project-id="projectId" :not-in-ids="notInIds" :versionEnable="versionEnable" + @selectCountChange="setSelectCounts" ref="apiCaseList"/> @@ -103,6 +104,9 @@ export default { this.$refs.baseRelevance.close(); }); }, + setSelectCounts(data) { + this.$refs.baseRelevance.selectCounts = data; + } } } diff --git a/frontend/src/business/components/track/case/components/TestCaseLoadRelate.vue b/frontend/src/business/components/track/case/components/TestCaseLoadRelate.vue index 63a263827a..9c71379a7c 100644 --- a/frontend/src/business/components/track/case/components/TestCaseLoadRelate.vue +++ b/frontend/src/business/components/track/case/components/TestCaseLoadRelate.vue @@ -9,6 +9,7 @@ :project-id="projectId" :not-in-ids="notInIds" :versionEnable="versionEnable" + @selectCountChange="setSelectCounts" ref="apiCaseList"/> @@ -80,6 +81,9 @@ export default { this.$refs.baseRelevance.close(); }); }, + setSelectCounts(data) { + this.$refs.baseRelevance.selectCounts = data; + } } } diff --git a/frontend/src/business/components/track/case/components/TestCaseRelateApiList.vue b/frontend/src/business/components/track/case/components/TestCaseRelateApiList.vue index 53b79d84ac..b4724bd65d 100644 --- a/frontend/src/business/components/track/case/components/TestCaseRelateApiList.vue +++ b/frontend/src/business/components/track/case/components/TestCaseRelateApiList.vue @@ -14,6 +14,7 @@ :total="total" :showSelectAll="false" :screenHeight="screenHeight" + @selectCountChange="selectCountChange" @refresh="initTable" ref="table"> @@ -59,8 +60,6 @@ - -
@@ -72,7 +71,6 @@ import MsTableColumn from "@/business/components/common/components/table/MsTable import {API_METHOD_COLOUR} from "@/business/components/api/definition/model/JsonData"; import PriorityTableItem from "@/business/components/track/common/tableItems/planview/PriorityTableItem"; import MsTablePagination from "@/business/components/common/pagination/TablePagination"; -import TableSelectCountBar from "@/business/components/api/automation/scenario/api/TableSelectCountBar"; import {TEST_CASE_RELEVANCE_API_CASE_CONFIGS} from "@/business/components/common/components/search/search-components"; import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar"; import MsTag from "@/business/components/common/components/MsTag"; @@ -83,7 +81,6 @@ const VersionSelect = requireComponent.keys().length > 0 ? requireComponent("./v export default { name: "TestCaseRelateApiList", components: { - TableSelectCountBar, MsTablePagination, PriorityTableItem, MsTable, @@ -152,6 +149,9 @@ export default { } }, methods: { + selectCountChange(data) { + this.$emit("selectCountChange", data); + }, initTable(projectId) { this.condition.status = ""; this.condition.moduleIds = this.selectNodeIds; diff --git a/frontend/src/business/components/track/case/components/TestCaseRelateLoadList.vue b/frontend/src/business/components/track/case/components/TestCaseRelateLoadList.vue index 830fda8ca9..df94573e0c 100644 --- a/frontend/src/business/components/track/case/components/TestCaseRelateLoadList.vue +++ b/frontend/src/business/components/track/case/components/TestCaseRelateLoadList.vue @@ -14,6 +14,7 @@ :total="total" :showSelectAll="false" :screenHeight="screenHeight" + @selectCountChange="selectCountChange" @refresh="initTable" ref="table"> @@ -67,8 +68,6 @@ - - @@ -78,7 +77,6 @@ import MsTable from "@/business/components/common/components/table/MsTable"; import MsTableColumn from "@/business/components/common/components/table/MsTableColumn"; import MsTablePagination from "@/business/components/common/pagination/TablePagination"; -import TableSelectCountBar from "@/business/components/api/automation/scenario/api/TableSelectCountBar"; import MsPerformanceTestStatus from "@/business/components/performance/test/PerformanceTestStatus"; import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar"; import {TEST_CASE_RELEVANCE_LOAD_CASE} from "@/business/components/common/components/search/search-components"; @@ -90,7 +88,6 @@ export default { name: "TestCaseRelateLoadList", components: { MsPerformanceTestStatus, - TableSelectCountBar, MsTablePagination, MsTable, MsTableColumn, @@ -138,6 +135,9 @@ export default { } }, methods: { + selectCountChange(data) { + this.$emit("selectCountChange", data); + }, initTable(projectId) { this.condition.status = ""; if (projectId != null && typeof projectId === 'string') { diff --git a/frontend/src/business/components/track/case/components/TestCaseRelateScenarioList.vue b/frontend/src/business/components/track/case/components/TestCaseRelateScenarioList.vue index 3b16e019d6..2ccc2e52a7 100644 --- a/frontend/src/business/components/track/case/components/TestCaseRelateScenarioList.vue +++ b/frontend/src/business/components/track/case/components/TestCaseRelateScenarioList.vue @@ -14,6 +14,7 @@ :total="total" :showSelectAll="false" :screenHeight="screenHeight" + @selectCountChange="selectCountChange" @refresh="initTable" ref="table"> @@ -70,8 +71,6 @@ - - @@ -82,7 +81,6 @@ import MsTable from "@/business/components/common/components/table/MsTable"; import MsTableColumn from "@/business/components/common/components/table/MsTableColumn"; import PriorityTableItem from "@/business/components/track/common/tableItems/planview/PriorityTableItem"; import MsTablePagination from "@/business/components/common/pagination/TablePagination"; -import TableSelectCountBar from "@/business/components/api/automation/scenario/api/TableSelectCountBar"; import PlanStatusTableItem from "@/business/components/track/common/tableItems/plan/PlanStatusTableItem"; import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar"; import MsTag from "@/business/components/common/components/MsTag"; @@ -95,7 +93,6 @@ export default { name: "TestCaseRelateScenarioList", components: { PlanStatusTableItem, - TableSelectCountBar, MsTablePagination, PriorityTableItem, MsTable, @@ -155,6 +152,9 @@ export default { } }, methods: { + selectCountChange(data) { + this.$emit("selectCountChange", data); + }, initTable(projectId) { this.condition.status = ""; this.condition.moduleIds = this.selectNodeIds; diff --git a/frontend/src/business/components/track/case/components/TestCaseScenarioRelate.vue b/frontend/src/business/components/track/case/components/TestCaseScenarioRelate.vue index 68b41dcaba..b12851d0a5 100644 --- a/frontend/src/business/components/track/case/components/TestCaseScenarioRelate.vue +++ b/frontend/src/business/components/track/case/components/TestCaseScenarioRelate.vue @@ -21,6 +21,7 @@ :project-id="projectId" :not-in-ids="notInIds" :versionEnable="versionEnable" + @selectCountChange="setSelectCounts" ref="apiCaseList"/> @@ -101,6 +102,9 @@ export default { this.$refs.baseRelevance.close(); }); }, + setSelectCounts(data) { + this.$refs.baseRelevance.selectCounts = data; + } } } diff --git a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue index 589c79cf24..2068d9d2bc 100644 --- a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue +++ b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue @@ -7,8 +7,10 @@