From eec895b8c8f175b089caf336c9bb8c2a3988064c Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Sat, 29 Jan 2022 09:06:31 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=87=BA=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E7=9B=AE?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/mobile/service/DirService.java | 18 ++++++++++-------- mobile/src/pages/tabBar/dir/search.vue | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/backend/src/main/java/io/dataease/mobile/service/DirService.java b/backend/src/main/java/io/dataease/mobile/service/DirService.java index 79abaa2c7b..d280d2dd8e 100644 --- a/backend/src/main/java/io/dataease/mobile/service/DirService.java +++ b/backend/src/main/java/io/dataease/mobile/service/DirService.java @@ -12,16 +12,18 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @Service public class DirService { + private static final String[] filterDirNames = { "i18n_panel_list", "i18n_default_panel" }; + @Resource private MobileDirMapper mobileDirMapper; - public List permissions() { CurrentUserDto user = AuthUtils.getUser(); Long userId = user.getUserId(); @@ -43,13 +45,14 @@ public class DirService { String userId = String.valueOf(AuthUtils.getUser().getUserId()); List panelEntities = new ArrayList<>(); if (StringUtils.isNotBlank(request.getName())) { - panelEntities = mobileDirMapper.queryWithName(request.getName(),userId); - }else { - panelEntities = mobileDirMapper.query(request.getPid(),userId); + panelEntities = mobileDirMapper.queryWithName(request.getName(), userId); + } else { + panelEntities = mobileDirMapper.query(request.getPid(), userId); } - if (CollectionUtils.isEmpty(panelEntities)) return null; - - List dtos = panelEntities.stream().map(data -> { + if (CollectionUtils.isEmpty(panelEntities)) + return null; + List filterLists = Arrays.asList(filterDirNames); + List dtos = panelEntities.stream().filter(dto -> !filterLists.contains(dto.getText())).map(data -> { DirItemDTO dirItemDTO = new DirItemDTO(); dirItemDTO.setId(data.getId()); dirItemDTO.setText(data.getText()); @@ -63,5 +66,4 @@ public class DirService { return CommonBeanFactory.getBean(DirService.class); } - } diff --git a/mobile/src/pages/tabBar/dir/search.vue b/mobile/src/pages/tabBar/dir/search.vue index 666f923f85..cc4cabc957 100644 --- a/mobile/src/pages/tabBar/dir/search.vue +++ b/mobile/src/pages/tabBar/dir/search.vue @@ -89,7 +89,7 @@ export default { const param = {name: val} requestDir(param).then(res => { let dataObj = res.data - dataObj.map(item => { + dataObj && dataObj.map(item => { item.name = item.text return util.dataHandle(item, val); }); From 8986e4cc3af935c20423472e5871406ce9c194a3 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Sat, 29 Jan 2022 23:45:23 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E8=AF=86=E5=88=AB=20hive=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/provider/datasource/JdbcProvider.java | 2 +- .../java/io/dataease/service/dataset/DataSetTableService.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java index 5dd5dcba00..64975c4fd8 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java @@ -282,7 +282,7 @@ public class JdbcProvider extends DatasourceProvider { String f = metaData.getColumnName(j + 1); String l = StringUtils.isNotEmpty(metaData.getColumnLabel(j + 1)) ? metaData.getColumnLabel(j + 1) : f; String t = metaData.getColumnTypeName(j + 1); - if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.hive.name())) { + if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.hive.name()) && l.contains("\\.")) { l = l.split("\\.")[1]; } TableFiled field = new TableFiled(); 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 271619b33c..e3357d878b 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -1697,6 +1697,8 @@ public class DataSetTableService { if (datasetTableIncrementalConfig == null || StringUtils.isEmpty(datasetTableIncrementalConfig.getTableId())) { return; } + datasetTableIncrementalConfig.setIncrementalAdd(datasetTableIncrementalConfig.getIncrementalAdd().trim()); + datasetTableIncrementalConfig.setIncrementalDelete(datasetTableIncrementalConfig.getIncrementalDelete().trim()); if (StringUtils.isEmpty(datasetTableIncrementalConfig.getId())) { datasetTableIncrementalConfig.setId(UUID.randomUUID().toString()); datasetTableIncrementalConfigMapper.insertSelective(datasetTableIncrementalConfig); From 2a62c3567374796007c7ee75494be75447e521e2 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Sun, 30 Jan 2022 00:11:30 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20es=20=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/query/es/EsQueryProvider.java | 14 +++++++------- .../provider/query/es/EsSqlLConstants.java | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java index 49670f34bc..77f24131ab 100644 --- a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java @@ -942,24 +942,24 @@ public class EsQueryProvider extends QueryProvider { } if (StringUtils.isEmpty(dateStyle)) { - return "YYYY-MM-dd HH:mm:ss"; + return "yyyy-MM-dd HH:mm:ss"; } switch (dateStyle) { case "y": - return "YYYY"; + return "yyyy"; case "y_M": - return "YYYY" + split + "MM"; + return "yyyy" + split + "MM"; case "y_M_d": - return "YYYY" + split + "MM" + split + "dd"; + return "yyyy" + split + "MM" + split + "dd"; case "H_m_s": return "HH:mm:ss"; case "y_M_d_H_m": - return "YYYY" + split + "MM" + split + "dd" + " HH:mm"; + return "yyyy" + split + "MM" + split + "dd" + " HH:mm"; case "y_M_d_H_m_s": - return "YYYY" + split + "MM" + split + "dd" + " HH:mm:ss"; + return "yyyy" + split + "MM" + split + "dd" + " HH:mm:ss"; default: - return "YYYY-MM-dd HH:mm:ss"; + return "yyyy-MM-dd HH:mm:ss"; } } diff --git a/backend/src/main/java/io/dataease/provider/query/es/EsSqlLConstants.java b/backend/src/main/java/io/dataease/provider/query/es/EsSqlLConstants.java index 3dab2d8e56..62301f3bf6 100644 --- a/backend/src/main/java/io/dataease/provider/query/es/EsSqlLConstants.java +++ b/backend/src/main/java/io/dataease/provider/query/es/EsSqlLConstants.java @@ -21,7 +21,7 @@ public class EsSqlLConstants extends SQLConstants { public static final String ROUND = "ROUND(%s, %s)"; - public static final String DEFAULT_DATE_FORMAT = "YYYY-MM-dd HH:mm:ss"; + public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; public static final String WHERE_VALUE_NULL = "(NULL,'')"; From 83c0894a4ba67b3471309be62f87da172d73b18b Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Sun, 30 Jan 2022 10:01:31 +0800 Subject: [PATCH 4/6] =?UTF-8?q?refactor:=20=E5=BD=93=E5=89=8D=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E7=BB=84=E4=BB=B6=E6=9C=89=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=E6=97=B6=E6=97=A0=E6=95=88=E8=A7=A6=E5=8F=91=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/widget/DeWidget/DeDate.vue | 4 ---- frontend/src/components/widget/DeWidget/DeNumberRange.vue | 4 ---- frontend/src/components/widget/DeWidget/DeSelect.vue | 4 ---- frontend/src/components/widget/DeWidget/DeSelectGrid.vue | 5 ----- 4 files changed, 17 deletions(-) diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue index 715ff92c81..d7d8686baa 100644 --- a/frontend/src/components/widget/DeWidget/DeDate.vue +++ b/frontend/src/components/widget/DeWidget/DeDate.vue @@ -158,7 +158,6 @@ export default { this.element.options.manualModify = true } this.setCondition() - this.styleChange() }, formatFilterValue() { if (this.values === null) return [] @@ -184,9 +183,6 @@ export default { return timeSection(parseFloat(value), this.element.options.attrs.type) } }, - styleChange() { - this.$store.commit('recordStyleChange') - }, fillValueDerfault() { const defaultV = this.element.options.value === null ? '' : this.element.options.value.toString() if (this.element.options.attrs.type === 'daterange') { diff --git a/frontend/src/components/widget/DeWidget/DeNumberRange.vue b/frontend/src/components/widget/DeWidget/DeNumberRange.vue index 8def85aeaf..c98a430b30 100644 --- a/frontend/src/components/widget/DeWidget/DeNumberRange.vue +++ b/frontend/src/components/widget/DeWidget/DeNumberRange.vue @@ -185,7 +185,6 @@ export default { } this.setCondition() - this.$store.commit('recordStyleChange') }) }) }, @@ -219,9 +218,6 @@ export default { return } }, - styleChange() { - this.$store.commit('recordStyleChange') - }, inputChange(val) { if (!this.inDraw) { diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue index 731c4fdb02..ef50d62164 100644 --- a/frontend/src/components/widget/DeWidget/DeSelect.vue +++ b/frontend/src/components/widget/DeWidget/DeSelect.vue @@ -168,7 +168,6 @@ export default { this.element.options.manualModify = true } this.setCondition() - this.styleChange() this.showNumber = false this.$nextTick(() => { @@ -207,9 +206,6 @@ export default { return defaultV.split(',')[0] } }, - styleChange() { - this.$store.commit('recordStyleChange') - }, optionDatas(datas) { if (!datas) return null return datas.filter(item => !!item).map(item => { diff --git a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue index 2fa8a45e49..84c284d693 100644 --- a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue +++ b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue @@ -196,7 +196,6 @@ export default { this.element.options.manualModify = true } this.setCondition() - this.styleChange() }, setCondition() { @@ -222,10 +221,6 @@ export default { return defaultV.split(',')[0] } }, - - styleChange() { - this.$store.commit('recordStyleChange') - }, optionDatas(datas) { if (!datas) return null return datas.filter(item => !!item).map(item => { From f362dce13f2996fecca708ab4110587a901c4f0b Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Sun, 30 Jan 2022 12:43:38 +0800 Subject: [PATCH 5/6] =?UTF-8?q?refactor:=20=E9=A6=96=E9=A1=B5=E6=96=87?= =?UTF-8?q?=E6=A1=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 5 ++-- frontend/src/lang/tw.js | 23 ++++++++++--------- frontend/src/lang/zh.js | 5 ++-- .../src/views/wizard/details/CardDetail.vue | 4 ++-- frontend/src/views/wizard/index.vue | 4 ++-- 5 files changed, 22 insertions(+), 19 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index cfc7c8cf24..c1a0036c7a 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1814,6 +1814,7 @@ export default { welcome_title: 'Welcome To Use DataEase', welcome_hint: 'Open source data visual analysis tool available to everyone', demo_video: 'Demo', + quick_start: 'Quick Start', online_document: 'Online', latest_developments: 'Latest', teaching_video: 'Teaching', @@ -1822,9 +1823,9 @@ export default { demo_video_hint: 'How to make a DataEase dashboard in 3 minutes and share it with others', online_document_hint: 'It covers the installation steps, user manuals, tutorials, solutions to common problems, and secondary development of DataEase', teaching_video_bottom_hint: 'More videos', - enterprise_edition_hint1: 'Provide enterprise application scenario x-pack enhancement package', + enterprise_edition_hint1: 'Provide enterprise application scenario X-Pack enhancement package', enterprise_edition_hint2: 'Provide high-level original factory service support', - enterprise_edition_hint3: 'Provide dataease O & M security best practices', + enterprise_edition_hint3: 'Provide DateEase best practice recommendations', open_source_community: 'Open source community', click_show: 'Click To View', show_more: 'Show More', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index f070820e2a..622f135d37 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -465,7 +465,7 @@ export default { display: '顯示設置', ldap: 'LDAP設置', oidc: 'OIDC設置', - theme: '主题设置' + theme: '主題設置' }, license: { i18n_no_license_record: '沒有 License 記錄', @@ -1016,7 +1016,7 @@ export default { filter_exp: '過濾值', filter_type: '過濾方式', filter_value_can_not_str: '數值類型字段過濾值不能包含文本', - enum_value_can_not_null: '字段枚舉值不能为空' + enum_value_can_not_null: '字段枚舉值不能為空' }, dataset: { sheet_warn: '有多個 Sheet 頁，默認抽取第一個', @@ -1460,7 +1460,7 @@ export default { linkage: '聯動', jump: '跳轉', cancel_linkage: '取消聯動', - switch_picture: '更换图片', + switch_picture: '更換圖片', remove_all_linkage: '清除所有聯動', exit_un_march_linkage_field: '存在未匹配聯動關繫的字段', details: '詳情', @@ -1549,7 +1549,7 @@ export default { themeLight: '淺色', themeDark: '深色', themeCustom: '自定義', - openHomePage: '显示首页' + openHomePage: '顯示首頁' }, auth: { @@ -1823,23 +1823,24 @@ export default { welcome_title: '歡迎使用DataEase', welcome_hint: '人人可用的開源數據可視化分析工具', demo_video: '演示視頻', + quick_start: '快速入門', online_document: '在線文檔', latest_developments: '最新動態', teaching_video: '教學視頻', enterprise_edition: '企業版', - contact_us: '聯系我們', - demo_video_hint: '如何3分鐘製作一個DataEase 數據看板、並分享給他人', + contact_us: '聯繫我們', + demo_video_hint: '如何3分鐘製作一個DataEase 數據看闆、並分享給他人', online_document_hint: '涵蓋DataEase的安裝步驟、用戶手冊、使用教程、常見問題的解決方案、以及二次開發等', teaching_video_bottom_hint: '更多視頻資料', - enterprise_edition_hint1: '提供企業級應用場景X-Pack增強包', + enterprise_edition_hint1: '提供企業級應用場景 X-Pack 增強包', enterprise_edition_hint2: '提供高等級原廠服務支持', - enterprise_edition_hint3: '提供DataEase 運維安全最佳實踐', + enterprise_edition_hint3: '提供 DataEase 最佳實踐建議', open_source_community: '開源社區', click_show: '點擊查看', show_more: '查看更多', click_inner: '點擊進入', - email: '邮箱：', - tel: '电话：', - web: '网址：' + email: '郵箱：', + tel: '電話：', + web: '網址：' } } diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index dc1050ce88..79869971c1 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1833,6 +1833,7 @@ export default { welcome_title: '欢迎使用DataEase', welcome_hint: '人人可用的开源数据可视化分析工具', demo_video: '演示视频', + quick_start: '快速入门', online_document: '在线文档', latest_developments: '最新动态', teaching_video: '教学视频', @@ -1841,9 +1842,9 @@ export default { demo_video_hint: '如何3分钟制作一个DataEase 数据看板、并分享给他人', online_document_hint: '涵盖DataEase的安装步骤、用户手册、使用教程、常见问题的解决方案、以及二次开发等', teaching_video_bottom_hint: '更多视频资料', - enterprise_edition_hint1: '提供企业级应用场景X-Pack增强包', + enterprise_edition_hint1: '提供企业级应用场景 X-Pack 增强包', enterprise_edition_hint2: '提供高等级原厂服务支持', - enterprise_edition_hint3: '提供DataEase 运维安全最佳实践', + enterprise_edition_hint3: '提供 DataEase 最佳实践建议', open_source_community: '开源社区', click_show: '点击查看', show_more: '查看更多', diff --git a/frontend/src/views/wizard/details/CardDetail.vue b/frontend/src/views/wizard/details/CardDetail.vue index 581d678b89..c4b8adadda 100644 --- a/frontend/src/views/wizard/details/CardDetail.vue +++ b/frontend/src/views/wizard/details/CardDetail.vue @@ -61,7 +61,7 @@ export default { } .demo_content{ margin: auto; - padding-left: 15px; + padding-left: 8px; height: 100%; overflow: hidden; .head{ @@ -71,7 +71,7 @@ export default { .content{ height: 50%; padding-top: 15px; - padding-right: 10px; + padding-right: 3px; color: var(--TextPrimary, #6D6D6D); font-size: 12px; overflow-y: auto; diff --git a/frontend/src/views/wizard/index.vue b/frontend/src/views/wizard/index.vue index 2700013857..3419af2c18 100644 --- a/frontend/src/views/wizard/index.vue +++ b/frontend/src/views/wizard/index.vue @@ -32,7 +32,7 @@ export default { return { cardList: [ { - head: this.$t('wizard.demo_video'), + head: this.$t('wizard.quick_start'), content: this.$t('wizard.demo_video_hint'), bottom: '', href: 'https://www.bilibili.com/video/BV1UB4y1K7jA', @@ -54,7 +54,7 @@ export default { }, { head: this.$t('wizard.teaching_video'), - content: '【DataEase教学视频】视图钻取
【DataEase教学视频】移动端布局设置', + content: '【DataEase教学视频】视图钻取
【DataEase教学视频】视图组件联动
【DataEase教学视频】移动端布局设置', bottom: '', href: 'https://space.bilibili.com/510493147/channel/collectiondetail?sid=150431', component: 'CardDetail' From 2ebf1f57c4a7538838bcf3fa5d6cfbeae2610144 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 4 Feb 2022 15:54:26 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E5=88=97=E6=9D=83=E9=99=90=E5=A4=9A?= =?UTF-8?q?=E6=AC=A1=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/plugins/server/ColumnPermissionsController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/plugins/server/ColumnPermissionsController.java b/backend/src/main/java/io/dataease/plugins/server/ColumnPermissionsController.java index 75b10a988c..2a5d1cfda5 100644 --- a/backend/src/main/java/io/dataease/plugins/server/ColumnPermissionsController.java +++ b/backend/src/main/java/io/dataease/plugins/server/ColumnPermissionsController.java @@ -29,7 +29,7 @@ public class ColumnPermissionsController { @ApiOperation("保存") @PostMapping("save") - public void save(@RequestBody DatasetColumnPermissions datasetColumnPermissions) throws Exception { + public DatasetColumnPermissions save(@RequestBody DatasetColumnPermissions datasetColumnPermissions) throws Exception { ColumnPermissionService columnPermissionService = SpringContextUtil.getBean(ColumnPermissionService.class); DataSetColumnPermissionsDTO request = new DataSetColumnPermissionsDTO(); request.setAuthTargetType(datasetColumnPermissions.getAuthTargetType()); @@ -48,7 +48,7 @@ public class ColumnPermissionsController { throw new Exception(Translator.get("i18n_cp_exist")); } } - columnPermissionService.save(datasetColumnPermissions); + return columnPermissionService.save(datasetColumnPermissions); } @ApiOperation("查询")