Merge branch 'main' of github.com:nocobase/nocobase into fix/import-export-with-permission

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": "当前表有继承关系时，可选择继承链路上的表作为模板来源",

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],
     ),

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',