From f4cb7e8533a3440533b25f9e8d6385292d55fe53 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 28 Sep 2022 10:48:17 +0800 Subject: [PATCH 01/15] =?UTF-8?q?refactor:=20=E5=B1=8F=E8=94=BDecharts?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E8=81=94=E5=8A=A8=E5=92=8C=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/canvas/components/Editor/SettingMenu.vue | 8 ++++++-- .../src/components/canvas/custom-component/UserView.vue | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/SettingMenu.vue b/frontend/src/components/canvas/components/Editor/SettingMenu.vue index c951e7fbc5..2ad28034c0 100644 --- a/frontend/src/components/canvas/components/Editor/SettingMenu.vue +++ b/frontend/src/components/canvas/components/Editor/SettingMenu.vue @@ -83,10 +83,14 @@ export default { }, computed: { linkJumpSetShow() { - return this.curComponent.type === 'view' && !this.jumpExcludeViewType.includes(this.curComponent.propValue.innerType) + return this.curComponent.type === 'view' + && !this.jumpExcludeViewType.includes(this.curComponent.propValue.innerType) + && !(this.curComponent.propValue.innerType.includes('table') && this.curComponent.propValue.render === 'echarts') }, linkageSettingShow() { - return this.curComponent.type === 'view' && !this.linkageExcludeViewType.includes(this.curComponent.propValue.innerType) + return this.curComponent.type === 'view' + && !this.linkageExcludeViewType.includes(this.curComponent.propValue.innerType) + && !(this.curComponent.propValue.innerType.includes('table') && this.curComponent.propValue.render === 'echarts') }, panelInfo() { return this.$store.state.panel.panelInfo diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index f43c538304..4a857b0360 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -680,6 +680,7 @@ export default { } } Vue.set(this.element.propValue, 'innerType', chartDetails.type) + Vue.set(this.element.propValue, 'render', chartDetails.render) if (chartDetails.type === 'richTextView') { this.$nextTick(() => { bus.$emit('initCurFields-' + this.element.id) From c47db49f3e4493ba5f62734598c4e06484da7e12 Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 28 Sep 2022 11:16:34 +0800 Subject: [PATCH 02/15] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=88=86=E7=BB=84=E6=9F=B1=E7=8A=B6=E5=9B=BE=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/chart/ChartViewService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index e29cf1e558..b3189175dc 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -647,6 +647,12 @@ public class ChartViewService { xAxis = xAxis.stream().filter(item -> StringUtils.isNotEmpty(item.getChartId()) || dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); yAxis = yAxis.stream().filter(item -> StringUtils.isNotEmpty(item.getChartId()) || dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); break; + case "bar-group": + xAxis = xAxis.stream().filter(item -> StringUtils.isNotEmpty(item.getChartId()) || (!desensitizationList.contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName()))).collect(Collectors.toList()); + yAxis = yAxis.stream().filter(item -> StringUtils.isNotEmpty(item.getChartId()) || (!desensitizationList.contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName()))).collect(Collectors.toList()); + xAxisBase = xAxisBase.stream().filter(item -> StringUtils.isNotEmpty(item.getChartId()) || (!desensitizationList.contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName()))).collect(Collectors.toList()); + xAxisExt = xAxisExt.stream().filter(item -> StringUtils.isNotEmpty(item.getChartId()) || (!desensitizationList.contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName()))).collect(Collectors.toList()); + break; default: xAxis = xAxis.stream().filter(item -> StringUtils.isNotEmpty(item.getChartId()) || (!desensitizationList.contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName()))).collect(Collectors.toList()); yAxis = yAxis.stream().filter(item -> StringUtils.isNotEmpty(item.getChartId()) || (!desensitizationList.contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName()))).collect(Collectors.toList()); From 9367a535c56177c4b6e1c15d78b553686abd90b6 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 28 Sep 2022 11:21:07 +0800 Subject: [PATCH 03/15] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 2 +- frontend/src/lang/tw.js | 6 +++--- frontend/src/lang/zh.js | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index f14fe50959..9940582d9b 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1545,7 +1545,7 @@ export default { preview_100_data: 'Show 100 lines data', invalid_table_check: 'Please sync data first.', parse_error: 'Parse failed,please check.Reference：https://dataease.io/docs/user_manual/dataset_configuration/dataset_Excel', - origin_field_type: 'Origin Type', + origin_field_type: 'Field Origin Type', edit_excel_table: 'Edit Excel Dataset', edit_excel: 'Edit Excel', excel_replace: 'Replace', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 212c7e7b65..eeecbe3040 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1462,8 +1462,8 @@ export default { create_view: '創建視圖', data_preview: '數據預覽', field_type: '字段類型', - field_name: '字段名', - field_origin_name: '原始名', + field_name: '字段名稱', + field_origin_name: '原始名稱', field_check: '選中', update_info: '更新信息', join_view: '數據關聯', @@ -1545,7 +1545,7 @@ export default { preview_100_data: '顯示前100行數據', invalid_table_check: '非直連數據集請先完成數據同步', parse_error: 'Excel解析失敗，請檢查格式、字段等信息。具體參考：https://dataease.io/docs/user_manual/dataset_configuration/dataset_Excel', - origin_field_type: '原始類型', + origin_field_type: '字段原始類型', edit_excel_table: '編輯Excel數據集', edit_excel: '編輯Excel', excel_replace: '替換', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index c1ba56582b..e1f5e5861a 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1461,8 +1461,8 @@ export default { create_view: '创建视图', data_preview: '数据预览', field_type: '字段类型', - field_name: '字段名', - field_origin_name: '原始名', + field_name: '字段名称', + field_origin_name: '原始名称', field_check: '选中', update_info: '更新信息', join_view: '数据关联', @@ -1544,7 +1544,7 @@ export default { preview_100_data: '显示前100行数据', invalid_table_check: '非直连数据集请先完成数据同步', parse_error: 'Excel解析失败，请检查格式、字段等信息。具体参考：https://dataease.io/docs/user_manual/dataset_configuration/dataset_Excel', - origin_field_type: '原始类型', + origin_field_type: '字段原始类型', edit_excel_table: '编辑Excel数据集', edit_excel: '编辑Excel', excel_replace: '替换', From 0891e0aff0acddc18ba8f0bae8e18463d51ed233 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 28 Sep 2022 11:50:35 +0800 Subject: [PATCH 04/15] =?UTF-8?q?perf(=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?):=20=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=E7=BB=91?= =?UTF-8?q?=E5=AE=9ADE=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/io/dataease/ext/AuthMapper.xml | 6 +++--- .../java/io/dataease/plugins/server/XDingtalkServer.java | 2 +- .../main/java/io/dataease/plugins/server/XLarkServer.java | 2 +- .../main/java/io/dataease/plugins/server/XWecomServer.java | 2 +- backend/src/main/resources/db/migration/V40__1.15.sql | 2 +- frontend/src/layout/components/Topbar.vue | 2 +- frontend/src/router/index.js | 6 +----- 7 files changed, 9 insertions(+), 13 deletions(-) diff --git a/backend/src/main/java/io/dataease/ext/AuthMapper.xml b/backend/src/main/java/io/dataease/ext/AuthMapper.xml index 2d897cfd1a..ac07e54e79 100644 --- a/backend/src/main/java/io/dataease/ext/AuthMapper.xml +++ b/backend/src/main/java/io/dataease/ext/AuthMapper.xml @@ -109,7 +109,7 @@ select - user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` + u.user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` from sys_user_assist a left join @@ -129,7 +129,7 @@