diff --git a/backend/src/main/java/io/metersphere/controller/UserController.java b/backend/src/main/java/io/metersphere/controller/UserController.java index e4872aee44..7dee4a3caf 100644 --- a/backend/src/main/java/io/metersphere/controller/UserController.java +++ b/backend/src/main/java/io/metersphere/controller/UserController.java @@ -128,7 +128,6 @@ public class UserController { } @GetMapping("/list") - @RequiresRoles(value = {RoleConstants.ADMIN, RoleConstants.ORG_ADMIN, RoleConstants.TEST_MANAGER}, logical = Logical.OR) public List getUserList() { return userService.getUserList(); } diff --git a/frontend/src/business/components/api/test/ApiTestConfig.vue b/frontend/src/business/components/api/test/ApiTestConfig.vue index ee53e8d31d..ab1d4cd63f 100644 --- a/frontend/src/business/components/api/test/ApiTestConfig.vue +++ b/frontend/src/business/components/api/test/ApiTestConfig.vue @@ -52,7 +52,7 @@ - + diff --git a/frontend/src/business/components/api/test/components/ApiKeyValue.vue b/frontend/src/business/components/api/test/components/ApiKeyValue.vue index abb60a4b8a..697035533e 100644 --- a/frontend/src/business/components/api/test/components/ApiKeyValue.vue +++ b/frontend/src/business/components/api/test/components/ApiKeyValue.vue @@ -9,7 +9,7 @@ - diff --git a/frontend/src/business/components/common/components/MsScheduleConfig.vue b/frontend/src/business/components/common/components/MsScheduleConfig.vue index 09bc606d6c..cb1ed5a58a 100644 --- a/frontend/src/business/components/common/components/MsScheduleConfig.vue +++ b/frontend/src/business/components/common/components/MsScheduleConfig.vue @@ -5,8 +5,8 @@ SCHEDULER - - + +
@@ -44,6 +44,10 @@ type: Function, default: defaultCustomValidate }, + isReadOnly: { + type: Boolean, + default: false + } }, methods: { scheduleEdit() { diff --git a/frontend/src/business/components/common/components/MsScheduleEdit.vue b/frontend/src/business/components/common/components/MsScheduleEdit.vue index e4df37739c..530428507b 100644 --- a/frontend/src/business/components/common/components/MsScheduleEdit.vue +++ b/frontend/src/business/components/common/components/MsScheduleEdit.vue @@ -4,12 +4,12 @@ - + - {{$t('commons.save')}} + {{$t('commons.save')}} - {{$t('schedule.generate_expression')}} + {{$t('schedule.generate_expression')}} @@ -38,6 +38,10 @@ type: Function, default: defaultCustomValidate }, + isReadOnly: { + type: Boolean, + default: false + } }, watch: { 'schedule.value'() {