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

Merge remote-tracking branch 'origin/main'

This commit is contained in:
liqiang-fit2cloud 2022-10-17 14:53:03 +08:00
parent 8a58e449b3 ae0e401b6e
commit 97922fba73
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,7 +194,7 @@ export default {
if (repeatKey !== "") { if (repeatKey !== "") {
this.$warning(this.$t('api_test.environment.common_config') + "【" + repeatKey + "】" + this.$t('load_test.param_is_duplicate')); this.$warning(this.$t('api_test.environment.common_config') + "【" + repeatKey + "】" + this.$t('load_test.param_is_duplicate'));
} }
if (isNeedCreate && !repeatKey) { if (isNeedCreate) {
this.variables.push(new KeyValue({enable: true, id: getUUID(), type: 'CONSTANT'})); this.variables.push(new KeyValue({enable: true, id: getUUID(), type: 'CONSTANT'}));
} }
this.$emit('change', this.variables); this.$emit('change', this.variables);

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

@ -403,7 +403,7 @@ export default {
name: '', name: '',
projectId: row.id projectId: row.id
}; };
getProjectMemberPages(this.currentPage, this.pageSize, row.workspaceId, param).then(res => { getProjectMemberPages(this.dialogCurrentPage, this.dialogPageSize, row.workspaceId, param).then(res => {
let data = res.data; let data = res.data;
let {listObject, itemCount} = data; let {listObject, itemCount} = data;
this.memberLineData = listObject; this.memberLineData = listObject;