test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(测试跟踪): 关闭定时任务提示优化 

--bug=1010471 --user=陈建星 【定时任务】定时任务关闭保存，也会弹执行时间过短的提示 https://www.tapd.cn/55049933/s/1107194
This commit is contained in:
chenjianxing 2022-02-22 11:31:09 +08:00 committed by 刘瑞斌
parent 6e1abd2c7f
commit 75b4f95187
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
View File

@ -591,9 +591,17 @@ public class JiraPlatform extends AbstractIssuePlatform {
msDefaultValue = defaultList; msDefaultValue = defaultList;
} else { } else {
if (customFieldDao.getType().equals(CustomFieldType.DATE.getValue())) { if (customFieldDao.getType().equals(CustomFieldType.DATE.getValue())) {
msDefaultValue = Instant.ofEpochMilli((Long) defaultValue).atZone(ZoneId.systemDefault()).toLocalDate(); if (defaultValue instanceof String) {
msDefaultValue = defaultValue;
} else {
msDefaultValue = Instant.ofEpochMilli((Long) defaultValue).atZone(ZoneId.systemDefault()).toLocalDate();
}
} else if (customFieldDao.getType().equals(CustomFieldType.DATETIME.getValue())) { } else if (customFieldDao.getType().equals(CustomFieldType.DATETIME.getValue())) {
msDefaultValue = LocalDateTime.ofInstant(Instant.ofEpochMilli((Long) defaultValue), ZoneId.systemDefault()).toString(); if (defaultValue instanceof String) {
msDefaultValue = defaultValue;
} else {
msDefaultValue = LocalDateTime.ofInstant(Instant.ofEpochMilli((Long) defaultValue), ZoneId.systemDefault()).toString();
}
} else { } else {
msDefaultValue = defaultValue; msDefaultValue = defaultValue;
} }

4
frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
View File

@ -11,7 +11,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="18"> <el-col :span="18">
<el-tooltip effect="dark" placement="bottom" <el-tooltip effect="dark" placement="bottom"
:content="schedule.enable?$t('commons.close_schedule'):$t('commons.open_schedule')"> :content="schedule.enable ? $t('commons.close_schedule') : $t('commons.open_schedule')">
<el-switch v-model="schedule.enable"></el-switch> <el-switch v-model="schedule.enable"></el-switch>
</el-tooltip> </el-tooltip>
</el-col> </el-col>
@ -322,7 +322,7 @@ export default {
removeGoBackListener(this.close); removeGoBackListener(this.close);
}, },
intervalShortValidate() { intervalShortValidate() {
if (this.getIntervalTime() < 3 * 60 * 1000) { if (this.schedule.enable && this.getIntervalTime() < 3 * 60 * 1000) {
// return false; // return false;
this.$info(this.$t('schedule.cron_expression_interval_short_error')); this.$info(this.$t('schedule.cron_expression_interval_short_error'));
} }

4
frontend/src/business/components/track/plan/components/ScheduleMaintain.vue
View File

@ -17,7 +17,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="18"> <el-col :span="18">
<el-tooltip effect="dark" placement="bottom" <el-tooltip effect="dark" placement="bottom"
:content="schedule.enable?$t('commons.close_schedule'):$t('commons.open_schedule')"> :content="schedule.enable ? $t('commons.close_schedule') : $t('commons.open_schedule')">
<el-switch v-model="schedule.enable"></el-switch> <el-switch v-model="schedule.enable"></el-switch>
</el-tooltip> </el-tooltip>
</el-col> </el-col>
@ -398,7 +398,7 @@ export default {
removeGoBackListener(this.close); removeGoBackListener(this.close);
}, },
intervalShortValidate() { intervalShortValidate() {
if (this.getIntervalTime() < 3 * 60 * 1000) { if (this.schedule.enable && this.getIntervalTime() < 3 * 60 * 1000) {
// return false; // return false;
this.$info(this.$t('schedule.cron_expression_interval_short_error')); this.$info(this.$t('schedule.cron_expression_interval_short_error'));
} }