diff --git a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue index a370d94ec7..245f5ef3de 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue @@ -115,6 +115,10 @@ const props = defineProps({ type: String, required: false, default: 'inherit' + }, + optType: { + type: String, + required: false } }) const { @@ -418,6 +422,7 @@ const showActive = computed(() => props.popActive || (dvMainStore.mobileInPc && ref="component" class="component" :canvas-style-data="canvasStyleData" + :opt-type="optType" :dv-info="dvInfo" :dv-type="dvInfo.type" :canvas-view-info="canvasViewInfo" diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue index 0f47f210b8..bf4ef09f28 100644 --- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue +++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue @@ -98,6 +98,7 @@ { :suffixId="suffixId" :font-family="fontFamily" @onPointClick="onPointClick" + :opt-type="optType" > diff --git a/core/core-frontend/src/views/chart/components/views/components/DrillPath.vue b/core/core-frontend/src/views/chart/components/views/components/DrillPath.vue index 3e9e3a7dbb..9bb9e7fb39 100644 --- a/core/core-frontend/src/views/chart/components/views/components/DrillPath.vue +++ b/core/core-frontend/src/views/chart/components/views/components/DrillPath.vue @@ -17,6 +17,11 @@ const props = defineProps({ type: Object, required: false, default: null + }, + disabled: { + type: Boolean, + required: false, + default: false } }) @@ -75,6 +80,7 @@ const drillPathVar = computed(() => [{ '--drill-color': textColor.value }]) v-if="props.drillFilters && props.drillFilters.length > 0" class="drill" :style="drillPathVar" + :class="{ noClick: disabled }" > @@ -119,4 +125,7 @@ const drillPathVar = computed(() => [{ '--drill-color': textColor.value }]) color: var(--drill-color) !important; } } +.noClick { + pointer-events: none; /* 禁止鼠标点击 */ +} 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 a5ee63e857..ba6d201d76 100644 --- a/core/core-frontend/src/views/chart/components/views/index.vue +++ b/core/core-frontend/src/views/chart/components/views/index.vue @@ -136,6 +136,10 @@ const props = defineProps({ type: String, required: false, default: 'inherit' + }, + optType: { + type: String, + required: false } }) const dynamicAreaId = ref('') @@ -714,6 +718,7 @@ const changeDataset = () => { } onMounted(() => { if (!view.value.isPlugin) { + state.drillClickDimensionList = view.value?.chartExtRequest?.drill ?? [] queryData(!showPosition.value.includes('viewDialog')) } if (!listenerEnable.value) { @@ -1223,7 +1228,11 @@ const titleTooltipWidth = computed(() => { :themes="canvasStyleData.dashboard.themeColor" :view-icon="view.type" > - +