From 1113d1aa53a5394ff148b698b803122fd4e0ca9e Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 26 Dec 2022 19:49:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=BF=AB=E6=8D=B7?= =?UTF-8?q?=E9=94=AE=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/utils/shortcutKey.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/canvas/utils/shortcutKey.js b/frontend/src/components/canvas/utils/shortcutKey.js index 02f61cc7ae..3cf4ce3552 100644 --- a/frontend/src/components/canvas/utils/shortcutKey.js +++ b/frontend/src/components/canvas/utils/shortcutKey.js @@ -53,12 +53,14 @@ export function listenGlobalKeyDown() { window.onkeydown = (e) => { if (!store.state.isInEditor) return const { keyCode } = e - e.preventDefault() - e.stopPropagation() if (keyCode === ctrlKey || keyCode === commandKey) { + e.preventDefault() + e.stopPropagation() isCtrlOrCommandDown = true } else if (isCtrlOrCommandDown) { if (keyCode === zKey || keyCode === yKey || keyCode === dKey || keyCode === sKey || keyCode === enlargeKey) { + e.preventDefault() + e.stopPropagation() unlockMap[keyCode]() } } @@ -74,13 +76,14 @@ export function listenGlobalKeyDown() { export function listenGlobalKeyDownPreview() { window.onkeydown = (e) => { const { keyCode } = e - e.preventDefault() - e.stopPropagation() if (keyCode === ctrlKey || keyCode === commandKey) { + e.preventDefault() + e.stopPropagation() isCtrlOrCommandDown = true } else if (isCtrlOrCommandDown) { if (keyCode === enlargeKey) { e.preventDefault() + e.stopPropagation() unlockMap[keyCode]() } } From ef8032dd260e82c635adee9f46f8948f70c1a8f4 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 27 Dec 2022 10:40:17 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20AntV?= =?UTF-8?q?=20=E9=80=8F=E8=A7=86=E8=A1=A8=E6=A0=BC=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=A1=8C=E5=A4=B4=E5=88=97=E5=A4=B4=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=B9=B6=E5=9C=A8=E8=B7=B3=E8=BD=AC=E6=97=B6=E5=B8=A6?= =?UTF-8?q?=E5=85=A5=E5=85=B6=E4=BB=96=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/components/editor/PreviewEject.vue | 2 +- frontend/src/views/chart/components/ChartComponentS2.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/canvas/components/editor/PreviewEject.vue b/frontend/src/components/canvas/components/editor/PreviewEject.vue index f3d81c4dc4..2811351cea 100644 --- a/frontend/src/components/canvas/components/editor/PreviewEject.vue +++ b/frontend/src/components/canvas/components/editor/PreviewEject.vue @@ -141,7 +141,7 @@ export default { } //透视表中的其他维度数据数据都进行匹配 if (jumpParam.sourceType && jumpParam.sourceType === 'table-pivot') { - jumpRequestParam.targetPanelId = null + jumpRequestParam.sourceFieldId = null } try { // 刷新跳转目标仪表板联动信息 diff --git a/frontend/src/views/chart/components/ChartComponentS2.vue b/frontend/src/views/chart/components/ChartComponentS2.vue index 2bb2f650b6..e4b1797706 100644 --- a/frontend/src/views/chart/components/ChartComponentS2.vue +++ b/frontend/src/views/chart/components/ChartComponentS2.vue @@ -426,7 +426,8 @@ export default { name: this.pointParam.data.name, viewId: this.chart.id, dimensionList: this.pointParam.data.dimensionList, - quotaList: this.pointParam.data.quotaList + quotaList: this.pointParam.data.quotaList, + sourceType: this.pointParam.data.sourceType } switch (trackAction) { case 'drill': From 27a8b49bc73dabe3a4be8463634fd973948589da Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 27 Dec 2022 10:50:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E9=93=BE=E6=8E=A5=E9=80=8F=E8=A7=86=E8=A1=A8=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/link/view/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/views/link/view/index.vue b/frontend/src/views/link/view/index.vue index 2070287ccf..733a0b103b 100644 --- a/frontend/src/views/link/view/index.vue +++ b/frontend/src/views/link/view/index.vue @@ -152,6 +152,9 @@ export default { sourceFieldId: jumpParam.sourceFieldId, targetPanelId: this.resourceId } + if (jumpParam.sourceType && jumpParam.sourceType === 'table-pivot') { + jumpRequestParam.sourceFieldId = null + } // 刷新跳转目标仪表板联动信息 queryTargetPanelJumpInfo(jumpRequestParam).then(rsp => { this.show = true From 6864012d28975ee96357f1a84a6e444e6df20d48 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 27 Dec 2022 11:40:34 +0800 Subject: [PATCH 4/5] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=A7=86=E5=9B=BE=E6=A0=BC=E5=BC=8F=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0=E7=A9=BA=E5=80=BC=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/customComponent/UserView.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/canvas/customComponent/UserView.vue b/frontend/src/components/canvas/customComponent/UserView.vue index b840daff45..2e8af43ea0 100644 --- a/frontend/src/components/canvas/customComponent/UserView.vue +++ b/frontend/src/components/canvas/customComponent/UserView.vue @@ -792,12 +792,14 @@ export default { this.requestStatus = 'success' this.httpRequest.status = true } else { + console.error('err2-' + JSON.stringify(response)) this.requestStatus = 'error' this.message = response.message } this.isFirstLoad = false return true }).catch(err => { + console.error('err-' + err) this.requestStatus = 'error' if (err.message && err.message.indexOf('timeout') > -1) { this.message = this.$t('panel.timeout_refresh') @@ -878,10 +880,10 @@ export default { } if (formatterCfg) { const v = valueFormatter(value, formatterCfg) - rowData[key] = v.includes('NaN') ? value : v + rowData[key] = v && v.includes('NaN') ? value : v } else { const v = valueFormatter(value, formatterItem) - rowData[key] = v.includes('NaN') ? value : v + rowData[key] = v && v.includes('NaN') ? value : v } } } From e262c93ae2667c656189e6ba573ba2c8a8fa1972 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Tue, 27 Dec 2022 12:17:55 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix(=E8=A1=80=E6=BA=90=E5=88=86=E6=9E=90):?= =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E8=A1=80=E6=BA=90=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复 Excel 数据集的引用未正确显示，去除查询结果中重复的部分。 --- .../src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml | 1 + .../src/main/java/io/dataease/ext/ExtDataSourceMapper.xml | 1 + .../src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml b/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml index b51d1e3d16..46bbce05dd 100644 --- a/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml +++ b/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml @@ -234,6 +234,7 @@ group by sa.auth_source ) pg_auth on pg_auth.id = pg.id where dt.id=#{datasetId,jdbcType=VARCHAR} + group by id,panel_id order by id diff --git a/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml b/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml index e20645682e..49c1bfe889 100644 --- a/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml +++ b/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml @@ -239,6 +239,7 @@ group by sa.auth_source ) pg_auth on pg_auth.id = pg.id where ds.id=#{datasourceId,jdbcType=VARCHAR} + group by id,panel_id order by id diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml index 4c6343e5e3..8aebceeb0c 100644 --- a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml +++ b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml @@ -285,7 +285,7 @@ ) group by sa.auth_source ) dt_auth on dt.id = dt_auth.id - join datasource ds on dt.data_source_id = ds.id + left join datasource ds on dt.data_source_id = ds.id left join ( select @@ -318,7 +318,8 @@ group by sa.auth_source ) ds_auth on ds_auth.id = ds.id where pg.id=#{panelId,jdbcType=VARCHAR} - group by dt.id + group by id,dt_id + order by id