From 9301932fa7e68bacc538d35ef1de574875d68b78 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 27 Aug 2024 17:08:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F?=
=?UTF-8?q?=E3=80=81=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE=E5=A4=8DTab?=
=?UTF-8?q?=E5=86=85=E5=9B=BE=E8=A1=A8=E4=B8=8D=E6=94=AF=E6=8C=81=E8=87=AA?=
=?UTF-8?q?=E5=8A=A8=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../data-visualization/canvas/DePreview.vue | 13 +++++++++++--
.../custom-component/de-tabs/Component.vue | 19 +++++++++++++++++--
2 files changed, 28 insertions(+), 4 deletions(-)
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 d0f3a569d4..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'
@@ -411,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"
></de-preview>
</el-tab-pane>
</template>
@@ -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: '',