diff --git a/frontend/src/views/dashboard/canvas/CanvasCore.vue b/frontend/src/views/dashboard/canvas/CanvasCore.vue
index 3f7eeee1..cd43be39 100644
--- a/frontend/src/views/dashboard/canvas/CanvasCore.vue
+++ b/frontend/src/views/dashboard/canvas/CanvasCore.vue
@@ -10,12 +10,13 @@ import { useEmitt, useEmittLazy } from '@/utils/useEmitt.ts'
import html2canvas from 'html2canvas'
import EmptyBackground from '@/views/dashboard/common/EmptyBackground.vue'
import { useI18n } from 'vue-i18n'
+import { isMainCanvas } from '@/views/dashboard/utils/canvasUtils.ts'
const { t } = useI18n()
const dashboardStore = dashboardStoreWithOut()
const canvasLocked = ref(false) // Is the canvas movement locked, Default false
const emits = defineEmits(['parentAddItemBox'])
-const { curComponentId, curComponent } = storeToRefs(dashboardStore)
+const { curComponentId, curComponent, fullscreenFlag } = storeToRefs(dashboardStore)
let currentInstance: any
const props = defineProps({
canvasId: {
@@ -1178,7 +1179,7 @@ defineExpose({
@mousemove="moving()"
>
@@ -1186,6 +1187,7 @@ defineExpose({
,
required: true,
},
+ canEdit: {
+ type: Boolean,
+ default: true,
+ },
active: {
type: Boolean,
default: false,
@@ -69,14 +73,16 @@ const shapeClick = (e: MouseEvent) => {
>
-
+
+
+
{
}
}
-// 针对钉钉windows版无法退出全屏问题 这里主动退出
-const handleKeydown = (event) => {
+const handleKeydown = (event: KeyboardEvent) => {
if (event.key === 'Escape' && document.fullscreenElement) {
document.exitFullscreen()
}
diff --git a/frontend/src/views/dashboard/editor/Toolbar.vue b/frontend/src/views/dashboard/editor/Toolbar.vue
index fe4e774d..a42b4434 100644
--- a/frontend/src/views/dashboard/editor/Toolbar.vue
+++ b/frontend/src/views/dashboard/editor/Toolbar.vue
@@ -141,6 +141,7 @@ const addChatChart = (views: any) => {
const previewInner = () => {
if (fullScreeRef.value) {
+ // @ts-expect-error eslint-disable-next-line @typescript-eslint/ban-ts-comment
fullScreeRef.value.toggleFullscreen()
}
}
diff --git a/frontend/src/views/dashboard/utils/canvasUtils.ts b/frontend/src/views/dashboard/utils/canvasUtils.ts
index 5dbeb7f8..97806d85 100644
--- a/frontend/src/views/dashboard/utils/canvasUtils.ts
+++ b/frontend/src/views/dashboard/utils/canvasUtils.ts
@@ -34,6 +34,10 @@ export const load_resource_prepare = (params: any, callBack: (obj: any) => void)
})
}
+export const isMainCanvas = (canvasId: string) => {
+ return canvasId === 'canvas-main'
+}
+
export const initCanvasData = (params: any, callBack: () => void) => {
load_resource_prepare(params, function (result: any) {
dashboardStore.setDashboardInfo(result?.dashboardInfo)