refactor: 代码规范

This commit is contained in:
shiziyuan9527 2021-04-07 11:07:34 +08:00 committed by BugKing
parent c169f66dad
commit 47f0333392
3 changed files with 5 additions and 124 deletions

View File

@ -119,8 +119,8 @@
return new Promise((resolve) => { return new Promise((resolve) => {
this.$post("/api/automation/getApiScenarioEnv", {definition: definition}, res => { this.$post("/api/automation/getApiScenarioEnv", {definition: definition}, res => {
if (res.data) { if (res.data) {
this.$emit("update:projectIds", new Set(res.data.projectIds)) this.$emit("update:projectIds", new Set(res.data.projectIds));
this.$emit("update:isFullUrl", res.data.fullUrl) this.$emit("update:isFullUrl", res.data.fullUrl);
} }
resolve(); resolve();
}) })

View File

@ -35,7 +35,7 @@ export default {
data() { data() {
return { return {
visible: false visible: false
} };
}, },
methods: { methods: {
showPopover() { showPopover() {

View File

@ -48,7 +48,7 @@ export default {
environments: [], environments: [],
dialogVisible: false, dialogVisible: false,
isFullUrl: true, isFullUrl: true,
} };
}, },
methods: { methods: {
init() { init() {
@ -68,7 +68,7 @@ export default {
let envId = this.envMap.get(id); let envId = this.envMap.get(id);
// //
temp.selectEnv = envs.filter(e => e.id === envId).length === 0 ? null : envId; temp.selectEnv = envs.filter(e => e.id === envId).length === 0 ? null : envId;
}) });
} }
}) })
}, },
@ -106,122 +106,6 @@ export default {
this.$emit('setProjectEnvMap', map); this.$emit('setProjectEnvMap', map);
this.$emit('close'); this.$emit('close');
}, },
getApiInfo(request) {
if (request.id && request.referenced === 'REF') {
let requestResult = request.requestResult;
let url = request.refType && request.refType === 'CASE' ? "/api/testcase/get/" : "/api/definition/get/";
let enable = request.enable;
this.$get(url + request.id, response => {
if (response.data) {
Object.assign(request, JSON.parse(response.data.request));
request.name = response.data.name;
request.enable = enable;
if (response.data.path && response.data.path != null) {
request.path = response.data.path;
request.url = response.data.url;
this.setUrl(request.path);
}
if (response.data.method && response.data.method != null) {
request.method = response.data.method;
}
request.requestResult = requestResult;
request.id = response.data.id;
request.disabled = true;
request.root = true;
if (!request.projectId) {
request.projectId = response.data.projectId;
}
this.reload();
this.sort();
} else {
request.referenced = "Deleted";
}
})
}
},
getScenario(scenario) {
this.result = this.$get("/api/automation/getApiScenario/" + scenario.id, response => {
if (response.data) {
scenario.loaded = true;
let obj = {};
if (response.data.scenarioDefinition) {
obj = JSON.parse(response.data.scenarioDefinition);
scenario.hashTree = obj.hashTree;
}
//scenario.disabled = true;
scenario.name = response.data.name;
if (!scenario.projectId) {
scenario.projectId = response.data.projectId;
}
scenario.headers = obj.headers;
scenario.variables = obj.variables;
scenario.environmentMap = obj.environmentMap;
this.$emit('refReload');
} else {
scenario.referenced = "Deleted";
}
})
},
recursiveSorting(arr) {
for (let i in arr) {
if (arr[i].referenced === 'REF') {
//
if (arr[i].type === "HTTPSamplerProxy") {
//
this.getApiInfo(arr[i]);
//
if (!arr[i].url || (!arr[i].url.startsWith("http://") && !arr[i].url.startsWith("https://"))) {
this.isFullUrl = false;
}
} else if (arr[i].type === "scenario") {
this.getScenario(arr[i]);
}
} else {
if (arr[i].type === "HTTPSamplerProxy") {
//
if (arr[i].enable) {
if (!arr[i].url || (!arr[i].url.startsWith("http://") && !arr[i].url.startsWith("https://"))) {
this.isFullUrl = false;
}
}
}
}
if (arr[i].hashTree != undefined && arr[i].hashTree.length > 0) {
this.recursiveSorting(arr[i].hashTree);
}
}
},
checkFullUrl(scenarioDefinition) {
for (let i in scenarioDefinition) {
// ID
let request = scenarioDefinition[i];
if (request.referenced === 'REF') {
if (request.type === "HTTPSamplerProxy") {
this.getApiInfo(request);
//
if (!request.url || (!request.url.startsWith("http://") && !request.url.startsWith("https://"))) {
this.isFullUrl = false;
}
} else if (request.type === "scenario") {
this.getScenario(request);
}
} else {
if (request.type === "HTTPSamplerProxy") {
//
if (request.enable) {
if (!request.url || (!request.url.startsWith("http://") && !request.url.startsWith("https://"))) {
this.isFullUrl = false;
}
}
}
}
if (scenarioDefinition[i].hashTree != undefined && scenarioDefinition[i].hashTree.length > 0) {
this.recursiveSorting(scenarioDefinition[i].hashTree);
}
}
},
checkEnv() { checkEnv() {
let sign = true; let sign = true;
this.isFullUrl = true; this.isFullUrl = true;
@ -244,9 +128,6 @@ export default {
} else { } else {
sign = false; sign = false;
} }
//
//this.checkFullUrl(data);
//sign = this.isFullUrl;
} }
if (!sign) { if (!sign) {