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

fix(接口测试): 修复前后置脚本序号发生变化问题 

【【接口测试】github#34598，接口场景中步骤的前置后置操作序号发生变更】
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001050316
This commit is contained in:
fit2-zhao 2024-12-12 18:05:17 +08:00 committed by Craftsman
parent 0638aa5d38
commit 3ef3cf258c
1 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
api-test/frontend/src/business/automation/scenario/EditApiScenario.vue
View File

@ -1594,18 +1594,31 @@ export default {
stepArray = stepArray || this.scenarioDefinition; stepArray = stepArray || this.scenarioDefinition;
this.recursionStep(stepArray); this.recursionStep(stepArray);
}, },
recursionStep(stepArray, scenarioProjectId, fullPath, isGeneric) { recursionStep(stepArray, scenarioProjectId, fullPath, isGeneric) {
for (let i in stepArray) { for (let i = 0; i < stepArray.length; i++) {
let step = stepArray[i]; let step = stepArray[i];
step.index = !isGeneric ? Number(i) + 1 : step.index;
if (step.type === 'GenericController') { // 计算 index 和 projectId
this.pluginOrder(step); if (!isGeneric && !this.stepFilter.get('ALlSamplerStep').includes(step.type)) {
step.index = Number(i) + 1;
} }
step.resourceId = step.resourceId || getUUID(); step.projectId = step.projectId || scenarioProjectId || this.projectId;
// 历史数据处理
// 设置 clazzName
step.clazzName = step.clazzName || TYPE_TO_C.get(step.type);
// 处理步骤中的身份认证管理器
if (step.authManager && !step.authManager.clazzName) {
step.authManager.clazzName = TYPE_TO_C.get(step.authManager.type);
}
// 处理历史数据
if (step.type === 'HTTPSamplerProxy' && !step.headers) { if (step.type === 'HTTPSamplerProxy' && !step.headers) {
step.headers = [new KeyValue()]; step.headers = [new KeyValue()];
} }
// 设置 LoopController 类型的额外处理
if ( if (
step.type === ELEMENT_TYPE.LoopController && step.type === ELEMENT_TYPE.LoopController &&
step.loopType === 'LOOP_COUNT' && step.loopType === 'LOOP_COUNT' &&
@ -1614,19 +1627,25 @@ export default {
) { ) {
step.countController.proceed = true; step.countController.proceed = true;
} }
step.clazzName = step.clazzName || TYPE_TO_C.get(step.type);
if (step && step.authManager && !step.authManager.clazzName) { // 设置资源ID，若没有则生成一个
step.authManager.clazzName = TYPE_TO_C.get(step.authManager.type); step.resourceId = step.resourceId || getUUID();
// 设置 parentIndex
step.parentIndex = fullPath ? `${fullPath}_${step.index}` : step.index;
// 处理 GenericController 类型的步骤
if (step.type === 'GenericController') {
this.pluginOrder(step);
} }
// 如果自身没有ID并且场景有ID则赋值场景ID，否则赋值当前项目ID
step.projectId = step.projectId || scenarioProjectId || this.projectId; // 如果有子步骤，递归处理
// 添加debug结果
step.parentIndex = fullPath ? fullPath + '_' + step.index : step.index;
if (step.hashTree && step.hashTree.length > 0) { if (step.hashTree && step.hashTree.length > 0) {
this.recursionStep(step.hashTree, step.projectId, step.parentIndex, step.type === 'GenericController'); this.recursionStep(step.hashTree, step.projectId, step.parentIndex, step.type === 'GenericController');
} }
} }
}, },
addCustomizeApi(request) { addCustomizeApi(request) {
this.customizeVisible = false; this.customizeVisible = false;
request.enable === undefined ? (request.enable = true) : request.enable; request.enable === undefined ? (request.enable = true) : request.enable;