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 d6674781c1..dd205469be 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue
@@ -15,9 +15,11 @@ import { personInfoApi } from '@/api/user'
import router from '@/router'
import { XpackComponent } from '@/components/plugin'
import PopArea from '@/custom-component/pop-area/Component.vue'
+import CanvasFilterBtn from '@/custom-component/canvas-filter-btn/Component.vue'
const dvMainStore = dvMainStoreWithOut()
const { pcMatrixCount, curComponent, mobileInPc, canvasState } = storeToRefs(dvMainStore)
const openHandler = ref(null)
+
const props = defineProps({
canvasStyleData: {
type: Object,
@@ -295,6 +297,9 @@ const userViewEnlargeOpen = (opt, item) => {
}
const handleMouseDown = () => {
dvMainStore.setCurComponent({ component: null, index: null })
+ if (!curComponent.value || (curComponent.value && curComponent.value.category !== 'hidden')) {
+ dvMainStore.canvasStateChange({ key: 'curPointArea', value: 'base' })
+ }
}
const onPointClick = param => {
@@ -328,6 +333,10 @@ const popAreaAvailable = computed(
() => canvasStyleData.value?.popupAvailable && isMainCanvas(canvasId.value)
)
+const filterBtnShow = computed(
+ () => popAreaAvailable.value && popComponentData.value && popComponentData.value.length > 0
+)
+
defineExpose({
restore
})
@@ -341,6 +350,8 @@ defineExpose({
ref="previewCanvas"
@mousedown="handleMouseDown"
>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/core-frontend/src/custom-component/common/CommonAttr.vue b/core/core-frontend/src/custom-component/common/CommonAttr.vue
index 6bad08932a..c1034964d6 100644
--- a/core/core-frontend/src/custom-component/common/CommonAttr.vue
+++ b/core/core-frontend/src/custom-component/common/CommonAttr.vue
@@ -88,8 +88,10 @@ const colorPickerWidth = computed(() => {
}
})
+// 暂时关闭
const eventsShow = computed(() => {
- return !dashboardActive.value && ['Picture'].includes(element.value.component)
+ return false
+ // return !dashboardActive.value && ['Picture'].includes(element.value.component)
})
const backgroundCustomShow = computed(() => {
diff --git a/core/core-frontend/src/custom-component/picture/Component.vue b/core/core-frontend/src/custom-component/picture/Component.vue
index 40d41c4c3b..7133314144 100644
--- a/core/core-frontend/src/custom-component/picture/Component.vue
+++ b/core/core-frontend/src/custom-component/picture/Component.vue
@@ -71,6 +71,7 @@ const uploadImg = () => {
overflow: hidden;
width: 100%;
height: 100%;
+ cursor: pointer;
}
.pic-upload {
display: flex;
diff --git a/core/core-frontend/src/custom-component/pop-area/Component.vue b/core/core-frontend/src/custom-component/pop-area/Component.vue
index 00d3723aa0..e4f5b8da6e 100644
--- a/core/core-frontend/src/custom-component/pop-area/Component.vue
+++ b/core/core-frontend/src/custom-component/pop-area/Component.vue
@@ -1,6 +1,6 @@
-