fix: 修复冲突
This commit is contained in:
parent
a1d0dc5208
commit
4e376541d1
|
@ -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,18 +182,6 @@ export default {
|
||||||
MsTablePagination,
|
MsTablePagination,
|
||||||
MsTag,
|
MsTag,
|
||||||
MsApiCaseList,
|
MsApiCaseList,
|
||||||
name: "ApiCaseSimpleList",
|
|
||||||
components: {
|
|
||||||
MsTableHeaderSelectPopover,
|
|
||||||
MsSetEnvironment,
|
|
||||||
ApiCaseList,
|
|
||||||
PriorityTableItem,
|
|
||||||
ApiListContainerWithDoc,
|
|
||||||
MsTableOperatorButton,
|
|
||||||
MsTableOperator,
|
|
||||||
MsTablePagination,
|
|
||||||
MsTag,
|
|
||||||
MsApiCaseList,
|
|
||||||
MsContainer,
|
MsContainer,
|
||||||
MsBottomContainer,
|
MsBottomContainer,
|
||||||
ShowMoreBtn,
|
ShowMoreBtn,
|
||||||
|
@ -203,6 +192,9 @@ export default {
|
||||||
},
|
},
|
||||||
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>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue