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:
song.tianyang 2021-01-28 12:00:29 +08:00
parent 590e31eee8
commit ec06a36bab
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,7 @@ import MsContainer from "../../../../common/components/MsContainer";
import MsBottomContainer from "../BottomContainer"; import MsBottomContainer from "../BottomContainer";
import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn"; import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
import MsBatchEdit from "../basis/BatchEdit"; import MsBatchEdit from "../basis/BatchEdit";
import {API_METHOD_COLOUR, CASE_PRIORITY, REQ_METHOD} from "../../model/JsonData"; import {API_METHOD_COLOUR, CASE_PRIORITY, DUBBO_METHOD, REQ_METHOD, SQL_METHOD, TCP_METHOD} from "../../model/JsonData";
import {getBodyUploadFiles, getCurrentProjectID} from "@/common/js/utils"; import {getBodyUploadFiles, getCurrentProjectID} from "@/common/js/utils";
import ApiListContainer from "./ApiListContainer"; import ApiListContainer from "./ApiListContainer";
@ -409,6 +409,15 @@ export default {
// } // }
}, },
handleEditBatch() { handleEditBatch() {
if(this.currentProtocol =='HTTP'){
this.valueArr.method = REQ_METHOD;
}else if(this.currentProtocol =='TCP'){
this.valueArr.method = TCP_METHOD;
}else if(this.currentProtocol =='SQL'){
this.valueArr.method = SQL_METHOD;
}else if(this.currentProtocol =='DUBBO'){
this.valueArr.method = DUBBO_METHOD;
}
this.$refs.batchEdit.open(); this.$refs.batchEdit.open();
}, },
batchEdit(form) { batchEdit(form) {

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

@ -162,11 +162,10 @@
import MsBottomContainer from "../BottomContainer"; import MsBottomContainer from "../BottomContainer";
import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn"; import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
import MsBatchEdit from "../basis/BatchEdit"; import MsBatchEdit from "../basis/BatchEdit";
import {API_METHOD_COLOUR, API_STATUS, REQ_METHOD} from "../../model/JsonData"; import {API_METHOD_COLOUR, API_STATUS, REQ_METHOD,TCP_METHOD,SQL_METHOD,DUBBO_METHOD} from "../../model/JsonData";
import {_filter, _sort, getCurrentProjectID} from "@/common/js/utils"; import {_filter, _sort, getCurrentProjectID} from "@/common/js/utils";
import {WORKSPACE_ID} from '@/common/js/constants'; import {WORKSPACE_ID} from '@/common/js/constants';
import ApiListContainer from "./ApiListContainer"; import ApiListContainer from "./ApiListContainer";
// import MsTableSelectAll from "../../../../common/components/table/MsTableSelectAll";
import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover"; import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus"; import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus";
import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar"; import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
@ -513,6 +512,15 @@
} }
}, },
handleEditBatch() { handleEditBatch() {
if(this.currentProtocol =='HTTP'){
this.valueArr.method = REQ_METHOD;
}else if(this.currentProtocol =='TCP'){
this.valueArr.method = TCP_METHOD;
}else if(this.currentProtocol =='SQL'){
this.valueArr.method = SQL_METHOD;
}else if(this.currentProtocol =='DUBBO'){
this.valueArr.method = DUBBO_METHOD;
}
this.$refs.batchEdit.open(); this.$refs.batchEdit.open();
}, },
batchEdit(form) { batchEdit(form) {

9
frontend/src/business/components/api/definition/model/JsonData.js
View File

@ -44,6 +44,15 @@ export const REQ_METHOD = [
{id: 'HEAD', label: 'HEAD'}, {id: 'HEAD', label: 'HEAD'},
{id: 'CONNECT', label: 'CONNECT'} {id: 'CONNECT', label: 'CONNECT'}
] ]
export const TCP_METHOD = [
{id: 'TCP', label: 'TCP'}
]
export const SQL_METHOD = [
{id: 'SQL', label: 'SQL'}
]
export const DUBBO_METHOD = [
{id: 'dubbo://', label: 'dubbo://'},
]
export const CASE_PRIORITY = [ export const CASE_PRIORITY = [
{id: 'P0', label: 'P0'}, {id: 'P0', label: 'P0'},