center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix(视图-表格): 表格组合后点击页面下钻。

Browse Source
This commit is contained in:
wisonic-s 2023-12-13 14:17:50 +08:00
parent cd35fe45e8
commit 0e602170e2
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
View File

@ -10,7 +10,8 @@ import {
shallowRef, shallowRef,
ShallowRef, ShallowRef,
toRaw, toRaw,
toRefs toRefs,
watch
} from 'vue' } from 'vue'
import { getData } from '@/api/chart' import { getData } from '@/api/chart'
import chartViewManager from '@/views/chart/components/js/panel' 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 let scrollTop = 0
const initScroll = () => { const initScroll = () => {
clearInterval(scrollTimer) clearInterval(scrollTimer)
@ -216,7 +217,7 @@ const showPage = computed(() => {
const handleCurrentChange = pageNum => { const handleCurrentChange = pageNum => {
let extReq = { goPage: pageNum } let extReq = { goPage: pageNum }
if (chartExtRequest) { if (chartExtRequest.value) {
extReq = { ...extReq, ...chartExtRequest.value } extReq = { ...extReq, ...chartExtRequest.value }
} }
const chart = { ...view.value, chartExtRequest: extReq } const chart = { ...view.value, chartExtRequest: extReq }
@ -317,7 +318,7 @@ const resize = (width, height) => {
} }
const preSize = [0, 0] const preSize = [0, 0]
const TOLERANCE = 1 const TOLERANCE = 1
let resizeObserver let resizeObserver: ResizeObserver
onMounted(() => { onMounted(() => {
isDataEaseBi.value = !!window.DataEaseBi isDataEaseBi.value = !!window.DataEaseBi
resizeObserver = new ResizeObserver(([entry] = []) => { resizeObserver = new ResizeObserver(([entry] = []) => {

4
core/core-frontend/src/views/chart/components/views/index.vue
View File

@ -270,8 +270,8 @@ const initTitle = () => {
} }
} }
const drillJump = index => { const drillJump = (index: number) => {
state.drillClickDimensionList = state.drillClickDimensionList.slice(0, index) state.drillClickDimensionList.splice(index)
view.value.chartExtRequest = filter() view.value.chartExtRequest = filter()
calcData(view.value) calcData(view.value)
} }