From e074e1c0ba6fc9d9ff97c007db5c6c00ca649600 Mon Sep 17 00:00:00 2001 From: wxg0103 <727495428@qq.com> Date: Mon, 24 Oct 2022 15:32:20 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF=E8=AE=BE=E7=BD=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1018657 --user=王孝刚 【系统设置】操作日志-操作对象中的 “消息设置”？&“模板管理”还在工作空间级 https://www.tapd.cn/55049933/s/1274370 --- .../frontend/src/business/menu/log/config.js | 300 +----------------- .../frontend/src/business/common/config.js | 144 +-------- 2 files changed, 10 insertions(+), 434 deletions(-) diff --git a/project-management/frontend/src/business/menu/log/config.js b/project-management/frontend/src/business/menu/log/config.js index d48e3a3028..4db0e14317 100644 --- a/project-management/frontend/src/business/menu/log/config.js +++ b/project-management/frontend/src/business/menu/log/config.js @@ -100,300 +100,6 @@ export function LOG_MODULE_MAP(_this) { return LOG_MODULE_MAP; } -export function SYSLIST() { - let sysList = [ - { - label: i18n.t('test_track.test_track'), value: i18n.t('test_track.test_track'), children: [ - { - label: i18n.t('permission.project_track_case.name'), - value: [i18n.t('permission.project_track_case.name'), 'TRACK_TEST_CASE'], - leaf: true - }, - { - label: i18n.t('test_track.review.test_review'), - value: [i18n.t('test_track.review.test_review'), 'TRACK_TEST_CASE_REVIEW'], - leaf: true - }, - { - label: i18n.t('test_track.plan.test_plan'), - value: [i18n.t('test_track.plan.test_plan'), 'TRACK_TEST_PLAN'], - leaf: true - }, - { - label: i18n.t('operating_log.track_test_plan_schedule'), - value: [i18n.t('operating_log.track_test_plan_schedule'), 'TRACK_TEST_PLAN_SCHEDULE'], - leaf: true - }, - { - label: i18n.t('test_track.issue.issue_management'), - value: [i18n.t('test_track.issue.issue_management'), 'TRACK_BUG'], - leaf: true - }, - {label: i18n.t('commons.report'), value: [i18n.t('commons.report'), 'TRACK_REPORT'], leaf: true}] - }, - { - label: i18n.t('commons.api'), value: i18n.t('commons.api'), children: [ - { - label: i18n.t('workstation.table_name.api_definition'), - value: [i18n.t('workstation.table_name.api_definition'), 'API_DEFINITION'], - leaf: true - }, - { - label: i18n.t('operating_log.api_definition_case'), - value: [i18n.t('operating_log.api_definition_case'), 'API_DEFINITION_CASE'], - leaf: true - }, - { - label: i18n.t('workstation.table_name.api_automation'), - value: [i18n.t('workstation.table_name.api_automation'), 'API_AUTOMATION'], - leaf: true - }, - { - label: i18n.t('operating_log.api_automation_schedule'), - value: [i18n.t('operating_log.api_automation_schedule'), 'API_AUTOMATION_SCHEDULE'], - leaf: true - }, - { - label: i18n.t('permission.project_api_report.name'), - value: [i18n.t('permission.project_api_report.name'), 'API_AUTOMATION_REPORT'], - leaf: true - }] - }, - { - label: i18n.t('workstation.table_name.performance'), - value: i18n.t('workstation.table_name.performance'), - children: [ - { - label: i18n.t('workstation.table_name.performance'), - value: [i18n.t('workstation.table_name.performance'), 'PERFORMANCE_TEST'], - leaf: true - }, - { - label: i18n.t('report.load_test_report'), - value: [i18n.t('report.load_test_report'), 'PERFORMANCE_TEST_REPORT'], - leaf: true - }] - }, - { - label: i18n.t('commons.system_setting'), value: i18n.t('commons.system_setting'), children: [ - { - label: i18n.t('commons.system') + "-" + i18n.t('commons.user'), - value: [i18n.t('commons.system') + "-" + i18n.t('commons.user'), 'SYSTEM_USER'], - leaf: true - }, - { - label: i18n.t('commons.system') + "-" + i18n.t('commons.test_resource_pool'), - value: [i18n.t('commons.system') + "-" + i18n.t('commons.test_resource_pool'), 'SYSTEM_TEST_RESOURCE'], - leaf: true - }, - { - label: i18n.t('commons.system') + "-" + i18n.t('commons.system_parameter_setting'), - value: [i18n.t('commons.system') + "-" + i18n.t('commons.system_parameter_setting'), 'SYSTEM_PARAMETER_SETTING'], - leaf: true - }, - { - label: i18n.t('commons.system') + "-" + i18n.t('commons.quota'), - value: [i18n.t('commons.system') + "-" + i18n.t('commons.quota'), 'SYSTEM_QUOTA_MANAGEMENT'], - leaf: true - }, - { - label: i18n.t('commons.system') + "-" + i18n.t('license.title'), - value: [i18n.t('commons.system') + "-" + i18n.t('license.title'), 'SYSTEM_AUTHORIZATION_MANAGEMENT'], - leaf: true - }, - - { - label: i18n.t('commons.workspace'), - value: [i18n.t('commons.workspace'), 'SYSTEM_WORKSPACE'], - leaf: true - }, - { - label: i18n.t('commons.workspace') + "-" + i18n.t('permission.workspace_service.name'), - value: [i18n.t('commons.workspace') + "-" + i18n.t('permission.workspace_service.name'), 'WORKSPACE_SERVICE_INTEGRATION'], - leaf: true - }, - { - label: i18n.t('commons.workspace') + "-" + i18n.t('permission.project_message.name'), - value: [i18n.t('commons.workspace') + "-" + i18n.t('permission.project_message.name'), 'WORKSPACE_MESSAGE_SETTINGS'], - leaf: true - }, - { - label: i18n.t('commons.workspace') + "-" + i18n.t('permission.project_user.name'), - value: [i18n.t('commons.workspace') + "-" + i18n.t('permission.project_user.name'), 'WORKSPACE_MEMBER'], - leaf: true - }, - { - label: i18n.t('commons.workspace') + "-" + i18n.t('permission.project_template.name'), - value: [i18n.t('commons.workspace') + "-" + i18n.t('permission.project_template.name'), 'WORKSPACE_TEMPLATE_SETTINGS_CASE'], - leaf: true - }, - { - label: i18n.t('commons.personal_information') + "-" + i18n.t('commons.personal_setting'), - value: [i18n.t('commons.personal_information') + "-" + i18n.t('commons.personal_setting'), 'PERSONAL_INFORMATION_PERSONAL_SETTINGS'], - leaf: true - }, - { - label: i18n.t('commons.personal_information') + "-API Keys", - value: [i18n.t('commons.personal_information') + "-API Keys", 'PERSONAL_INFORMATION_APIKEYS'], - leaf: true - }, - { - label: i18n.t('operating_log.auth_title'), - value: [i18n.t('operating_log.auth_title'), 'AUTH_TITLE'], - leaf: true - } - ] - }, - { - label: i18n.t('commons.project_setting'), value: i18n.t('commons.project_setting'), children: [ - { - label: i18n.t('commons.project') + "-" + i18n.t('project.manager'), - value: [i18n.t('commons.project') + "-" + i18n.t('project.manager'), 'PROJECT_PROJECT_MANAGER'], - leaf: true - }, - { - label: i18n.t('commons.project') + "-" + i18n.t('permission.project_user.name'), - value: [i18n.t('commons.project') + "-" + i18n.t('permission.project_user.name'), 'PROJECT_PROJECT_MEMBER'], - leaf: true - }, - { - label: i18n.t('commons.project') + "-" + i18n.t('api_test.jar_config.jar_manage'), - value: [i18n.t('commons.project') + "-" + i18n.t('api_test.jar_config.jar_manage'), 'PROJECT_PROJECT_JAR'], - leaf: true - }, - { - label: i18n.t('commons.project') + "-" + i18n.t('permission.workspace_project_environment.name'), - value: [i18n.t('commons.project') + "-" + i18n.t('permission.workspace_project_environment.name'), 'PROJECT_ENVIRONMENT_SETTING'], - leaf: true - }, - { - label: i18n.t('commons.project') + "-" + i18n.t('permission.project_file.name'), - value: [i18n.t('commons.project') + "-" + i18n.t('permission.project_file.name'), 'PROJECT_FILE_MANAGEMENT'], - leaf: true - }, - { - label: i18n.t('commons.project') + "-" + i18n.t('permission.template.name'), - value: [i18n.t('commons.project') + "-" + i18n.t('permission.template.name'), 'PROJECT_TEMPLATE_MANAGEMENT'], - leaf: true - }, - ] - }, - ]; - return sysList; -} - -export function WORKSYSLIST() { - let worksysList = [ - { - label: i18n.t('test_track.test_track'), value: i18n.t('test_track.test_track'), children: [ - { - label: i18n.t('permission.project_track_case.name'), - value: [i18n.t('permission.project_track_case.name'), 'TRACK_TEST_CASE'], - leaf: true - }, - { - label: i18n.t('test_track.review.test_review'), - value: [i18n.t('test_track.review.test_review'), 'TRACK_TEST_CASE_REVIEW'], - leaf: true - }, - { - label: i18n.t('test_track.plan.test_plan'), - value: [i18n.t('test_track.plan.test_plan'), 'TRACK_TEST_PLAN'], - leaf: true - }, - { - label: i18n.t('operating_log.track_test_plan_schedule'), - value: [i18n.t('operating_log.track_test_plan_schedule'), 'TRACK_TEST_PLAN_SCHEDULE'], - leaf: true - }, - { - label: i18n.t('test_track.issue.issue_management'), - value: [i18n.t('test_track.issue.issue_management'), 'TRACK_BUG'], - leaf: true - }, - {label: i18n.t('commons.report'), value: [i18n.t('commons.report'), 'TRACK_REPORT'], leaf: true}] - }, - { - label: i18n.t('commons.api'), value: i18n.t('commons.api'), children: [ - { - label: i18n.t('workstation.table_name.api_definition'), - value: [i18n.t('workstation.table_name.api_definition'), 'API_DEFINITION'], - leaf: true - }, - { - label: i18n.t('operating_log.api_definition_case'), - value: [i18n.t('operating_log.api_definition_case'), 'API_DEFINITION_CASE'], - leaf: true - }, - { - label: i18n.t('workstation.table_name.api_automation'), - value: [i18n.t('workstation.table_name.api_automation'), 'API_AUTOMATION'], - leaf: true - }, - { - label: i18n.t('operating_log.api_automation_schedule'), - value: [i18n.t('operating_log.api_automation_schedule'), 'API_AUTOMATION_SCHEDULE'], - leaf: true - }, - { - label: i18n.t('permission.project_api_report.name'), - value: [i18n.t('permission.project_api_report.name'), 'API_AUTOMATION_REPORT'], - leaf: true - }] - }, - { - label: i18n.t('workstation.table_name.performance'), - value: i18n.t('workstation.table_name.performance'), - children: [ - { - label: i18n.t('workstation.table_name.performance'), - value: [i18n.t('workstation.table_name.performance'), 'PERFORMANCE_TEST'], - leaf: true - }, - { - label: i18n.t('report.load_test_report'), - value: [i18n.t('report.load_test_report'), 'PERFORMANCE_TEST_REPORT'], - leaf: true - }] - }, - { - label: i18n.t('commons.project_setting'), value: i18n.t('commons.project_setting'), children: [ - { - label: i18n.t('commons.project') + "-" + i18n.t('project.manager'), - value: [i18n.t('commons.project') + "-" + i18n.t('project.manager'), 'PROJECT_PROJECT_MANAGER'], - leaf: true - }, - { - label: i18n.t('commons.project') + "-" + i18n.t('permission.project_user.name'), - value: [i18n.t('commons.project') + "-" + i18n.t('permission.project_user.name'), 'PROJECT_PROJECT_MEMBER'], - leaf: true - }, - { - label: i18n.t('commons.project') + "-" + i18n.t('api_test.jar_config.jar_manage'), - value: [i18n.t('commons.project') + "-" + i18n.t('api_test.jar_config.jar_manage'), 'PROJECT_PROJECT_JAR'], - leaf: true - }, - { - label: i18n.t('commons.project') + "-" + i18n.t('permission.workspace_project_environment.name'), - value: [i18n.t('commons.project') + "-" + i18n.t('permission.workspace_project_environment.name'), 'PROJECT_ENVIRONMENT_SETTING'], - leaf: true - }, - { - label: i18n.t('commons.project') + "-" + i18n.t('permission.project_file.name'), - value: [i18n.t('commons.project') + "-" + i18n.t('permission.project_file.name'), 'PROJECT_FILE_MANAGEMENT'], - leaf: true - }, - { - label: i18n.t('commons.project') + "-" + i18n.t('permission.template.name'), - value: [i18n.t('commons.project') + "-" + i18n.t('permission.template.name'), 'PROJECT_TEMPLATE_MANAGEMENT'], - leaf: true - }, - ] - }, - ]; - return worksysList; -} - export function PROJECTSYSLIST() { let projectsysList = [ { @@ -501,13 +207,17 @@ export function PROJECTSYSLIST() { value: [i18n.t('commons.project') + "-" + i18n.t('permission.template.name'), 'PROJECT_TEMPLATE_MANAGEMENT'], leaf: true }, + { + label: i18n.t('commons.project') + "-" + i18n.t('permission.project_message.name'), + value: [i18n.t('commons.project') + "-" + i18n.t('permission.project_message.name'), 'WORKSPACE_MESSAGE_SETTINGS'], + leaf: true + }, ] }, ]; return projectsysList; } - export function getUrl(d, _this) { let url = "/#"; let resourceId = d.sourceId; diff --git a/system-setting/frontend/src/business/common/config.js b/system-setting/frontend/src/business/common/config.js index 4452a5d46f..1bd836372a 100644 --- a/system-setting/frontend/src/business/common/config.js +++ b/system-setting/frontend/src/business/common/config.js @@ -213,36 +213,11 @@ export function SYSLIST() { value: [i18n.t('commons.workspace') + "-" + i18n.t('permission.workspace_service.name'), 'WORKSPACE_SERVICE_INTEGRATION'], leaf: true }, - { - label: i18n.t('commons.workspace') + "-" + i18n.t('permission.project_message.name'), - value: [i18n.t('commons.workspace') + "-" + i18n.t('permission.project_message.name'), 'WORKSPACE_MESSAGE_SETTINGS'], - leaf: true - }, { label: i18n.t('commons.workspace') + "-" + i18n.t('permission.project_user.name'), value: [i18n.t('commons.workspace') + "-" + i18n.t('permission.project_user.name'), 'WORKSPACE_MEMBER'], leaf: true }, - { - label: i18n.t('commons.workspace') + "-" + i18n.t('permission.project_template.name'), - value: [i18n.t('commons.workspace') + "-" + i18n.t('permission.project_template.name'), 'WORKSPACE_TEMPLATE_SETTINGS_CASE'], - leaf: true - }, - { - label: i18n.t('commons.personal_information') + "-" + i18n.t('commons.personal_setting'), - value: [i18n.t('commons.personal_information') + "-" + i18n.t('commons.personal_setting'), 'PERSONAL_INFORMATION_PERSONAL_SETTINGS'], - leaf: true - }, - { - label: i18n.t('commons.personal_information') + "-API Keys", - value: [i18n.t('commons.personal_information') + "-API Keys", 'PERSONAL_INFORMATION_APIKEYS'], - leaf: true - }, - { - label: i18n.t('operating_log.auth_title'), - value: [i18n.t('operating_log.auth_title'), 'AUTH_TITLE'], - leaf: true - } ] }, { @@ -389,126 +364,17 @@ export function WORKSYSLIST() { value: [i18n.t('commons.project') + "-" + i18n.t('permission.template.name'), 'PROJECT_TEMPLATE_MANAGEMENT'], leaf: true }, + { + label: i18n.t('commons.project') + "-" + i18n.t('permission.project_message.name'), + value: [i18n.t('commons.project') + "-" + i18n.t('permission.project_message.name'), 'WORKSPACE_MESSAGE_SETTINGS'], + leaf: true + }, ] }, ]; return worksysList; } -export function PROJECTSYSLIST() { - let projectsysList = [ - { - label: i18n.t('test_track.test_track'), value: i18n.t('test_track.test_track'), children: [ - { - label: i18n.t('permission.project_track_case.name'), - value: [i18n.t('permission.project_track_case.name'), 'TRACK_TEST_CASE'], - leaf: true - }, - { - label: i18n.t('test_track.review.test_review'), - value: [i18n.t('test_track.review.test_review'), 'TRACK_TEST_CASE_REVIEW'], - leaf: true - }, - { - label: i18n.t('test_track.plan.test_plan'), - value: [i18n.t('test_track.plan.test_plan'), 'TRACK_TEST_PLAN'], - leaf: true - }, - { - label: i18n.t('operating_log.track_test_plan_schedule'), - value: [i18n.t('operating_log.track_test_plan_schedule'), 'TRACK_TEST_PLAN_SCHEDULE'], - leaf: true - }, - { - label: i18n.t('test_track.issue.issue_management'), - value: [i18n.t('test_track.issue.issue_management'), 'TRACK_BUG'], - leaf: true - }, - {label: i18n.t('commons.report'), value: [i18n.t('commons.report'), 'TRACK_REPORT'], leaf: true}] - }, - { - label: i18n.t('commons.api'), value: i18n.t('commons.api'), children: [ - { - label: i18n.t('workstation.table_name.api_definition'), - value: [i18n.t('workstation.table_name.api_definition'), 'API_DEFINITION'], - leaf: true - }, - { - label: i18n.t('operating_log.api_definition_case'), - value: [i18n.t('operating_log.api_definition_case'), 'API_DEFINITION_CASE'], - leaf: true - }, - { - label: i18n.t('workstation.table_name.api_automation'), - value: [i18n.t('workstation.table_name.api_automation'), 'API_AUTOMATION'], - leaf: true - }, - { - label: i18n.t('operating_log.api_automation_schedule'), - value: [i18n.t('operating_log.api_automation_schedule'), 'API_AUTOMATION_SCHEDULE'], - leaf: true - }, - { - label: i18n.t('permission.project_api_report.name'), - value: [i18n.t('permission.project_api_report.name'), 'API_AUTOMATION_REPORT'], - leaf: true - }] - }, - { - label: i18n.t('workstation.table_name.performance'), - value: i18n.t('workstation.table_name.performance'), - children: [ - { - label: i18n.t('workstation.table_name.performance'), - value: [i18n.t('workstation.table_name.performance'), 'PERFORMANCE_TEST'], - leaf: true - }, - { - label: i18n.t('report.load_test_report'), - value: [i18n.t('report.load_test_report'), 'PERFORMANCE_TEST_REPORT'], - leaf: true - }] - }, - - { - label: i18n.t('commons.project_setting'), value: i18n.t('commons.project_setting'), children: [ - { - label: i18n.t('commons.project') + "-" + i18n.t('project.manager'), - value: [i18n.t('commons.project') + "-" + i18n.t('project.manager'), 'PROJECT_PROJECT_MANAGER'], - leaf: true - }, - { - label: i18n.t('commons.project') + "-" + i18n.t('permission.project_user.name'), - value: [i18n.t('commons.project') + "-" + i18n.t('permission.project_user.name'), 'PROJECT_PROJECT_MEMBER'], - leaf: true - }, - { - label: i18n.t('commons.project') + "-" + i18n.t('api_test.jar_config.jar_manage'), - value: [i18n.t('commons.project') + "-" + i18n.t('api_test.jar_config.jar_manage'), 'PROJECT_PROJECT_JAR'], - leaf: true - }, - { - label: i18n.t('commons.project') + "-" + i18n.t('permission.workspace_project_environment.name'), - value: [i18n.t('commons.project') + "-" + i18n.t('permission.workspace_project_environment.name'), 'PROJECT_ENVIRONMENT_SETTING'], - leaf: true - }, - { - label: i18n.t('commons.project') + "-" + i18n.t('permission.project_file.name'), - value: [i18n.t('commons.project') + "-" + i18n.t('permission.project_file.name'), 'PROJECT_FILE_MANAGEMENT'], - leaf: true - }, - { - label: i18n.t('commons.project') + "-" + i18n.t('permission.template.name'), - value: [i18n.t('commons.project') + "-" + i18n.t('permission.template.name'), 'PROJECT_TEMPLATE_MANAGEMENT'], - leaf: true - }, - ] - }, - ]; - return projectsysList; -} - - export function getUrl(d, _this) { let url = "/#"; let resourceId = d.sourceId;