From 8d132a87da0da38acb3f025bdb0481c89ed9474a Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 6 Mar 2024 11:18:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?style(X-Pack):=20=E5=A4=96=E8=A7=82?= =?UTF-8?q?=E9=85=8D=E7=BD=AE-=E6=8B=96=E5=8A=A8=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E5=AF=BC=E8=87=B4=E9=A1=B5=E9=9D=A2=E6=B7=B7?= =?UTF-8?q?=E4=B9=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de-xpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de-xpack b/de-xpack index adecb7fcd0..d8931934b1 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit adecb7fcd0085056548524503c2a086edcdf5b19 +Subproject commit d8931934b19d90c5211ce8391cc7df1c49dc52a1 From 2ade1a1eeb6146bc414a1e90bc46b33572435f88 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Wed, 6 Mar 2024 11:45:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(=E7=A7=BB=E5=8A=A8=E7=AB=AF):=20tab?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=AD=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E5=92=8C?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-visualization/canvas/DePreview.vue | 2 +- core/core-frontend/src/utils/canvasUtils.ts | 10 ++++++++++ .../src/views/dashboard/MobileConfigPanel.vue | 11 +++++++++++ .../src/views/mobile/panel/index.vue | 19 +++++++++++++++++-- 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue index 5b23bee7c3..3ccfd3bbbd 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue @@ -276,7 +276,7 @@ defineExpose({ :style="getShapeItemShowStyle(item)" :show-position="showPosition" :search-count="searchCount" - :scale="mobileInPc ? scaleWidth * 3 : scaleWidth" + :scale="mobileInPc ? 100 : scaleWidth" @userViewEnlargeOpen="userViewEnlargeOpen($event, item)" /> diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts index 13b5c53e39..52ad68196b 100644 --- a/core/core-frontend/src/utils/canvasUtils.ts +++ b/core/core-frontend/src/utils/canvasUtils.ts @@ -160,6 +160,16 @@ export function initCanvasDataMobile(dvId, busiFlag, callBack) { ele.y = my ele.sizeX = mSizeX ele.sizeY = mSizeY + if (ele.component === 'DeTabs') { + ele.propValue.forEach(tabItem => { + tabItem.componentData.forEach(tabComponent => { + tabComponent.x = tabComponent.mx + tabComponent.y = tabComponent.my + tabComponent.sizeX = tabComponent.mSizeX + tabComponent.sizeY = tabComponent.mSizeY + }) + }) + } }) dvMainStore.setComponentData(componentData) dvMainStore.setCanvasStyle(canvasStyleResult) diff --git a/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue b/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue index 60fd44e3ac..b03a223e45 100644 --- a/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue +++ b/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue @@ -81,6 +81,17 @@ const hanedleMessage = event => { ele.my = y ele.mSizeX = sizeX ele.mSizeY = sizeY + if (ele.component === 'DeTabs') { + ele.propValue.forEach(tabItem => { + tabItem.componentData.forEach(tabComponent => { + const { x: tx, y: ty, sizeX: tSizeX, sizeY: tSizeY } = com.tab[tabComponent.id] + tabComponent.mx = tx + tabComponent.my = ty + tabComponent.mSizeX = tSizeX + tabComponent.mSizeY = tSizeY + }) + }) + } } }) diff --git a/core/core-frontend/src/views/mobile/panel/index.vue b/core/core-frontend/src/views/mobile/panel/index.vue index 1086bf6e7f..6acb1134a0 100644 --- a/core/core-frontend/src/views/mobile/panel/index.vue +++ b/core/core-frontend/src/views/mobile/panel/index.vue @@ -13,6 +13,7 @@ const checkItemPosition = component => { component.y = dvMainStore.componentData.reduce((pre, next) => { return Math.max(pre, next.y + next.sizeY) }, 1) + component.sizeY = 10 } const hanedleMessage = event => { @@ -50,8 +51,22 @@ const hanedleMessage = event => { { type: 'mobileSaveFromMobile', value: dvMainStore.componentData.reduce((pre, next) => { - const { x, y, sizeX, sizeY, id } = next - pre[id] = { x, y, sizeX, sizeY } + const { x, y, sizeX, sizeY, id, component } = next + pre[id] = { x, y, sizeX, sizeY, component } + if (next.component === 'DeTabs') { + pre[id].tab = {} + next.propValue.forEach(tabItem => { + tabItem.componentData.forEach(tabComponent => { + const { x: tx, y: ty, sizeX: tSizeX, sizeY: tSizeY, id: tId } = tabComponent + pre[id].tab[tId] = { + x: tx, + y: ty, + sizeX: tSizeX, + sizeY: tSizeY + } + }) + }) + } return pre }, {}) }, From bae30bb60f72727bcd4bcb7a675a0f6829bdcd44 Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 6 Mar 2024 11:54:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E5=90=AF=E7=94=A8calcite=E8=BF=90?= =?UTF-8?q?=E7=AE=97=E7=AC=A6=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/datasource/provider/CalciteProvider.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java index abe17af3da..144ed2a868 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java @@ -221,6 +221,7 @@ public class CalciteProvider { registerDriver(); Properties info = new Properties(); info.setProperty("lex", "JAVA"); + info.setProperty("fuc", "all"); info.setProperty("caseSensitive", "false"); info.setProperty("remarks", "true"); info.setProperty("parserFactory", "org.apache.calcite.sql.parser.impl.SqlParserImpl#FACTORY");