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

Author: dataeaseShu

backend/apps/system/api/user.py

@@ -120,11 +120,11 @@ async def query(session: SessionDep, trans: Trans, id: int) -> UserEditor:
 @router.post("")
 async def create(session: SessionDep, creator: UserCreator, trans: Trans):
     if check_account_exists(session=session, account=creator.account):
-        raise Exception(trans('i18n_exist', msg = f"{trans('i18n_user.account') [{creator.account}]}"))
+        raise Exception(trans('i18n_exist', msg = f"{trans('i18n_user.account')} [{creator.account}]"))
     if check_email_exists(session=session, email=creator.email):
-        raise Exception(trans('i18n_exist', msg = f"{trans('i18n_user.email') [{creator.email}]}"))
+        raise Exception(trans('i18n_exist', msg = f"{trans('i18n_user.email')} [{creator.email}]"))
     if not check_email_format(creator.email):
-        raise Exception(trans('i18n_format_invalid', key = f"{trans('i18n_user.email') [{creator.email}]}"))
+        raise Exception(trans('i18n_format_invalid', key = f"{trans('i18n_user.email')} [{creator.email}]"))
     data = creator.model_dump(exclude_unset=True)
     user_model = UserModel.model_validate(data)
     #user_model.create_time = get_timestamp()
@@ -154,9 +154,9 @@ async def update(session: SessionDep, editor: UserEditor, trans: Trans):
     if editor.account != user_model.account:
         raise Exception(f"account cannot be changed!")
     if editor.email != user_model.email and check_email_exists(session=session, account=editor.email):
-        raise Exception(trans('i18n_exist', msg = f"{trans('i18n_user.email') [{editor.email}]}"))
+        raise Exception(trans('i18n_exist', msg = f"{trans('i18n_user.email')} [{editor.email}]"))
     if not check_email_format(editor.email):
-        raise Exception(trans('i18n_format_invalid', key = f"{trans('i18n_user.email') [{editor.email}]}"))
+        raise Exception(trans('i18n_format_invalid', key = f"{trans('i18n_user.email')} [{editor.email}]"))
     origin_oid: int = user_model.oid
     del_stmt = sqlmodel_delete(UserWsModel).where(UserWsModel.uid == editor.id)
     session.exec(del_stmt)

backend/common/utils/locale.py

@@ -45,9 +45,9 @@ def _get_nested_translation(self, data: Dict[str, Any], key_path: str) -> str:
 
         return current if isinstance(current, str) else key_path
 
-    def __call__(self, key: str, **kwargs) -> str:
+    def __call__(self, arg_key: str, **kwargs) -> str:
         lang_data = self.i18n.translations.get(self.lang, {})
-        text = self._get_nested_translation(lang_data, key)
+        text = self._get_nested_translation(lang_data, arg_key)
 
         if kwargs:
             try:

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
+        //   })
       }
     }
   })