diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue index 163e43d87c..71fb0f6663 100644 --- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue +++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue @@ -189,7 +189,8 @@ const DETAIL_CHART_ATTR: DeepPartial = { scrollCfg: { open: false } - } + }, + showPosition: 'dialog' } const state = reactive({ @@ -200,7 +201,8 @@ const DETAIL_TABLE_ATTR: DeepPartial = { scrollCfg: { open: false } - } + }, + showPosition: 'dialog' } const authShow = computed(() => editMode.value === 'edit' || dvInfo.value.weight > 3) diff --git a/core/core-frontend/src/models/chart/chart.d.ts b/core/core-frontend/src/models/chart/chart.d.ts index 8d65b4bec5..2dff80aff4 100644 --- a/core/core-frontend/src/models/chart/chart.d.ts +++ b/core/core-frontend/src/models/chart/chart.d.ts @@ -67,6 +67,7 @@ declare interface Chart { seriesFieldObjs?: any[] flowMapStartName?: Axis[] flowMapEndName?: Axis[] + showPosition: string } declare type CustomAttr = DeepPartial | JSONString> declare type CustomStyle = DeepPartial | JSONString> diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue index 46a64a9148..402474f774 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue @@ -267,6 +267,7 @@ init() :key="fieldOption.id" :label="fieldOption.name" :value="fieldOption.id" + :disabled="chart.type === 'table-info' && fieldOption.deType === 7" > { } s2Options.dataCell = viewMeta => { const deType = axisMap[viewMeta.valueField]?.deType - if (deType === 7) { + if (deType === 7 && chart.showPosition !== 'dialog') { return new ImageCell(viewMeta, viewMeta?.spreadsheet) } if (viewMeta.colIndex === 0 && s2Options.showSeriesNumber) { diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue index 061cd2e5ac..5e6f343db3 100644 --- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue +++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue @@ -506,7 +506,7 @@ const trackMenuCalc = itemId => { // 明细表 URL 字段图片放大 if (view.value.type === 'table-info') { view.value.xAxis?.forEach(axis => { - if (axis.id === itemId) { + if (axis.id === itemId && axis.deType === 7) { trackMenuInfo.push('enlarge') } })