From d5a0f9a9c6b21472810ab24928e007fdce45fcaa Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 29 Dec 2021 17:52:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20sql=20=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E6=9C=89=E9=87=8D=E5=A4=8D=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/dataset/DataSetTableService.java | 5 ++++- backend/src/main/resources/i18n/messages_en_US.properties | 2 +- backend/src/main/resources/i18n/messages_zh_CN.properties | 2 +- backend/src/main/resources/i18n/messages_zh_TW.properties | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 73b1fa82b3..583ac5fe75 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -648,6 +648,7 @@ public class DataSetTableService { datasourceRequest.setPreviewData(true); try { datasourceRequest.setPageable(true); + System.out.println(datasourceRequest.getQuery()); data.addAll(datasourceProvider.getData(datasourceRequest)); } catch (Exception e) { logger.error(e.getMessage()); @@ -887,7 +888,9 @@ public class DataSetTableService { List data = result.get("dataList"); List fields = result.get("fieldList"); String[] fieldArray = fields.stream().map(TableFiled::getFieldName).toArray(String[]::new); - + if (checkIsRepeat(fieldArray)) { + DataEaseException.throwException(Translator.get("i18n_excel_field_repeat")); + } List> jsonArray = new ArrayList<>(); if (CollectionUtils.isNotEmpty(data)) { jsonArray = data.stream().map(ele -> { diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 8a7ed5cdd5..bf8b774aba 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -265,7 +265,7 @@ i18n_sql_add_not_matching=The data column of incremental SQL does not match the i18n_sql_delete_not_matching=The data column of incremental delete SQL does not match the dataset, i18n_cst_ds_tb_or_field_deleted=Custom dataset union data is deleted or field changed,can not display i18n_no_all_delete_privilege_folder=This folder have sources which have no manage or view privilege,Can Not Be Deleted. -i18n_excel_field_repeat=Excel exists repeat field，please fix and upload again. +i18n_excel_field_repeat=Exists repeat field，please fix and retry. i18n_schema_is_empty=Database schema is empty 站内消息=Internal Messages 所有消息=All Messages diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 10b984dd9d..643108af35 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -264,7 +264,7 @@ i18n_sql_add_not_matching=增量添加 SQL 的数据列与数据集不匹配, i18n_sql_delete_not_matching=增量删除 SQL 的数据列与数据集不匹配, i18n_cst_ds_tb_or_field_deleted=自定义数据集所关联数据被删除或字段发生变化，无法正常显示 i18n_no_all_delete_privilege_folder=该目录下存在没有管理权限或查看权限的资源，无法删除 -i18n_excel_field_repeat=Excel存在重复字段，请修改后重新上传 +i18n_excel_field_repeat=存在重复字段，请修改后重试 i18n_schema_is_empty=数据库 Schema 为空 站内消息=站内消息 所有消息=所有消息 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 1cff76bac6..ace5c7bf60 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -267,7 +267,7 @@ i18n_sql_add_not_matching=增量添加 sql 的數據列與數據集不匹配, i18n_sql_delete_not_matching=增量刪除 sql 的數據列與數據集不匹配, i18n_cst_ds_tb_or_field_deleted=自定義數據集所關聯數據被刪除或字段發生變化，無法正常顯示 i18n_no_all_delete_privilege_folder=該目錄下存在沒有管理權限或查看權限的資源，無法刪除 -i18n_excel_field_repeat=Excel存在重復字段，請修改後重新上傳 +i18n_excel_field_repeat=存在重復字段，請修改後重试 i18n_schema_is_empty=數據庫 Schema 為空 站内消息=站內消息 所有消息=所有消息 From b2e4307ba5a874c1f0b17f6ac710b6323ebe0756 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 29 Dec 2021 18:47:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E5=A4=9A=E5=AD=97=E6=AE=B5=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E6=8E=A5=E5=8F=A3=E5=85=8D=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/service/impl/ShiroServiceImpl.java | 1 + .../io/dataease/service/system/EmailService.java | 15 ++++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java index 4e1401ccaf..9ce092b0e1 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java +++ b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java @@ -50,6 +50,7 @@ public class ShiroServiceImpl implements ShiroService { filterChainDefinitionMap.put("/api/link/validate**", ANON); filterChainDefinitionMap.put("/api/map/areaEntitys/**", ANON); filterChainDefinitionMap.put("/dataset/field/fieldValues/**", ANON); + filterChainDefinitionMap.put("/dataset/field/multFieldValues", ANON); filterChainDefinitionMap.put("/linkJump/queryPanelJumpInfo/**", ANON); filterChainDefinitionMap.put("/tempMobileLink/**", ANON); diff --git a/backend/src/main/java/io/dataease/service/system/EmailService.java b/backend/src/main/java/io/dataease/service/system/EmailService.java index 3c03ffe25a..575bc8382c 100644 --- a/backend/src/main/java/io/dataease/service/system/EmailService.java +++ b/backend/src/main/java/io/dataease/service/system/EmailService.java @@ -29,7 +29,6 @@ import java.util.List; import java.util.Properties; import java.util.UUID; - @Service public class EmailService { @@ -47,7 +46,6 @@ public class EmailService { private static final String SMTP_CONNECTIONTIMEOUT_VAL = "5000"; - @Resource private SystemParameterMapper systemParameterMapper; @@ -57,7 +55,8 @@ public class EmailService { * @param content 内容 */ public void send(String to, String title, String content) { - if (StringUtils.isBlank(to)) return; + if (StringUtils.isBlank(to)) + return; MailInfo mailInfo = proxy().mailInfo(); JavaMailSenderImpl driver = driver(mailInfo); @@ -77,7 +76,8 @@ public class EmailService { } public void sendWithImage(String to, String title, String content, byte[] bytes) { - if (StringUtils.isBlank(to)) return; + if (StringUtils.isBlank(to)) + return; MailInfo mailInfo = proxy().mailInfo(); JavaMailSenderImpl driver = driver(mailInfo); MimeMessage mimeMessage = driver.createMimeMessage(); @@ -89,7 +89,8 @@ public class EmailService { MimeBodyPart text = new MimeBodyPart(); try { - text.setContent("

" + content + "

" + "
", "text/html; charset=gb2312"); + text.setContent(content + "
", + "text/html; charset=gb2312"); image.setDataHandler(png); image.setContentID(uuid); MimeMultipart multipart = new MimeMultipart(); @@ -131,7 +132,6 @@ public class EmailService { return CommonBeanFactory.getBean(EmailService.class); } - public MailInfo mailInfo() { String type = ParamConstants.Classify.MAIL.getValue(); List paramList = getParamList(type); @@ -159,14 +159,12 @@ public class EmailService { return mailInfo; } - public List getParamList(String type) { SystemParameterExample example = new SystemParameterExample(); example.createCriteria().andParamKeyLike(type + "%"); return systemParameterMapper.selectByExample(example); } - public void editMail(List parameters) { parameters.forEach(parameter -> { SystemParameterExample example = new SystemParameterExample(); @@ -227,6 +225,5 @@ public class EmailService { } } - } } From a386b6f2c722b145a6175c9af367f5bedcd98350 Mon Sep 17 00:00:00 2001 From: fit2cloudrd Date: Wed, 29 Dec 2021 18:52:48 +0800 Subject: [PATCH 3/5] =?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 style: 样式修改 --- .../components/Editor/ComponentWrapper.vue | 2 +- .../src/views/panel/LinkJumpSet/index.vue | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) 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 { 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 9fa458a7045f75f61238d16aefa0421eb08dfbea Mon Sep 17 00:00:00 2001 From: junjie Date: Thu, 30 Dec 2021 10:18:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E5=88=86=E7=BB=84?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=8F=B3=E4=BE=A7=E7=95=8C=E9=9D=A2=E5=85=B3?= =?UTF-8?q?=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/group/Group.vue | 1 + frontend/src/views/dataset/group/Group.vue | 2 ++ 2 files changed, 3 insertions(+) diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue index b6d79352d1..3cf184e9fe 100644 --- a/frontend/src/views/chart/group/Group.vue +++ b/frontend/src/views/chart/group/Group.vue @@ -580,6 +580,7 @@ export default { showClose: true }) this.treeNode() + this.$emit('switchComponent', { name: '' }) }) }).catch(() => { }) diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue index 103b3c899d..9df36e1942 100644 --- a/frontend/src/views/dataset/group/Group.vue +++ b/frontend/src/views/dataset/group/Group.vue @@ -457,6 +457,7 @@ export default { showClose: true }) this.treeNode() + this.$emit('switchComponent', { name: '' }) }) }).catch(() => { }) @@ -475,6 +476,7 @@ export default { showClose: true }) this.treeNode() + this.$emit('switchComponent', { name: '' }) this.$store.dispatch('dataset/setTable', new Date().getTime()) }) }).catch(() => { From 1b174f589a52bb12cf0445e4e75512510892e74a Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 30 Dec 2021 10:39:53 +0800 Subject: [PATCH 5/5] =?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 @@