@nocobase/flow-engine 2.0.46 → 2.0.47

package/src/components/dnd/index.tsx

@@ -74,16 +74,19 @@ export const Droppable: FC<{ model: FlowModel<any>; children: React.ReactNode }>
 export const DndProvider: FC<DndContextProps & PersistOptions> = ({
   persist = true,
   children,
+  onDragStart,
   onDragEnd,
+  onDragCancel,
   ...restProps
 }) => {
   const [activeId, setActiveId] = useState<string | null>(null);
   const flowEngine = useFlowEngine();
   return (
     <DndContext
+      {...restProps}
       onDragStart={(event) => {
         setActiveId(event.active.id as string);
-        restProps.onDragStart?.(event);
+        onDragStart?.(event);
       }}
       onDragEnd={(event) => {
         setActiveId(null);
@@ -97,13 +100,17 @@ export const DndProvider: FC<DndContextProps & PersistOptions> = ({
           onDragEnd(event);
         }
       }}
-      {...restProps}
+      onDragCancel={(event) => {
+        setActiveId(null);
+        onDragCancel?.(event);
+      }}
     >
       {children}
       {createPortal(
         <DragOverlay dropAnimation={null} zIndex={2000}>
           {activeId && (
             <span
+              data-testid="flow-drag-preview"
               style={{
                 display: 'inline-flex',
                 alignItems: 'center',
@@ -113,7 +120,6 @@ export const DndProvider: FC<DndContextProps & PersistOptions> = ({
                 borderRadius: 4,
                 padding: '4px 12px',
                 color: '#1890ff',
-                // fontSize: 18,
                 boxShadow: '0 2px 8px rgba(0,0,0,0.15)',
               }}
             >

package/src/utils/__tests__/createCollectionContextMeta.test.ts

@@ -26,6 +26,7 @@ describe('createCollectionContextMeta', () => {
         { name: 'id', type: 'integer', interface: 'number', filterable: true },
         { name: 'email', type: 'string', interface: 'text', filterable: true },
         { name: 'nickname', type: 'string', interface: 'text' }, // 未声明 filterable
+        { name: 'rawUserPayload', type: 'json', filterable: true },
       ],
     });
 
@@ -34,6 +35,7 @@ describe('createCollectionContextMeta', () => {
       fields: [
         { name: 'title', type: 'string', interface: 'text', filterable: true },
         { name: 'author', type: 'belongsTo', target: 'users', interface: 'm2o', filterable: true },
+        { name: 'rawPostPayload', type: 'json', filterable: true },
       ],
     });
 
@@ -44,8 +46,54 @@ describe('createCollectionContextMeta', () => {
     const authorMeta: any = props?.author;
     const authorFields = await authorMeta?.properties?.();
 
+    expect(props).toHaveProperty('title');
+    expect(props).toHaveProperty('author');
+    expect(props).not.toHaveProperty('rawPostPayload');
     expect(authorFields).toBeTruthy();
     expect(authorFields).toHaveProperty('email');
     expect(authorFields).not.toHaveProperty('nickname');
+    expect(authorFields).not.toHaveProperty('rawUserPayload');
+  });
+
+  it('keeps interfaced non-filterable fields but hides fields without interface when includeNonFilterable is true', async () => {
+    const engine = new FlowEngine();
+    const dm = engine.dataSourceManager as any;
+    dm.collectionFieldInterfaceManager = new CollectionFieldInterfaceManager([], {}, dm);
+    engine.context.defineProperty('app', { value: { dataSourceManager: dm } });
+    const ds = dm.getDataSource('main')!;
+
+    ds.addCollection({
+      name: 'users',
+      fields: [
+        { name: 'id', type: 'integer', interface: 'number', filterable: true },
+        { name: 'email', type: 'string', interface: 'text', filterable: true },
+        { name: 'nickname', type: 'string', interface: 'text' },
+        { name: 'rawUserPayload', type: 'json', filterable: true },
+      ],
+    });
+
+    ds.addCollection({
+      name: 'posts',
+      fields: [
+        { name: 'title', type: 'string', interface: 'text', filterable: true },
+        { name: 'internalName', type: 'string', interface: 'text' },
+        { name: 'rawPostPayload', type: 'json', filterable: true },
+        { name: 'author', type: 'belongsTo', target: 'users', interface: 'm2o', filterable: true },
+      ],
+    });
+
+    const posts = ds.getCollection('posts')!;
+    const metaFactory = createCollectionContextMeta(posts, 'Posts', true);
+    const meta = await metaFactory();
+    const props = await (meta?.properties as any)?.();
+    const authorFields = await props?.author?.properties?.();
+
+    expect(props).toHaveProperty('title');
+    expect(props).toHaveProperty('internalName');
+    expect(props).toHaveProperty('author');
+    expect(props).not.toHaveProperty('rawPostPayload');
+    expect(authorFields).toHaveProperty('email');
+    expect(authorFields).toHaveProperty('nickname');
+    expect(authorFields).not.toHaveProperty('rawUserPayload');
   });
 });

package/src/utils/createCollectionContextMeta.ts

@@ -14,6 +14,10 @@ import type { PropertyMetaFactory } from '../flowContext';
 const RELATION_FIELD_TYPES = ['belongsTo', 'hasOne', 'hasMany', 'belongsToMany', 'belongsToArray'] as const;
 const NUMERIC_FIELD_TYPES = ['integer', 'float', 'double', 'decimal'] as const;
 
+function shouldShowFieldInMeta(field: CollectionField, includeNonFilterable?: boolean) {
+  return Boolean(field.interface && (includeNonFilterable || field.filterable));
+}
+
 /**
  * 创建字段的完整元数据（统一处理关联和非关联字段）
  */
@@ -36,7 +40,7 @@ function createFieldMetadata(field: CollectionField, includeNonFilterable?: bool
       properties: async () => {
         const subProperties: Record<string, any> = {};
         targetCollection.fields.forEach((subField) => {
-          if (includeNonFilterable || subField.filterable) {
+          if (shouldShowFieldInMeta(subField, includeNonFilterable)) {
             subProperties[subField.name] = createFieldMetadata(subField, includeNonFilterable);
           }
         });
@@ -114,7 +118,7 @@ export function createCollectionContextMeta(
 
         // 添加所有字段
         collection.fields.forEach((field) => {
-          if (includeNonFilterable || field.filterable) {
+          if (shouldShowFieldInMeta(field, includeNonFilterable)) {
             properties[field.name] = createFieldMetadata(field, includeNonFilterable);
           }
         });