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

Merge pull request #12696 from dataease/pr@dev-v2@refactor_picture-group

Browse Source 
refactor(数据大屏): 更换数据大屏图片组编辑器
This commit is contained in:
王嘉豪 2024-10-14 17:51:44 +08:00 committed by GitHub
commit 89a3a54e75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/components/data-visualization/DvToolbar.vue
View File

@ -346,7 +346,7 @@ const fullScreenPreview = () => {
<component-group <component-group
is-label is-label
placement="bottom" placement="bottom"
:base-width="315" :base-width="328"
:icon-name="dvMedia" :icon-name="dvMedia"
title="媒体" title="媒体"
> >

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

@ -11,7 +11,7 @@ import { storeToRefs } from 'pinia'
import DvToolbar from '../../components/data-visualization/DvToolbar.vue' import DvToolbar from '../../components/data-visualization/DvToolbar.vue'
import ComponentToolBar from '../../components/data-visualization/ComponentToolBar.vue' import ComponentToolBar from '../../components/data-visualization/ComponentToolBar.vue'
import eventBus from '../../utils/eventBus' import eventBus from '../../utils/eventBus'
import findComponent from '../../utils/components' import { findComponentAttr } from '../../utils/components'
import DvSidebar from '../../components/visualization/DvSidebar.vue' import DvSidebar from '../../components/visualization/DvSidebar.vue'
import router from '@/router' import router from '@/router'
import Editor from '@/views/chart/components/editor/index.vue' import Editor from '@/views/chart/components/editor/index.vue'
@ -375,17 +375,26 @@ onUnmounted(() => {
const previewStatus = computed(() => editMode.value === 'preview') const previewStatus = computed(() => editMode.value === 'preview')
const commonPropertiesShow = computed( const otherEditorShow = computed(() => {
() => return Boolean(
curComponent.value && curComponent.value &&
!['UserView', 'GroupArea', 'VQuery'].includes(curComponent.value.component) (!['UserView', 'GroupArea', 'VQuery'].includes(curComponent.value?.component) ||
) (curComponent.value?.component === 'UserView' &&
curComponent.value?.innerType === 'picture-group')) &&
!batchOptStatus.value
)
})
const canvasPropertiesShow = computed( const canvasPropertiesShow = computed(
() => !curComponent.value || ['GroupArea'].includes(curComponent.value.component) () => !curComponent.value || ['GroupArea'].includes(curComponent.value.component)
) )
const viewsPropertiesShow = computed( const viewsPropertiesShow = computed(() => {
() => !!(curComponent.value && ['UserView', 'VQuery'].includes(curComponent.value.component)) return Boolean(
) curComponent.value &&
['UserView', 'VQuery'].includes(curComponent.value.component) &&
curComponent.value.innerType !== 'picture-group' &&
!batchOptStatus.value
)
})
const scrollCanvas = e => { const scrollCanvas = e => {
deWRulerRef.value.rulerScroll(e) deWRulerRef.value.rulerScroll(e)
@ -475,7 +484,7 @@ eventBus.on('handleNew', handleNew)
<div style="width: auto; height: 100%" ref="leftSidebarRef"> <div style="width: auto; height: 100%" ref="leftSidebarRef">
<template v-if="!batchOptStatus"> <template v-if="!batchOptStatus">
<dv-sidebar <dv-sidebar
v-if="commonPropertiesShow" v-if="otherEditorShow"
:title="curComponent['name']" :title="curComponent['name']"
:width="240" :width="240"
:side-name="'componentProp'" :side-name="'componentProp'"
@ -483,7 +492,7 @@ eventBus.on('handleNew', handleNew)
class="left-sidebar" class="left-sidebar"
:class="{ 'preview-aside': editMode === 'preview' }" :class="{ 'preview-aside': editMode === 'preview' }"
> >
<component :is="findComponent(curComponent['component'] + 'Attr')" /> <component :is="findComponentAttr(curComponent)" />
</dv-sidebar> </dv-sidebar>
<dv-sidebar <dv-sidebar
v-show="canvasPropertiesShow" v-show="canvasPropertiesShow"