From 7e6f4d3a0027d3c82a51601286c6b89f3ef82a16 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 21 Jul 2025 18:01:45 +0800
Subject: [PATCH] refactor: canvas shape style

---
 .../src/views/dashboard/canvas/CanvasCore.vue    |  2 +-
 .../src/views/dashboard/canvas/ComponentBar.vue  | 16 +++++++++-------
 .../src/views/dashboard/canvas/DragHandle.vue    |  2 +-
 .../views/dashboard/components/sq-tab/index.vue  |  2 +-
 .../views/dashboard/components/sq-text/index.vue |  2 +-
 .../src/views/dashboard/css/CanvasStyle.less     |  4 ++--
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/frontend/src/views/dashboard/canvas/CanvasCore.vue b/frontend/src/views/dashboard/canvas/CanvasCore.vue
index b03619df..2a6c141b 100644
--- a/frontend/src/views/dashboard/canvas/CanvasCore.vue
+++ b/frontend/src/views/dashboard/canvas/CanvasCore.vue
@@ -1093,7 +1093,7 @@ function tabMoveOutCheckSQ() {
 
 function tabMoveInCheckSQ() {
   const { cloneItem, moveItem } = infoBox.value
-  if (cloneItem && moveItem && moveItem !== 'SQTab') {
+  if (cloneItem && moveItem && moveItem.component !== 'SQTab') {
     const width = cloneItem.offsetWidth
     const height = cloneItem.offsetHeight
     const left = cloneItem.offsetLeft
diff --git a/frontend/src/views/dashboard/canvas/ComponentBar.vue b/frontend/src/views/dashboard/canvas/ComponentBar.vue
index ac2ee942..7b0583d1 100644
--- a/frontend/src/views/dashboard/canvas/ComponentBar.vue
+++ b/frontend/src/views/dashboard/canvas/ComponentBar.vue
@@ -60,9 +60,12 @@ const doDeleteComponent = (e: MouseEvent) => {
               @click="doPreview"
               >{{ t('dashboard.preview') }}</el-dropdown-item
             >
-            <el-dropdown-item divided :icon="icon_delete" @click="doDeleteComponent">{{
-              t('dashboard.delete')
-            }}</el-dropdown-item>
+            <el-dropdown-item
+              :divided="configItem.component === 'SQView'"
+              :icon="icon_delete"
+              @click="doDeleteComponent"
+              >{{ t('dashboard.delete') }}</el-dropdown-item
+            >
           </el-dropdown-menu>
         </template>
       </el-dropdown>
@@ -74,10 +77,10 @@ const doDeleteComponent = (e: MouseEvent) => {
 .component-bar-main {
   height: 20px;
   position: absolute;
-  right: 5px;
-  top: 5px;
+  right: 12px;
+  top: 12px;
   display: flex;
-  z-index: 5;
+  z-index: 1;
   cursor: pointer !important;
 }
 
@@ -93,7 +96,6 @@ const doDeleteComponent = (e: MouseEvent) => {
   background: rgba(255, 255, 255, 1);
   border: 1px solid rgba(217, 220, 223, 1);
   padding: 8px;
-
   &:hover {
     background-color: rgba(245, 246, 247, 1);
   }
diff --git a/frontend/src/views/dashboard/canvas/DragHandle.vue b/frontend/src/views/dashboard/canvas/DragHandle.vue
index 945820ad..221c6d8b 100644
--- a/frontend/src/views/dashboard/canvas/DragHandle.vue
+++ b/frontend/src/views/dashboard/canvas/DragHandle.vue
@@ -54,7 +54,7 @@ const shadowStyle = (size: number, index: number) => {
 
 <style scoped lang="less">
 .dragArea {
-  opacity: 0.05;
+  opacity: 0;
 }
 
 .dragHandle {
diff --git a/frontend/src/views/dashboard/components/sq-tab/index.vue b/frontend/src/views/dashboard/components/sq-tab/index.vue
index 308ca4a1..815ad3a7 100644
--- a/frontend/src/views/dashboard/components/sq-tab/index.vue
+++ b/frontend/src/views/dashboard/components/sq-tab/index.vue
@@ -279,7 +279,7 @@ defineExpose({
 
 <style scoped lang="less">
 ::v-deep(.ed-tabs__header) {
-  margin: 0 24px 0 12px !important;
+  margin: 0 40px 0 12px !important;
 }
 ::v-deep(.ed-tabs__nav-scroll) {
   margin: 0 12px !important;
diff --git a/frontend/src/views/dashboard/components/sq-text/index.vue b/frontend/src/views/dashboard/components/sq-text/index.vue
index fe1ceb68..64e4d116 100644
--- a/frontend/src/views/dashboard/components/sq-text/index.vue
+++ b/frontend/src/views/dashboard/components/sq-text/index.vue
@@ -56,7 +56,7 @@ const init = reactive({
   plugins: 'link letterspacing', // 插件
   // 工具栏
   toolbar:
-    'undo redo | fontfamily fontsize | |forecolor backcolor bold italic letterspacing |underline strikethrough link lineheight| formatselect | alignleft aligncenter alignright |',
+    'fontfamily fontsize | |forecolor backcolor bold italic letterspacing |underline strikethrough link lineheight| formatselect | alignleft aligncenter alignright |',
   toolbar_location: '/',
   font_family_formats:
     '微软雅黑=Microsoft YaHei;宋体=SimSun;黑体=SimHei;仿宋=FangSong;华文黑体=STHeiti;华文楷体=STKaiti;华文宋体=STSong;华文仿宋=STFangsong;Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings',
diff --git a/frontend/src/views/dashboard/css/CanvasStyle.less b/frontend/src/views/dashboard/css/CanvasStyle.less
index 29254bff..44590cb2 100644
--- a/frontend/src/views/dashboard/css/CanvasStyle.less
+++ b/frontend/src/views/dashboard/css/CanvasStyle.less
@@ -64,9 +64,9 @@
 
   .movingItem {
     position: absolute;
-
     border: none;
-
+    border-radius: 12px;
+    overflow: hidden;
     &:before {
       position: absolute;
       z-index: 2;