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/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..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.16", + "sqlbot-xpack>=0.0.3.19,<1.0.0", "fastapi-cache2>=0.2.2", "sqlparse>=0.5.3", "redis>=6.2.0", 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 5666f0eb..c3f1f837 100644 --- a/frontend/src/views/system/embedded/SetUi.vue +++ b/frontend/src/views/system/embedded/SetUi.vue @@ -10,6 +10,7 @@ import { cloneDeep } from 'lodash-es' const appearanceStore = useAppearanceStoreWithOut() const { t } = useI18n() +const currentId = ref() interface SqlBotForm { name: string theme: string @@ -131,7 +132,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 } @@ -204,6 +205,7 @@ const open = (row: any) => { console.log(JSON.parse(row.configuration)) // rawData = JSON.parse(row.configuration) // init() + currentId.value = row.id dialogVisible.value = true nextTick(() => { setPageCustomColor('#1CBA90')