diff --git a/backend/apps/db/db.py b/backend/apps/db/db.py index 8bde9578..d1fa5ab0 100644 --- a/backend/apps/db/db.py +++ b/backend/apps/db/db.py @@ -9,6 +9,7 @@ from sqlalchemy.orm import sessionmaker from apps.datasource.models.datasource import DatasourceConf, CoreDatasource, TableSchema, ColumnSchema from apps.datasource.utils.utils import aes_decrypt from apps.db.engine import get_engine_config +from decimal import Decimal def get_uri(ds: CoreDatasource): @@ -238,7 +239,7 @@ def exec_sql(ds: CoreDatasource, sql: str): columns = result.keys()._keys res = result.fetchall() result_list = [ - {columns[i]: value for i, value in enumerate(tuple_item)} + {columns[i]: float(value) if isinstance(value, Decimal) else value for i, value in enumerate(tuple_item)} for tuple_item in res ] return {"fields": columns, "data": result_list, "sql": bytes.decode(base64.b64encode(bytes(sql, 'utf-8')))} diff --git a/frontend/package.json b/frontend/package.json index 7a59f24c..8b6ad676 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -10,7 +10,7 @@ } }, "scripts": { - "dev": "vite", + "dev": "vue-tsc -b && vite", "build": "vue-tsc -b && vite build", "preview": "vite preview", "lint": "eslint . --ext .vue,.js,.ts,.jsx,.tsx --fix" diff --git a/frontend/src/components/layout/index.vue b/frontend/src/components/layout/index.vue index 88960f45..f7b8a455 100644 --- a/frontend/src/components/layout/index.vue +++ b/frontend/src/components/layout/index.vue @@ -60,7 +60,7 @@ - Back + {{ t('common.back') }} diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json index 712b8220..ff8452ec 100644 --- a/frontend/src/i18n/en.json +++ b/frontend/src/i18n/en.json @@ -9,9 +9,13 @@ "back": "Back", "confirm": "Confirm", "cancel": "Cancel", + "search": "Search", "system_manage": "System Management", + "update_success": "Update", + "save_success": "Save Successful", "next": "Next", - "save": "Save" + "save": "Save", + "logout": "Logout" }, "dashboard": { "length_1_64_characters": "Name field length must be 1-64 characters", @@ -23,7 +27,12 @@ "folder": "Folder", "dashboard": "Dashboard", "delete_warning": "Are you sure you want to delete?", - "delete_success": "Successfully deleted" + "delete_success": "Successfully deleted", + "delete_resource_warn": "Are you sure you want to delete {0}?", + "new_folder": "New Folder", + "new_dashboard": "New Dashboard", + "add_chart": "Add Chart", + "chart_selected": "Selected {0}" }, "qa": { "New Conversation": "New Conversation", diff --git a/frontend/src/i18n/zh-CN.json b/frontend/src/i18n/zh-CN.json index eca7d3e0..3f55310d 100644 --- a/frontend/src/i18n/zh-CN.json +++ b/frontend/src/i18n/zh-CN.json @@ -14,7 +14,8 @@ "update_success": "更新", "save_success": "保存成功", "next": "下一步", - "save": "保存" + "save": "保存", + "logout": "退出登录" }, "dashboard": { "length_1_64_characters": "名称字段长度1-64个字符",