dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13479 from dataease/pr@dev-v2@fix_console

Browse Source 
fix: 修复部分控制台报错
This commit is contained in:
王嘉豪 2024-11-21 22:08:53 +08:00 committed by GitHub
commit 9f8bf957ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/core-frontend/src/hooks/web/useMoveLine.ts
View File

@ -8,7 +8,7 @@ export const useMoveLine = (type: Sidebar) => {
const width = ref(wsCache.get(type) || 280)
const getCoordinates = () => {
document.querySelector('.sidebar-move-line').className = 'sidebar-move-line dragging'
document.querySelector('.sidebar-move-line')?.className = 'sidebar-move-line dragging'
document.addEventListener('mousemove', setCoordinates)
document.addEventListener('mouseup', cancelEvent)
document.querySelector('body').style['user-select'] = 'none'
@ -26,7 +26,7 @@ export const useMoveLine = (type: Sidebar) => {
}
const cancelEvent = () => {
document.querySelector('.sidebar-move-line').className = 'sidebar-move-line'
document.querySelector('.sidebar-move-line')?.className = 'sidebar-move-line'
document.querySelector('body').style['user-select'] = 'auto'
wsCache.set(type, width.value)
document.removeEventListener('mousemove', setCoordinates)

2
core/core-frontend/src/views/dashboard/DashboardPreviewShow.vue
View File

@ -252,7 +252,7 @@ defineExpose({
<el-container
class="preview-area"
:class="{ 'no-data': !hasTreeData }"
v-loading="requestStore.loadingMap[permissionStore.currentPath]"
v-loading="requestStore.loadingMap && requestStore.loadingMap[permissionStore.currentPath]"
>
<div
@click="slideOpenChange"

18
core/core-frontend/src/views/data-visualization/index.vue
View File

@ -251,13 +251,15 @@ listenGlobalKeyDown()
const initScroll = () => {
nextTick(() => {
const { width, height } = canvasStyleData.value
const mainWidth = canvasCenterRef.value.clientWidth
mainHeight.value = canvasCenterRef.value.clientHeight
const scrollX = (1.5 * width - mainWidth) / 2
const scrollY = (1.5 * height - mainHeight.value) / 2 + 20
// 设置画布初始滚动条位置
canvasOut.value.scrollTo(scrollX, scrollY)
if (canvasCenterRef.value) {
const { width, height } = canvasStyleData.value
const mainWidth = canvasCenterRef.value.clientWidth
mainHeight.value = canvasCenterRef.value.clientHeight
const scrollX = (1.5 * width - mainWidth) / 2
const scrollY = (1.5 * height - mainHeight.value) / 2 + 20
// 设置画布初始滚动条位置
canvasOut.value.scrollTo(scrollX, scrollY)
}
})
}
const doUseCache = flag => {
@ -477,7 +479,7 @@ eventBus.on('tabSort', tabSort)
<div class="custom-dv-divider" />
<el-container
v-if="loadFinish"
v-loading="requestStore.loadingMap[permissionStore.currentPath]"
v-loading="requestStore.loadingMap && requestStore.loadingMap[permissionStore.currentPath]"
element-loading-background="rgba(0, 0, 0, 0)"
class="dv-layout-container"
:class="{ 'preview-layout-container': previewStatus }"