From cd04b234a53c7b33418d26ef162947b0c6eebbc0 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 24 Jul 2025 13:49:50 +0800
Subject: [PATCH] fix: update rich text style
---
frontend/src/style.less | 4 ++++
frontend/src/views/dashboard/canvas/CanvasCore.vue | 10 +++++++---
frontend/src/views/dashboard/canvas/CanvasShape.vue | 6 ++++--
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/frontend/src/style.less b/frontend/src/style.less
index 685e6f51..e00658d6 100644
--- a/frontend/src/style.less
+++ b/frontend/src/style.less
@@ -183,3 +183,7 @@ body {
.ed-dialog {
border-radius: 12px !important;
}
+
+.tox-tinymce-inline {
+ z-index: 10 !important;
+}
diff --git a/frontend/src/views/dashboard/canvas/CanvasCore.vue b/frontend/src/views/dashboard/canvas/CanvasCore.vue
index 37b806c0..728d298c 100644
--- a/frontend/src/views/dashboard/canvas/CanvasCore.vue
+++ b/frontend/src/views/dashboard/canvas/CanvasCore.vue
@@ -16,7 +16,7 @@ const { t } = useI18n()
const dashboardStore = dashboardStoreWithOut()
const canvasLocked = ref(false) // Is the canvas movement locked, Default false
const emits = defineEmits(['parentAddItemBox'])
-const { curComponentId, fullscreenFlag } = storeToRefs(dashboardStore)
+const { curComponentId, curComponent, fullscreenFlag } = storeToRefs(dashboardStore)
let currentInstance: any
const props = defineProps({
canvasId: {
@@ -736,8 +736,12 @@ function containerMouseDown(e: MouseEvent) {
}
infoBox.value.startX = e.pageX
infoBox.value.startY = e.pageY
- e.preventDefault()
- e.stopPropagation()
+ if (isMainCanvas(props.canvasId) && curComponent.value?.editing) {
+ // do SQtext
+ } else {
+ e.preventDefault()
+ e.stopPropagation()
+ }
}
function getNowPosition(addSizeX: number, addSizeY: number, moveXSize: number, moveYSize: number) {
diff --git a/frontend/src/views/dashboard/canvas/CanvasShape.vue b/frontend/src/views/dashboard/canvas/CanvasShape.vue
index 3d93959f..f49de87f 100644
--- a/frontend/src/views/dashboard/canvas/CanvasShape.vue
+++ b/frontend/src/views/dashboard/canvas/CanvasShape.vue
@@ -1,6 +1,6 @@
@@ -78,7 +80,7 @@ const shapeClick = (e: MouseEvent) => {
:canvas-id="canvasId"
@enlarge-view="() => emits('enlargeView')"
>
-
+