diff --git a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue index 77b5318254..cc5b118c88 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue @@ -83,6 +83,12 @@ const props = defineProps({ showPopBar: { type: Boolean, default: false + }, + // 字体 + fontFamily: { + type: String, + required: false, + default: 'inherit' } }) @@ -97,7 +103,8 @@ const { downloadStatus, outerScale, outerSearchCount, - showPopBar + showPopBar, + fontFamily } = toRefs(props) const domId = 'preview-' + canvasId.value const scaleWidthPoint = ref(100) @@ -468,6 +475,7 @@ defineExpose({ :search-count="curSearchCount" :scale="mobileInPc && isDashboard() ? 100 : scaleMin" :is-selector="props.isSelector" + :font-family="canvasStyleData.fontFamily || fontFamily" @userViewEnlargeOpen="userViewEnlargeOpen($event, item)" @datasetParamsInit="datasetParamsInit(item)" @onPointClick="onPointClick" diff --git a/core/core-frontend/src/custom-component/common/CanvasGroup.vue b/core/core-frontend/src/custom-component/common/CanvasGroup.vue index f8d1d16a51..cf96d94437 100644 --- a/core/core-frontend/src/custom-component/common/CanvasGroup.vue +++ b/core/core-frontend/src/custom-component/common/CanvasGroup.vue @@ -51,6 +51,12 @@ const props = defineProps({ type: Number, required: false, default: 1 + }, + // 字体 + fontFamily: { + type: String, + required: false, + default: 'inherit' } }) const { element, isEdit, showPosition, canvasStyleData, canvasViewInfo, dvInfo, componentData } = @@ -67,6 +73,7 @@ const { element, isEdit, showPosition, canvasStyleData, canvasViewInfo, dvInfo, :canvas-view-info="canvasViewInfo" :canvas-id="canvasId" :canvas-active="element['canvasActive']" + :font-family="fontFamily" > diff --git a/core/core-frontend/src/custom-component/group/Component.vue b/core/core-frontend/src/custom-component/group/Component.vue index 341ad3c04b..4a84f2d65f 100644 --- a/core/core-frontend/src/custom-component/group/Component.vue +++ b/core/core-frontend/src/custom-component/group/Component.vue @@ -55,6 +55,12 @@ const props = defineProps({ canvasViewInfo: { type: Object, required: true + }, + // 字体 + fontFamily: { + type: String, + required: false, + default: 'inherit' } }) @@ -112,6 +118,7 @@ onMounted(() => { :element="element" :scale="scale" :search-count="searchCount" + :font-family="fontFamily" > diff --git a/core/core-frontend/src/custom-component/group/GroupPreview.vue b/core/core-frontend/src/custom-component/group/GroupPreview.vue index fc20b46662..ca11cf8d1d 100644 --- a/core/core-frontend/src/custom-component/group/GroupPreview.vue +++ b/core/core-frontend/src/custom-component/group/GroupPreview.vue @@ -43,6 +43,12 @@ const props = defineProps({ canvasViewInfo: { type: Object, required: true + }, + // 字体 + fontFamily: { + type: String, + required: false, + default: 'inherit' } }) @@ -82,6 +88,7 @@ const userViewEnlargeOpen = (opt, item) => { :show-position="showPosition" :search-count="searchCount" :scale="scale" + :font-family="fontFamily" @userViewEnlargeOpen="userViewEnlargeOpen($event, item)" /> diff --git a/core/core-frontend/src/utils/canvasStyle.ts b/core/core-frontend/src/utils/canvasStyle.ts index f5de63e151..7d2267b6c0 100644 --- a/core/core-frontend/src/utils/canvasStyle.ts +++ b/core/core-frontend/src/utils/canvasStyle.ts @@ -444,18 +444,18 @@ export function adaptTitleFontFamilyAll(fontFamily) { } else if (item.component === 'Group') { item.propValue.forEach(groupItem => { if (groupItem.component === 'UserView') { - const viewDetails = dvMainStore.canvasViewInfo[item.id] + const viewDetails = dvMainStore.canvasViewInfo[groupItem.id] adaptTitleFontFamily(fontFamily, viewDetails) - useEmitt().emitter.emit('renderChart-' + item.id, viewDetails) + useEmitt().emitter.emit('renderChart-' + groupItem.id, viewDetails) } }) } else if (item.component === 'DeTabs') { item.propValue.forEach(tabItem => { tabItem.componentData.forEach(tabComponent => { if (tabComponent.component === 'UserView') { - const viewDetails = dvMainStore.canvasViewInfo[item.id] + const viewDetails = dvMainStore.canvasViewInfo[tabComponent.id] adaptTitleFontFamily(fontFamily, viewDetails) - useEmitt().emitter.emit('renderChart-' + item.id, viewDetails) + useEmitt().emitter.emit('renderChart-' + tabComponent.id, viewDetails) } }) }) diff --git a/core/core-frontend/src/views/data-visualization/index.vue b/core/core-frontend/src/views/data-visualization/index.vue index ebbba8f1bc..9bf8abb45d 100644 --- a/core/core-frontend/src/views/data-visualization/index.vue +++ b/core/core-frontend/src/views/data-visualization/index.vue @@ -548,6 +548,7 @@ eventBus.on('tabSort', tabSort) :canvas-id="state.canvasId" :base-height="state.baseHeight" :base-width="state.baseWidth" + :font-family="canvasStyleData.fontFamily" >