From d2a220c5a5c0dbb864b2697509a3f234c8c9d6e8 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 20 Aug 2025 13:09:42 +0800 Subject: [PATCH 1/3] perf(X-Pack): Open permission configuration and page embedding function --- backend/common/core/config.py | 1 + backend/pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/common/core/config.py b/backend/common/core/config.py index 1d1a6bfe..f32dad35 100644 --- a/backend/common/core/config.py +++ b/backend/common/core/config.py @@ -65,6 +65,7 @@ class Settings(BaseSettings): SQL_DEBUG: bool = False UPLOAD_DIR: str = "/opt/sqlbot/data/file" + SQLBOT_KEY_EXPIRED: int = 100 # License key expiration timestamp, 0 means no expiration @computed_field # type: ignore[prop-decorator] @property diff --git a/backend/pyproject.toml b/backend/pyproject.toml index bbdf7b9d..0b59f29e 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -36,7 +36,7 @@ dependencies = [ "pyyaml (>=6.0.2,<7.0.0)", "fastapi-mcp (>=0.3.4,<0.4.0)", "tabulate>=0.9.0", - "sqlbot-xpack==0.0.3.16", + "sqlbot-xpack>=0.0.3.18", "fastapi-cache2>=0.2.2", "sqlparse>=0.5.3", "redis>=6.2.0", From 0e7099bbdcd610803a02f6f537557cf8ba0660e1 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 20 Aug 2025 13:42:15 +0800 Subject: [PATCH 2/3] perf(X-Pack): Appearance configuration save api error --- backend/apps/system/schemas/system_schema.py | 2 +- frontend/src/components/layout/Menu.vue | 1 + frontend/src/views/system/embedded/SetUi.vue | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/apps/system/schemas/system_schema.py b/backend/apps/system/schemas/system_schema.py index a9546d45..79eca6f4 100644 --- a/backend/apps/system/schemas/system_schema.py +++ b/backend/apps/system/schemas/system_schema.py @@ -175,7 +175,7 @@ class AssistantUiSchema(BaseCreatorDTO): x_type: Optional[str] = 'right' x_val: Optional[int] = 0 y_type: Optional[str] = 'bottom' - y_val: Optional[str] = 33 + y_val: Optional[int] = 33 name: Optional[str] = None welcome: Optional[str] = None welcome_desc: Optional[str] = None diff --git a/frontend/src/components/layout/Menu.vue b/frontend/src/components/layout/Menu.vue index 00f8c3bf..c0f1c91f 100644 --- a/frontend/src/components/layout/Menu.vue +++ b/frontend/src/components/layout/Menu.vue @@ -44,6 +44,7 @@ const routerList = computed(() => { } const list = router.getRoutes().filter((route) => { return ( + !route.path.includes('embeddedPage') && !route.path.includes('assistant') && !route.path.includes('embeddedPage') && !route.path.includes('canvas') && diff --git a/frontend/src/views/system/embedded/SetUi.vue b/frontend/src/views/system/embedded/SetUi.vue index 5b9de567..e6337cb5 100644 --- a/frontend/src/views/system/embedded/SetUi.vue +++ b/frontend/src/views/system/embedded/SetUi.vue @@ -11,6 +11,7 @@ import { cloneDeep } from 'lodash-es' const appearanceStore = useAppearanceStoreWithOut() const { t } = useI18n() +const currentId = ref() interface SqlBotForm { name: string theme: string @@ -132,7 +133,7 @@ const buildParam = () => { formData.append('files', newfile) }) } - formData.append('data', JSON.stringify(unref(sqlBotForm))) + formData.append('data', JSON.stringify({ ...unref(sqlBotForm), id: currentId.value })) return formData } @@ -223,6 +224,7 @@ const open = (row: any) => { console.log(JSON.parse(row.configuration)) // rawData = JSON.parse(row.configuration) // init() + currentId.value = row.id dialogVisible.value = true } defineExpose({ From 0119105dd5f476fd5d4e912af0fd9a7498e9959a Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 20 Aug 2025 13:57:46 +0800 Subject: [PATCH 3/3] chore: Keep xpack dependency packages the latest version --- backend/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/pyproject.toml b/backend/pyproject.toml index 0b59f29e..f925c6ea 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -36,7 +36,7 @@ dependencies = [ "pyyaml (>=6.0.2,<7.0.0)", "fastapi-mcp (>=0.3.4,<0.4.0)", "tabulate>=0.9.0", - "sqlbot-xpack>=0.0.3.18", + "sqlbot-xpack>=0.0.3.19,<1.0.0", "fastapi-cache2>=0.2.2", "sqlparse>=0.5.3", "redis>=6.2.0",