diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue
index 3a0dc669d3..7a40da9c3d 100644
--- a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue
+++ b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue
@@ -250,7 +250,7 @@ export default {
Task.identification = '';
Task.taskType = 'SCHEDULE_TASK';
Task.testId = this.testId;
- this.scheduleTask.push(Task);
+ this.scheduleTask.unshift(Task);
},
handleEditTask(index, data) {
data.isSet = true;
diff --git a/frontend/src/business/components/api/definition/components/import/SwaggerTaskNotification.vue b/frontend/src/business/components/api/definition/components/import/SwaggerTaskNotification.vue
index 2c5cf77a2d..1375af51f4 100644
--- a/frontend/src/business/components/api/definition/components/import/SwaggerTaskNotification.vue
+++ b/frontend/src/business/components/api/definition/components/import/SwaggerTaskNotification.vue
@@ -220,7 +220,7 @@ export default {
Task.identification = '';
Task.taskType = 'SWAGGER_URL';
Task.testId = this.testId;
- this.scheduleTask.push(Task);
+ this.scheduleTask.unshift(Task);
},
handleEditTask(index, data) {
data.isSet = true;
diff --git a/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue b/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue
index 1adf52386d..a44995fd80 100644
--- a/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue
@@ -241,7 +241,7 @@ export default {
Task.identification = '';
Task.taskType = 'SCHEDULE_TASK';
Task.testId = this.testId;
- this.scheduleTask.push(Task);
+ this.scheduleTask.unshift(Task);
},
handleEditTask(index, data) {
data.isSet = true;
diff --git a/frontend/src/business/components/settings/organization/components/api/ApiAutomationNotification.vue b/frontend/src/business/components/settings/organization/components/api/ApiAutomationNotification.vue
index 8b936fa4c9..2e5ff0903c 100644
--- a/frontend/src/business/components/settings/organization/components/api/ApiAutomationNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/api/ApiAutomationNotification.vue
@@ -237,7 +237,7 @@ export default {
task.isSet = true;
task.identification = '';
task.taskType = TASK_TYPE;
- this.defectTask.push(task);
+ this.defectTask.unshift(task);
},
handleAddTask(index, data) {
@@ -257,8 +257,8 @@ export default {
}
},
addTask(data) {
- data.isSet = false;
this.result = this.$post("/notice/save/message/task", data, () => {
+ data.isSet = false;
this.initForm();
this.$success(this.$t('commons.save_success'));
});
diff --git a/frontend/src/business/components/settings/organization/components/api/ApiDefinitionNotification.vue b/frontend/src/business/components/settings/organization/components/api/ApiDefinitionNotification.vue
index 6f9b1051be..0767811671 100644
--- a/frontend/src/business/components/settings/organization/components/api/ApiDefinitionNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/api/ApiDefinitionNotification.vue
@@ -240,7 +240,7 @@ export default {
task.isSet = true;
task.identification = '';
task.taskType = TASK_TYPE;
- this.defectTask.push(task);
+ this.defectTask.unshift(task);
},
handleAddTask(index, data) {
@@ -260,8 +260,8 @@ export default {
}
},
addTask(data) {
- data.isSet = false;
this.result = this.$post("/notice/save/message/task", data, () => {
+ data.isSet = false;
this.initForm();
this.$success(this.$t('commons.save_success'));
});
diff --git a/frontend/src/business/components/settings/organization/components/api/ApiHomeNotification.vue b/frontend/src/business/components/settings/organization/components/api/ApiHomeNotification.vue
index 2389878406..93ca9837ff 100644
--- a/frontend/src/business/components/settings/organization/components/api/ApiHomeNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/api/ApiHomeNotification.vue
@@ -237,7 +237,7 @@ export default {
task.isSet = true;
task.identification = '';
task.taskType = TASK_TYPE;
- this.defectTask.push(task);
+ this.defectTask.unshift(task);
},
handleAddTask(index, data) {
@@ -257,8 +257,8 @@ export default {
}
},
addTask(data) {
- data.isSet = false;
this.result = this.$post("/notice/save/message/task", data, () => {
+ data.isSet = false;
this.initForm();
this.$success(this.$t('commons.save_success'));
});
diff --git a/frontend/src/business/components/settings/organization/components/api/ApiReportNotification.vue b/frontend/src/business/components/settings/organization/components/api/ApiReportNotification.vue
index fc5b9c53b0..27a82eef43 100644
--- a/frontend/src/business/components/settings/organization/components/api/ApiReportNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/api/ApiReportNotification.vue
@@ -233,7 +233,7 @@ export default {
task.isSet = true;
task.identification = '';
task.taskType = TASK_TYPE;
- this.defectTask.push(task);
+ this.defectTask.unshift(task);
},
handleAddTask(index, data) {
@@ -253,8 +253,8 @@ export default {
}
},
addTask(data) {
- data.isSet = false;
this.result = this.$post("/notice/save/message/task", data, () => {
+ data.isSet = false;
this.initForm();
this.$success(this.$t('commons.save_success'));
});
diff --git a/frontend/src/business/components/settings/organization/components/jenkins/JenkinsNotification.vue b/frontend/src/business/components/settings/organization/components/jenkins/JenkinsNotification.vue
index 36c7effd28..6d742b6897 100644
--- a/frontend/src/business/components/settings/organization/components/jenkins/JenkinsNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/jenkins/JenkinsNotification.vue
@@ -248,7 +248,7 @@ export default {
Task.isSet = true;
Task.identification = '';
Task.taskType = TASK_TYPE;
- this.jenkinsTask.push(Task);
+ this.jenkinsTask.unshift(Task);
},
handleAddTask(index, data) {
if (data.event && data.userIds.length > 0 && data.type) {
diff --git a/frontend/src/business/components/settings/organization/components/performance/PerformanceReportNotification.vue b/frontend/src/business/components/settings/organization/components/performance/PerformanceReportNotification.vue
index 0b60b70385..9758dab9ae 100644
--- a/frontend/src/business/components/settings/organization/components/performance/PerformanceReportNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/performance/PerformanceReportNotification.vue
@@ -233,7 +233,7 @@ export default {
task.isSet = true;
task.identification = '';
task.taskType = TASK_TYPE;
- this.defectTask.push(task);
+ this.defectTask.unshift(task);
},
handleAddTask(index, data) {
@@ -253,8 +253,8 @@ export default {
}
},
addTask(data) {
- data.isSet = false;
this.result = this.$post("/notice/save/message/task", data, () => {
+ data.isSet = false;
this.initForm();
this.$success(this.$t('commons.save_success'));
});
diff --git a/frontend/src/business/components/settings/organization/components/performance/PerformanceTestNotification.vue b/frontend/src/business/components/settings/organization/components/performance/PerformanceTestNotification.vue
index 3716e7f371..bb4cdb6c04 100644
--- a/frontend/src/business/components/settings/organization/components/performance/PerformanceTestNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/performance/PerformanceTestNotification.vue
@@ -8,21 +8,21 @@
{{ $t('organization.message.create_new_notification') }}
+ placement="right-end"
+ title="示例"
+ width="600"
+ trigger="click">
{{ $t('organization.message.mail_template_example') }}
+ placement="right-end"
+ title="示例"
+ width="400"
+ trigger="click"
+ :content="robotTitle">
{{ $t('organization.message.robot_template') }}
@@ -33,11 +33,11 @@
@@ -45,10 +45,10 @@
@change="handleReceivers(scope.row)"
prop="event" :disabled="!scope.row.isSet">
+ v-for="item in eventOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
@@ -59,10 +59,10 @@
:placeholder="$t('commons.please_select')"
style="width: 100%;" :disabled="!row.isSet">
+ v-for="item in row.receiverOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
@@ -73,10 +73,10 @@
size="mini"
:disabled="!scope.row.isSet" @change="handleEdit(scope.$index, scope.row)">
+ v-for="item in receiveTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
@@ -90,48 +90,48 @@
+ circle
+ type="success"
+ size="mini"
+ v-if="scope.row.isSet"
+ v-xpack
+ @click="handleTemplate(scope.$index,scope.row)"
+ :tip="$t('organization.message.template')"
+ icon="el-icon-tickets"/>
+ circle
+ type="primary"
+ size="mini"
+ v-show="scope.row.isSet"
+ @click="handleAddTask(scope.$index,scope.row)"
+ :tip="$t('commons.add')"
+ icon="el-icon-check"/>
+ circle
+ size="mini"
+ v-show="scope.row.isSet"
+ @click="removeRowTask(scope.$index,defectTask)"
+ :tip="$t('commons.cancel')"
+ icon="el-icon-refresh-left"/>
+ el-button
+ circle
+ type="primary"
+ size="mini"
+ icon="el-icon-edit"
+ v-show="!scope.row.isSet"
+ :tip="$t('commons.edit')"
+ @click="handleEditTask(scope.$index,scope.row)"
+ v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']"/>
+ circle
+ type="danger"
+ icon="el-icon-delete"
+ size="mini"
+ v-show="!scope.row.isSet"
+ @click="deleteRowTask(scope.$index,scope.row)"
+ :tip="$t('commons.delete')"
+ v-permission="['ORGANIZATION_MESSAGE:READ+EDIT']"/>
@@ -169,17 +169,17 @@ export default {
return {
modes: ['text', 'html'],
title: "\n" +
- "\n" +
- "\n" +
- " \n" +
- " MeterSphere\n" +
- "\n" +
- "\n" +
- "\n" +
- "
${creator}创建了测试用例
\n" +
- "
\n" +
- "\n" +
- "",
+ "\n" +
+ "\n" +
+ " \n" +
+ " MeterSphere\n" +
+ "\n" +
+ "\n" +
+ "\n" +
+ "
${creator}创建了测试用例
\n" +
+ "
\n" +
+ "\n" +
+ "",
robotTitle: "【任务通知】:${creator}创建了测试用例",
defectTask: [{
taskType: "defectTask",
@@ -236,7 +236,7 @@ export default {
task.isSet = true;
task.identification = '';
task.taskType = TASK_TYPE;
- this.defectTask.push(task);
+ this.defectTask.unshift(task);
},
handleAddTask(index, data) {
@@ -256,8 +256,8 @@ export default {
}
},
addTask(data) {
- data.isSet = false;
this.result = this.$post("/notice/save/message/task", data, () => {
+ data.isSet = false;
this.initForm();
this.$success(this.$t('commons.save_success'));
});
diff --git a/frontend/src/business/components/settings/organization/components/track/DefectTaskNotification.vue b/frontend/src/business/components/settings/organization/components/track/DefectTaskNotification.vue
index c65a9064b2..70196ec88d 100644
--- a/frontend/src/business/components/settings/organization/components/track/DefectTaskNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/track/DefectTaskNotification.vue
@@ -234,7 +234,7 @@ export default {
Task.isSet = true;
Task.identification = '';
Task.taskType = TASK_TYPE;
- this.defectTask.push(Task);
+ this.defectTask.unshift(Task);
},
handleAddTask(index, data) {
@@ -254,8 +254,8 @@ export default {
}
},
addTask(data) {
- data.isSet = false;
this.result = this.$post("/notice/save/message/task", data, () => {
+ data.isSet = false;
this.initForm();
this.$success(this.$t('commons.save_success'));
});
diff --git a/frontend/src/business/components/settings/organization/components/track/TestCaseNotification.vue b/frontend/src/business/components/settings/organization/components/track/TestCaseNotification.vue
index 272041b9cc..9c6b0e4ca5 100644
--- a/frontend/src/business/components/settings/organization/components/track/TestCaseNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/track/TestCaseNotification.vue
@@ -236,7 +236,7 @@ export default {
task.isSet = true;
task.identification = '';
task.taskType = TASK_TYPE;
- this.defectTask.push(task);
+ this.defectTask.unshift(task);
},
handleAddTask(index, data) {
@@ -256,8 +256,8 @@ export default {
}
},
addTask(data) {
- data.isSet = false;
this.result = this.$post("/notice/save/message/task", data, () => {
+ data.isSet = false;
this.initForm();
this.$success(this.$t('commons.save_success'));
});
diff --git a/frontend/src/business/components/settings/organization/components/track/TestPlanTaskNotification.vue b/frontend/src/business/components/settings/organization/components/track/TestPlanTaskNotification.vue
index b3b9c92ab4..db6c61fef3 100644
--- a/frontend/src/business/components/settings/organization/components/track/TestPlanTaskNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/track/TestPlanTaskNotification.vue
@@ -244,7 +244,7 @@ export default {
Task.isSet = true;
Task.identification = '';
Task.taskType = TASK_TYPE;
- this.testCasePlanTask.push(Task);
+ this.testCasePlanTask.unshift(Task);
},
handleAddTask(index, data) {
@@ -264,8 +264,8 @@ export default {
}
},
addTask(data) {
- data.isSet = false;
this.result = this.$post("/notice/save/message/task", data, () => {
+ data.isSet = false;
this.initForm();
this.$success(this.$t('commons.save_success'));
});
diff --git a/frontend/src/business/components/settings/organization/components/track/TestReviewNotification.vue b/frontend/src/business/components/settings/organization/components/track/TestReviewNotification.vue
index 1a9a10bb23..999da6c1e4 100644
--- a/frontend/src/business/components/settings/organization/components/track/TestReviewNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/track/TestReviewNotification.vue
@@ -242,7 +242,7 @@ export default {
Task.isSet = true;
Task.identification = '';
Task.taskType = TASK_TYPE;
- this.reviewTask.push(Task);
+ this.reviewTask.unshift(Task);
},
handleAddTask(index, data) {
@@ -262,8 +262,8 @@ export default {
}
},
addTask(data) {
- data.isSet = false;
this.result = this.$post("/notice/save/message/task", data, () => {
+ data.isSet = false;
this.initForm();
this.$success(this.$t('commons.save_success'));
});
diff --git a/frontend/src/business/components/settings/organization/components/track/TrackHomeNotification.vue b/frontend/src/business/components/settings/organization/components/track/TrackHomeNotification.vue
index dce4f98848..b461bd36cb 100644
--- a/frontend/src/business/components/settings/organization/components/track/TrackHomeNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/track/TrackHomeNotification.vue
@@ -237,7 +237,7 @@ export default {
task.isSet = true;
task.identification = '';
task.taskType = TASK_TYPE;
- this.defectTask.push(task);
+ this.defectTask.unshift(task);
},
handleAddTask(index, data) {
@@ -257,8 +257,8 @@ export default {
}
},
addTask(data) {
- data.isSet = false;
this.result = this.$post("/notice/save/message/task", data, () => {
+ data.isSet = false;
this.initForm();
this.$success(this.$t('commons.save_success'));
});
diff --git a/frontend/src/business/components/settings/organization/components/track/TrackReportNotification.vue b/frontend/src/business/components/settings/organization/components/track/TrackReportNotification.vue
index 8070cae306..cdf80abbd4 100644
--- a/frontend/src/business/components/settings/organization/components/track/TrackReportNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/track/TrackReportNotification.vue
@@ -233,7 +233,7 @@ export default {
Task.isSet = true;
Task.identification = '';
Task.taskType = TASK_TYPE;
- this.defectTask.push(Task);
+ this.defectTask.unshift(Task);
},
handleAddTask(index, data) {
@@ -253,8 +253,8 @@ export default {
}
},
addTask(data) {
- data.isSet = false;
this.result = this.$post("/notice/save/message/task", data, () => {
+ data.isSet = false;
this.initForm();
this.$success(this.$t('commons.save_success'));
});