From 7430b9c5bc3e42b14b567ec84fc1f383c93dee00 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Thu, 29 May 2025 10:32:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subject-setting/dashboard-style/OverallSetting.vue | 2 +- .../src/custom-component/de-frame/FrameLinks.vue | 2 +- core/core-frontend/src/style/index.less | 4 ++++ .../views/chart/components/editor/drag-item/DimensionItem.vue | 2 +- .../src/views/chart/components/editor/drag-item/QuotaItem.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 +- .../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 +- .../editor/editor-style/components/TitleSelector.vue | 2 +- .../editor/editor-style/components/TooltipSelector.vue | 2 +- .../editor/editor-style/components/XAxisSelector.vue | 2 +- .../editor/editor-style/components/YAxisSelector.vue | 2 +- .../core-frontend/src/views/chart/components/editor/index.vue | 2 +- 19 files changed, 22 insertions(+), 18 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 04ad2a9af5..a1551bf0a9 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 @@ -331,7 +331,7 @@ const fontFamily = CHART_FONT_FAMILY_ORIGIN.concat( ) const toolTip = computed(() => { - return props.themes === 'dark' ? 'ndark' : 'dark' + return props.themes === 'dark' ? 'light' : '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 6b50bb6ccb..3766b2ba35 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' ? 'ndark' : 'dark' + return props.themes === 'dark' ? 'light' : 'dark' }) const state = reactive({ diff --git a/core/core-frontend/src/style/index.less b/core/core-frontend/src/style/index.less index 1c42b3ab48..c147cd5b24 100644 --- a/core/core-frontend/src/style/index.less +++ b/core/core-frontend/src/style/index.less @@ -696,3 +696,7 @@ strong { } } } + +.ed-upload-list__item .ed-icon--close-tip { + display: none !important; +} diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue index df68aec8ac..42a34e4c1d 100644 --- a/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue +++ b/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue @@ -67,7 +67,7 @@ const emit = defineEmits([ const { item } = toRefs(props) const toolTip = computed(() => { - return props.themes === 'dark' ? 'ndark' : 'dark' + return props.themes === 'dark' ? 'light' : 'dark' }) const showValueFormatter = computed(() => { return ( diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue index f062e47cc3..5449bc46fd 100644 --- a/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue +++ b/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue @@ -80,7 +80,7 @@ const emit = defineEmits([ const { item, chart } = toRefs(props) const toolTip = computed(() => { - return props.themes === 'dark' ? 'ndark' : 'dark' + return props.themes === 'dark' ? 'light' : 'dark' }) watch( [() => props.quotaData, () => props.item, () => props.chart.type], 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 b2bfa4e2de..8a36970a2a 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' ? 'ndark' : 'dark' + return props.themes === 'dark' ? 'light' : '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 f220125c70..798e72bb44 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' ? 'ndark' : 'dark' + return props.themes === 'dark' ? 'light' : '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 e04d870545..0062547c24 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' ? 'ndark' : 'dark' + return props.themes === 'dark' ? 'light' : '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 9a7120fee4..4b84d16845 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' ? 'ndark' : 'dark' + return props.themes === 'dark' ? 'light' : '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 d61f3de737..79a86536f0 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' ? 'ndark' : 'dark' + return props.themes === 'dark' ? 'light' : '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 2525832012..fc927347c4 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' ? 'ndark' : 'dark' + return props.themes === 'dark' ? 'light' : '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 6068f6adb4..53e406b298 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 @@ -34,7 +34,7 @@ useEmitt({ }) const emit = defineEmits(['onLegendChange', 'onMiscChange']) const toolTip = computed(() => { - return props.themes === 'dark' ? 'ndark' : 'dark' + return props.themes === 'dark' ? 'light' : '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 97d2053a6b..9fda7d29e9 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' ? 'ndark' : 'dark' + return props.themes === 'dark' ? 'light' : '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 723fb30e68..a3214471d3 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' ? 'ndark' : 'dark' + return props.themes === 'dark' ? 'light' : '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 a22ef35eee..9c158f61b2 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' ? 'ndark' : 'dark' + return props.themes === 'dark' ? 'light' : '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 004fea48fd..e9ac60c361 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 @@ -45,7 +45,7 @@ const dvMainStore = dvMainStoreWithOut() const { batchOptStatus, mobileInPc } = storeToRefs(dvMainStore) const predefineColors = COLOR_PANEL const toolTip = computed(() => { - return props.themes === 'dark' ? 'ndark' : 'dark' + return props.themes === 'dark' ? 'light' : '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 b3b2d8c74f..eed93d9038 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' ? 'ndark' : 'dark' + return props.themes === 'dark' ? 'light' : '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 c382e96395..068c5ecac0 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' ? 'ndark' : 'dark' + return props.themes === 'dark' ? 'light' : 'dark' }) const state = reactive({ axisForm: JSON.parse(JSON.stringify(DEFAULT_YAXIS_STYLE)) diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue index 1319e62e2f..c61cca7b12 100644 --- a/core/core-frontend/src/views/chart/components/editor/index.vue +++ b/core/core-frontend/src/views/chart/components/editor/index.vue @@ -174,7 +174,7 @@ const editComponentName = () => { }) } const toolTip = computed(() => { - return props.themes === 'dark' ? 'ndark' : 'dark' + return props.themes === 'dark' ? 'light' : 'dark' }) const templateStatusShow = computed(() => {