fix: 修复冲突

This commit is contained in:
wenyann 2021-02-19 18:27:24 +08:00
parent a1d0dc5208
commit 4e376541d1
1 changed files with 11 additions and 20 deletions

View File

@ -163,13 +163,14 @@ import MsTableHeaderSelectPopover from "@/business/components/common/components/
import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar"; import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
import {API_CASE_CONFIGS} from "@/business/components/common/components/search/search-components"; import {API_CASE_CONFIGS} from "@/business/components/common/components/search/search-components";
import {_filter, _handleSelect, _handleSelectAll, _sort,} from "@/common/js/tableUtils"; import {_filter, _handleSelect, _handleSelectAll, _sort,} from "@/common/js/tableUtils";
import {API_CASE_LIST, TEST_CASE_LIST} from "@/common/js/constants"; import {API_CASE_LIST, API_LIST, API_SCENARIO_LIST, TEST_CASE_LIST} from "@/common/js/constants";
import {Api_Case_List, Track_Test_Case} from "@/business/components/common/model/JsonData"; import {Api_Case_List, Api_List, Track_Test_Case} from "@/business/components/common/model/JsonData";
import HeaderCustom from "@/business/components/common/head/HeaderCustom"; import HeaderCustom from "@/business/components/common/head/HeaderCustom";
export default { export default {
name: "ApiCaseSimpleList", name: "ApiCaseSimpleList",
components: { components: {
ApiListContainerWithDoc,
HeaderCustom, HeaderCustom,
MsTableHeaderSelectPopover, MsTableHeaderSelectPopover,
MsSetEnvironment, MsSetEnvironment,
@ -181,28 +182,19 @@ export default {
MsTablePagination, MsTablePagination,
MsTag, MsTag,
MsApiCaseList, MsApiCaseList,
name: "ApiCaseSimpleList", MsContainer,
components: { MsBottomContainer,
MsTableHeaderSelectPopover, ShowMoreBtn,
MsSetEnvironment, MsBatchEdit,
ApiCaseList, MsApiCaseTableExtendBtns,
PriorityTableItem,
ApiListContainerWithDoc,
MsTableOperatorButton,
MsTableOperator,
MsTablePagination,
MsTag,
MsApiCaseList,
MsContainer,
MsBottomContainer,
ShowMoreBtn,
MsBatchEdit,
MsApiCaseTableExtendBtns,
MsReferenceView, MsReferenceView,
MsTableAdvSearchBar MsTableAdvSearchBar
}, },
data() { data() {
return { return {
type: API_CASE_LIST,
headerItems: Api_Case_List,
tableLabel: Api_Case_List,
condition: { condition: {
components: API_CASE_CONFIGS components: API_CASE_CONFIGS
}, },
@ -636,7 +628,6 @@ export default {
}); });
}, },
}, },
},
} }
</script> </script>