fix(client): fix the issue where adding block templates in the popup …

…does not display (#4531) * chore: avoid crashing * fix(client): fix the issue where adding block templates in the popup does not display
nocobase · May 30, 2024 · 803ea80 · 803ea80
1 parent d83c102
commit 803ea80
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/packages/core/client/src/schema-component/antd/table-v2/Table.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.tsx
@@ -230,7 +230,6 @@ const SortableRow = (props) => {
       ? classObj.topActiveClass
       : classObj.bottomActiveClass;
 
-  console.log('active?.id !== id', active?.id, id, active?.id !== id);
   return (
     <tr
       ref={active?.id !== id ? setNodeRef : null}

diff --git a/packages/core/client/src/schema-component/hooks/useDesignable.tsx b/packages/core/client/src/schema-component/hooks/useDesignable.tsx
@@ -65,6 +65,9 @@ interface RecursiveRemoveOptions {
 }
 
 const generateUid = (s: ISchema) => {
+  if (!s) {
+    return;
+  }
   if (!s['x-uid']) {
     s['x-uid'] = uid();
   }

diff --git a/packages/core/client/src/schema-initializer/buttons/RecordBlockInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/RecordBlockInitializers.tsx
@@ -178,7 +178,7 @@ function useRecordBlocks() {
             if (fromOthersInPopup) {
               return templateWrapCollection(templateSchema, { item, fromOthersInPopup });
             }
-            templateWrap(templateSchema, { item });
+            return templateWrap(templateSchema, { item });
           },
           showAssociationFields: true,
         };

diff --git a/packages/core/client/src/schema-initializer/utils.ts b/packages/core/client/src/schema-initializer/utils.ts
@@ -42,7 +42,7 @@ export const gridRowColWrap = (schema: ISchema) => {
         type: 'void',
         'x-component': 'Grid.Col',
         properties: {
-          [schema.name || uid()]: schema,
+          [schema?.name || uid()]: schema,
         },
       },
     },
@@ -968,13 +968,14 @@ export const useCollectionDataSourceItems = ({
         // 目的是使点击无效
         onClick() {},
         componentProps: {
+          ...dataBlockInitializerProps,
           icon: null,
           title: otherText || t('Other records'),
           name: 'otherRecords',
           showAssociationFields: false,
           onlyCurrentDataSource: false,
           hideChildrenIfSingleCollection: false,
-          onCreateBlockSchema: dataBlockInitializerProps.onCreateBlockSchema,
+          fromOthersInPopup: true,
           componentType: componentTypeMap[componentName] || componentName,
           filter({ collection, associationField }) {
             if (filterOtherRecordsCollection) {