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 4e7faa5c6d..6c69f1e2b3 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue @@ -67,6 +67,11 @@ const props = defineProps({ required: false, default: 1 }, + outerSearchCount: { + type: Number, + required: false, + default: 0 + }, isSelector: { type: Boolean, default: false @@ -82,7 +87,8 @@ const { showPosition, previewActive, downloadStatus, - outerScale + outerScale, + outerSearchCount } = toRefs(props) const domId = 'preview-' + canvasId.value const scaleWidthPoint = ref(100) @@ -99,6 +105,9 @@ const dashboardActive = computed(() => { return dvInfo.value.type === 'dashboard' }) +const curSearchCount = computed(() => { + return outerSearchCount.value + searchCount.value +}) // 大屏是否保持宽高比例 非全屏 full 都需要保持宽高比例 const dataVKeepRadio = computed(() => { return canvasStyleData.value?.screenAdaptor !== 'full' @@ -133,9 +142,6 @@ const canvasStyle = computed(() => { ? changeStyleWithScale(canvasStyleData.value?.width, scaleHeightPoint.value) + 'px' : '100%' } - if (!dashboardActive.value) { - style['overflow-y'] = 'hidden' - } return style }) @@ -414,7 +420,7 @@ defineExpose({ :config="item" :style="getShapeItemShowStyle(item)" :show-position="showPosition" - :search-count="searchCount" + :search-count="curSearchCount" :scale="mobileInPc ? 100 : scaleMin" :is-selector="props.isSelector" @userViewEnlargeOpen="userViewEnlargeOpen($event, item)" diff --git a/core/core-frontend/src/custom-component/de-tabs/Component.vue b/core/core-frontend/src/custom-component/de-tabs/Component.vue index 10cadeb968..198667440f 100644 --- a/core/core-frontend/src/custom-component/de-tabs/Component.vue +++ b/core/core-frontend/src/custom-component/de-tabs/Component.vue @@ -74,6 +74,7 @@ :preview-active="editableTabsValue === tabItem.name" :show-position="showPosition" :outer-scale="scale" + :outer-search-count="searchCount" > @@ -164,10 +165,24 @@ const props = defineProps({ type: Number, required: false, default: 1 + }, + // 仪表板刷新计时器 + searchCount: { + type: Number, + required: false, + default: 0 } }) -const { element, isEdit, showPosition, canvasStyleData, canvasViewInfo, dvInfo, scale } = - toRefs(props) +const { + element, + isEdit, + showPosition, + canvasStyleData, + canvasViewInfo, + dvInfo, + scale, + searchCount +} = toRefs(props) const state = reactive({ activeTabName: '',