diff --git a/backend/src/main/resources/mail/ApiFailedNotification.html b/backend/src/main/resources/mail/ApiFailedNotification.html index 0eae4dc441..90d282ed72 100644 --- a/backend/src/main/resources/mail/ApiFailedNotification.html +++ b/backend/src/main/resources/mail/ApiFailedNotification.html @@ -12,10 +12,12 @@
- -

您所执行的 ${testName} 接口测试运行失败
- 请点击下面链接进入测试报告页面【接口定义暂无报告路径】
- 【旧版接口测试报告路径】

+

${testName} 接口测试运行失败
+

执行人:${executor}

+

执行环境:${executionEnvironment}

+

执行时间:${executionTime}

+ 请点击下面链接进入测试报告页面【接口定义暂无报告路径】
+ 【旧版接口测试报告路径】

${url}/#/${type}/report/view/${id}

【新版接口测试报告路径】

${url}/#/api/automation/report/view/${id} diff --git a/backend/src/main/resources/mail/ApiSuccessfulNotification.html b/backend/src/main/resources/mail/ApiSuccessfulNotification.html index a3399e770b..e0f141a2a7 100644 --- a/backend/src/main/resources/mail/ApiSuccessfulNotification.html +++ b/backend/src/main/resources/mail/ApiSuccessfulNotification.html @@ -10,9 +10,12 @@

您好:

-

您所执行的 ${testName} 接口测试运行成功
- 请点击下面链接进入测试报告页面【接口定义暂无报告路径】
- 【旧版接口测试报告路径】

+

${testName} 接口测试运行成功
+

执行人:${executor}

+

执行环境:${executionEnvironment}

+

执行时间:${executionTime}

+ 请点击下面链接进入测试报告页面【接口定义暂无报告路径】
+ 【旧版接口测试报告路径】

${url}/#/${type}/report/view/${id}

【新版接口测试报告路径】

${url}/#/api/automation/report/view/${id} diff --git a/frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue b/frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue index e73f8bd268..25b88bb723 100644 --- a/frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue +++ b/frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue @@ -277,6 +277,7 @@ export default { diff --git a/frontend/src/business/components/settings/organization/components/JenkinsNotification.vue b/frontend/src/business/components/settings/organization/components/JenkinsNotification.vue index 560ac1a345..25bfe675fa 100644 --- a/frontend/src/business/components/settings/organization/components/JenkinsNotification.vue +++ b/frontend/src/business/components/settings/organization/components/JenkinsNotification.vue @@ -170,7 +170,8 @@ export default { '

您好:\n' + '

\n' + '
\n' + - '

${executor}所执行的 ${testName} 接口测试运行失败
\n' + + '

${testName} 接口测试运行失败/成功
\n' + + '

执行人:${executor}

' + '

执行环境:${executionEnvironment}

' + '

执行时间:${executionTime}

' + ' 请点击下面链接进入测试报告页面

\n' + @@ -307,4 +308,18 @@ export default { .el-button { margin-left: 10px; } + +/deep/ .el-select .el-input.is-disabled .el-input__inner { + background-color: #F5F7FA; + border-color: #E4E7ED; + color: #0a0a0a; + cursor: not-allowed; +} + +/deep/ .el-input.is-disabled .el-input__inner { + background-color: #F5F7FA; + border-color: #E4E7ED; + color: #0a0a0a; + cursor: not-allowed; +} diff --git a/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue b/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue index ebd88645fa..66ddf731f2 100644 --- a/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue +++ b/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue @@ -171,7 +171,8 @@ export default { '

您好:\n' + '

\n' + '
\n' + - '

${executor}所执行的 ${testName} 接口测试运行失败
\n' + + '

${testName} 接口测试运行失败/成功
\n' + + '

执行人:${executor}

' + '

执行环境:${executionEnvironment}

' + '

执行时间:${executionTime}

' + ' 请点击下面链接进入测试报告页面

\n' + @@ -307,5 +308,19 @@ export default { .el-row { margin-bottom: 10px; } + +/deep/ .el-select .el-input.is-disabled .el-input__inner { + background-color: #F5F7FA; + border-color: #E4E7ED; + color: #0a0a0a; + cursor: not-allowed; +} + +/deep/ .el-input.is-disabled .el-input__inner { + background-color: #F5F7FA; + border-color: #E4E7ED; + color: #0a0a0a; + cursor: not-allowed; +} diff --git a/frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue b/frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue index e0e69e4625..848958de4d 100644 --- a/frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue +++ b/frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue @@ -316,4 +316,18 @@ export default { .el-button { margin-left: 10px; } + +/deep/ .el-select .el-input.is-disabled .el-input__inner { + background-color: #F5F7FA; + border-color: #E4E7ED; + color: #0a0a0a; + cursor: not-allowed; +} + +/deep/ .el-input.is-disabled .el-input__inner { + background-color: #F5F7FA; + border-color: #E4E7ED; + color: #0a0a0a; + cursor: not-allowed; +} diff --git a/frontend/src/business/components/settings/organization/components/TestReviewNotification.vue b/frontend/src/business/components/settings/organization/components/TestReviewNotification.vue index 762d4652dc..6459f61df5 100644 --- a/frontend/src/business/components/settings/organization/components/TestReviewNotification.vue +++ b/frontend/src/business/components/settings/organization/components/TestReviewNotification.vue @@ -322,4 +322,18 @@ export default { .el-button { margin-left: 10px; } + +/deep/ .el-select .el-input.is-disabled .el-input__inner { + background-color: #F5F7FA; + border-color: #E4E7ED; + color: #0a0a0a; + cursor: not-allowed; +} + +/deep/ .el-input.is-disabled .el-input__inner { + background-color: #F5F7FA; + border-color: #E4E7ED; + color: #0a0a0a; + cursor: not-allowed; +} diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue index 43a3ae0b9a..77a8b45456 100644 --- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue +++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue @@ -543,12 +543,15 @@ export default { if (this.projectId) { param.projectId = this.projectId; } + if (this.type === 'copy') { + param.num = ""; + } param.name = param.name.trim(); if (this.form.tags instanceof Array) { this.form.tags = JSON.stringify(this.form.tags); } - param.testId = JSON.stringify(this.form.selected) + param.testId = JSON.stringify(this.form.selected); param.tags = this.form.tags; param.type = 'functional'; buildCustomFields(this.form, param, this.testCaseTemplate);