From 34859866f6f034be29a665591cedfd7b0c7baff6 Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Fri, 28 Aug 2020 11:24:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?= =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0test=5Fcase=20=E8=A1=A8node=5Fpath?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V16__modify_test_case_path.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 backend/src/main/resources/db/migration/V16__modify_test_case_path.sql diff --git a/backend/src/main/resources/db/migration/V16__modify_test_case_path.sql b/backend/src/main/resources/db/migration/V16__modify_test_case_path.sql new file mode 100644 index 0000000000..a354291d33 --- /dev/null +++ b/backend/src/main/resources/db/migration/V16__modify_test_case_path.sql @@ -0,0 +1 @@ +ALTER TABLE test_case MODIFY COLUMN node_path varchar(999) NOT NULL COMMENT 'Node path this case belongs to' ; From ac3093641ffb2175dc3f5ed29c600e9938c84f19 Mon Sep 17 00:00:00 2001 From: q4speed Date: Fri, 28 Aug 2020 11:26:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/business/permission.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/frontend/src/business/permission.js b/frontend/src/business/permission.js index 62ec88a8a9..fd8e8ddce2 100644 --- a/frontend/src/business/permission.js +++ b/frontend/src/business/permission.js @@ -1,6 +1,6 @@ import router from './components/common/router/router' -import {TokenKey} from '../common/js/constants'; -import {hasRolePermissions, hasRoles} from "../common/js/utils"; +import {TokenKey} from '@/common/js/constants'; +import {hasRolePermissions, hasRoles} from "@/common/js/utils"; const whiteList = ['/login']; // no redirect whitelist @@ -17,22 +17,18 @@ export const roles = { }; function checkRolePermission(el, binding, type) { - const { value } = binding; - const rolesString = localStorage.getItem("roles"); - const roles = rolesString.split(','); + const {value} = binding; if (value && value instanceof Array && value.length > 0) { const permissionRoles = value; let hasPermission = false; if (type === 'roles') { - hasPermission = hasRoles(...permissionRoles); + hasPermission = hasRoles(...permissionRoles); } else if (type === 'permission') { hasPermission = hasRolePermissions(...permissionRoles); } if (!hasPermission) { el.parentNode && el.parentNode.removeChild(el) } - } else { - // throw new Error(`need roles! Like v-permission="['admin','editor']"`) } } From 46cab70f36ec51a5953bd5e487e551857ac60cc0 Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Fri, 28 Aug 2020 12:10:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=E5=AF=B9=E8=AF=9D=E6=A1=86?= =?UTF-8?q?=E4=B8=8D=E7=82=B9=E5=87=BB=E5=A4=96=E9=83=A8=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/test/components/ApiEnvironmentConfig.vue | 2 +- .../api/test/components/import/ApiImport.vue | 2 +- .../components/common/components/MsDeleteConfirm.vue | 3 ++- .../components/common/components/MsScheduleEdit.vue | 2 +- frontend/src/business/components/project/MsProject.vue | 2 +- .../settings/organization/OrganizationMember.vue | 4 ++-- .../settings/organization/OrganizationWorkspace.vue | 10 +++++----- .../components/settings/personal/PersonSetting.vue | 4 ++-- .../components/settings/system/Organization.vue | 10 +++++----- .../components/settings/system/SystemWorkspace.vue | 10 +++++----- .../components/settings/system/TestResourcePool.vue | 2 ++ .../src/business/components/settings/system/User.vue | 6 +++--- .../components/settings/workspace/WorkspaceMember.vue | 4 ++-- .../components/track/case/components/TestCaseEdit.vue | 3 ++- .../components/track/plan/components/TestPlanEdit.vue | 3 ++- 15 files changed, 36 insertions(+), 31 deletions(-) diff --git a/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue b/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue index f7f84b005c..0918e487cc 100644 --- a/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue +++ b/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue @@ -1,5 +1,5 @@ - diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue index 4b615f805c..8a77480bea 100644 --- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue +++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue @@ -2,7 +2,8 @@
- diff --git a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue index b51d0de096..a8a5cf7450 100644 --- a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue +++ b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue @@ -2,7 +2,8 @@
-