From 8d8229f8ca8e81cd7b37af39ab4a9d1d5c204b62 Mon Sep 17 00:00:00 2001 From: Junyi Date: Wed, 16 Apr 2025 18:40:05 +0800 Subject: [PATCH 1/3] fix(client): fix upload component locale (#6682) --- packages/core/client/src/locale/zh-CN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/core/client/src/locale/zh-CN.json b/packages/core/client/src/locale/zh-CN.json index f0fb2ebbe9..0f8fa660a2 100644 --- a/packages/core/client/src/locale/zh-CN.json +++ b/packages/core/client/src/locale/zh-CN.json @@ -818,6 +818,7 @@ "File size should not exceed {{size}}.": "文件大小不能超过 {{size}}", "File size exceeds the limit": "文件大小超过限制", "File type is not allowed": "文件类型不允许", + "Uploading": "上传中", "Incomplete uploading files need to be resolved": "未完成上传的文件需要处理", "Default title for each record": "用作数据的默认标题", "If collection inherits, choose inherited collections as templates": "当前表有继承关系时，可选择继承链路上的表作为模板来源", From 181c24c2a39909db220ce3228379bb6434cd24ff Mon Sep 17 00:00:00 2001 From: gchust Date: Wed, 16 Apr 2025 20:40:32 +0800 Subject: [PATCH 2/3] fix: layload errors if component not exist (#6683) --- .../core/client/src/schema-component/hooks/useDesignable.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/client/src/schema-component/hooks/useDesignable.tsx b/packages/core/client/src/schema-component/hooks/useDesignable.tsx index 655a83a952..560197ef5c 100644 --- a/packages/core/client/src/schema-component/hooks/useDesignable.tsx +++ b/packages/core/client/src/schema-component/hooks/useDesignable.tsx @@ -796,7 +796,7 @@ export function useDesignable() { return component; } const c = get(components, component); - return c[LAZY_COMPONENT_KEY] ?? c; + return c?.[LAZY_COMPONENT_KEY] ?? c; }, [get], ), From 18791bfe2d6c9443aa4de053726564b665f1e891 Mon Sep 17 00:00:00 2001 From: xilesun <2013xile@gmail.com> Date: Wed, 16 Apr 2025 21:18:34 +0800 Subject: [PATCH 3/3] fix(departments): test error --- .../src/server/__tests__/update-department-is-leaf.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts index 3f3803c485..7115d45456 100644 --- a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts +++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts @@ -64,7 +64,7 @@ describe('update department isLeaf', () => { expect(record.isLeaf).toBe(false); }); - it('should update isLeaf when update department', async () => { + it.runIf(process.env.DB_DIALECT !== 'sqlite')('should update isLeaf when update department', async () => { const res = await agent.resource('departments').create({ values: { title: 'Department',