diff --git a/frontend/src/business/components/settings/operatinglog/OperatingLog.vue b/frontend/src/business/components/settings/operatinglog/OperatingLog.vue index ee555a504d..c3e4d260c9 100644 --- a/frontend/src/business/components/settings/operatinglog/OperatingLog.vue +++ b/frontend/src/business/components/settings/operatinglog/OperatingLog.vue @@ -139,7 +139,7 @@ condition: {}, tableData: [], userList: [], - screenHeight: 'calc(100vh - 275px)', + screenHeight: 'calc(100vh - 215px)', LOG_TYPE: [ {id: 'CREATE', label: this.$t('api_test.definition.request.create_info')}, {id: 'DELETE', label: this.$t('commons.delete')}, diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue index db159cf690..d8a622c799 100644 --- a/frontend/src/business/components/settings/organization/OrganizationMember.vue +++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue @@ -121,7 +121,7 @@ result: {}, createVisible: false, updateVisible: false, - screenHeight: 'calc(100vh - 255px)', + screenHeight: 'calc(100vh - 195px)', form: {}, queryPath: "/user/org/member/list", condition: {}, diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue index 7928ad45d8..e82f2b5c0a 100644 --- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue +++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue @@ -422,7 +422,7 @@ export default { dialogTotal: 0, memberLineData: [], memberForm: {}, - screenHeight: 'calc(100vh - 255px)', + screenHeight: 'calc(100vh - 195px)', form: { // name: "", // description: "" diff --git a/frontend/src/business/components/settings/project/EnvironmentList.vue b/frontend/src/business/components/settings/project/EnvironmentList.vue index 4f9766a6ee..fd1e4f3030 100644 --- a/frontend/src/business/components/settings/project/EnvironmentList.vue +++ b/frontend/src/business/components/settings/project/EnvironmentList.vue @@ -149,7 +149,7 @@ total: 0, projectIds: [], //当前工作空间所拥有的所有项目id projectFilters: [], - screenHeight: 'calc(100vh - 255px)', + screenHeight: 'calc(100vh - 195px)', } }, created() { diff --git a/frontend/src/business/components/settings/project/Member.vue b/frontend/src/business/components/settings/project/Member.vue index 05562cf755..67fe1d3cb4 100644 --- a/frontend/src/business/components/settings/project/Member.vue +++ b/frontend/src/business/components/settings/project/Member.vue @@ -105,7 +105,7 @@ export default { result: {}, dialogResult: {}, tableData: [], - screenHeight: 'calc(100vh - 255px)', + screenHeight: 'calc(100vh - 195px)', currentPage: 1, pageSize: 10, total: 0, diff --git a/frontend/src/business/components/settings/project/ProjectList.vue b/frontend/src/business/components/settings/project/ProjectList.vue index 3482241f9d..d34a671cbb 100644 --- a/frontend/src/business/components/settings/project/ProjectList.vue +++ b/frontend/src/business/components/settings/project/ProjectList.vue @@ -214,7 +214,7 @@ export default { // caseTemplateId: [{required: true}], // issueTemplateId: [{required: true}], }, - screenHeight: 'calc(100vh - 255px)', + screenHeight: 'calc(100vh - 195px)', labelWidth: '150px' }; }, diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue index b342ba0c18..882c2bed39 100644 --- a/frontend/src/business/components/settings/system/Organization.vue +++ b/frontend/src/business/components/settings/system/Organization.vue @@ -214,7 +214,7 @@ export default { dialogPageSize: 10, dialogTotal: 0, currentRow: {}, - screenHeight: 'calc(100vh - 255px)', + screenHeight: 'calc(100vh - 195px)', condition: {}, dialogCondition: {}, tableData: [], diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue index 0661d3e600..1a40ab6a3a 100644 --- a/frontend/src/business/components/settings/system/SystemWorkspace.vue +++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue @@ -449,7 +449,7 @@ export default { dialogTotal: 0, memberLineData: [], memberForm: {}, - screenHeight: 'calc(100vh - 255px)', + screenHeight: 'calc(100vh - 195px)', form: { // name: "", // description: "" diff --git a/frontend/src/business/components/settings/system/TestResourcePool.vue b/frontend/src/business/components/settings/system/TestResourcePool.vue index f03e0887a2..f8ceda7086 100644 --- a/frontend/src/business/components/settings/system/TestResourcePool.vue +++ b/frontend/src/business/components/settings/system/TestResourcePool.vue @@ -233,7 +233,7 @@ export default { pageSize: 10, total: 0, form: {}, - screenHeight: 'calc(100vh - 255px)', + screenHeight: 'calc(100vh - 195px)', requiredRules: [{required: true, message: this.$t('test_resource_pool.fill_the_data'), trigger: 'blur'}], rule: { name: [ diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue index 0f1551a2f6..29376bcbb1 100644 --- a/frontend/src/business/components/settings/system/User.vue +++ b/frontend/src/business/components/settings/system/User.vue @@ -189,7 +189,7 @@ export default { id: '' }] }, - screenHeight: 'calc(100vh - 255px)', + screenHeight: 'calc(100vh - 195px)', checkPasswordForm: {}, ruleForm: {}, buttons: [ diff --git a/frontend/src/business/components/settings/system/group/UserGroup.vue b/frontend/src/business/components/settings/system/group/UserGroup.vue index fd77375317..ce721d2b5f 100644 --- a/frontend/src/business/components/settings/system/group/UserGroup.vue +++ b/frontend/src/business/components/settings/system/group/UserGroup.vue @@ -94,7 +94,7 @@ export default { currentPage: 1, pageSize: 10, total: 0, - screenHeight: 'calc(100vh - 275px)', + screenHeight: 'calc(100vh - 200px)', groups: [], currentGroup: {} }; diff --git a/frontend/src/business/components/settings/workspace/MsProject.vue b/frontend/src/business/components/settings/workspace/MsProject.vue index b875786213..662ba0544c 100644 --- a/frontend/src/business/components/settings/workspace/MsProject.vue +++ b/frontend/src/business/components/settings/workspace/MsProject.vue @@ -296,7 +296,7 @@ export default { // caseTemplateId: [{required: true}], // issueTemplateId: [{required: true}], }, - screenHeight: 'calc(100vh - 255px)', + screenHeight: 'calc(100vh - 195px)', dialogCondition: {}, memberVisible: false, memberLineData: [], diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue index 3aad1aa1d4..ad74be917b 100644 --- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue +++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue @@ -136,7 +136,7 @@ {required: true, message: this.$t('group.please_select_group'), trigger: ['blur']} ] }, - screenHeight: 'calc(100vh - 255px)', + screenHeight: 'calc(100vh - 195px)', multipleSelection: [], currentPage: 1, pageSize: 10, diff --git a/frontend/src/business/components/settings/workspace/WsEnvironmentList.vue b/frontend/src/business/components/settings/workspace/WsEnvironmentList.vue index 1b0cd88d93..9ebae72e8e 100644 --- a/frontend/src/business/components/settings/workspace/WsEnvironmentList.vue +++ b/frontend/src/business/components/settings/workspace/WsEnvironmentList.vue @@ -149,7 +149,7 @@ total: 0, projectIds: [], //当前工作空间所拥有的所有项目id projectFilters: [], - screenHeight: 'calc(100vh - 255px)', + screenHeight: 'calc(100vh - 195px)', } }, created() { diff --git a/frontend/src/business/components/settings/workspace/template/CustomFieldList.vue b/frontend/src/business/components/settings/workspace/template/CustomFieldList.vue index 276c526bbe..f22d631d40 100644 --- a/frontend/src/business/components/settings/workspace/template/CustomFieldList.vue +++ b/frontend/src/business/components/settings/workspace/template/CustomFieldList.vue @@ -233,6 +233,6 @@ export default { diff --git a/frontend/src/business/components/settings/workspace/template/IssuesTemplateList.vue b/frontend/src/business/components/settings/workspace/template/IssuesTemplateList.vue index 12ab1d70c3..b80fe18aa2 100644 --- a/frontend/src/business/components/settings/workspace/template/IssuesTemplateList.vue +++ b/frontend/src/business/components/settings/workspace/template/IssuesTemplateList.vue @@ -179,6 +179,6 @@ export default { diff --git a/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue b/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue index c30f7d8a17..bcd1dee187 100644 --- a/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue +++ b/frontend/src/business/components/settings/workspace/template/TestCaseTemplateList.vue @@ -187,6 +187,6 @@ export default { diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue index 498c84d135..8c3bf21ebb 100644 --- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue +++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue @@ -38,7 +38,7 @@ - {{ testCase.name }} + {{ testCase.name }} @@ -501,7 +501,7 @@ export default { } .container >>> .el-card__body { - height: calc(100vh - 70px); + height: calc(100vh - 50px); } .comment-card >>> .el-card__header { @@ -509,7 +509,7 @@ export default { } .comment-card >>> .el-card__body { - height: calc(100vh - 120px); + height: calc(100vh - 100px); } .case_container > .el-row { @@ -543,4 +543,13 @@ p { .save-btn { margin-left: 10px; } + + +.el-divider__text { + line-height: normal; +} + +.test-case-name { + padding: 0; +} diff --git a/frontend/src/business/components/track/plan/view/comonents/report/statistics/TestCaseStatisticsReportView.vue b/frontend/src/business/components/track/plan/view/comonents/report/statistics/TestCaseStatisticsReportView.vue index 0c26dcffad..1e99428f51 100644 --- a/frontend/src/business/components/track/plan/view/comonents/report/statistics/TestCaseStatisticsReportView.vue +++ b/frontend/src/business/components/track/plan/view/comonents/report/statistics/TestCaseStatisticsReportView.vue @@ -222,7 +222,7 @@ diff --git a/frontend/src/common/js/utils.js b/frontend/src/common/js/utils.js index 2f681bd8a0..1bda1e3814 100644 --- a/frontend/src/common/js/utils.js +++ b/frontend/src/common/js/utils.js @@ -502,5 +502,5 @@ export function getNodePath(id, moduleOptions) { } export function getDefaultTableHeight() { - return document.documentElement.clientHeight - 280; + return document.documentElement.clientHeight - 200; }