diff --git a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue index 5b888dbe3f..2c33a523cc 100644 --- a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue +++ b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue @@ -56,6 +56,7 @@ import treemapOrigin from '@/assets/svg/treemap-origin.svg' import waterfallOrigin from '@/assets/svg/waterfall-origin.svg' import wordCloudOrigin from '@/assets/svg/word-cloud-origin.svg' import tHeatmapOrigin from '@/assets/svg/t-heatmap-origin.svg' +import pictureGroupOrigin from '@/assets/svg/picture-group-origin.svg' import dvMore from '@/assets/svg/dv-more.svg' import dvExpandDown from '@/assets/svg/dv-expand-down.svg' import dvExpandRight from '@/assets/svg/dv-expand-right.svg' @@ -324,6 +325,7 @@ const iconMap = { 'waterfall-origin': waterfallOrigin, 'word-cloud-origin': wordCloudOrigin, 't-heatmap-origin': tHeatmapOrigin, + 'picture-group-origin': pictureGroupOrigin, group: group } const getIconName = item => { diff --git a/core/core-frontend/src/components/visualization/DvSidebar.vue b/core/core-frontend/src/components/visualization/DvSidebar.vue index 9653bf6e09..6aa475919a 100644 --- a/core/core-frontend/src/components/visualization/DvSidebar.vue +++ b/core/core-frontend/src/components/visualization/DvSidebar.vue @@ -1,11 +1,15 @@ @@ -55,7 +105,17 @@ const slideStyle = computed(() => { :style="slideStyle" > - {{ title }} + + {{ isViewTitle ? view.title : title }} + { {{ title }} + + + @@ -184,4 +254,38 @@ const slideStyle = computed(() => { .ed-scrollbar__bar.is-vertical { width: var(--de-scroll-width); } + +.name-area-attr { + position: relative; + line-height: 24px; + height: 24px; + font-size: 14px !important; + overflow: hidden; + cursor: pointer; + input { + position: absolute; + left: 0; + width: 100%; + outline: none; + border: 1px solid #295acc; + border-radius: 4px; + padding: 0 4px; + height: 100%; + } +} + +.component-name-dark { + input { + position: absolute; + left: 0; + width: 100%; + color: @dv-canvas-main-font-color; + background-color: #050e21; + outline: none; + border: 1px solid #295acc; + border-radius: 4px; + padding: 0 4px; + height: 100%; + } +} diff --git a/core/core-frontend/src/views/dashboard/index.vue b/core/core-frontend/src/views/dashboard/index.vue index 7dcf0453bd..68f56a2b55 100644 --- a/core/core-frontend/src/views/dashboard/index.vue +++ b/core/core-frontend/src/views/dashboard/index.vue @@ -282,6 +282,7 @@ onUnmounted(() => { :width="420" :side-name="'componentProp'" :aside-position="'right'" + :view="canvasViewInfo[curComponent.id]" class="left-sidebar" > diff --git a/core/core-frontend/src/views/data-visualization/index.vue b/core/core-frontend/src/views/data-visualization/index.vue index acb98ddd02..7f60d3b76c 100644 --- a/core/core-frontend/src/views/data-visualization/index.vue +++ b/core/core-frontend/src/views/data-visualization/index.vue @@ -492,6 +492,8 @@ eventBus.on('handleNew', handleNew) :side-name="'componentProp'" :aside-position="'right'" class="left-sidebar" + :slide-index="2" + :view="canvasViewInfo[curComponent.id]" :class="{ 'preview-aside': editMode === 'preview' }" >