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

Merge pull request #5396 from dataease/pr@dev@fix_panel-view-cancel

Browse Source 
fix(仪表板): 修复仪表板视图请求可能被提前取消导致视图不显示问题
This commit is contained in:
王嘉豪 2023-06-02 16:50:42 +08:00 committed by GitHub
commit 6280514d0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/canvas/components/editor/Preview.vue
View File

@ -423,10 +423,6 @@ export default {
if (this.canvasId === 'canvas-main' && !this.showPosition.includes('multiplexing')) { if (this.canvasId === 'canvas-main' && !this.showPosition.includes('multiplexing')) {
listenGlobalKeyDownPreview() listenGlobalKeyDownPreview()
} }
// 取消视图请求
this.$cancelRequest('/chart/view/getData/**')
this.$cancelRequest('/api/link/viewDetail/**')
this.$cancelRequest('/static-resource/**')
}, },
mounted() { mounted() {
this.initWatermark() this.initWatermark()

5
frontend/src/components/canvas/utils/utils.js
View File

@ -11,6 +11,7 @@ import store from '@/store'
import { AIDED_DESIGN, MOBILE_SETTING, PAGE_LINE_DESIGN, PANEL_CHART_INFO, TAB_COMMON_STYLE } from '@/views/panel/panel' import { AIDED_DESIGN, MOBILE_SETTING, PAGE_LINE_DESIGN, PANEL_CHART_INFO, TAB_COMMON_STYLE } from '@/views/panel/panel'
import html2canvas from 'html2canvasde' import html2canvas from 'html2canvasde'
import xssCheck from 'xss' import xssCheck from 'xss'
import Vue from 'vue'
export function deepCopy(target) { export function deepCopy(target) {
if (typeof target === 'object' && target !== null) { if (typeof target === 'object' && target !== null) {
@ -70,6 +71,10 @@ export function mobile2MainCanvas(mainSource, mobileSource) {
} }
export function panelInit(componentData, componentStyle) { export function panelInit(componentData, componentStyle) {
// 取消视图请求
Vue.prototype.$cancelRequest('/chart/view/getData/**')
Vue.prototype.$cancelRequest('/api/link/viewDetail/**')
Vue.prototype.$cancelRequest('/static-resource/**')
panelDataPrepare(componentData, componentStyle, function() { panelDataPrepare(componentData, componentStyle, function() {
// 将data 和 style 数据设置到全局store中 // 将data 和 style 数据设置到全局store中
store.commit('setComponentData', resetID(componentData)) store.commit('setComponentData', resetID(componentData))