From b96f7be8422163b83880364ad393d1f2e1fa0103 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 22 Mar 2022 18:16:23 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix:=20oidc=E4=BD=BF=E7=94=A8de=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E7=99=BB=E5=BD=95=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 1 + frontend/src/views/login/index.vue | 5 +++-- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 515a63644f..ca082a4505 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -573,6 +573,7 @@ export default { secret: 'Please key Secret', scope: 'Please key scope', redirectUrl: 'Please key redirectUrl', + input_mapping: 'Please key OIDC mapping', open: 'Enable OIDC Authentication' }, role: { diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 1d2826763c..af37fb6af0 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -575,6 +575,7 @@ export default { secret: '請輸入Secret', scope: '請輸入scope', redirectUrl: '請輸入redirectUrl', + input_mapping: '請輸入OIDC屬性映射', open: '啓用OIDC認證' }, role: { diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index fc2d222f20..11497026ef 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -576,6 +576,7 @@ export default { secret: '请输入Secret', scope: '请输入scope', redirectUrl: '请输入redirectUrl', + input_mapping: '請輸入OIDC屬性映射', open: '启用OIDC认证' }, role: { diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue index e8ff368bd3..ab88a0b105 100644 --- a/frontend/src/views/login/index.vue +++ b/frontend/src/views/login/index.vue @@ -23,7 +23,7 @@ - +
- + {{ $t('commons.login') }}
From c5883670762a324120fd47ddf955b19547d63e45 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 23 Mar 2022 13:09:35 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84oidc=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/plugins/server/SSOServer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/plugins/server/SSOServer.java b/backend/src/main/java/io/dataease/plugins/server/SSOServer.java index 00dde59a39..768b242ae9 100644 --- a/backend/src/main/java/io/dataease/plugins/server/SSOServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/SSOServer.java @@ -2,6 +2,7 @@ package io.dataease.plugins.server; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -113,7 +114,8 @@ public class SSOServer { } private Map config(OidcXpackService oidcXpackService) { List sysSettingDtos = oidcXpackService.oidcSettings(); - Map config = sysSettingDtos.stream().collect(Collectors.toMap(SysSettingDto::getParamKey, SysSettingDto::getParamValue)); + Map config = sysSettingDtos.stream().collect(HashMap::new,(m, v)->m.put(v.getParamKey(), v.getParamValue()), HashMap::putAll); + return config; } From c1d9387578ae14367866f46bf374a44061dee90e Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 23 Mar 2022 14:26:51 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E5=89=8D=E7=AB=AF?= =?UTF-8?q?debugger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/DeDrag/index.vue | 5 +---- frontend/src/components/DeDrag/shadow.vue | 1 - frontend/src/components/canvas/components/Editor/EditBar.vue | 1 - .../src/components/canvas/components/Editor/PreviewEject.vue | 1 - .../src/components/canvas/components/Editor/SettingMenu.vue | 1 - .../components/canvas/components/Editor/SettingMenuTest.vue | 1 - frontend/src/components/canvas/components/Editor/index.vue | 1 - frontend/src/views/chart/view/ChartEdit.vue | 2 -- frontend/src/views/panel/OuterParamsSet/index.vue | 2 -- frontend/src/views/panel/edit/index.vue | 1 - 10 files changed, 1 insertion(+), 15 deletions(-) diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue index 20cb6b3100..3bae65830c 100644 --- a/frontend/src/components/DeDrag/index.vue +++ b/frontend/src/components/DeDrag/index.vue @@ -531,7 +531,7 @@ export default { width: this.computedMainSlotWidth, height: this.computedMainSlotHeight } - if (this.element.commonBackground&&this.element.commonBackground.enable) { + if (this.element.commonBackground && this.element.commonBackground.enable) { if (this.element.commonBackground.backgroundType === 'innerImage') { style['background'] = `url(${this.element.commonBackground.innerImage}) no-repeat` } else if (this.element.commonBackground.backgroundType === 'outerImage') { @@ -1604,7 +1604,6 @@ export default { }, // 记录当前样式 recordCurStyle() { - // debugger const style = { ...this.defaultStyle } @@ -1619,7 +1618,6 @@ export default { // 记录当前样式 矩阵处理 recordMatrixCurStyle() { - // debugger const left = Math.round(this.left / this.curCanvasScale.matrixStyleWidth) * this.curCanvasScale.matrixStyleWidth const top = Math.round(this.top / this.curCanvasScale.matrixStyleHeight) * this.curCanvasScale.matrixStyleHeight const width = Math.round(this.width / this.curCanvasScale.matrixStyleWidth) * this.curCanvasScale.matrixStyleWidth @@ -1644,7 +1642,6 @@ export default { }, // 记录当前样式 跟随阴影位置 矩阵处理 recordMatrixCurShadowStyle() { - // debugger const left = (this.element.x - 1) * this.curCanvasScale.matrixStyleWidth const top = (this.element.y - 1) * this.curCanvasScale.matrixStyleHeight const width = this.element.sizex * this.curCanvasScale.matrixStyleWidth diff --git a/frontend/src/components/DeDrag/shadow.vue b/frontend/src/components/DeDrag/shadow.vue index 97bcfd614a..b57a4d3334 100644 --- a/frontend/src/components/DeDrag/shadow.vue +++ b/frontend/src/components/DeDrag/shadow.vue @@ -12,7 +12,6 @@ export default { computed: { styleInfo() { // console.log('styleInfo==>') - // debugger // console.log('dragComponentInfo==>' + this.dragComponentInfo.shadowStyle.x) let left = 0 let top = 0 diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue index d13c4f6910..37c46f8b6e 100644 --- a/frontend/src/components/canvas/components/Editor/EditBar.vue +++ b/frontend/src/components/canvas/components/Editor/EditBar.vue @@ -169,7 +169,6 @@ export default { }, // 记录当前样式 跟随阴影位置 矩阵处理 recordMatrixCurShadowStyle() { - // debugger const left = (this.curComponent.x - 1) * this.curCanvasScale.matrixStyleWidth const top = (this.curComponent.y - 1) * this.curCanvasScale.matrixStyleHeight const width = this.curComponent.sizex * this.curCanvasScale.matrixStyleWidth diff --git a/frontend/src/components/canvas/components/Editor/PreviewEject.vue b/frontend/src/components/canvas/components/Editor/PreviewEject.vue index 3a1a9c8794..5746f77bef 100644 --- a/frontend/src/components/canvas/components/Editor/PreviewEject.vue +++ b/frontend/src/components/canvas/components/Editor/PreviewEject.vue @@ -43,7 +43,6 @@ export default { this.mainHeight = mainHeight }, restore() { - debugger const _this = this _this.dataLoading = true if (!this.$route.params.reportId) { diff --git a/frontend/src/components/canvas/components/Editor/SettingMenu.vue b/frontend/src/components/canvas/components/Editor/SettingMenu.vue index c08b8b260c..0d065d0db3 100644 --- a/frontend/src/components/canvas/components/Editor/SettingMenu.vue +++ b/frontend/src/components/canvas/components/Editor/SettingMenu.vue @@ -128,7 +128,6 @@ export default { this.$store.commit('recordSnapshot', 'bottomComponent') }, linkageSetting() { - debugger // sourceViewId 也加入查询 const targetViewIds = this.componentData.filter(item => item.type === 'view' && item.propValue && item.propValue.viewId) .map(item => item.propValue.viewId) diff --git a/frontend/src/components/canvas/components/Editor/SettingMenuTest.vue b/frontend/src/components/canvas/components/Editor/SettingMenuTest.vue index 3144ff9c82..53e57d220e 100644 --- a/frontend/src/components/canvas/components/Editor/SettingMenuTest.vue +++ b/frontend/src/components/canvas/components/Editor/SettingMenuTest.vue @@ -126,7 +126,6 @@ export default { this.$store.commit('recordSnapshot') }, linkageSetting() { - debugger // sourceViewId 也加入查询 const targetViewIds = this.componentData.filter(item => item.type === 'view' && item.propValue && item.propValue.viewId) .map(item => item.propValue.viewId) diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index 62ca0c7aa8..733be762e2 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -1270,7 +1270,6 @@ export default { this.timeMachine = null }, openChartDetailsDialog(chartInfo) { - debugger this.showChartInfo = chartInfo.chart this.showChartTableInfo = chartInfo.tableChart this.chartDetailsVisible = true diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index b8351b03d4..aa4e9d5a8d 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -1404,12 +1404,10 @@ export default { } }, created() { - debugger // this.get(this.$store.state.chart.viewId); // this.initAreas() }, mounted() { - debugger this.bindPluginEvent() this.initFromPanel() this.chartInit() diff --git a/frontend/src/views/panel/OuterParamsSet/index.vue b/frontend/src/views/panel/OuterParamsSet/index.vue index 2b7820906f..8641f9f5dc 100644 --- a/frontend/src/views/panel/OuterParamsSet/index.vue +++ b/frontend/src/views/panel/OuterParamsSet/index.vue @@ -228,7 +228,6 @@ export default { created() { }, mounted() { - debugger this.init() }, destroyed() { @@ -237,7 +236,6 @@ export default { init() { // 获取当前仪表板外部跳转蚕食信息 queryWithPanelId(this.panelInfo.id).then(rsp => { - debugger this.outerParams = rsp.data this.outerParamsInfoArray = this.outerParams.outerParamsInfoArray if (this.outerParamsInfoArray.length > 0) { diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index 092c939c42..fa9e50dec5 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -578,7 +578,6 @@ export default { this.$store.commit('resetViewEditInfo') }, mounted() { - debugger // this.insertToBody() bus.$on('component-on-drag', () => { this.show = false From 9c967cf1dbbcd71e28c19ea8f88f5d5428cc911b Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 23 Mar 2022 15:01:40 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=AF=86=E7=A0=81=E5=BC=BA=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/utils/StringUtils.js | 11 +++++++++++ frontend/src/views/link/generate/index.vue | 10 ++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/frontend/src/utils/StringUtils.js b/frontend/src/utils/StringUtils.js index 6124dc0dcc..6886395dc5 100644 --- a/frontend/src/utils/StringUtils.js +++ b/frontend/src/utils/StringUtils.js @@ -5,3 +5,14 @@ export function pdfTemplateReplaceAll(content, source, target) { return content } +export function randomRange(min, max) { + let returnStr = '' + const range = (max ? Math.round(Math.random() * (max - min)) + min : min) + const charStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789' + + for (var i = 0; i < range; i++) { + var index = Math.round(Math.random() * (charStr.length - 1)) + returnStr += charStr.substring(index, index + 1) + } + return returnStr +} diff --git a/frontend/src/views/link/generate/index.vue b/frontend/src/views/link/generate/index.vue index d307a58eeb..864c26b205 100644 --- a/frontend/src/views/link/generate/index.vue +++ b/frontend/src/views/link/generate/index.vue @@ -77,6 +77,7 @@ import { shortUrl, setOverTime } from '@/api/link' +import { randomRange } from '@/utils/StringUtils' export default { name: 'LinkGenerate', @@ -171,14 +172,7 @@ export default { }, createPwd() { - const randomNum = () => { - return Math.floor(Math.random() * 10) + '' - } - let result = '' - for (let index = 0; index < this.pwdNums; index++) { - result += randomNum() - } - return result + return randomRange(this.pwdNums) }, resetPwd() { From 8c52ea1e70e98f9e258ddebafa2431784accff7d Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 23 Mar 2022 16:55:36 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=E6=8F=92=E4=BB=B6=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml index 3fe88d66c6..f8026fa4b3 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml @@ -183,6 +183,7 @@ `result_count`, `result_mode`, `chart_type`, + `is_plugin`, `senior`, `data_from`) SELECT #{newChartId}, @@ -210,6 +211,7 @@ `result_count`, `result_mode`, 'private', + `is_plugin`, `senior`, `data_from` FROM chart_view_cache From 01fee74fa54a7571cfb272ab48db5965cbb3097b Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 23 Mar 2022 17:09:23 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=BC=B9=E5=87=BA=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/components/Editor/EditBar.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue index 37c46f8b6e..9c7fd9d56d 100644 --- a/frontend/src/components/canvas/components/Editor/EditBar.vue +++ b/frontend/src/components/canvas/components/Editor/EditBar.vue @@ -201,7 +201,11 @@ export default { // } // }, edit() { - bus.$emit('change_panel_right_draw', true) + if (this.curComponent.type === 'custom') { + bus.$emit('component-dialog-edit') + } else if (this.curComponent.type === 'v-text' || this.curComponent.type === 'rect-shape') { + bus.$emit('component-dialog-style') + } else { bus.$emit('change_panel_right_draw', true) } }, linkageEdit() { From d5ca2168c46a12487103a823b3bbdef073027e62 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 24 Mar 2022 17:01:19 +0800 Subject: [PATCH 7/8] =?UTF-8?q?refactor:=20=E6=94=AF=E6=8C=81ES=E5=B8=83?= =?UTF-8?q?=E5=B0=94=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/query/es/EsQueryProvider.java | 48 +++++++++++++++---- 1 file changed, 40 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 d5d5138e77..5187b8429d 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 @@ -224,7 +224,11 @@ public class EsQueryProvider extends QueryProvider { } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == DeTypeConstants.DE_TIME) { originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); } else { - originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + if (x.getDeType() == 2 || x.getDeType() == 3) { + originField = String.format(EsSqlLConstants.CAST, String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()), "bigint"); + } else { + originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + } } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 @@ -253,7 +257,11 @@ public class EsQueryProvider extends QueryProvider { } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == DeTypeConstants.DE_TIME) { originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); } else { - originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + if (y.getDeType() == 2 || y.getDeType() == 3) { + originField = String.format(EsSqlLConstants.CAST, String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()), "bigint"); + } else { + originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + } } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i); // 处理纵轴字段 @@ -333,7 +341,11 @@ public class EsQueryProvider extends QueryProvider { } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 1) { originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); } else { - originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + if (x.getDeType() == 2 || x.getDeType() == 3) { + originField = String.format(EsSqlLConstants.CAST, String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()), "bigint"); + } else { + originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + } } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 @@ -409,7 +421,11 @@ public class EsQueryProvider extends QueryProvider { } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == DeTypeConstants.DE_TIME) { originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); } else { - originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + if (x.getDeType() == 2 || x.getDeType() == 3) { + originField = String.format(EsSqlLConstants.CAST, String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()), "bigint"); + } else { + originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + } } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 @@ -438,7 +454,11 @@ public class EsQueryProvider extends QueryProvider { } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == DeTypeConstants.DE_TIME) { originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); } else { - originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + if (y.getDeType() == 2 || y.getDeType() == 3) { + originField = String.format(EsSqlLConstants.CAST, String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()), "bigint"); + } else { + originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + } } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i); // 处理纵轴字段 @@ -517,7 +537,11 @@ public class EsQueryProvider extends QueryProvider { } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 1) { originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); } else { - originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + if (x.getDeType() == 2 || x.getDeType() == 3) { + originField = String.format(EsSqlLConstants.CAST, String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()), "bigint"); + } else { + originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + } } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 @@ -549,7 +573,11 @@ public class EsQueryProvider extends QueryProvider { } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) { originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); } else { - originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + if (y.getDeType() == 2 || y.getDeType() == 3) { + originField = String.format(EsSqlLConstants.CAST, String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()), "bigint"); + } else { + originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + } } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i); // 处理纵轴字段 @@ -635,7 +663,11 @@ public class EsQueryProvider extends QueryProvider { } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) { originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); } else { - originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + if (y.getDeType() == 2 || y.getDeType() == 3) { + originField = String.format(EsSqlLConstants.CAST, String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()), "bigint"); + } else { + originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + } } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i); // 处理纵轴字段 From 70dbd65a1ab466c695556ca8d788f22900532c42 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 25 Mar 2022 14:27:47 +0800 Subject: [PATCH 8/8] =?UTF-8?q?faet:=20=E9=9B=86=E6=88=90=E6=96=B0?= =?UTF-8?q?=E7=9A=84tabs=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V33__1.9.sql | 1 + .../components/AsyncSoltComponent/index.vue | 76 +++++++++++++++ .../components/canvas/components/TextAttr.vue | 23 ++++- .../src/components/widget/DeWidget/DeTabs.vue | 47 +++++++-- .../components/widget/DeWidget/TabStyle.vue | 97 +++++++++++++++++++ frontend/src/styles/index.scss | 25 ++++- 6 files changed, 255 insertions(+), 14 deletions(-) create mode 100644 frontend/src/components/AsyncSoltComponent/index.vue create mode 100644 frontend/src/components/widget/DeWidget/TabStyle.vue diff --git a/backend/src/main/resources/db/migration/V33__1.9.sql b/backend/src/main/resources/db/migration/V33__1.9.sql index be23dae42e..9b92b7000f 100644 --- a/backend/src/main/resources/db/migration/V33__1.9.sql +++ b/backend/src/main/resources/db/migration/V33__1.9.sql @@ -89,3 +89,4 @@ INSERT INTO `system_parameter`(`param_key`, `param_value`, `type`, `sort`) VALUE UPDATE `demo_gdp_district_top100` set `province` = '新疆维吾尔自治区' WHERE `province` = '新疆维吾尔族自治区'; +INSERT INTO `my_plugin`(`plugin_id`, `name`, `store`, `free`, `cost`, `category`, `descript`, `version`, `install_type`, `creator`, `load_mybatis`, `release_time`, `install_time`, `module_name`, `icon`) VALUES (3, 'tabs插件', 'default', 0, 20000, 'panel', 'tabs插件', '1.0-SNAPSHOT', NULL, 'fit2cloud-chenyw', 0, NULL, NULL, 'dataease-extensions-tabs-backend', NULL); \ No newline at end of file diff --git a/frontend/src/components/AsyncSoltComponent/index.vue b/frontend/src/components/AsyncSoltComponent/index.vue new file mode 100644 index 0000000000..891e1a6900 --- /dev/null +++ b/frontend/src/components/AsyncSoltComponent/index.vue @@ -0,0 +1,76 @@ + + + diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue index 13688f3b5d..94cdc24b5c 100644 --- a/frontend/src/components/canvas/components/TextAttr.vue +++ b/frontend/src/components/canvas/components/TextAttr.vue @@ -140,6 +140,12 @@
+
+ + + +
+
@@ -150,7 +156,6 @@ import Hyperlinks from '@/components/canvas/components/Editor/Hyperlinks' import VideoLinks from '@/components/canvas/components/Editor/VideoLinks' import DateFormat from '@/components/canvas/components/Editor/DateFormat' import { COLOR_PANEL } from '@/views/chart/chart/chart' -import { chartTransStr2Object } from '@/views/panel/panel' export default { components: { Hyperlinks, DateFormat, VideoLinks }, @@ -245,7 +250,8 @@ export default { 'borderWidth', 'borderRadius', 'opacity', - 'borderColor' + 'borderColor', + 'deTabStyle' ], // 矩形组件显示的属性 'rect-shape': [ @@ -416,6 +422,18 @@ export default { }, styleChange() { this.$store.commit('recordStyleChange') + }, + goHeadFontColor() { + this.$refs.headFontColorPicker.handleTrigger() + }, + goHeadFontActiveColor() { + this.$refs.headFontActiveColorPicker.handleTrigger() + }, + goHeadBorderColor() { + this.$refs.headBorderColorPicker.handleTrigger() + }, + goHeadBorderActiveColor() { + this.$refs.headBorderActiveColorPicker.handleTrigger() } } } @@ -448,7 +466,6 @@ export default { display: inline!important; } - ::v-deep input::-webkit-outer-spin-button, ::v-deep input::-webkit-inner-spin-button { -webkit-appearance: none !important; diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue index 359fd7945b..94adcab6a3 100644 --- a/frontend/src/components/widget/DeWidget/DeTabs.vue +++ b/frontend/src/components/widget/DeWidget/DeTabs.vue @@ -1,6 +1,19 @@