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"); 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 }, {}) },