From d5f29146be1e2bbb3084c602a7b3bfc71896e63f Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 3 Dec 2024 14:55:47 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=B0=83=E6=95=B4=E7=BC=A9=E6=94=BE?= =?UTF-8?q?=E5=AF=B9=E8=B7=B3=E8=BD=AC=E4=B8=8B=E9=92=BB=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E7=9A=84=E5=BD=B1=E5=93=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/visualization/ViewTrackBar.vue | 24 ++++++++++--------- .../views/components/ChartComponentG2Plot.vue | 23 +++++++++++++++--- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/core/core-frontend/src/components/visualization/ViewTrackBar.vue b/core/core-frontend/src/components/visualization/ViewTrackBar.vue index 7611ff7350..68de24d925 100644 --- a/core/core-frontend/src/components/visualization/ViewTrackBar.vue +++ b/core/core-frontend/src/components/visualization/ViewTrackBar.vue @@ -3,18 +3,20 @@ diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue index 1d029e91b7..9ae5e15d15 100644 --- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue +++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue @@ -23,8 +23,8 @@ import { defaultsDeep, cloneDeep } from 'lodash-es' import ChartError from '@/views/chart/components/views/components/ChartError.vue' import { BASE_VIEW_CONFIG } from '../../editor/util/chart' import { customAttrTrans, customStyleTrans, recursionTransObj } from '@/utils/canvasStyle' -import { deepCopy } from '@/utils/utils' -import { trackBarStyleCheck } from '@/utils/canvasUtils' +import { deepCopy, isMobile } from '@/utils/utils' +import { isDashboard, trackBarStyleCheck } from '@/utils/canvasUtils' import { useEmitt } from '@/hooks/web/useEmitt' import { L7ChartView } from '@/views/chart/components/js/panel/types/impl/l7' @@ -92,7 +92,6 @@ const { view, showPosition, scale, terminal, suffixId } = toRefs(props) const isError = ref(false) const errMsg = ref('') const linkageActiveHistory = ref(false) -const antVRenderStatus = ref(false) const state = reactive({ trackBarStyle: { @@ -100,6 +99,11 @@ const state = reactive({ left: '50px', top: '50px' }, + trackBarStyleMobile: { + position: 'absolute', + left: '50px', + top: '50px' + }, linkageActiveParam: null, pointParam: null, data: { fields: [] } // 图表数据 @@ -369,12 +373,25 @@ const action = param => { top: param.y + 10 } trackBarStyleCheck(props.element, barStyleTemp, props.scale, trackMenu.value.length) + const trackBarX = barStyleTemp.left + let trackBarY = 50 state.trackBarStyle.left = barStyleTemp.left + 'px' if (curView.type === 'symbolic-map') { + trackBarY = param.y + 10 state.trackBarStyle.top = param.y + 10 + 'px' } else { + trackBarY = barStyleTemp.top state.trackBarStyle.top = barStyleTemp.top + 'px' } + if (!isDashboard() && isMobile()) { + state.trackBarStyle.left = trackBarX / props.scale + 'px' + state.trackBarStyle.top = trackBarY / props.scale + 'px' + state.trackBarStyle['zoom'] = props.scale + } else { + state.trackBarStyle.left = trackBarX + 'px' + state.trackBarStyle.top = trackBarY + 'px' + } + viewTrack.value.trackButtonClick() } }