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

frontend/src/router/watch.ts

@@ -19,7 +19,7 @@ export const watchRouter = (router: any) => {
       return
     }
     if (!token) {
-      ElMessage.error('Please login first')
+      // ElMessage.error('Please login first')
       next('/login')
       return
     }

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

@@ -921,25 +921,10 @@ function startMove(e: MouseEvent, item: CanvasItem, index: number) {
       //If the current canvas is locked, no component movement will be performed
       if (canvasLocked.value) return
       // Adjust the accuracy of moving coordinate changes
-      const newX = Math.max(
-        Math.floor(
-          (nowCloneItemX - 20 + infoBox.value.cloneItem.offsetWidth / 96 - baseMarginLeft.value) /
-            cellWidth.value +
-            1
-        ),
-        1
-      )
-      // temp adjust board
-
-      // Adjust the accuracy of moving coordinate changes
-      const newY = Math.max(
-        Math.floor(
-          (nowCloneItemY + infoBox.value.cloneItem.offsetHeight / 96 - baseMarginTop.value) /
-            cellHeight.value +
-            1
-        ),
-        1
-      )
+      let newX = Math.floor(nowCloneItemX / cellWidth.value)
+      let newY = Math.floor(nowCloneItemY / cellHeight.value)
+      newX = newX > 0 ? newX : 1
+      newY = newY > 0 ? newY : 1
       debounce(() => {
         if (newX !== infoBox.value.oldX || newY !== infoBox.value.oldY) {
           movePlayer(moveItem, { x: newX, y: newY })

frontend/src/views/ds/DatasourceForm.vue

@@ -274,15 +274,15 @@ const save = async (formEl: FormInstance | undefined) => {
         }
       } else {
         requestObj.tables = list
-        const a = datasourceApi
-          .add(requestObj)
-          .then(() => {
-            close()
-            emit('refresh')
-          })
-          .finally(() => {
-            saveLoading.value = false
-          })
+        // const a = datasourceApi
+        //   .add(requestObj)
+        //   .then(() => {
+        //     close()
+        //     emit('refresh')
+        //   })
+        //   .finally(() => {
+        //     saveLoading.value = false
+        //   })
       }
     }
   })