From b522aab62f1b59ca3cac973d8b4e54a2bee08e8c Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 29 Dec 2021 18:35:57 +0800 Subject: [PATCH 1/9] =?UTF-8?q?style:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/canvas/components/Editor/ComponentWrapper.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue index 7a6e9092ab..3bfcdc76a8 100644 --- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue +++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue @@ -189,7 +189,7 @@ export default { } .component:hover { - box-shadow: 0px 0px 7px #0a7be0; + box-shadow: 0px 0px 3px #0a7be0; } .gap_class { From ba3c3fd1c2fa1032f6fb112146df9cd124ff4642 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 29 Dec 2021 18:51:07 +0800 Subject: [PATCH 2/9] =?UTF-8?q?style:=20=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/panel/LinkJumpSet/index.vue | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/frontend/src/views/panel/LinkJumpSet/index.vue b/frontend/src/views/panel/LinkJumpSet/index.vue index dbdb016174..3181a316b8 100644 --- a/frontend/src/views/panel/LinkJumpSet/index.vue +++ b/frontend/src/views/panel/LinkJumpSet/index.vue @@ -35,18 +35,7 @@ - - - {{ $t('panel.open_model') }}： - - - - {{ $t('panel.now_window') }} - {{ $t('panel.new_window') }} - - - - + {{ $t('panel.link_type') }}： @@ -69,6 +58,17 @@ /> + + + {{ $t('panel.open_model') }}： + + + + {{ $t('panel.now_window') }} + {{ $t('panel.new_window') }} + + + From 1b174f589a52bb12cf0445e4e75512510892e74a Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 30 Dec 2021 10:39:53 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E6=9C=89=E6=95=88=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/link/generate/index.vue | 125 ++++++++++++++------- 1 file changed, 86 insertions(+), 39 deletions(-) diff --git a/frontend/src/views/link/generate/index.vue b/frontend/src/views/link/generate/index.vue index 45e3fddae5..5572ba106c 100644 --- a/frontend/src/views/link/generate/index.vue +++ b/frontend/src/views/link/generate/index.vue @@ -15,11 +15,7 @@ {{ $t('panel.link_share_desc') }} - + @@ -37,17 +33,34 @@ - {{ $t('panel.passwd_protect') }} + {{ $t('panel.passwd_protect') }} {{ form.pwd }} - {{ $t('commons.reset') }} + + {{ $t('commons.reset') }} +
- {{ $t('panel.copy_link') }} - {{ $t('panel.copy_link_passwd') }} + {{ $t('panel.copy_link') }} + + {{ $t('panel.copy_link_passwd') }}
@@ -56,8 +69,14 @@ From f29b6608194f4cb7151bd913e3bea0b4077e9a44 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 30 Dec 2021 11:47:26 +0800 Subject: [PATCH 4/9] =?UTF-8?q?refactor:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E9=97=B4=E9=9A=99=E8=AE=BE=E7=BD=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/DeDrag/index.vue | 2 +- .../components/canvas/components/Editor/ComponentWrapper.vue | 2 +- frontend/src/components/canvas/custom-component/UserView.vue | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue index bc2065eeaa..0c339f1b8f 100644 --- a/frontend/src/components/DeDrag/index.vue +++ b/frontend/src/components/DeDrag/index.vue @@ -535,7 +535,7 @@ export default { return this.$store.state.curComponent }, curGap() { - return this.element.auxiliaryMatrix && this.element.type !== 'custom' ? this.componentGap : 0 + return (this.canvasStyleData.panel.gap === 'yes' && this.element.auxiliaryMatrix && this.element.type !== 'custom') ? this.componentGap : 0 }, ...mapState([ 'editor', diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue index 3bfcdc76a8..1b4d51095d 100644 --- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue +++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue @@ -85,7 +85,7 @@ export default { return (this.curComponent && this.config === this.curComponent) && !this.previewVisible }, curGap() { - return this.config.auxiliaryMatrix ? this.componentGap : 0 + return (this.canvasStyleData.panel.gap === 'yes' && this.config.auxiliaryMatrix) ? this.componentGap : 0 }, ...mapState([ 'mobileLayoutStatus', diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index b1d40b3a97..01db302241 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -261,6 +261,10 @@ export default { if (!this.preCanvasPanel || this.preCanvasPanel.resultCount !== newVal.panel.resultCount || this.preCanvasPanel.resultMode !== newVal.panel.resultMode) { this.getData(this.element.propValue.viewId, false) } + // 如果gap有变化刷新 + if (this.preCanvasPanel && this.preCanvasPanel.gap !== newVal.panel.gap) { + this.$refs[this.element.propValue.id].chartResize() + } this.preCanvasPanel = deepCopy(newVal.panel) }, deep: true From b8cc97fad85c7e17cdc73cfa4eed203a9c4ae421 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 30 Dec 2021 12:38:00 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix:=20=E9=82=AE=E4=BB=B6=E6=88=AA=E5=9B=BE?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/sechedule/strategy/impl/EmailTaskHandler.java | 8 ++------ 1 file changed, 2 insertions(+), 6 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 2b23aea483..3f604967fa 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 @@ -20,7 +20,6 @@ import io.dataease.service.system.EmailService; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.quartz.*; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -67,13 +66,10 @@ public class EmailTaskHandler extends TaskHandler implements Job { XpackEmailTemplateDTO emailTemplate = (XpackEmailTemplateDTO) jobDataMap.get("emailTemplate"); SysUserEntity creator = (SysUserEntity) jobDataMap.get("creator"); - proxy().sendReport(taskInstance, emailTemplate, creator); + sendReport(taskInstance, emailTemplate, creator); } - public EmailTaskHandler proxy() { - return CommonBeanFactory.getBean(EmailTaskHandler.class); - } public Long saveInstance(GlobalTaskInstance taskInstance) { EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class); @@ -102,7 +98,7 @@ public class EmailTaskHandler extends TaskHandler implements Job { emailXpackService.saveInstance(taskInstance); } - @Async + public void sendReport(GlobalTaskInstance taskInstance, XpackEmailTemplateDTO emailTemplateDTO, SysUserEntity user) { EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class); From 613731700e9c40188c22b0c9f3cc9743da0c80f1 Mon Sep 17 00:00:00 2001 From: junjie Date: Thu, 30 Dec 2021 13:29:16 +0800 Subject: [PATCH 6/9] =?UTF-8?q?fix:=20=E5=BC=B9=E6=A1=86=E5=9B=9E=E8=BD=A6?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/group/Group.vue | 3 ++- frontend/src/views/dataset/group/Group.vue | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue index 3cf184e9fe..7e1324ac6e 100644 --- a/frontend/src/views/chart/group/Group.vue +++ b/frontend/src/views/chart/group/Group.vue @@ -145,6 +145,7 @@ :model="groupForm" :rules="groupFormRules" @keypress.enter.native="saveGroup(groupForm)" + @submit.native.prevent > @@ -159,7 +160,7 @@ - + diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue index 9df36e1942..bee55202fd 100644 --- a/frontend/src/views/dataset/group/Group.vue +++ b/frontend/src/views/dataset/group/Group.vue @@ -174,7 +174,7 @@ - + @@ -188,7 +188,7 @@ - + From d451100a577b13779b2e2e5253ee72ef134ee91c Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 30 Dec 2021 13:48:28 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E6=89=93=E5=8D=B0=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=A0=86=E6=A0=88=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/job/sechedule/strategy/impl/EmailTaskHandler.java | 1 + 1 file changed, 1 insertion(+) 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 3f604967fa..cf10e23513 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 @@ -118,6 +118,7 @@ public class EmailTaskHandler extends TaskHandler implements Job { } catch (Exception e) { error(taskInstance, e); LogUtil.error(e.getMessage(), e); + e.printStackTrace(); } } From 2dfe2e3cc003e67e8c0c40c635cbf1f2102d98c6 Mon Sep 17 00:00:00 2001 From: fit2cloudrd Date: Thu, 30 Dec 2021 14:30:37 +0800 Subject: [PATCH 8/9] =?UTF-8?q?style:=20=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20(#1563)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * style: 样式修改 * style: 样式修改 Co-authored-by: wangjiahao <1522128093@qq.com> --- .../canvas/components/Editor/Preview.vue | 15 ++++++++++++++- .../canvas/custom-component/DeVideo.vue | 12 ++++++++++-- .../src/views/panel/edit/ComponentWaitItem.vue | 8 ++++++-- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index ea0b1fa68a..534a6fa3dc 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -4,7 +4,7 @@
@@ -53,6 +53,9 @@ export default { } }, computed: { + outItemHeight() { + return this.itemHeight - (4 * this.componentGap) + }, // 移动端编辑组件选择按钮显示 mobileCheckBarShow() { // 显示条件：1.当前是移动端画布编辑状态 @@ -74,7 +77,8 @@ export default { }, ...mapState([ 'mobileLayoutStatus', - 'componentData' + 'componentData', + 'componentGap' ]) }, methods: { From f39f56e0fe080903d1698fb9f28cdd1a4948e296 Mon Sep 17 00:00:00 2001 From: junjie Date: Thu, 30 Dec 2021 14:44:36 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=9B=86=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E8=BD=AC=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/provider/query/doris/DorisQueryProvider.java | 2 +- .../java/io/dataease/provider/query/hive/HiveQueryProvider.java | 2 +- .../io/dataease/provider/query/mysql/MysqlQueryProvider.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java index f3f4013fe9..9ba233dc06 100644 --- a/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java @@ -114,7 +114,7 @@ public class DorisQueryProvider extends QueryProvider { } else if (f.getDeType() == 3) { fieldName = String.format(DorisConstants.CAST, originField, DorisConstants.DEFAULT_FLOAT_FORMAT); } else if (f.getDeType() == 1) { - fieldName = String.format(DorisConstants.DATE_FORMAT, originField, DorisConstants.DEFAULT_DATE_FORMAT); + fieldName = String.format(DorisConstants.STR_TO_DATE, originField, DorisConstants.DEFAULT_DATE_FORMAT); } else { fieldName = originField; } diff --git a/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java index 813a98476b..457651b642 100644 --- a/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java @@ -106,7 +106,7 @@ public class HiveQueryProvider extends QueryProvider { } else if (f.getDeType() == DeTypeConstants.DE_FLOAT) { fieldName = String.format(HiveConstants.CAST, originField, HiveConstants.DEFAULT_FLOAT_FORMAT); } else if (f.getDeType() == DeTypeConstants.DE_TIME) { - fieldName = String.format(HiveConstants.DATE_FORMAT, originField, HiveConstants.DEFAULT_DATE_FORMAT); + fieldName = String.format(HiveConstants.STR_TO_DATE, originField, HiveConstants.DEFAULT_DATE_FORMAT); } else { fieldName = originField; } diff --git a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java index 8050c6ebf5..706c0fe034 100644 --- a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java @@ -113,7 +113,7 @@ public class MysqlQueryProvider extends QueryProvider { } else if (f.getDeType() == 3) { fieldName = String.format(MySQLConstants.CAST, originField, MySQLConstants.DEFAULT_FLOAT_FORMAT); } else if (f.getDeType() == 1) { - fieldName = String.format(MySQLConstants.DATE_FORMAT, originField, MySQLConstants.DEFAULT_DATE_FORMAT); + fieldName = String.format(MySQLConstants.STR_TO_DATE, originField, MySQLConstants.DEFAULT_DATE_FORMAT); } else { fieldName = originField; }