From ad6264ae1bd71a2ff6c7f1c909716480151de6bc Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 1 Mar 2022 14:04:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E9=98=9F=E5=88=97=E4=B8=AD=E7=9A=84=E4=BB=BB=E5=8A=A1=E8=BF=87?= =?UTF-8?q?=E6=9C=9F=E4=BE=9D=E7=84=B6=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/sechedule/strategy/impl/EmailTaskHandler.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java index f7d14699c4..d7ec2a9886 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java +++ b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java @@ -15,6 +15,7 @@ import io.dataease.job.sechedule.strategy.TaskHandler; import io.dataease.plugins.common.entity.GlobalTaskEntity; import io.dataease.plugins.common.entity.GlobalTaskInstance; import io.dataease.plugins.config.SpringContextUtil; +import io.dataease.plugins.xpack.email.dto.request.XpackEmailTaskRequest; import io.dataease.plugins.xpack.email.dto.request.XpackPixelEntity; import io.dataease.plugins.xpack.email.dto.response.XpackEmailTemplateDTO; import io.dataease.plugins.xpack.email.service.EmailXpackService; @@ -127,7 +128,10 @@ public class EmailTaskHandler extends TaskHandler implements Job { SysUserEntity user) { EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class); try { - + XpackEmailTaskRequest taskForm = emailXpackService.taskForm(taskInstance.getTaskId()); + if (ObjectUtils.isEmpty(taskForm) || CronUtils.taskExpire(taskForm.getEndTime())) { + return; + } String panelId = emailTemplateDTO.getPanelId(); String url = panelUrl(panelId); String token = tokenByUser(user); @@ -148,7 +152,6 @@ public class EmailTaskHandler extends TaskHandler implements Job { emailService.sendWithImage(recipients, emailTemplateDTO.getTitle(), contentStr, bytes); - Thread.sleep(10000); success(taskInstance); } catch (Exception e) { error(taskInstance, e); From 50ba73d7ad1a2b3143936fedcc6fd73cb2085465 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 1 Mar 2022 14:46:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=97=B6=E9=92=9F=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E6=94=B9=E5=8F=98=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE=E6=9C=AA?= =?UTF-8?q?=E9=AB=98=E4=BA=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/components/Editor/DateFormat.vue | 8 ++++++++ .../src/components/canvas/components/TextAttr.vue | 9 +++++++++ frontend/src/views/panel/edit/index.vue | 14 +++++++------- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/DateFormat.vue b/frontend/src/components/canvas/components/Editor/DateFormat.vue index 97e0d45673..3c5b9642f8 100644 --- a/frontend/src/components/canvas/components/Editor/DateFormat.vue +++ b/frontend/src/components/canvas/components/Editor/DateFormat.vue @@ -119,6 +119,14 @@ export default { 'curCanvasScale' ]) }, + watch: { + formatInfo: { + handler(newVal, oldVla) { + this.$store.state.styleChangeTimes++ + }, + deep: true + } + }, created() { }, diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue index 511ee8c81d..25bf2e313d 100644 --- a/frontend/src/components/canvas/components/TextAttr.vue +++ b/frontend/src/components/canvas/components/TextAttr.vue @@ -447,4 +447,13 @@ export default { ::v-deep .el-color-dropdown__link-btn { display: inline!important; } + + ::v-deep input::-webkit-outer-spin-button, + ::v-deep input::-webkit-inner-spin-button { + /*-webkit-appearance: none !important;*/ + } + ::v-deep input[type='number'] { + /*-moz-appearance: textfield !important;*/ + } + diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index 19ebf68fa4..a88ae63a8b 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -621,7 +621,6 @@ export default { this.currentFilterCom.mobileStyle = BASE_MOBILE_STYLE this.currentFilterCom.commonBackground || deepCopy(COMMON_BACKGROUND) - if (this.currentWidget.filterDialog) { this.show = false this.openFilterDialog(true) @@ -870,13 +869,14 @@ export default { // 如果内部样式有变化 1秒钟后保存一个镜像 recordStyleChange(index) { - this.timeMachine = setTimeout(() => { - if (index === this.$store.state.styleChangeTimes) { - this.$store.commit('recordSnapshot', 'recordStyleChange') + if (index === this.$store.state.styleChangeTimes) { + this.timeMachine = setTimeout(() => { + // console.log('recordSnapshot') + this.$store.commit('recordSnapshot') this.$store.state.styleChangeTimes = 0 - } - this.destroyTimeMachine() - }, 1000) + this.destroyTimeMachine() + }, 1000) + } }, handleDragOver(e) { e.preventDefault()