diff --git a/framework/sdk-parent/frontend/src/components/environment/commons/variable/FileBatchMove.vue b/framework/sdk-parent/frontend/src/components/environment/commons/variable/FileBatchMove.vue index fc1a399431..aa9368612b 100644 --- a/framework/sdk-parent/frontend/src/components/environment/commons/variable/FileBatchMove.vue +++ b/framework/sdk-parent/frontend/src/components/environment/commons/variable/FileBatchMove.vue @@ -30,9 +30,9 @@ diff --git a/framework/sdk-parent/frontend/src/components/module/ModulePublicButton.vue b/framework/sdk-parent/frontend/src/components/module/ModulePublicButton.vue index 34584ba51a..80545be1f5 100644 --- a/framework/sdk-parent/frontend/src/components/module/ModulePublicButton.vue +++ b/framework/sdk-parent/frontend/src/components/module/ModulePublicButton.vue @@ -4,7 +4,7 @@ {{ $t('project.case_public') }} {{ '(' + publicTotal + ')' }} - + diff --git a/framework/sdk-parent/frontend/src/components/new-ui/MsNodeTree.vue b/framework/sdk-parent/frontend/src/components/new-ui/MsNodeTree.vue index 80ff8a88de..662509a038 100644 --- a/framework/sdk-parent/frontend/src/components/new-ui/MsNodeTree.vue +++ b/framework/sdk-parent/frontend/src/components/new-ui/MsNodeTree.vue @@ -688,7 +688,7 @@ export default { } .node-tree { - height: calc(100vh - 330px); + height: calc(100vh - 270px); } .father .child { diff --git a/framework/sdk-parent/frontend/src/i18n/lang/en-US.js b/framework/sdk-parent/frontend/src/i18n/lang/en-US.js index fc68f351af..e390993dec 100644 --- a/framework/sdk-parent/frontend/src/i18n/lang/en-US.js +++ b/framework/sdk-parent/frontend/src/i18n/lang/en-US.js @@ -2189,6 +2189,7 @@ const message = { scene: "Scenario", load: "Load", functional: "Functional", + ui: "UI", }, }, }, @@ -2882,7 +2883,7 @@ const message = { batch_download: "Batch download", batch_move: "Batch move", local_upload: "Local upload", - associated_files: "Associated files", + associated_files: "Relate file", file_delete_tip: "Source file deleted", save_to_file_manage: "Transfer to file management", }, diff --git a/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js b/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js index f7fb812031..02181fd80f 100644 --- a/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js +++ b/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js @@ -2103,6 +2103,7 @@ const message = { scene: "場景用例", load: "性能用例", functional: "功能用例", + ui: "UI用例", }, }, }, diff --git a/test-track/frontend/src/business/case/components/TestCaseEdit.vue b/test-track/frontend/src/business/case/components/TestCaseEdit.vue index 30222b003e..31c6db0beb 100644 --- a/test-track/frontend/src/business/case/components/TestCaseEdit.vue +++ b/test-track/frontend/src/business/case/components/TestCaseEdit.vue @@ -1086,7 +1086,9 @@ export default { this.form.id = null; testCase.casePublic = false; } - document.title = testCase.name; + if (!this.isPublicShow) { + document.title = testCase.name; + } this.currentTestCaseInfo = testCase; this.setFormData(testCase); this.setTestCaseExtInfo(testCase); @@ -1795,7 +1797,7 @@ export default { color: #646a73; align-items: center; margin-left: px2rem(8); - padding: -1 0.5rem; + padding: 0.2rem; .version-icon { width: 20.17px; @@ -1914,7 +1916,7 @@ export default { .label-row { } margin-right: px2rem(10); - padding: 0 0.5rem; + padding: 0.2rem 0.5rem; } .edit-public-row.head-opt { @@ -1962,7 +1964,7 @@ export default { .label-row { } margin-right: px2rem(24); - padding: 0 0.5rem; + padding: 0.2rem 0.5rem; } } } diff --git a/test-track/frontend/src/business/case/components/TestCaseList.vue b/test-track/frontend/src/business/case/components/TestCaseList.vue index 4ff3e2a5ac..be413d2f10 100644 --- a/test-track/frontend/src/business/case/components/TestCaseList.vue +++ b/test-track/frontend/src/business/case/components/TestCaseList.vue @@ -220,8 +220,8 @@ - + 0 - ? this.$t("load_test.delete_file_when_uploading") + "
" - : "") + - this.$t("load_test.delete_file_confirm") + - file.name + - "?", - "", + (this.cancelFileToken.length > 0 ? this.$t("load_test.delete_file_when_uploading") + "
" : "") + + this.$t("load_test.delete_file_confirm") + file.name + "?", + this.$t("attachment.delete_confirm_tips"), { confirmButtonText: this.$t("commons.confirm"), dangerouslyUseHTMLString: true, @@ -521,6 +517,7 @@ export default { /* identical to box height, or 157% */ width: 100%; color: #8f959e; + margin-top: 2px; } .el-button--small { font-family: "PingFang SC"; diff --git a/test-track/frontend/src/business/case/components/case/CaseAttachmentItem.vue b/test-track/frontend/src/business/case/components/case/CaseAttachmentItem.vue index 5d76648b60..627fdcc920 100644 --- a/test-track/frontend/src/business/case/components/case/CaseAttachmentItem.vue +++ b/test-track/frontend/src/business/case/components/case/CaseAttachmentItem.vue @@ -440,8 +440,9 @@ export default { img:hover { background-color: rgba(31, 35, 41, 0.1); border-radius: 4px; - width: 18px; - height: 18px; + width: 20px; + height: 20px; + padding: 3px; } .opt-item { diff --git a/test-track/frontend/src/business/case/components/case/CaseCommentEdit.vue b/test-track/frontend/src/business/case/components/case/CaseCommentEdit.vue index 1470456645..49626ea59c 100644 --- a/test-track/frontend/src/business/case/components/case/CaseCommentEdit.vue +++ b/test-track/frontend/src/business/case/components/case/CaseCommentEdit.vue @@ -181,6 +181,14 @@ export default { } } + .options .cancel:hover { + background-color: whitesmoke; + } + + .options .submit:hover { + background-color: rgb(147, 96, 159)!important; + } + .state-ready-row:hover { border: 1px solid #783887; } diff --git a/test-track/frontend/src/business/case/components/case/CaseIssueRelate.vue b/test-track/frontend/src/business/case/components/case/CaseIssueRelate.vue index 36d080d962..bdad40800d 100644 --- a/test-track/frontend/src/business/case/components/case/CaseIssueRelate.vue +++ b/test-track/frontend/src/business/case/components/case/CaseIssueRelate.vue @@ -3,7 +3,7 @@
-
+
{{ $t("case.associated_defect") }}
@@ -31,8 +31,7 @@ > {{ $t("case.associate_existing_defects") }}
- +
@@ -425,7 +424,7 @@ export default { left: 112px; top: 251px; background: #ffffff; - border: 1px solid #783887; + border: 1px solid #DCDFE6; border-radius: 4px; text-align: center; color: #783887; @@ -437,6 +436,10 @@ export default { } } +.relate-box .relate-header .menu-left-row:hover { + background-color: whitesmoke; +} + .el-dropdown-menu__item:hover { background-color: rgba(31, 35, 41, 0.1) !important; } diff --git a/test-track/frontend/src/business/case/components/case/CaseRelationshipViewer.vue b/test-track/frontend/src/business/case/components/case/CaseRelationshipViewer.vue index 0824650096..ad908c9079 100644 --- a/test-track/frontend/src/business/case/components/case/CaseRelationshipViewer.vue +++ b/test-track/frontend/src/business/case/components/case/CaseRelationshipViewer.vue @@ -128,13 +128,14 @@ export default { min-width: 98px; height: 32px; background: #ffffff; - border: 1px solid #bbbfc4; + border: 1px solid #DCDFE6; border-radius: 4px; gap: 4px; .header-row { display: flex; color: #1f2329; - margin-left: 12.58px; + border-radius: 4px; + padding-left: 12.58px; align-items: center; height: 100%; cursor: pointer; @@ -160,4 +161,8 @@ export default { } } } + +.dependencies-container .dep-header-wrap .header-row:hover { + background-color: whitesmoke; +} diff --git a/test-track/frontend/src/business/case/components/case/CaseStepChange.vue b/test-track/frontend/src/business/case/components/case/CaseStepChange.vue index 61a145e3ad..5f13d95ea1 100644 --- a/test-track/frontend/src/business/case/components/case/CaseStepChange.vue +++ b/test-track/frontend/src/business/case/components/case/CaseStepChange.vue @@ -43,7 +43,7 @@ export default { .el-dropdown-link { cursor: pointer; color: #646a73; - padding: 0.2rem 0.5rem; + padding: 0.3rem 0.6rem; } .el-dropdown-link:hover { diff --git a/test-track/frontend/src/business/case/components/case/CaseStepItem.vue b/test-track/frontend/src/business/case/components/case/CaseStepItem.vue index 8f67dfeb34..bf1e980885 100644 --- a/test-track/frontend/src/business/case/components/case/CaseStepItem.vue +++ b/test-track/frontend/src/business/case/components/case/CaseStepItem.vue @@ -95,11 +95,13 @@
-
- -
-
- {{ $t("case.add_steps") }} +
+
+ +
+
+ {{ $t("case.add_steps") }} +
@@ -383,4 +385,7 @@ i.el-icon-more:hover { color: #fab6b6; cursor: not-allowed; } +.add-step-hover:hover{ + background-color: rgba(117, 36, 101, 0.1); +} diff --git a/test-track/frontend/src/business/case/components/case/CaseTestRelate.vue b/test-track/frontend/src/business/case/components/case/CaseTestRelate.vue index cfc7083bef..3cdfd604b9 100644 --- a/test-track/frontend/src/business/case/components/case/CaseTestRelate.vue +++ b/test-track/frontend/src/business/case/components/case/CaseTestRelate.vue @@ -3,9 +3,8 @@
-
- {{$t("test_track.case.relate_test")}} +
+ {{$t("test_track.case.relate_test")}}
{{ @@ -267,12 +266,11 @@ export default { left: 112px; top: 251px; background: #ffffff; - border: 1px solid #783887; + border: 1px solid #DCDFE6; border-radius: 4px; text-align: center; color: #783887; } - .opt-row { } } @@ -281,6 +279,10 @@ export default { } } +.relate-container .header-wrap .menu-row:hover { + background-color: whitesmoke; +} + .disable-row { cursor: not-allowed; } diff --git a/test-track/frontend/src/business/case/components/common/CaseRelationshipList.vue b/test-track/frontend/src/business/case/components/common/CaseRelationshipList.vue index 5d144ccdb1..3bcb49f080 100644 --- a/test-track/frontend/src/business/case/components/common/CaseRelationshipList.vue +++ b/test-track/frontend/src/business/case/components/common/CaseRelationshipList.vue @@ -16,7 +16,6 @@ icon="el-icon-plus" v-permission="['PROJECT_TRACK_CASE:READ+EDIT']" :disabled="readOnly || !resourceId" - type="primary" @click="openRelevance" >{{ $t($t("commons.add")) }} @@ -114,18 +113,15 @@ export default { .opt-add-row { .el-button--small { background: #ffffff; - border: 1px solid #783887; border-radius: 4px; - color: #783887; height: 32px; line-height: 32px; - padding: 0px 18.17px 0px 18.17px !important; + padding: 0 18.17px 0 18.17px !important; font-size: 14px !important; } :deep(.el-icon-plus:before) { width: 11.67px; height: 11.67px; - color: #783887; } } } @@ -137,5 +133,8 @@ export default { background-color: rgba(31, 35, 41, 0.15); margin-top: px2rem(24); } + .opt-add-row .el-button--small:hover { + background-color: whitesmoke; + } } diff --git a/test-track/frontend/src/business/case/components/head/TestCaseEditNameView.vue b/test-track/frontend/src/business/case/components/head/TestCaseEditNameView.vue index 075cf0f9c2..6df933a3d9 100644 --- a/test-track/frontend/src/business/case/components/head/TestCaseEditNameView.vue +++ b/test-track/frontend/src/business/case/components/head/TestCaseEditNameView.vue @@ -94,7 +94,7 @@ export default { .name-text { width: auto; - padding-right: 0.5rem; + padding: 0.2rem; } .input-error :deep(.el-input__inner) { diff --git a/test-track/frontend/src/i18n/lang/en-US.js b/test-track/frontend/src/i18n/lang/en-US.js index 0b346a9fda..fe28b04610 100644 --- a/test-track/frontend/src/i18n/lang/en-US.js +++ b/test-track/frontend/src/i18n/lang/en-US.js @@ -109,12 +109,12 @@ const message = { previous_public_case: "Previous", next_public_case: "Next", add_to_public_case: "Add to Common Use Case Library", - added_to_public_case: "Added to public use case library", + added_to_public_case: "Add to public", make_comment: "Make comment", please_enter_comment: "Please enter a comment", associated_defect: "Associated", - create_defect: "Create defect", - associate_existing_defects: "Associate existing defects", + create_defect: "Create", + associate_existing_defects: "Associate", search_by_id: "Search by ID or Name", relieve: "Relieve", content_before_change: "Content before change",