Merge pull request '完善工具栏的样式和功能' (#2) from master into stage

Reviewed-on: http://159.75.202.135:33300/liuhuajie/lowcode-frontend/pulls/2

src/components/DynamicComponent.vue

@@ -12,10 +12,16 @@
       @mouseover="isHovered = true"
       @mouseleave="isHovered = false"
   >
+    <div v-if="isHovered" class="component-header">
+      <span>{{componentName}}</span>
+    </div>
     <div v-if="componentSelected" class="component-header" :style="headerStyle">
-      <span>{{ componentName }}</span>
-      <button style="color: #1057CC" @click="handleEditFunc">编辑</button>
-      <button style="color: #1057CC" @click="handleDeleteFunc">删除</button>
+      <div  style="background-color:#3457cc;color: #ffffff;padding: 5px ;margin-right: 2px">{{ componentName }}</div>
+      <div v-if="componentSelected" style="background-color:#3457cc;color:#ffffff;padding: 6px 5px 5px 5px;display: flex;width: fit-content;flex-wrap: nowrap">
+        <icon-copy class="clickable" size="20" />
+        <icon-edit class="clickable" @click="handleEditFunc" size="20"/>
+        <icon-delete class="clickable" @click="handleDeleteFunc" size="20"/>
+      </div>
     </div>
     <div class="component-content">
       <component
@@ -103,6 +109,7 @@ const adjustHeaderPosition = () => {
 
   let top = 0;
   let left = 0;
+  let justification='';
 
   // 获取最外层组件渲染区域的边界
   const containerEl = document.getElementById('renderArea');
@@ -110,34 +117,35 @@ const adjustHeaderPosition = () => {
 
   const containerRect = containerEl.getBoundingClientRect();
 
+  debugger
   // 计算上下左右的可用空间
   const topSpace = componentRect.top - containerRect.top;
   const bottomSpace = containerRect.bottom - componentRect.bottom;
-  const leftSpace = componentRect.left - containerRect.left;
-  const rightSpace = containerRect.right - componentRect.right;
-
   // 检查上方是否有足够的空间
   if (topSpace >= headerRect.height) {
-    top = -headerRect.height - 10;
-    left = rightSpace >= headerRect.width ? componentRect.width - headerRect.width : 0;
-  } else if (bottomSpace >= headerRect.height) {
-    top = componentRect.height + 10;
-    left = rightSpace >= headerRect.width ? componentRect.width - headerRect.width : 0;
-  } else if (leftSpace >= headerRect.width) {
-    left = -headerRect.width - 10;
-    top = 0;
-  } else if (rightSpace >= headerRect.width) {
-    left = componentRect.width + 10;
-    top = 0;
-  }
+    top = -headerRect.height+2;
 
+  } else if (bottomSpace >= headerRect.height) {
+    top = componentRect.height-2;
+  }
+  if (headerRect.width>componentRect.width)
+  {
+    left=-2;
+    justification='flex-start';
+  }else
+  {
+    left=componentRect.width-headerRect.width-2;
+    justification='flex-end';
+  }
   headerStyle.value = {
     top: `${top}px`,
-    left: `${left}px`
+    left: `${left}px`,
+    justifyContent: justification
   };
 };
 
 onMounted(() => {
+  adjustHeaderPosition()
   // console.log("组件挂载后",props.componentData);
 });
 
@@ -159,21 +167,20 @@ watch(() => componentSelected.value, () => {
 }
 
 .dynamic-component.hover-state {
-  border: 1px dashed #1057CC; /* 悬停时浅蓝色虚线框 */
+  border: 1px dashed #3457cc; /* 悬停时浅蓝色虚线框 */
 }
 
 .dynamic-component.click-state {
-  border: 2px solid #1057CC; /* 点击时深蓝色实线框 */
+  border: 2px solid #3457cc; /* 点击时深蓝色实线框 */
 }
 
 .component-header {
   position: absolute;
-  color: #1057CC;
-  padding: 5px;
+  color: #3457cc;
   display: flex;
+  flex-wrap: nowrap; /* 禁止换行 */
+  align-content: center;
   align-items: center;
-  justify-content: space-between;
-  width: 100%;
   z-index: 1000;
   background-color: transparent; /* 确保没有背景颜色 */
   box-sizing: border-box; /* 确保内边距不会影响宽度 */
@@ -186,7 +193,7 @@ watch(() => componentSelected.value, () => {
 .component-header button {
   background-color: transparent;
   border: none;
-  color: #1057CC;
+  color: #3457cc;
   cursor: pointer;
   margin-left: 10px;
 }
@@ -200,4 +207,8 @@ watch(() => componentSelected.value, () => {
   position: relative;
   z-index: 1;
 }
+
+.clickable {
+  cursor: pointer; /* 当鼠标悬停在此元素上时，鼠标指针变为手形 */
+}
 </style>

src/stores/useSchemeStore.ts

@@ -80,7 +80,7 @@ export const useSchemeStore = defineStore('scheme', {
         },
 
         updateNowScheme(updates: Partial<IPageComponent>) {
-            debugger;
+            // debugger;
             this.nowComponentsData = updates;
             pushToStack(this.selectedComponentStack, this.nowComponentsData.id);
 
@@ -89,7 +89,7 @@ export const useSchemeStore = defineStore('scheme', {
             return this.nowComponentsData;
         },
         deleteScheme(id: string) {
-            debugger;
+            // debugger;
             console.log("删除前,组件id", id);
             const currentStateHash = this.currentHash;
             const objToDelete = findObjectById(this.previewScheme, id);