From c8e14fd1b28e022dcbb8d7626098f7f824ef433a Mon Sep 17 00:00:00 2001 From: WangXu10 Date: Wed, 21 Jun 2023 16:01:47 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E7=94=A8=E4=BE=8B=E6=95=B0=E9=87=8F=E8=BF=87?= =?UTF-8?q?=E5=A4=9A=E7=94=9F=E6=88=90=E4=BE=9D=E8=B5=96=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E5=9B=BE=E9=A1=B5=E9=9D=A2=E5=8A=A0=E8=BD=BD=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1027277 --user=王旭 【测试跟踪】测试用例生成依赖关系，页面崩溃 https://www.tapd.cn/55049933/s/1384791 --bug=1027250 --user=王旭 【系统设置】系统管理员设置个人信息权限，点击个人信息直接跳到系统设置模块 https://www.tapd.cn/55049933/s/1384943 --- .../io/metersphere/controller/ServiceIntegrationController.java | 1 - .../business/components/track/case/components/TestCaseList.vue | 2 +- frontend/src/i18n/en-US.js | 2 +- frontend/src/i18n/zh-CN.js | 2 +- frontend/src/i18n/zh-TW.js | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/metersphere/controller/ServiceIntegrationController.java b/backend/src/main/java/io/metersphere/controller/ServiceIntegrationController.java index c8a8da97e9..b36fffb853 100644 --- a/backend/src/main/java/io/metersphere/controller/ServiceIntegrationController.java +++ b/backend/src/main/java/io/metersphere/controller/ServiceIntegrationController.java @@ -42,7 +42,6 @@ public class ServiceIntegrationController { } @GetMapping("/all") - @RequiresPermissions(PermissionConstants.WORKSPACE_SERVICE_READ) public List getAll() { return integrationService.getAll(SessionUtils.getCurrentWorkspaceId()); } diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue index aa49477f93..955eea1e68 100644 --- a/frontend/src/business/components/track/case/components/TestCaseList.vue +++ b/frontend/src/business/components/track/case/components/TestCaseList.vue @@ -974,7 +974,7 @@ export default { }); }, generateGraph() { - if (getSelectDataCounts(this.condition, this.total, this.$refs.table.selectRows) > 100) { + if (getSelectDataCounts(this.condition, this.$refs.table.selectDataCounts, this.$refs.table.selectRows) > 100) { this.$warning(this.$t('test_track.case.generate_dependencies_warning')); return; } diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index ecf3b1d461..a8cdf3853c 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -2158,7 +2158,7 @@ export default { batch_add_public: 'Batch add public', public_warning: 'The public library configuration is not enabled', generate_dependencies: 'Generate dependencies', - generate_dependencies_warning: 'For a better experience, it is recommended to check the data below 100', + generate_dependencies_warning: 'For a better experience, it is recommended to check the data below 500', batch_delete_case: 'Batch delete', batch_unlink: 'Batch Unlink', unlink: 'Unlink', diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index f3f4f2c38e..102b64ad0b 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -2158,7 +2158,7 @@ export default { batch_add_public: '批量添加到公共用例库', public_warning: '未开启公共库用例配置', generate_dependencies: '生成依赖关系', - generate_dependencies_warning: '为了更好的体验，建议勾选一百条以下的数据', + generate_dependencies_warning: '为了更好的体验，建议勾选五百条以下的数据', batch_unlink: '批量取消关联', unlink: '取消关联', project_name: '所属项目', diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index d766e33c9d..49214e191a 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -2157,7 +2157,7 @@ export default { batch_add_public: '批量添加到公共用例庫', public_warning: '未開啟公共庫用例配置', generate_dependencies: '生成依賴關系', - generate_dependencies_warning: '為了更好的體驗，建議勾選一百條以下的數據', + generate_dependencies_warning: '為了更好的體驗，建議勾選五百條以下的數據', batch_unlink: '批量取消關聯', unlink: '取消關聯', project_name: '所屬項目',