test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 冲突

This commit is contained in:
wenyann 2021-02-19 16:53:54 +08:00
parent 6e6ca3c0b9
commit 774c44c28a
3 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
View File

@ -171,8 +171,7 @@ import MsTableHeader from "@/business/components/common/components/MsTableHeader
import MsTablePagination from "@/business/components/common/pagination/TablePagination";
import ShowMoreBtn from "@/business/components/track/case/components/ShowMoreBtn";
import MsTag from "../../../common/components/MsTag";
import {downloadFile, getCurrentProjectID, getUUID} from "@/common/js/utils";
import {getCurrentProjectID, getCurrentUser, getUUID} from "@/common/js/utils";
import {downloadFile, getCurrentProjectID, getCurrentUser, getUUID} from "@/common/js/utils";
import MsApiReportDetail from "../report/ApiReportDetail";
import MsTableMoreBtn from "./TableMoreBtn";
import MsScenarioExtendButtons from "@/business/components/api/automation/scenario/ScenarioExtendBtns";
@ -184,17 +183,16 @@ import PriorityTableItem from "../../../track/common/tableItems/planview/Priorit
import PlanStatusTableItem from "../../../track/common/tableItems/plan/PlanStatusTableItem";
import BatchEdit from "../../../track/case/components/BatchEdit";
import {API_SCENARIO_LIST, TEST_CASE_LIST, TEST_PLAN_LIST, WORKSPACE_ID} from "../../../../../common/js/constants";
import {PROJECT_NAME, WORKSPACE_ID} from "../../../../../common/js/constants";
import {PROJECT_NAME} from "../../../../../common/js/constants";
import EnvironmentSelect from "../../definition/components/environment/EnvironmentSelect";
import BatchMove from "../../../track/case/components/BatchMove";
import {_filter, _sort} from "@/common/js/tableUtils";
import {_sort} from "@/common/js/tableUtils";
import {Api_Scenario_List, Track_Test_Case} from "@/business/components/common/model/JsonData";
import HeaderCustom from "@/business/components/common/head/HeaderCustom";
import {
_filter,
_handleSelect,
_handleSelectAll,
_sort,
getSelectDataCounts,
setUnSelectIds, toggleAllSelection
} from "@/common/js/tableUtils";

22
frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
View File

@ -150,7 +150,6 @@ import {API_METHOD_COLOUR, CASE_PRIORITY, DUBBO_METHOD, REQ_METHOD, SQL_METHOD,
import {getBodyUploadFiles, getCurrentProjectID, getCurrentUser} from "@/common/js/utils";
import ApiListContainer from "./ApiListContainer";
import {getBodyUploadFiles, getCurrentProjectID} from "@/common/js/utils";
// import ApiListContainer from "./ApiListContainer";
import ApiListContainerWithDoc from "@/business/components/api/definition/components/list/ApiListContainerWithDoc";
import PriorityTableItem from "../../../../track/common/tableItems/planview/PriorityTableItem";
@ -249,7 +248,7 @@ export default {
props: {
currentProtocol: String,
selectNodeIds: Array,
activeDom:String,
activeDom: String,
visible: {
type: Boolean,
default: false,
@ -312,8 +311,8 @@ export default {
isApiListEnableChange(data) {
this.$emit('isApiListEnableChange', data);
},
activeDomChange(tabType){
this.$emit("activeDomChange",tabType);
activeDomChange(tabType) {
this.$emit("activeDomChange", tabType);
},
initTable() {
this.getLabel()
@ -474,13 +473,13 @@ export default {
// }
},
handleEditBatch() {
if(this.currentProtocol =='HTTP'){
if (this.currentProtocol == 'HTTP') {
this.valueArr.method = REQ_METHOD;
}else if(this.currentProtocol =='TCP'){
} else if (this.currentProtocol == 'TCP') {
this.valueArr.method = TCP_METHOD;
}else if(this.currentProtocol =='SQL'){
} else if (this.currentProtocol == 'SQL') {
this.valueArr.method = SQL_METHOD;
}else if(this.currentProtocol =='DUBBO'){
} else if (this.currentProtocol == 'DUBBO') {
this.valueArr.method = DUBBO_METHOD;
}
this.$refs.batchEdit.open();
@ -570,9 +569,9 @@ export default {
this.clickRow = row;
this.$refs.setEnvironment.open(row);
},
headerDragend(newWidth,oldWidth,column,event){
headerDragend(newWidth, oldWidth, column, event) {
let finalWidth = newWidth;
if(column.minWidth>finalWidth){
if (column.minWidth > finalWidth) {
finalWidth = column.minWidth;
}
column.width = finalWidth;
@ -637,7 +636,8 @@ export default {
});
},
},
}
},
}
</script>
<style scoped>

6
frontend/src/business/components/api/definition/components/list/ApiList.vue
View File

@ -221,8 +221,8 @@ import MsBottomContainer from "../BottomContainer";
import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
import MsBatchEdit from "../basis/BatchEdit";
import {API_METHOD_COLOUR, API_STATUS, DUBBO_METHOD, REQ_METHOD, SQL_METHOD, TCP_METHOD} from "../../model/JsonData";
import {downloadFile, getCurrentProjectID} from "@/common/js/utils";
import {PROJECT_NAME, WORKSPACE_ID} from '@/common/js/constants';
import {downloadFile} from "@/common/js/utils";
import {PROJECT_NAME} from '@/common/js/constants';
import {getCurrentProjectID, getCurrentUser} from "@/common/js/utils";
import {API_LIST, TEST_CASE_LIST, WORKSPACE_ID} from '@/common/js/constants';
import ApiListContainer from "./ApiListContainer";
@ -234,10 +234,8 @@ import MsTipButton from "@/business/components/common/components/MsTipButton";
import CaseBatchMove from "@/business/components/api/definition/components/basis/BatchMove";
import ApiListContainerWithDoc from "@/business/components/api/definition/components/list/ApiListContainerWithDoc";
import {
_filter,
_handleSelect,
_handleSelectAll,
_sort,
getSelectDataCounts, initCondition,
setUnSelectIds, toggleAllSelection
} from "@/common/js/tableUtils";