Merge branch 'main' of https://github.com/dataease/SQLBot

Author: dataeaseShu

frontend/src/views/dashboard/canvas/CanvasCore.vue

@@ -251,7 +251,9 @@ function removeItemFromPositionBox(item: CanvasItem) {
  */
 function recomputeCellWidth() {
   if (!containerRef.value) return
-  maxCell.value = Math.round(containerRef.value.offsetWidth / cellWidth.value)
+  maxCell.value = isMainCanvas(props.canvasId)
+    ? Math.floor(containerRef.value.offsetWidth / cellWidth.value)
+    : Math.round(containerRef.value.offsetWidth / cellWidth.value)
 }
 
 function sizeInit() {
@@ -918,6 +920,8 @@ function startMove(e: MouseEvent, item: CanvasItem, index: number) {
         ),
         1
       )
+      // temp adjust board
+
       // Adjust the accuracy of moving coordinate changes
       const newY = Math.max(
         Math.floor(

frontend/src/views/dashboard/editor/DashboardEditor.vue

@@ -66,12 +66,12 @@ const canvasSizeInit = () => {
 
 const sizeInit = () => {
   if (dashboardEditorRef.value) {
+    baseMarginLeft.value = 16
+    baseMarginTop.value = 16
     // @ts-expect-error eslint-disable-next-line @typescript-eslint/ban-ts-comment
     const screenWidth = dashboardEditorRef.value.offsetWidth
     // @ts-expect-error eslint-disable-next-line @typescript-eslint/ban-ts-comment
     const screenHeight = dashboardEditorRef.value.offsetHeight
-    baseMarginLeft.value = 10
-    baseMarginTop.value = 10
     baseWidth.value =
       (screenWidth - baseMarginLeft.value) / props.baseMatrixCount.x - baseMarginLeft.value
     baseHeight.value =

frontend/src/views/dashboard/editor/Toolbar.vue

@@ -272,6 +272,7 @@ const previewInner = () => {
       height: 24px;
       font-size: 16px;
       width: 300px;
+      font-weight: 500;
       overflow: hidden;
       cursor: pointer;
       color: #1f2329;
@@ -324,6 +325,8 @@ const previewInner = () => {
 
 .back-icon {
   margin-top: 8px;
+  width: 20px;
+  height: 20px;
 }
 
 .toolbar-hover-icon {

frontend/src/views/dashboard/editor/index.vue

@@ -91,7 +91,7 @@ const baseParams = computed(() => {
 
 <style scoped lang="less">
 .editor-content {
-  padding: 12px;
+  padding: 8px;
   width: 100vw;
   height: 100vh;
   background: #fff;
@@ -105,7 +105,7 @@ const baseParams = computed(() => {
   border-radius: 12px;
   position: relative;
   background: #f5f6f7;
-  box-shadow: 0px 4px 8px 0px rgba(31, 35, 41, 0.1);
+  box-shadow: 4px 4px 8px 4px rgba(31, 35, 41, 0.2);
   overflow: hidden;
   width: 100%;
   height: 100%;