From 8ea018059d330a9d2575539077fd7ca7cc7a8297 Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 16 Jun 2021 19:25:33 +0800 Subject: [PATCH 01/12] =?UTF-8?q?feat(fix):=E5=85=B3=E8=81=94=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=BF=85=E9=A1=BB=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E7=9A=84=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataset/common/DatasetGroupSelector.vue | 7 ++++- frontend/src/views/dataset/data/UnionView.vue | 30 +++++++++---------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/frontend/src/views/dataset/common/DatasetGroupSelector.vue b/frontend/src/views/dataset/common/DatasetGroupSelector.vue index 0a82c28262..e1071ab0b3 100644 --- a/frontend/src/views/dataset/common/DatasetGroupSelector.vue +++ b/frontend/src/views/dataset/common/DatasetGroupSelector.vue @@ -132,6 +132,11 @@ export default { type: Object, required: false, default: null + }, + showMode: { + type: String, + required: false, + default: null } }, data() { @@ -283,7 +288,7 @@ export default { return } // check mode=1的数据集是否创建doris表 - if (data.mode === 1) { + if (data.mode === 1 && !this.showMode) { post('/dataset/table/checkDorisTableIsExists/' + data.id, {}, false).then(response => { if (response.data) { this.$nextTick(function() { diff --git a/frontend/src/views/dataset/data/UnionView.vue b/frontend/src/views/dataset/data/UnionView.vue index bf0d804456..b5d4e2940c 100644 --- a/frontend/src/views/dataset/data/UnionView.vue +++ b/frontend/src/views/dataset/data/UnionView.vue @@ -92,7 +92,7 @@ width="500" trigger="click" > - +

{{ targetTable.name || $t('dataset.pls_slc_union_table') }}

 @@ -193,21 +193,21 @@ export default { showUnionEdit() { // 校验同步状态 - post('/dataset/table/checkDorisTableIsExists/' + this.table.id, {}, true).then(response => { - if (response.data) { - this.union.sourceTableId = this.table.id - fieldList(this.table.id).then(response => { - this.sourceFieldOption = response.data - }) - this.editUnion = true - } else { - this.$message({ - type: 'error', - message: this.$t('dataset.invalid_table_check'), - showClose: true - }) - } + // post('/dataset/table/checkDorisTableIsExists/' + this.table.id, {}, true).then(response => { + // if (response.data) { + this.union.sourceTableId = this.table.id + fieldList(this.table.id).then(response => { + this.sourceFieldOption = response.data }) + this.editUnion = true + // } else { + // this.$message({ + // type: 'error', + // message: this.$t('dataset.invalid_table_check'), + // showClose: true + // }) + // } + // }) }, saveUnion() { // console.log(this.union) From 74df70866d90fa070ae7d73633855bef4e5a6697 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 16 Jun 2021 19:28:02 +0800 Subject: [PATCH 02/12] =?UTF-8?q?fix=EF=BC=9A=E6=8A=BD=E5=8F=96=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/utils/DorisTableUtils.java | 4 ++++ .../service/dataset/ExtractDataService.java | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/backend/src/main/java/io/dataease/commons/utils/DorisTableUtils.java b/backend/src/main/java/io/dataease/commons/utils/DorisTableUtils.java index a027f10e89..970078deed 100644 --- a/backend/src/main/java/io/dataease/commons/utils/DorisTableUtils.java +++ b/backend/src/main/java/io/dataease/commons/utils/DorisTableUtils.java @@ -14,6 +14,10 @@ public class DorisTableUtils { return "delete_" + dorisName; } + public static String dorisAddName(String dorisName) { + return "add_" + dorisName; + } + public static String dorisFieldName(String dorisName) { return "f_" + Md5Utils.md5(dorisName); } diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index c93236d857..3be446271d 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -491,7 +491,7 @@ public class ExtractDataService { case "all_scope": transName = "trans_" + DorisTableUtils.dorisName(datasetTable.getId()); outFile = DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTable.getId())); - jobName = "job_" + datasetTable.getId(); + jobName = "job_" + DorisTableUtils.dorisName(datasetTable.getId()); script = String.format(shellScript, dorisConfigration.getUsername(), dorisConfigration.getPassword(), String.valueOf(System.currentTimeMillis()), separator, columns, "APPEND", root_path + outFile + "." + extention, dorisConfigration.getHost(), dorisConfigration.getHttpPort(), dorisConfigration.getDataBase(), DorisTableUtils.dorisName(datasetTable.getId()), root_path + outFile + "." + extention); break; case "incremental_add": @@ -649,7 +649,7 @@ public class ExtractDataService { break; case "incremental_add": transName = "trans_add_" + DorisTableUtils.dorisName(datasetTable.getId()); - outFile = DorisTableUtils.dorisName(datasetTable.getId()); + outFile = DorisTableUtils.dorisAddName(datasetTable.getId()); transMeta.setName(transName); break; case "incremental_delete": @@ -789,18 +789,18 @@ public class ExtractDataService { switch (type) { case "all_scope": - transName = "trans_" + dataSetTableId; - jobName = "job_" + dataSetTableId; + transName = "trans_" + DorisTableUtils.dorisName(dataSetTableId); + jobName = "job_" + DorisTableUtils.dorisName(dataSetTableId); fileName = DorisTableUtils.dorisTmpName(dataSetTableId); break; case "incremental_add": - transName = "trans_add_" + dataSetTableId; - jobName = "job_add_" + dataSetTableId; - fileName = DorisTableUtils.dorisName(dataSetTableId); + transName = "trans_add_" + DorisTableUtils.dorisName(dataSetTableId); + jobName = "job_add_" + DorisTableUtils.dorisName(dataSetTableId); + fileName = DorisTableUtils.dorisAddName(dataSetTableId); break; case "incremental_delete": - transName = "trans_delete_" + dataSetTableId; - jobName = "job_delete_" + dataSetTableId; + transName = "trans_delete_" + DorisTableUtils.dorisName(dataSetTableId); + jobName = "job_delete_" + DorisTableUtils.dorisName(dataSetTableId); fileName = DorisTableUtils.dorisDeleteName(dataSetTableId); break; default: From 2bead0a66e469572cb10d2c4f4b2c64260616af9 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 16 Jun 2021 19:30:26 +0800 Subject: [PATCH 03/12] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E8=A1=A8=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=9B=9E=E8=BD=A6?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/user/form.vue | 18 ++++++++++++++++++ frontend/src/views/system/user/index.vue | 1 + 2 files changed, 19 insertions(+) diff --git a/frontend/src/views/system/user/form.vue b/frontend/src/views/system/user/form.vue index 48eaa4c78f..3625f02145 100644 --- a/frontend/src/views/system/user/form.vue +++ b/frontend/src/views/system/user/form.vue @@ -169,7 +169,25 @@ export default { } this.initRoles() }, + mounted() { + this.bindKey() + }, + destroyed() { + this.unBindKey() + }, methods: { + entryKey(event) { + const keyCode = event.keyCode + if (keyCode === 13) { + this.save() + } + }, + bindKey() { + document.addEventListener('keyup', this.entryKey) + }, + unBindKey() { + document.removeEventListener('keyup', this.entryKey) + }, repeatValidator(rule, value, callback) { if (value !== this.form.password) { callback(new Error(this.$t('member.inconsistent_passwords'))) diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue index fe93048dd3..906528ac72 100644 --- a/frontend/src/views/system/user/index.vue +++ b/frontend/src/views/system/user/index.vue @@ -143,6 +143,7 @@ label-width="120px" :rules="rule" class="demo-ruleForm" + @keyup.enter.native="editUserPassword('editPasswordForm')" > From 585fc9a73d5a53a94395740ad6a6ba432f0fb308 Mon Sep 17 00:00:00 2001 From: maninhill <41712985+maninhill@users.noreply.github.com> Date: Thu, 17 Jun 2021 09:45:21 +0800 Subject: [PATCH 04/12] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 6e20dc3c78..6c0ea644dd 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ +![license](https://img.shields.io/github/license/dataease/dataease?color=%231890FF&style=flat-square) +![release](https://img.shields.io/github/v/release/dataease/dataease?color=%231890FF&sort=semver&style=flat-square) +![stars](https://img.shields.io/github/stars/dataease/dataease?color=%231890FF&style=flat-square) +![downloads](https://img.shields.io/github/downloads/dataease/dataease/total) + # DataEase - 人人可用的开源数据可视化分析工具 DataEase 是开源的数据可视化分析工具，帮助用户分析数据、改善业务。DataEase 支持丰富的数据源连接，能够通过拖拉拽方式快速制作图表，并可以方便的与他人分享。 From 8ebaf7cfeb50c5a047de8f05a918d459b8c47667 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 17 Jun 2021 10:09:40 +0800 Subject: [PATCH 05/12] =?UTF-8?q?feat=EF=BC=9A=E5=9C=8B=E9=9A=9B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 3 ++- frontend/src/lang/tw.js | 3 ++- frontend/src/lang/zh.js | 3 ++- frontend/src/views/system/user/index.vue | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 4b70a0d56e..1349a155ad 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -446,7 +446,8 @@ export default { origin_passwd: 'Origin Password', new_passwd: 'New Password', confirm_passwd: 'Confirm Password', - change_password: 'Change Password' + change_password: 'Change Password', + search_by_name: 'Search by name' }, role: { menu_authorization: 'Menu Authorization', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index ea3f54f75f..ba0583b0d1 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -446,7 +446,8 @@ export default { origin_passwd: '原始密碼', new_passwd: '新密碼', confirm_passwd: '確認密碼', - change_password: '修改密碼' + change_password: '修改密碼', + search_by_name: '按姓名搜索' }, role: { menu_authorization: '菜單授權', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 3b8e493fca..11b1923e91 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -446,7 +446,8 @@ export default { origin_passwd: '原始密码', new_passwd: '新密码', confirm_passwd: '确认密码', - change_password: '修改密码' + change_password: '修改密码', + search_by_name: '按姓名搜索' }, role: { menu_authorization: '菜单授权', diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue index 906528ac72..ee641db4b9 100644 --- a/frontend/src/views/system/user/index.vue +++ b/frontend/src/views/system/user/index.vue @@ -197,12 +197,12 @@ export default { searchConfig: { useQuickSearch: true, useComplexSearch: true, - quickPlaceholder: '按姓名搜索', + quickPlaceholder: this.$t('user.search_by_name'), components: [ - { field: 'nick_name', label: '姓名', component: 'DeComplexInput' }, + { field: 'nick_name', label: this.$t('commons.nick_name'), component: 'DeComplexInput' }, { field: 'u.enabled', - label: '状态', + label: this.$t('commons.status'), component: 'FuComplexSelect', options: [ { label: '启用', value: '1' }, From e1ee9a4f7bf5ee1ccd4bb9565f2e26bb6aae593f Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 17 Jun 2021 10:25:34 +0800 Subject: [PATCH 06/12] =?UTF-8?q?fix:=20=E8=A1=A8=E5=8D=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=9B=9E=E8=BD=A6=E4=BF=9D=E5=AD=98=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 | 4 ++-- frontend/src/views/dataset/group/Group.vue | 4 ++-- .../src/views/panel/list/EditPanel/index.vue | 18 ++++++++++++++++++ frontend/src/views/panel/list/PanelList.vue | 2 +- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue index 9a2f75a99e..8b40cd5608 100644 --- a/frontend/src/views/chart/group/Group.vue +++ b/frontend/src/views/chart/group/Group.vue @@ -102,7 +102,7 @@ - + @@ -183,7 +183,7 @@ - + diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue index 6c8d1b15aa..c5f82fa174 100644 --- a/frontend/src/views/dataset/group/Group.vue +++ b/frontend/src/views/dataset/group/Group.vue @@ -104,7 +104,7 @@ - + @@ -223,7 +223,7 @@ - + diff --git a/frontend/src/views/panel/list/EditPanel/index.vue b/frontend/src/views/panel/list/EditPanel/index.vue index 7583d3b31b..2f29295c0b 100644 --- a/frontend/src/views/panel/list/EditPanel/index.vue +++ b/frontend/src/views/panel/list/EditPanel/index.vue @@ -80,7 +80,25 @@ export default { created() { // this.getTree() }, + mounted() { + this.bindKey() + }, + destroyed() { + this.unBindKey() + }, methods: { + entryKey(event) { + const keyCode = event.keyCode + if (keyCode === 13) { + this.save() + } + }, + bindKey() { + document.addEventListener('keyup', this.entryKey) + }, + unBindKey() { + document.removeEventListener('keyup', this.entryKey) + }, showCurrentTemplateInfo(data) { this.editPanel.panelInfo.name = data.name this.editPanel.panelInfo.panelStyle = data.templateStyle diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue index fa8e991f71..06b3fd8f92 100644 --- a/frontend/src/views/panel/list/PanelList.vue +++ b/frontend/src/views/panel/list/PanelList.vue @@ -134,7 +134,7 @@ - + From 52fe4687b0bd398e12b748daf1562c2e54e37536 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 17 Jun 2021 10:35:01 +0800 Subject: [PATCH 07/12] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=AE=A1=E7=90=86=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/layout/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/layout/index.vue b/frontend/src/layout/index.vue index 0ff45e8d3a..d2841ae1fc 100644 --- a/frontend/src/layout/index.vue +++ b/frontend/src/layout/index.vue @@ -120,6 +120,7 @@ export default { .sidebar-container { width: 100% !important; position: initial !important; + height: calc(100vh - 80px) !important; } } From 4d03ce78d29c0a8f76facef9421a360585c49669 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 17 Jun 2021 10:43:28 +0800 Subject: [PATCH 08/12] =?UTF-8?q?fix:=20=E6=8A=BD=E5=8F=96=E6=95=B8?= =?UTF-8?q?=E6=93=9A=E9=8C=AF=E8=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/dataset/ExtractDataService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 3be446271d..4e32ae8062 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -492,7 +492,7 @@ public class ExtractDataService { transName = "trans_" + DorisTableUtils.dorisName(datasetTable.getId()); outFile = DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTable.getId())); jobName = "job_" + DorisTableUtils.dorisName(datasetTable.getId()); - script = String.format(shellScript, dorisConfigration.getUsername(), dorisConfigration.getPassword(), String.valueOf(System.currentTimeMillis()), separator, columns, "APPEND", root_path + outFile + "." + extention, dorisConfigration.getHost(), dorisConfigration.getHttpPort(), dorisConfigration.getDataBase(), DorisTableUtils.dorisName(datasetTable.getId()), root_path + outFile + "." + extention); + script = String.format(shellScript, dorisConfigration.getUsername(), dorisConfigration.getPassword(), String.valueOf(System.currentTimeMillis()), separator, columns, "APPEND", root_path + outFile + "." + extention, dorisConfigration.getHost(), dorisConfigration.getHttpPort(), dorisConfigration.getDataBase(), DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTable.getId())), root_path + outFile + "." + extention); break; case "incremental_add": transName = "trans_add_" + DorisTableUtils.dorisName(datasetTable.getId()); From 4207e137387693e91d3fa6248e966a9220adbae4 Mon Sep 17 00:00:00 2001 From: junjie Date: Thu, 17 Jun 2021 11:02:54 +0800 Subject: [PATCH 09/12] =?UTF-8?q?feat(fix):=E5=8F=B3=E4=B8=8A=E8=A7=92UI?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8Cicon=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/icons/svg/docs.svg | 1 + frontend/src/icons/svg/language.svg | 2 +- frontend/src/layout/components/Topbar.vue | 11 ++++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 frontend/src/icons/svg/docs.svg diff --git a/frontend/src/icons/svg/docs.svg b/frontend/src/icons/svg/docs.svg new file mode 100644 index 0000000000..42a1046e3d --- /dev/null +++ b/frontend/src/icons/svg/docs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/icons/svg/language.svg b/frontend/src/icons/svg/language.svg index 0082b577ab..312f4f3b54 100644 --- a/frontend/src/icons/svg/language.svg +++ b/frontend/src/icons/svg/language.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue index 8826e2dfef..2f9fcffbf0 100644 --- a/frontend/src/layout/components/Topbar.vue +++ b/frontend/src/layout/components/Topbar.vue @@ -37,6 +37,11 @@ --> +
+ + + +
@@ -50,9 +55,9 @@ {{ $t('user.change_password') }} - - {{ $t('commons.help_documentation') }} - + + + {{ $t('commons.about_us') }} From 9b638f0a1a0c318a778989d439f5474cefd73060 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 17 Jun 2021 11:08:04 +0800 Subject: [PATCH 10/12] =?UTF-8?q?feat:=20=E7=B3=BB=E7=BB=9F=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA=E5=AD=90=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E4=B9=9F=E6=98=BE=E7=A4=BA=E5=B7=A6=E4=BE=A7=E8=8F=9C?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/layout/components/Topbar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue index 2f9fcffbf0..e68f484a9d 100644 --- a/frontend/src/layout/components/Topbar.vue +++ b/frontend/src/layout/components/Topbar.vue @@ -211,7 +211,7 @@ export default { // 设置侧边栏的显示和隐藏 setSidebarHide(route) { // if (!route.children || route.children.length === 1) { - if (!route.children || this.showChildLength(route) === 1) { + if (route.name !== 'system' && (!route.children || this.showChildLength(route) === 1)) { this.$store.dispatch('app/toggleSideBarHide', true) } else { this.$store.dispatch('app/toggleSideBarHide', false) From 43e1c198a36f600b8340e419a2df6d77a68442fc Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 17 Jun 2021 11:11:24 +0800 Subject: [PATCH 11/12] =?UTF-8?q?fix:=20=E6=A0=A1=E9=A9=97=E5=A2=9E?= =?UTF-8?q?=E9=87=8Fsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/dataset/DataSetTableService.java | 4 ++-- .../io/dataease/service/dataset/ExtractDataService.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 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 fe696ff646..0200ea4a5f 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -703,7 +703,7 @@ public class DataSetTableService { if (StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd()) && StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd().replace(" ", ""))) {// 增量添加 String sql = datasetTableIncrementalConfig.getIncrementalAdd().replace(lastUpdateTime, Long.valueOf(System.currentTimeMillis()).toString()) .replace(currentUpdateTime, Long.valueOf(System.currentTimeMillis()).toString()); - datasourceRequest.setQuery(sql); + datasourceRequest.setQuery(extractDataService.sqlFix(sql)); List sqlFileds = new ArrayList<>(); datasourceProvider.fetchResultField(datasourceRequest).stream().map(TableFiled::getFieldName).forEach(filed -> { sqlFileds.add(filed); @@ -716,7 +716,7 @@ public class DataSetTableService { if (StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalDelete()) && StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalDelete().replace(" ", ""))) {// 增量删除 String sql = datasetTableIncrementalConfig.getIncrementalDelete().replace(lastUpdateTime, Long.valueOf(System.currentTimeMillis()).toString()) .replace(currentUpdateTime, Long.valueOf(System.currentTimeMillis()).toString()); - datasourceRequest.setQuery(sql); + datasourceRequest.setQuery(extractDataService.sqlFix(sql)); List sqlFileds = new ArrayList<>(); datasourceProvider.fetchResultField(datasourceRequest).stream().map(TableFiled::getFieldName).forEach(filed -> { sqlFileds.add(filed); diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 4e32ae8062..8def5bebb4 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -566,11 +566,10 @@ public class ExtractDataService { } private String fetchSqlField(String sql, Datasource ds) throws Exception { - String tmpSql = "SELECT * FROM (" + sqlFix(sql) + ") AS tmp " + " LIMIT 0"; DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType()); DatasourceRequest datasourceRequest = new DatasourceRequest(); datasourceRequest.setDatasource(ds); - datasourceRequest.setQuery(tmpSql); + datasourceRequest.setQuery(sqlFix(sql)); List dorisFileds = new ArrayList<>(); datasourceProvider.fetchResultField(datasourceRequest).stream().map(TableFiled::getFieldName).forEach(filed ->{ dorisFileds.add(DorisTableUtils.columnName(filed)); @@ -578,12 +577,13 @@ public class ExtractDataService { return String.join(",", dorisFileds); } - private String sqlFix(String sql) { + public String sqlFix(String sql) { sql = sql.trim(); if (sql.lastIndexOf(";") == (sql.length() - 1)) { sql = sql.substring(0, sql.length() - 1); } - return sql; + String tmpSql = "SELECT * FROM (" + sql + ") AS tmp " + " LIMIT 0"; + return tmpSql; } From 54cc69278d99a2dad76a9bed7ac0ec627244de45 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 17 Jun 2021 11:39:52 +0800 Subject: [PATCH 12/12] =?UTF-8?q?fix:=20=E6=A0=A1=E9=A9=97=E5=A2=9E?= =?UTF-8?q?=E9=87=8Fsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/dataset/ExtractDataService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 8def5bebb4..ff19e54bd2 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -496,7 +496,7 @@ public class ExtractDataService { break; case "incremental_add": transName = "trans_add_" + DorisTableUtils.dorisName(datasetTable.getId()); - outFile = DorisTableUtils.dorisName(datasetTable.getId()); + outFile = DorisTableUtils.dorisAddName(datasetTable.getId()); jobName = "job_add_" + DorisTableUtils.dorisName(datasetTable.getId()); script = String.format(shellScript, dorisConfigration.getUsername(), dorisConfigration.getPassword(), String.valueOf(System.currentTimeMillis()), separator, columns, "APPEND", root_path + outFile + "." + extention, dorisConfigration.getHost(), dorisConfigration.getHttpPort(), dorisConfigration.getDataBase(), DorisTableUtils.dorisName(datasetTable.getId()), root_path + outFile + "." + extention); break;