Merge remote-tracking branch 'origin/main'

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

@@ -194,7 +194,7 @@ export default {
       if (repeatKey !== "") {
         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.$emit('change', this.variables);

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

@@ -403,7 +403,7 @@ export default {
         name: '',
         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 {listObject, itemCount} = data;
         this.memberLineData = listObject;