From 0e602170e23a76c6711a4d1eed41e965f5ad2f1f Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Wed, 13 Dec 2023 14:17:50 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE-=E8=A1=A8=E6=A0=BC):=20?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=BB=84=E5=90=88=E5=90=8E=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8B=E9=92=BB=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/views/components/ChartComponentS2.vue | 9 +++++---- .../src/views/chart/components/views/index.vue | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue index 9c021aa1b6..fc135dd7bb 100644 --- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue +++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue @@ -10,7 +10,8 @@ import { shallowRef, ShallowRef, toRaw, - toRefs + toRefs, + watch } from 'vue' import { getData } from '@/api/chart' import chartViewManager from '@/views/chart/components/js/panel' @@ -172,7 +173,7 @@ const setupPage = (chart: ChartObj, resetPageInfo?: boolean) => { } } -let scrollTimer +let scrollTimer: number let scrollTop = 0 const initScroll = () => { clearInterval(scrollTimer) @@ -216,7 +217,7 @@ const showPage = computed(() => { const handleCurrentChange = pageNum => { let extReq = { goPage: pageNum } - if (chartExtRequest) { + if (chartExtRequest.value) { extReq = { ...extReq, ...chartExtRequest.value } } const chart = { ...view.value, chartExtRequest: extReq } @@ -317,7 +318,7 @@ const resize = (width, height) => { } const preSize = [0, 0] const TOLERANCE = 1 -let resizeObserver +let resizeObserver: ResizeObserver onMounted(() => { isDataEaseBi.value = !!window.DataEaseBi resizeObserver = new ResizeObserver(([entry] = []) => { diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue index 3a3dc5edf3..9eca9348cf 100644 --- a/core/core-frontend/src/views/chart/components/views/index.vue +++ b/core/core-frontend/src/views/chart/components/views/index.vue @@ -270,8 +270,8 @@ const initTitle = () => { } } -const drillJump = index => { - state.drillClickDimensionList = state.drillClickDimensionList.slice(0, index) +const drillJump = (index: number) => { + state.drillClickDimensionList.splice(index) view.value.chartExtRequest = filter() calcData(view.value) }