From 4685f53a6c7575db5700a3cfe6bf5f856f434631 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Tue, 12 May 2026 15:13:27 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20?= =?UTF-8?q?=E6=B0=94=E6=B3=A1=E5=BC=B9=E7=AA=97=E9=A2=9C=E8=89=B2=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subject-setting/dashboard-style/OverallSetting.vue | 2 +- core/core-frontend/src/custom-component/de-frame/FrameLinks.vue | 2 +- .../chart/components/editor/editor-style/VQueryChartStyle.vue | 2 +- .../editor/editor-style/components/DualYAxisSelectorInner.vue | 2 +- .../editor/editor-style/components/FlowMapPointSelector.vue | 2 +- .../editor/editor-style/components/IndicatorNameSelector.vue | 2 +- .../editor/editor-style/components/IndicatorValueSelector.vue | 2 +- .../components/editor/editor-style/components/LabelSelector.vue | 2 +- .../editor/editor-style/components/LegendSelector.vue | 2 +- .../editor/editor-style/components/MiscStyleSelector.vue | 2 +- .../editor/editor-style/components/QuadrantSelector.vue | 2 +- .../components/editor/editor-style/components/TitleSelector.vue | 2 +- .../editor/editor-style/components/TooltipSelector.vue | 2 +- .../components/editor/editor-style/components/XAxisSelector.vue | 2 +- .../components/editor/editor-style/components/YAxisSelector.vue | 2 +- core/core-frontend/src/views/chart/components/views/index.vue | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) 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 a34c153c18..d41be9fd6c 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 @@ -329,7 +329,7 @@ const fontFamily = CHART_FONT_FAMILY_ORIGIN.concat( ) const toolTip = computed(() => { - return props.themes === 'dark' ? 'light' : 'dark' + return props.themes || 'dark' }) const resourceType = computed(() => diff --git a/core/core-frontend/src/custom-component/de-frame/FrameLinks.vue b/core/core-frontend/src/custom-component/de-frame/FrameLinks.vue index 3766b2ba35..e7db62d764 100644 --- a/core/core-frontend/src/custom-component/de-frame/FrameLinks.vue +++ b/core/core-frontend/src/custom-component/de-frame/FrameLinks.vue @@ -58,7 +58,7 @@ const props = defineProps({ const { frameLinks } = toRefs(props) const toolTip = computed(() => { - return props.themes === 'dark' ? 'light' : 'dark' + return props.themes || 'dark' }) const state = reactive({ diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue index e7f729bc8d..636adf5e9e 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue @@ -41,7 +41,7 @@ const props = defineProps({ }) const { chart, commonBackgroundPop, element } = toRefs(props) const toolTip = computed(() => { - return props.themes === 'dark' ? 'light' : 'dark' + return props.themes || 'dark' }) const predefineColors = COLOR_PANEL const fontSizeList = [] diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelectorInner.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelectorInner.vue index 6203b4015a..7b87a2638e 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelectorInner.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelectorInner.vue @@ -32,7 +32,7 @@ const props = withDefaults( const predefineColors = COLOR_PANEL const typeList = formatterType const toolTip = computed(() => { - return props.themes === 'dark' ? 'light' : 'dark' + return props.themes || 'dark' }) const state = reactive({ axisForm: JSON.parse(JSON.stringify(DEFAULT_YAXIS_STYLE)) diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapPointSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapPointSelector.vue index 0062547c24..326c6f6c8b 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapPointSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapPointSelector.vue @@ -42,7 +42,7 @@ const state = reactive({ } }) const toolTip = computed(() => { - return props.themes === 'dark' ? 'light' : 'dark' + return props.themes || 'dark' }) const emit = defineEmits(['onChangeFlowMapPointForm']) diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/IndicatorNameSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/IndicatorNameSelector.vue index b41b1f0dbc..278c67503c 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/IndicatorNameSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/IndicatorNameSelector.vue @@ -34,7 +34,7 @@ const props = defineProps({ const emit = defineEmits(['onIndicatorNameChange']) const toolTip = computed(() => { - return props.themes === 'dark' ? 'light' : 'dark' + return props.themes || 'dark' }) const predefineColors = COLOR_PANEL const fontFamily = CHART_FONT_FAMILY_ORIGIN.concat( diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/IndicatorValueSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/IndicatorValueSelector.vue index 74048db357..c2901c20e9 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/IndicatorValueSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/IndicatorValueSelector.vue @@ -41,7 +41,7 @@ const props = defineProps({ const emit = defineEmits(['onIndicatorChange', 'onBasicStyleChange']) const toolTip = computed(() => { - return props.themes === 'dark' ? 'light' : 'dark' + return props.themes || 'dark' }) const predefineColors = COLOR_PANEL const fontFamily = CHART_FONT_FAMILY_ORIGIN.concat( diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue index f735832a98..158cedad2e 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue @@ -48,7 +48,7 @@ const props = defineProps({ }) const dvMainStore = dvMainStoreWithOut() const toolTip = computed(() => { - return props.themes === 'dark' ? 'light' : 'dark' + return props.themes || 'dark' }) const { batchOptStatus } = storeToRefs(dvMainStore) watch( diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/LegendSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/LegendSelector.vue index caa3c644f1..2ef9cf1994 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/LegendSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/LegendSelector.vue @@ -37,7 +37,7 @@ useEmitt({ }) const emit = defineEmits(['onLegendChange', 'onMiscChange']) const toolTip = computed(() => { - return props.themes === 'dark' ? 'light' : 'dark' + return props.themes || 'dark' }) watch( () => props.chart.customStyle, diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscStyleSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscStyleSelector.vue index 9fda7d29e9..70e5135761 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscStyleSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscStyleSelector.vue @@ -16,7 +16,7 @@ const props = withDefaults( ) const toolTip = computed(() => { - return props.themes === 'dark' ? 'light' : 'dark' + return props.themes || 'dark' }) const predefineColors = COLOR_PANEL diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/QuadrantSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/QuadrantSelector.vue index a3214471d3..2c5a54ee98 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/QuadrantSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/QuadrantSelector.vue @@ -50,7 +50,7 @@ const state = reactive({ } }) const toolTip = computed(() => { - return props.themes === 'dark' ? 'light' : 'dark' + return props.themes || 'dark' }) const emit = defineEmits(['onChangeQuadrantForm']) diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/TitleSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/TitleSelector.vue index 394785992a..75823120f9 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/TitleSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/TitleSelector.vue @@ -41,7 +41,7 @@ const props = defineProps({ const appearanceStore = useAppearanceStoreWithOut() const emit = defineEmits(['onTextChange']) const toolTip = computed(() => { - return props.themes === 'dark' ? 'light' : 'dark' + return props.themes || 'dark' }) const predefineColors = COLOR_PANEL const fontFamily = CHART_FONT_FAMILY.concat( diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue index 692e0f7f92..1dded27008 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue @@ -46,7 +46,7 @@ const dvMainStore = dvMainStoreWithOut() const { batchOptStatus, mobileInPc } = storeToRefs(dvMainStore) const predefineColors = COLOR_PANEL const toolTip = computed(() => { - return props.themes === 'dark' ? 'light' : 'dark' + return props.themes || 'dark' }) const emit = defineEmits(['onTooltipChange', 'onExtTooltipChange']) const curSeriesFormatter = ref>({}) diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/XAxisSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/XAxisSelector.vue index e097581c1f..adaab34049 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/XAxisSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/XAxisSelector.vue @@ -35,7 +35,7 @@ const state = reactive({ axisForm: JSON.parse(JSON.stringify(DEFAULT_XAXIS_STYLE)) }) const toolTip = computed(() => { - return props.themes === 'dark' ? 'light' : 'dark' + return props.themes || 'dark' }) const emit = defineEmits(['onChangeXAxisForm']) diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/YAxisSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/YAxisSelector.vue index 04f91938f9..0a33f2c374 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/YAxisSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/YAxisSelector.vue @@ -31,7 +31,7 @@ const props = defineProps({ const predefineColors = COLOR_PANEL const typeList = formatterType const toolTip = computed(() => { - return props.themes === 'dark' ? 'light' : 'dark' + return props.themes || 'dark' }) const state = reactive({ axisForm: JSON.parse(JSON.stringify(DEFAULT_YAXIS_STYLE)) diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue index 1ff20d6d97..e464f541b5 100644 --- a/core/core-frontend/src/views/chart/components/views/index.vue +++ b/core/core-frontend/src/views/chart/components/views/index.vue @@ -983,7 +983,7 @@ function onTitleChange() { } const toolTip = computed(() => { - return props.themes === 'dark' ? 'light' : 'dark' + return props.themes || 'dark' }) const marginBottom = computed(() => {