Merge branch 'main' into next

.github/workflows/changelog-and-release.yml

@@ -89,7 +89,7 @@ jobs:
         with:
           node-version: 18
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install
       - name: Run script
         shell: bash
         run: |
@@ -101,6 +101,6 @@ jobs:
         if: ${{ steps.get-info.outputs.version == 'rc' }}
         run: |
           git pull origin main
-          git add .
+          git add CHANGELOG.md CHANGELOG.zh-CN.md
           git commit -m "docs: update changelogs"
           git push origin main

.github/workflows/manual-release-develop.yml

@@ -55,12 +55,15 @@ jobs:
           do
           git clone -b develop https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/nocobase/$repo.git packages/pro-plugins/@nocobase/$repo
           done
-      - name: Set Node.js 18
+      - name: Set Node.js 20
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
-      - name: Install Lerna
+      - name: yarn install and build
-        run: npm install -g lerna@4 auto-changelog@2
+        run: |
+          yarn config set registry https://registry.npmjs.org/
+          yarn install
+          yarn build
       - name: Run release.sh
         shell: bash
         run: |

.github/workflows/manual-release-next.yml

@@ -100,12 +100,15 @@ jobs:
           do
           git clone -b next https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/nocobase/$repo.git packages/pro-plugins/@nocobase/$repo
           done
-      - name: Set Node.js 18
+      - name: Set Node.js 20
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
-      - name: Install Lerna
+      - name: yarn install and build
-        run: npm install -g lerna@4 auto-changelog@2
+        run: |
+          yarn config set registry https://registry.npmjs.org/
+          yarn install
+          yarn build
       - name: Run release.sh
         shell: bash
         run: |

.github/workflows/manual-release.yml

@@ -94,12 +94,15 @@ jobs:
           do
           git clone -b main https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/nocobase/$repo.git packages/pro-plugins/@nocobase/$repo
           done
-      - name: Set Node.js 18
+      - name: Set Node.js 20
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
-      - name: Install Lerna
+      - name: yarn install and build
-        run: npm install -g lerna@4 auto-changelog@2
+        run: |
+          yarn config set registry https://registry.npmjs.org/
+          yarn install
+          yarn build
       - name: Run release.sh
         shell: bash
         run: |

packages/core/client/src/schema-initializer/items/DataBlockInitializer.tsx

@@ -398,7 +398,7 @@ export const DataBlockInitializer: FC<DataBlockInitializerProps> = (props) => {
     ] as MenuProps['items'];
   }, [searchedChildren, hideChildrenIfSingleCollection, name, compile, title, icon, onClick, props]);
 
-  if (childItems.length > 1 || (childItems.length === 1 && childItems[0].children?.length > 0)) {
+  if (childItems.length > 1 || (childItems.length === 1 && childItems[0].children)) {
     return (
       <SchemaInitializerMenu
         onOpenChange={(keys) => {