diff --git a/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/OverallSetting.vue b/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/OverallSetting.vue index f04209fb99..0fa80ad43b 100644 --- a/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/OverallSetting.vue +++ b/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/OverallSetting.vue @@ -298,7 +298,11 @@ const onRefreshChange = val => { themeChange() } const fontFamilyChange = () => { - appearanceStore.setCurrentFont(canvasStyleData.fontFamily) + appearanceStore.setCurrentFont(canvasStyleData.value.fontFamily) + document.documentElement.style.setProperty( + '--de-canvas_custom_font', + `${canvasStyleData.value.fontFamily}` + ) } const themeChange = (modifyName?) => { diff --git a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue index 063dd6c8d8..4253cef799 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue @@ -172,6 +172,11 @@ const props = defineProps({ type: Boolean, required: false, default: true + }, + fontFamily: { + type: String, + required: false, + default: 'inherit' } }) @@ -1628,6 +1633,7 @@ defineExpose({ :dv-info="dvInfo" :canvas-active="canvasActive" :show-position="'canvas'" + :font-family="fontFamily" /> diff --git a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue index 4fc82cdac1..aef95bbb7d 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue @@ -107,6 +107,12 @@ const props = defineProps({ type: String, required: false, default: 'common' + }, + // 字体 + fontFamily: { + type: String, + required: false, + default: 'inherit' } }) const { @@ -424,6 +430,7 @@ const showActive = computed(() => props.popActive || (dvMainStore.mobileInPc && :disabled="true" :is-edit="false" :suffix-id="suffixId" + :font-family="fontFamily" @onPointClick="onPointClick" /> diff --git a/core/core-frontend/src/components/visualization/CanvasBaseSetting.vue b/core/core-frontend/src/components/visualization/CanvasBaseSetting.vue index 2cf666b38f..4d0cb6d3fa 100644 --- a/core/core-frontend/src/components/visualization/CanvasBaseSetting.vue +++ b/core/core-frontend/src/components/visualization/CanvasBaseSetting.vue @@ -96,7 +96,11 @@ const fontFamily = CHART_FONT_FAMILY.concat( })) ) const onFontFamilyChange = () => { - appearanceStore.setCurrentFont(canvasStyleData.fontFamily) + appearanceStore.setCurrentFont(canvasStyleData.value.fontFamily) + document.documentElement.style.setProperty( + '--de-canvas_custom_font', + `${canvasStyleData.value.fontFamily}` + ) } const onThemeChange = () => { snapshotStore.recordSnapshotCache() diff --git a/core/core-frontend/src/components/visualization/ViewTrackBar.vue b/core/core-frontend/src/components/visualization/ViewTrackBar.vue index cafa0ace5d..7611ff7350 100644 --- a/core/core-frontend/src/components/visualization/ViewTrackBar.vue +++ b/core/core-frontend/src/components/visualization/ViewTrackBar.vue @@ -3,7 +3,11 @@ + diff --git a/core/core-frontend/src/custom-component/v-query/DynamicTimeRangeFiltering.vue b/core/core-frontend/src/custom-component/v-query/DynamicTimeRangeFiltering.vue index 4715db89dd..270d53edbd 100644 --- a/core/core-frontend/src/custom-component/v-query/DynamicTimeRangeFiltering.vue +++ b/core/core-frontend/src/custom-component/v-query/DynamicTimeRangeFiltering.vue @@ -147,8 +147,15 @@ const formatDate = computed(() => { :type="timeInterval" :prefix-icon="Calendar" :format="formatDate" + :popper-class="'custom-dynamic-time-range-filter-popper_class'" :range-separator="$t('cron.to')" :start-placeholder="$t('datasource.start_time')" :end-placeholder="$t('datasource.end_time')" /> + + diff --git a/core/core-frontend/src/custom-component/v-query/Select.vue b/core/core-frontend/src/custom-component/v-query/Select.vue index 920bf6e3e1..2cc0c9b969 100644 --- a/core/core-frontend/src/custom-component/v-query/Select.vue +++ b/core/core-frontend/src/custom-component/v-query/Select.vue @@ -648,6 +648,7 @@ defineExpose({