From 69b188208596701db6a033f9de4ee405c8e4d7c1 Mon Sep 17 00:00:00 2001 From: junjie <752696511@qq.com> Date: Wed, 9 Feb 2022 16:35:29 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E4=B8=8D=E5=8F=97=E6=9D=83=E9=99=90=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/view/ChartEdit.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index a868617587..d6583e5b59 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -233,6 +233,7 @@ :no-children-text="$t('commons.treeselect.no_children_text')" :no-options-text="$t('commons.treeselect.no_options_text')" :no-results-text="$t('commons.treeselect.no_results_text')" + :disabled="!hasDataPermission('manage',param.privileges)" @input="calcData" @deselect="calcData" /> From 064ca3b8c34bb9d7752b4a1ead5c1a65f65b31c8 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 9 Feb 2022 18:01:48 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E6=9D=83=E9=99=90=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=94=AF=E6=8C=81=E6=8C=89=E7=85=A7=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=8E=88=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/plugins/server/XAuthServer.java | 16 ++++++++-------- frontend/src/lang/en.js | 3 ++- frontend/src/lang/tw.js | 3 ++- frontend/src/lang/zh.js | 3 ++- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java index 012939cda2..c3a3c41a5c 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java @@ -27,35 +27,35 @@ public class XAuthServer { @PostMapping("/authModels") @I18n - public List authModels(@RequestBody XpackBaseTreeRequest request){ + public List authModels(@RequestBody XpackBaseTreeRequest request) { AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class); CurrentUserDto user = AuthUtils.getUser(); return sysAuthService.searchAuthModelTree(request, user.getUserId(), user.getIsAdmin()); } @PostMapping("/authDetails") - public Map> authDetails(@RequestBody XpackSysAuthRequest request){ + public Map> authDetails(@RequestBody XpackSysAuthRequest request) { AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class); return sysAuthService.searchAuthDetails(request); } - @GetMapping("/authDetailsModel/{authType}") + @GetMapping("/authDetailsModel/{authType}/{direction}") @I18n - public ListauthDetailsModel(@PathVariable String authType){ + public List authDetailsModel(@PathVariable String authType, @PathVariable String direction) { AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class); - List authDetails = sysAuthService.searchAuthDetailsModel(authType); - if(authType.equalsIgnoreCase("dataset")){ + List authDetails = sysAuthService.searchAuthDetailsModel(authType); + if ("source".equals(direction) && authType.equalsIgnoreCase("dataset")) { XpackSysAuthDetail xpackSysAuthDetail = new XpackSysAuthDetail(); xpackSysAuthDetail.setPrivilegeName("i18n_auth_row_permission"); xpackSysAuthDetail.setPrivilegeType(20); xpackSysAuthDetail.setPrivilegeValue(1); - authDetails.add(0,xpackSysAuthDetail); + authDetails.add(0, xpackSysAuthDetail); } return authDetails; } @PostMapping("/authChange") - public void authChange(@RequestBody XpackSysAuthRequest request){ + public void authChange(@RequestBody XpackSysAuthRequest request) { AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class); CurrentUserDto user = AuthUtils.getUser(); sysAuthService.authChange(request, user.getUserId(), user.getUsername(), user.getIsAdmin()); diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index c1a0036c7a..5a41d7facf 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1544,7 +1544,8 @@ export default { }, auth: { - authConfig: 'Auth Config', + authConfig: 'Configure Permissions By User', + sourceConfig: 'Configure Permissions By Source', authQuickConfig: 'Auth Quick Config', dept: 'Dept', role: 'Role', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 622f135d37..ed91d55cab 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1553,7 +1553,8 @@ export default { }, auth: { - authConfig: '權限配置', + authConfig: '按用户配置權限', + sourceConfig: '按资源配置權限', authQuickConfig: '權限快捷配置', dept: '組織', role: '角色', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 79869971c1..aec81e92aa 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1562,7 +1562,8 @@ export default { }, auth: { - authConfig: '权限配置', + authConfig: '按用户配置权限', + sourceConfig: '按资源配置权限', authQuickConfig: '权限快捷配置', dept: '组织', role: '角色', From 51412b6641cabe28304eb1b51d82f7cc72d58ae6 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 10 Feb 2022 10:22:45 +0800 Subject: [PATCH 3/6] feat: S2 pivot --- frontend/src/views/chart/view/ChartEdit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index d6583e5b59..76467520ec 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -1946,7 +1946,7 @@ export default { addYaxis(e) { this.dragCheckType(this.view.yaxis, 'q') this.dragMoveDuplicate(this.view.yaxis, e) - if ((this.view.type === 'map' || this.view.type === 'waterfall' || this.view.type === 'word-cloud') && this.view.yaxis.length > 1) { + if ((this.view.type === 'map' || this.view.type === 'waterfall' || this.view.type === 'word-cloud' || this.view.type === 'table-pivot') && this.view.yaxis.length > 1) { this.view.yaxis = [this.view.yaxis[0]] } this.calcData(true) From 05bd33b246c53ae9aaae803944b8ccba711b9a6d Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 10 Feb 2022 14:19:59 +0800 Subject: [PATCH 4/6] feat: S2 pivot --- frontend/src/views/chart/view/ChartEdit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 76467520ec..d6583e5b59 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -1946,7 +1946,7 @@ export default { addYaxis(e) { this.dragCheckType(this.view.yaxis, 'q') this.dragMoveDuplicate(this.view.yaxis, e) - if ((this.view.type === 'map' || this.view.type === 'waterfall' || this.view.type === 'word-cloud' || this.view.type === 'table-pivot') && this.view.yaxis.length > 1) { + if ((this.view.type === 'map' || this.view.type === 'waterfall' || this.view.type === 'word-cloud') && this.view.yaxis.length > 1) { this.view.yaxis = [this.view.yaxis[0]] } this.calcData(true) From 330bd292321486394d96018f269756e858345432 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 10 Feb 2022 17:10:58 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=B0tab?= =?UTF-8?q?=E9=A1=B5=E9=A2=84=E8=A7=88=E6=97=A0=E6=B3=95=E6=89=93=E5=BC=80?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/components/Editor/PreviewEject.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/canvas/components/Editor/PreviewEject.vue b/frontend/src/components/canvas/components/Editor/PreviewEject.vue index d9c76d0453..6c23856e7f 100644 --- a/frontend/src/components/canvas/components/Editor/PreviewEject.vue +++ b/frontend/src/components/canvas/components/Editor/PreviewEject.vue @@ -53,7 +53,7 @@ export default { } // 加载视图数据 initPanelData(this.panelId, function() { - this.dataLoading = false + _this.dataLoading = false // 如果含有跳转参数 进行触发 const tempParam = localStorage.getItem('jumpInfoParam') if (tempParam) { From 107635933ed590284228de13c8ec358f46663c05 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 10 Feb 2022 18:04:38 +0800 Subject: [PATCH 6/6] =?UTF-8?q?refactor:=20=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/query/doris/DorisQueryProvider.java | 10 +--------- frontend/src/views/dataset/data/TabDataPreview.vue | 8 +++++--- frontend/src/views/dataset/data/ViewTable.vue | 6 +++--- 3 files changed, 9 insertions(+), 15 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 9ba233dc06..4e2a59f65d 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 @@ -76,7 +76,7 @@ public class DorisQueryProvider extends QueryProvider { @Override public String createSQLPreview(String sql, String orderBy) { - return "SELECT * FROM (" + sql + ") AS tmp ORDER BY " + orderBy + " LIMIT 0,1000"; + return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp LIMIT 0,1000"; } @Override @@ -147,14 +147,6 @@ public class DorisQueryProvider extends QueryProvider { if (customWheres != null) wheres.add(customWheres); if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres); - if ((fields.size() > 0)) { - xOrders.add(SQLObj.builder() - .orderDirection("asc") - .orderField(fields.get(0).getDataeaseName()) - .orderAlias(String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, "0")) - .build()); - st_sql.add("orders", xOrders); - } return st_sql.render(); } diff --git a/frontend/src/views/dataset/data/TabDataPreview.vue b/frontend/src/views/dataset/data/TabDataPreview.vue index f7db8d26af..cb2ff98435 100644 --- a/frontend/src/views/dataset/data/TabDataPreview.vue +++ b/frontend/src/views/dataset/data/TabDataPreview.vue @@ -58,9 +58,10 @@ {{ $t('dataset.preview_item') }}