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

fix: MessageBox显示层级的错乱 

--bug=1018527 --user=陈建星 【测试跟踪】测试计划-接口测试-选择运行环境-通用配置-设置变量-批量删除 https://www.tapd.cn/55049933/s/1269286
--bug=1018315 --user=陈建星 【测试跟踪】测试计划-点击取消关联缺陷无反应 https://www.tapd.cn/55049933/s/1269563
This commit is contained in:
chenjianxing 2022-10-20 14:40:55 +08:00 committed by jianxing
parent 2060d78fba
commit 8f261f14b5
33 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api-test/frontend/src/business/automation/scenario/ApiScenarioList.vue
View File

@ -1090,7 +1090,7 @@ export default {
alertMsg += this.$t('api_test.is_continue') + " ？";
}
}
operationConfirm(alertMsg, () => {
operationConfirm(this, alertMsg, () => {
removeScenarioToGcByBatch(param).then(() => {
this.$success(this.$t('commons.delete_success'));
this.search();
@ -1259,7 +1259,7 @@ export default {
// 删除提供列表删除和全部版本删除
this.$refs.apiDeleteConfirm.open(row, alertMsg);
} else {
operationConfirm(alertMsg, () => {
operationConfirm(this, alertMsg, () => {
this._handleDelete(row, false);
});
}

2
api-test/frontend/src/business/definition/components/import/SwaggerTaskList.vue
View File

@ -87,7 +87,7 @@ export default {
message = this.$t('api_test.home_page.running_task_list.confirm.open_title');
}
row.enable = !row.enable;
operationConfirm(message, () => {
operationConfirm(this, message, () => {
row.enable = !row.enable
this.updateTask(row);
});

4
api-test/frontend/src/business/definition/components/list/ApiCaseSimpleList.vue
View File

@ -1006,7 +1006,7 @@ export default {
alertMsg += this.$t('api_test.is_continue') + " ？";
}
}
operationConfirm(alertMsg, () => {
operationConfirm(this, alertMsg, () => {
delCaseToGcByParam(obj).then(() => {
this.$refs.caseTable.clearSelectRows();
this.initTable();
@ -1099,7 +1099,7 @@ export default {
alertMsg += this.$t('api_test.is_continue') + " ？";
}
}
operationConfirm(alertMsg, () => {
operationConfirm(this, alertMsg, () => {
deleteToGc(apiCase.id).then(() => {
this.$success(this.$t('commons.delete_success'));
this.initTable();

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

@ -888,7 +888,7 @@ export default {
},
handleDeleteBatch() {
if (this.trashEnable) {
operationConfirm(this.$t('api_test.definition.request.delete_confirm') + "？", () => {
operationConfirm(this, this.$t('api_test.definition.request.delete_confirm') + "？", () => {
deleteBatchByParams(buildBatchParam(this, this.$refs.table.selectIds)).then(() => {
this.$refs.table.clear();
// this.initTable();
@ -897,7 +897,7 @@ export default {
});
});
} else {
operationConfirm(this.$t('api_test.definition.request.delete_confirm') + "？", () => {
operationConfirm(this, this.$t('api_test.definition.request.delete_confirm') + "？", () => {
removeToGcByParams(buildBatchParam(this, this.$refs.table.selectIds)).then(() => {
this.$refs.table.clear();
this.$emit("refreshTable");
@ -973,7 +973,7 @@ export default {
// 删除提供列表删除和全部版本删除
this.$refs.apiDeleteConfirm.open(api, this.$t('api_test.definition.request.delete_confirm'));
} else {
operationConfirm(this.$t('api_test.definition.request.delete_confirm') + ' ' + api.name, () => {
operationConfirm(this, this.$t('api_test.definition.request.delete_confirm') + ' ' + api.name, () => {
this._handleDelete(api, false);
});
}

2
api-test/frontend/src/business/definition/components/mock/MockConfig.vue
View File

@ -221,7 +221,7 @@ export default {
},
removeExpect(row) {
operationConfirm(this.$t('api_test.mock.delete_mock_expect'), () => {
operationConfirm(this, this.$t('api_test.mock.delete_mock_expect'), () => {
let mockInfoId = row.mockConfigId;
delMock(row.id).then(response => {
this.cleanMockExpectConfig();

2
api-test/frontend/src/business/definition/components/mock/MockTab.vue
View File

@ -382,7 +382,7 @@ export default {
});
},
removeExpect(row) {
operationConfirm(this.$t('api_test.mock.delete_mock_expect'), () => {
operationConfirm(this, this.$t('api_test.mock.delete_mock_expect'), () => {
let mockInfoId = row.mockConfigId;
delMock(row.id).then(response => {
this.refreshMockInfo(mockInfoId);

2
api-test/frontend/src/business/definition/components/mock/TcpMockConfig.vue
View File

@ -216,7 +216,7 @@ export default {
});
},
removeExpect(row) {
operationConfirm(this.$t('api_test.mock.delete_mock_expect'), () => {
operationConfirm(this, this.$t('api_test.mock.delete_mock_expect'), () => {
let mockInfoId = row.mockConfigId;
delMock(row.id).then(response => {
this.cleanMockExpectConfig();

2
api-test/frontend/src/business/home/components/ApiRunningTaskList.vue
View File

@ -138,7 +138,7 @@ export default {
closeTaskConfirm(row) {
let flag = row.taskStatus;
row.taskStatus = !flag; //保持switch点击前的状态
operationConfirm(this.$t('api_test.home_page.running_task_list.confirm.close_title'), () => {
operationConfirm(this, this.$t('api_test.home_page.running_task_list.confirm.close_title'), () => {
this.updateTask(row);
});
},

2
api-test/frontend/src/business/home/components/RunningTaskList.vue
View File

@ -142,7 +142,7 @@ export default {
closeTaskConfirm(row) {
let flag = row.taskStatus;
row.taskStatus = !flag; //保持switch点击前的状态
operationConfirm(this.$t('api_test.home_page.running_task_list.confirm.close_title'), () => {
operationConfirm(this, this.$t('api_test.home_page.running_task_list.confirm.close_title'), () => {
this.updateTask(row);
});
},

2
framework/sdk-parent/frontend/src/business/login/index.vue
View File

@ -300,7 +300,7 @@ export default {
return;
}
}
operationConfirm(this.$t('commons.auth_redirect_tip'), () => {
operationConfirm(this, this.$t('commons.auth_redirect_tip'), () => {
let config = JSON.parse(source.configuration);
let redirectUrl = eval('`' + config.redirectUrl + '`');
let url;

2
framework/sdk-parent/frontend/src/components/environment/commons/ApiScenarioVariables.vue
View File

@ -244,7 +244,7 @@ export default {
});
},
handleDeleteBatch() {
operationConfirm(this.$t('api_test.environment.variables_delete_info') + " ？", () => {
operationConfirm(this, this.$t('api_test.environment.variables_delete_info') + " ？", () => {
let ids = this.$refs.variableTable.selectRows;
ids.forEach(row => {
if (row.name) {

2
framework/sdk-parent/frontend/src/components/personal/ApiKeys.vue
View File

@ -104,7 +104,7 @@ export default {
)
},
deleteApiKey(row) {
operationConfirm(this.$t('user.apikey_delete_confirm'), () => {
operationConfirm(this, this.$t('user.apikey_delete_confirm'), () => {
this.result = deleteUserKey(row.id)
.then(response => {
this.$success(this.$t('commons.delete_success'));

6
framework/sdk-parent/frontend/src/utils/index.js
View File

@ -198,13 +198,11 @@ export function exportPdf(name, canvasList) {
}
let confirm = MessageBox.confirm;
export function operationConfirm(tip, success, cancel) {
export function operationConfirm(v, tip, success, cancel) {
if (tip[tip.length - 1] !== '?' && tip[tip.length - 1] !== '？') {
tip += '?';
}
return confirm(tip, '', {
return v.$confirm(tip, '', {
confirmButtonText: i18n.t('commons.confirm'),
cancelButtonText: i18n.t('commons.cancel'),
type: 'warning',

2
project-management/frontend/src/business/home/EditProject.vue
View File

@ -313,7 +313,7 @@ export default {
this.$refs.deleteConfirm.open(project);
},
_handleDelete(project) {
operationConfirm(this.$t('project.delete_tip'), () => {
operationConfirm(this, this.$t('project.delete_tip'), () => {
deleteProjectById(project.id).then(() => {
if (project.id === getCurrentProjectID()) {
localStorage.removeItem(PROJECT_ID);

2
project-management/frontend/src/business/menu/environment/EnvironmentList.vue
View File

@ -317,7 +317,7 @@ export default {
},
deleteEnv(environment) {
if (environment.id) {
operationConfirm(this.$t('commons.confirm_delete') + environment.name, () => {
operationConfirm(this, this.$t('commons.confirm_delete') + environment.name, () => {
this.loading = delEnvironmentById(environment.id).then(() => {
this.$success(this.$t('commons.delete_success'));
this.list();

2
project-management/frontend/src/business/menu/file/edit/EditFileMetadata.vue
View File

@ -263,7 +263,7 @@ export default {
this.$emit("download", this.data);
},
deleteData() {
operationConfirm(this.$t('project.file_delete_tip', [this.data.name]), () => {
operationConfirm(this, this.$t('project.file_delete_tip', [this.data.name]), () => {
this.close();
this.data.confirm = true;
this.$emit("delete", this.data);

4
project-management/frontend/src/business/menu/file/list/FileMetadataList.vue
View File

@ -389,7 +389,7 @@ export default {
},
handleDeleteBatch() {
operationConfirm(this.$t('project.file_delete_tip', [this.$refs.table.selectIds.length + " 条 "]), () => {
operationConfirm(this, this.$t('project.file_delete_tip', [this.$refs.table.selectIds.length + " 条 "]), () => {
batchDeleteMetaData(this.$refs.table.selectIds).then(() => {
this.$refs.table.clear();
this.$success(this.$t('commons.delete_success'));
@ -407,7 +407,7 @@ export default {
});
return;
}
operationConfirm(this.$t('project.file_delete_tip', [row.name]), () => {
operationConfirm(this, this.$t('project.file_delete_tip', [row.name]), () => {
deleteFileMetaById(row.id).then(() => {
this.$success(this.$t('commons.delete_success'));
this.getProjectFiles();

4
project-management/frontend/src/business/menu/file/quote/QuoteFileList.vue
View File

@ -265,7 +265,7 @@ export default {
},
handleDeleteBatch() {
operationConfirm(this.$t('project.file_delete_tip', [this.$refs.table.selectIds.length + " 条 "]), () => {
operationConfirm(this, this.$t('project.file_delete_tip', [this.$refs.table.selectIds.length + " 条 "]), () => {
batchDeleteMetaData(this.$refs.table.selectIds).then(() => {
this.$refs.table.clear();
this.$success(this.$t('commons.delete_success'));
@ -274,7 +274,7 @@ export default {
});
},
handleDelete(row) {
operationConfirm(this.$t('project.file_delete_tip', [row.name]), () => {
operationConfirm(this, this.$t('project.file_delete_tip', [row.name]), () => {
deleteFileMetaById(row.id).then(() => {
this.$success(this.$t('commons.delete_success'));
this.getProjectFiles();

2
project-management/frontend/src/business/menu/member/Member.vue
View File

@ -168,7 +168,7 @@ export default {
this.$set(this.form, 'groupIds', groupIds);
},
del(row) {
operationConfirm(this.$t('member.remove_member'), () => {
operationConfirm(this, this.$t('member.remove_member'), () => {
this.cardLoading = deleteProjectMember(this.projectId, encodeURIComponent(row.id)).then(() => {
this.$success(this.$t('commons.remove_success'));
this.initTableData();

2
project-management/frontend/src/business/menu/user.group/GroupMember.vue
View File

@ -262,7 +262,7 @@ export default {
})
},
removeMember(row) {
operationConfirm(this.$t('member.remove_member'), () => {
operationConfirm(this, this.$t('member.remove_member'), () => {
if (this.initUserUrl === 'user/ws/current/member/list') {
if (row.id === getCurrentUserId()) {
this.$warning(this.$t('group.unable_to_remove_current_member'));

2
report-stat/frontend/src/business/enterprisereport/components/list/ProjectReportList.vue
View File

@ -203,7 +203,7 @@ export default {
let param = {id: row.scheduleId, enable: row.scheduleIsOpen};
row.scheduleIsOpen = !row.scheduleIsOpen;
operationConfirm(titles, () => {
operationConfirm(this, titles, () => {
row.scheduleIsOpen = !row.scheduleIsOpen;
this.updateTask(param);
});

2
system-setting/frontend/src/business/system/SystemWorkspace.vue
View File

@ -408,7 +408,7 @@ export default {
this.$refs.deleteConfirm.open(workspace);
},
_handleDelete(workspace) {
operationConfirm(this.$t('workspace.delete_confirm'), () => {
operationConfirm(this, this.$t('workspace.delete_confirm'), () => {
this.loading = delWorkspaceSpecial(workspace.id).then(() => {
this.$success(this.$t('commons.delete_success'));
this.list();

2
system-setting/frontend/src/business/system/group/GroupMember.vue
View File

@ -258,7 +258,7 @@ export default {
})
},
removeMember(row) {
operationConfirm(this.$t('member.remove_member'), () => {
operationConfirm(this, this.$t('member.remove_member'), () => {
if (this.initUserUrl === 'user/ws/current/member/list') {
if (row.id === getCurrentUserId()) {
this.$warning(this.$t('group.unable_to_remove_current_member'));

2
system-setting/frontend/src/business/system/plugin/PluginConfig.vue
View File

@ -132,7 +132,7 @@ export default {
this.$refs.scriptView.open(row.scriptId);
},
handleDelete(id) {
operationConfirm(this.$t('api_test.jar_config.delete_tip'), () => {
operationConfirm(this, this.$t('api_test.jar_config.delete_tip'), () => {
this.loading = delPluginById(id).then(() => {
this.$success(this.$t('commons.delete_success'));
this.initPlugins();

2
system-setting/frontend/src/business/system/pool/TestResourcePool.vue
View File

@ -474,7 +474,7 @@ export default {
this.infoList = resources;
},
del(row) {
operationConfirm(this.$t('test_resource_pool.delete_prompt'), () => {
operationConfirm(this, this.$t('test_resource_pool.delete_prompt'), () => {
this.loading = delResourcePoolById(row.id).then(() => {
this.initTableData();
this.$success(this.$t('commons.delete_success'));

2
system-setting/frontend/src/business/system/user/User.vue
View File

@ -290,7 +290,7 @@ export default {
listenGoBack(this.handleClose);
},
del(row) {
operationConfirm(this.$t('user.delete_confirm'), () => {
operationConfirm(this, this.$t('user.delete_confirm'), () => {
this.loading = specialDeleteUserById(encodeURIComponent(row.id)).then(() => {
this.$success(this.$t('commons.delete_success'));
this.search();

2
system-setting/frontend/src/business/workspace/environment/EnvironmentList.vue
View File

@ -344,7 +344,7 @@ export default {
},
deleteEnv(environment) {
if (environment.id) {
operationConfirm(this.$t('commons.confirm_delete') + environment.name, () => {
operationConfirm(this, this.$t('commons.confirm_delete') + environment.name, () => {
this.loading = delEnvironmentById(environment.id).then(() => {
this.$success(this.$t('commons.delete_success'));
this.list();

2
system-setting/frontend/src/business/workspace/project/EditProject.vue
View File

@ -315,7 +315,7 @@ export default {
this.$refs.deleteConfirm.open(project);
},
_handleDelete(project) {
operationConfirm(this.$t('project.delete_tip'), () => {
operationConfirm(this, this.$t('project.delete_tip'), () => {
deleteProjectById(project.id).then(() => {
if (project.id === getCurrentProjectID()) {
localStorage.removeItem(PROJECT_ID);

2
system-setting/frontend/src/business/workspace/project/MsProject.vue
View File

@ -344,7 +344,7 @@ export default {
this.$refs.deleteConfirm.open(project);
},
_handleDelete(project) {
operationConfirm(this.$t('project.delete_tip'), () => {
operationConfirm(this, this.$t('project.delete_tip'), () => {
delProjectById(project.id).then(() => {
if (project.id === getCurrentProjectID()) {
localStorage.removeItem(PROJECT_ID);

2
test-track/frontend/src/business/case/components/TestCaseIssueRelate.vue
View File

@ -250,7 +250,7 @@ export default {
}
},
deleteIssue(row) {
operationConfirm(this.$t('test_track.issue.delete_warning'), () => {
operationConfirm(this, this.$t('test_track.issue.delete_warning'), () => {
this.page.result.loading = true;
deleteIssueRelate({
id: row.id,

8
test-track/frontend/src/business/case/components/TestCaseList.vue
View File

@ -793,7 +793,7 @@ export default {
});
},
handleDelete(testCase) {
operationConfirm(this.$t('test_track.case.delete_confirm') + '\'' + testCase.name + '\'', () => {
operationConfirm(this, this.$t('test_track.case.delete_confirm') + '\'' + testCase.name + '\'', () => {
this._handleDelete(testCase);
});
},
@ -815,7 +815,7 @@ export default {
// 删除提供列表删除和全部版本删除
this.$refs.apiDeleteConfirm.open(testCase, this.$t('test_track.case.delete_confirm'));
} else {
operationConfirm(this.$t('test_track.case.delete_confirm') + '\'' + testCase.name + '\'', () => {
operationConfirm(this, this.$t('test_track.case.delete_confirm') + '\'' + testCase.name + '\'', () => {
this._handleDeleteVersion(testCase, false);
});
}
@ -831,7 +831,7 @@ export default {
});
},
handleDeleteBatch() {
operationConfirm(this.$t('test_track.case.delete_confirm'), () => {
operationConfirm(this, this.$t('test_track.case.delete_confirm'), () => {
let param = buildBatchParam(this, this.$refs.table.selectIds);
testCaseBatchDelete(param)
.then(() => {
@ -854,7 +854,7 @@ export default {
});
},
handleDeleteBatchToGc() {
operationConfirm(this.$t('test_track.case.delete_confirm'), () => {
operationConfirm(this, this.$t('test_track.case.delete_confirm'), () => {
let param = buildBatchParam(this, this.$refs.table.selectIds);
testCaseBatchDeleteToGc(param)
.then(() => {

4
test-track/frontend/src/business/case/components/public/PublicTestCaseList.vue
View File

@ -423,7 +423,7 @@ export default {
// 删除提供列表删除和全部版本删除
this.$refs.apiDeleteConfirm.open(testCase, this.$t('test_track.case.delete_confirm'));
} else {
operationConfirm(this.$t('test_track.case.delete_confirm') + '\'' + testCase.name + '\'', () => {
operationConfirm(this, this.$t('test_track.case.delete_confirm') + '\'' + testCase.name + '\'', () => {
this._handleDeleteVersion(testCase, false);
});
}
@ -486,7 +486,7 @@ export default {
this.$emit('refreshAll');
},
handleDeleteBatchToPublic() {
operationConfirm(this.$t('test_track.case.delete_confirm'), () => {
operationConfirm(this, this.$t('test_track.case.delete_confirm'), () => {
let param = buildBatchParam(this, this.$refs.table.selectIds);
testCasePublicBatchDeleteToGc(param)
.then(() => {

2
test-track/frontend/src/business/plan/components/TestPlanList.vue
View File

@ -707,7 +707,7 @@ export default {
message = this.$t('api_test.home_page.running_task_list.confirm.open_title');
}
operationConfirm(message, () => {
operationConfirm(this, message, () => {
this.cardLoading = true;
testPlanUpdateScheduleEnable(param)
.then(response => {