@nocobase/flow-engine 2.1.0-beta.24 → 2.1.0-beta.26

package/lib/components/dnd/gridDragPlanner.js

@@ -851,6 +851,18 @@ const findCellByPath = /* @__PURE__ */ __name((layout, path) => {
   }
   return null;
 }, "findCellByPath");
+const findCellByPathOrClosestAncestor = /* @__PURE__ */ __name((layout, path) => {
+  if (!(path == null ? void 0 : path.length)) {
+    return null;
+  }
+  for (let length = path.length; length > 0; length -= 1) {
+    const target = findCellByPath(layout, path.slice(0, length));
+    if (target) {
+      return target;
+    }
+  }
+  return null;
+}, "findCellByPathOrClosestAncestor");
 const removeItemFromGridLayout = /* @__PURE__ */ __name((layout, sourceUid) => {
   const removeFromRows = /* @__PURE__ */ __name((rows) => rows.map((row) => {
     const cellsWithSizes = row.cells.map((cell, index) => {
@@ -918,7 +930,7 @@ const simulateGridLayoutForSlot = /* @__PURE__ */ __name(({
   removeItemFromGridLayout(cloned, sourceUid);
   switch (slot.type) {
     case "column": {
-      const target = findCellByPath(cloned, targetPath);
+      const target = findCellByPathOrClosestAncestor(cloned, targetPath);
       if (!target) {
         break;
       }
@@ -934,7 +946,7 @@ const simulateGridLayoutForSlot = /* @__PURE__ */ __name(({
       break;
     }
     case "empty-column": {
-      const target = findCellByPath(cloned, targetPath);
+      const target = findCellByPathOrClosestAncestor(cloned, targetPath);
       if (target) {
         delete target.cell.rows;
         target.cell.items = [sourceUid];
@@ -942,7 +954,7 @@ const simulateGridLayoutForSlot = /* @__PURE__ */ __name(({
       break;
     }
     case "column-edge": {
-      const target = findCellByPath(cloned, targetPath);
+      const target = findCellByPathOrClosestAncestor(cloned, targetPath);
       if (!target) {
         break;
       }
@@ -969,7 +981,7 @@ const simulateGridLayoutForSlot = /* @__PURE__ */ __name(({
       if (!targetItemUid) {
         break;
       }
-      const target = findCellByPath(cloned, targetPath);
+      const target = findCellByPathOrClosestAncestor(cloned, targetPath);
       if (!(target == null ? void 0 : target.cell.items)) {
         break;
       }

package/lib/components/settings/wrappers/component/SelectWithTitle.d.ts

@@ -15,5 +15,6 @@ export interface SelectWithTitleProps {
     itemKey?: string;
     onChange?: (...args: any[]) => void;
     dropdownRender?: any;
+    tooltip?: any;
 }
-export declare function SelectWithTitle({ title, getDefaultValue, onChange, options, fieldNames, itemKey, ...others }: SelectWithTitleProps): React.JSX.Element;
+export declare function SelectWithTitle({ title, getDefaultValue, onChange, options, fieldNames, itemKey, tooltip, ...others }: SelectWithTitleProps): React.JSX.Element;

package/lib/components/settings/wrappers/component/SelectWithTitle.js

@@ -50,6 +50,7 @@ function SelectWithTitle({
   options,
   fieldNames,
   itemKey,
+  tooltip,
   ...others
 }) {
   const [open, setOpen] = (0, import_react.useState)(false);
@@ -80,6 +81,18 @@ function SelectWithTitle({
     setValue(val);
     onChange == null ? void 0 : onChange({ [itemKey]: val });
   }, "handleChange");
+  const titleNode = /* @__PURE__ */ import_react.default.createElement(
+    "span",
+    {
+      style: {
+        whiteSpace: "nowrap",
+        // 不换行
+        flexShrink: 0
+        // 不被挤压
+      }
+    },
+    title
+  );
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -94,18 +107,7 @@ function SelectWithTitle({
         }, 200);
       }
     },
-    /* @__PURE__ */ import_react.default.createElement(
-      "span",
-      {
-        style: {
-          whiteSpace: "nowrap",
-          // 不换行
-          flexShrink: 0
-          // 不被挤压
-        }
-      },
-      title
-    ),
+    tooltip ? /* @__PURE__ */ import_react.default.createElement(import_antd.Tooltip, { title: tooltip, placement: "top", destroyTooltipOnHide: true }, titleNode) : titleNode,
     /* @__PURE__ */ import_react.default.createElement(
       import_antd.Select,
       {

package/lib/models/flowModel.js

@@ -622,6 +622,7 @@ const _FlowModel = class _FlowModel {
     } else {
       this.props = { ...this.props, ...props };
     }
+    this._options.props = { ...this.props };
   }
   getProps() {
     return this.props;
@@ -1163,6 +1164,7 @@ const _FlowModel = class _FlowModel {
     const data = {
       uid: this.uid,
       ...import_lodash.default.omit(this._options, ["flowEngine"]),
+      props: { ...this.props },
       stepParams: this.stepParams,
       sortIndex: this.sortIndex,
       flowRegistry: {}

package/lib/utils/createCollectionContextMeta.js

@@ -32,6 +32,10 @@ __export(createCollectionContextMeta_exports, {
 module.exports = __toCommonJS(createCollectionContextMeta_exports);
 const RELATION_FIELD_TYPES = ["belongsTo", "hasOne", "hasMany", "belongsToMany", "belongsToArray"];
 const NUMERIC_FIELD_TYPES = ["integer", "float", "double", "decimal"];
+function shouldShowFieldInMeta(field, includeNonFilterable) {
+  return Boolean(field.interface && (includeNonFilterable || field.filterable));
+}
+__name(shouldShowFieldInMeta, "shouldShowFieldInMeta");
 function createFieldMetadata(field, includeNonFilterable) {
   const baseProperties = createMetaBaseProperties(field);
   if (field.isAssociationField()) {
@@ -49,7 +53,7 @@ function createFieldMetadata(field, includeNonFilterable) {
       properties: /* @__PURE__ */ __name(async () => {
         const subProperties = {};
         targetCollection.fields.forEach((subField) => {
-          if (includeNonFilterable || subField.filterable) {
+          if (shouldShowFieldInMeta(subField, includeNonFilterable)) {
             subProperties[subField.name] = createFieldMetadata(subField, includeNonFilterable);
           }
         });
@@ -104,7 +108,7 @@ function createCollectionContextMeta(collectionOrFactory, title, includeNonFilte
       properties: /* @__PURE__ */ __name(async () => {
         const properties = {};
         collection.fields.forEach((field) => {
-          if (includeNonFilterable || field.filterable) {
+          if (shouldShowFieldInMeta(field, includeNonFilterable)) {
             properties[field.name] = createFieldMetadata(field, includeNonFilterable);
           }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.1.0-beta.24",
+  "version": "2.1.0-beta.26",
   "private": false,
   "description": "A standalone flow engine for NocoBase, managing workflows, models, and actions.",
   "main": "lib/index.js",
@@ -8,8 +8,8 @@
   "dependencies": {
     "@formily/antd-v5": "1.x",
     "@formily/reactive": "2.x",
-    "@nocobase/sdk": "2.1.0-beta.24",
-    "@nocobase/shared": "2.1.0-beta.24",
+    "@nocobase/sdk": "2.1.0-beta.26",
+    "@nocobase/shared": "2.1.0-beta.26",
     "ahooks": "^3.7.2",
     "axios": "^1.7.0",
     "dayjs": "^1.11.9",
@@ -37,5 +37,5 @@
   ],
   "author": "NocoBase Team",
   "license": "Apache-2.0",
-  "gitHead": "f77b85530a2d127d9bfe4dca3a26fbb02c1139ba"
+  "gitHead": "b17e1a72057813fa27d8435bf0f2af67ea4b059f"
 }

package/src/__tests__/objectVariable.test.ts

@@ -26,6 +26,7 @@ function setupEngineWithCollections() {
     fields: [
       { name: 'id', type: 'integer', interface: 'number' },
       { name: 'name', type: 'string', interface: 'text' },
+      { name: 'rawUserPayload', type: 'json', filterable: true },
     ],
   });
   ds.addCollection({
@@ -41,6 +42,8 @@ function setupEngineWithCollections() {
     filterTargetKey: 'id',
     fields: [
       { name: 'title', type: 'string', interface: 'text' },
+      { name: 'internalName', type: 'string', interface: 'text' },
+      { name: 'rawPostPayload', type: 'json', filterable: true },
       { name: 'author', type: 'belongsTo', target: 'users', interface: 'm2o' },
       { name: 'tags', type: 'belongsToMany', target: 'tags', interface: 'm2m' },
     ],
@@ -91,6 +94,27 @@ describe('objectVariable utilities', () => {
     });
   });
 
+  it('createAssociationAwareObjectMetaFactory should hide fields without interface from object variable meta', async () => {
+    const { collection } = setupEngineWithCollections();
+    const obj = { title: 'hello', internalName: 'internal', rawPostPayload: { secret: true }, author: 1 };
+    const metaFactory = createAssociationAwareObjectMetaFactory(
+      () => collection,
+      'Current object',
+      () => obj,
+    );
+
+    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('name');
+    expect(authorFields).not.toHaveProperty('rawUserPayload');
+  });
+
   it('integrates with FlowContext.resolveJsonTemplate to call variables:resolve with flattened contextParams', async () => {
     const { engine, collection } = setupEngineWithCollections();
     const obj = { author: 1 };

package/src/components/__tests__/gridDragPlanner.test.ts

@@ -829,6 +829,52 @@ describe('simulateLayoutForSlot', () => {
     expect(nestedRows[1].sizes).toEqual([12, 12]);
   });
 
+  it('keeps nested column insertion target when removing a sibling collapses the original path', () => {
+    const layout = createLayout(
+      {
+        vyvfw2jw071: [['6ad3ccaabd5', 'ff8b4b57f65']],
+        ablhoqw51gb: [['21b422021b8']],
+      },
+      {
+        vyvfw2jw071: [24],
+        ablhoqw51gb: [24],
+      },
+      ['vyvfw2jw071', 'ablhoqw51gb'],
+    );
+    layout.layout = normalizeGridLayout({
+      rows: layout.rows,
+      sizes: layout.sizes,
+      rowOrder: layout.rowOrder,
+      itemUids: ['6ad3ccaabd5', 'ff8b4b57f65', '21b422021b8'],
+    });
+
+    const slot: LayoutSlot = {
+      type: 'column',
+      rowId: 'll5vo5pzj3u',
+      columnIndex: 0,
+      insertIndex: 1,
+      position: 'after',
+      path: [
+        { rowId: 'vyvfw2jw071', cellId: 'vyvfw2jw071:cell:0' },
+        { rowId: 'll5vo5pzj3u', cellId: 'ghy612j5zzg' },
+      ],
+      rect,
+    };
+
+    const result = simulateLayoutForSlot({ slot, sourceUid: 'ff8b4b57f65', layout });
+
+    expect(result.layout!.rows).toMatchObject([
+      {
+        id: 'vyvfw2jw071',
+        cells: [{ items: ['6ad3ccaabd5', 'ff8b4b57f65'] }],
+      },
+      {
+        id: 'ablhoqw51gb',
+        cells: [{ items: ['21b422021b8'] }],
+      },
+    ]);
+  });
+
   it('treats dragging an item to its own item-edge as no-op', () => {
     const layout = createLayout(
       {

package/src/components/dnd/gridDragPlanner.ts

@@ -1146,6 +1146,21 @@ const findCellByPath = (layout: GridLayoutV2, path?: GridLayoutPath) => {
   return null;
 };
 
+const findCellByPathOrClosestAncestor = (layout: GridLayoutV2, path?: GridLayoutPath) => {
+  if (!path?.length) {
+    return null;
+  }
+
+  for (let length = path.length; length > 0; length -= 1) {
+    const target = findCellByPath(layout, path.slice(0, length));
+    if (target) {
+      return target;
+    }
+  }
+
+  return null;
+};
+
 const removeItemFromGridLayout = (layout: GridLayoutV2, sourceUid: string) => {
   const removeFromRows = (rows: GridRowV2[]): GridRowV2[] =>
     rows
@@ -1231,7 +1246,7 @@ const simulateGridLayoutForSlot = ({
 
   switch (slot.type) {
     case 'column': {
-      const target = findCellByPath(cloned, targetPath);
+      const target = findCellByPathOrClosestAncestor(cloned, targetPath);
       if (!target) {
         break;
       }
@@ -1247,7 +1262,7 @@ const simulateGridLayoutForSlot = ({
       break;
     }
     case 'empty-column': {
-      const target = findCellByPath(cloned, targetPath);
+      const target = findCellByPathOrClosestAncestor(cloned, targetPath);
       if (target) {
         delete target.cell.rows;
         target.cell.items = [sourceUid];
@@ -1255,7 +1270,7 @@ const simulateGridLayoutForSlot = ({
       break;
     }
     case 'column-edge': {
-      const target = findCellByPath(cloned, targetPath);
+      const target = findCellByPathOrClosestAncestor(cloned, targetPath);
       if (!target) {
         break;
       }
@@ -1282,7 +1297,7 @@ const simulateGridLayoutForSlot = ({
       if (!targetItemUid) {
         break;
       }
-      const target = findCellByPath(cloned, targetPath);
+      const target = findCellByPathOrClosestAncestor(cloned, targetPath);
       if (!target?.cell.items) {
         break;
       }

package/src/components/settings/wrappers/component/SelectWithTitle.tsx

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Select } from 'antd';
+import { Select, Tooltip } from 'antd';
 import React, { useEffect, useRef, useState } from 'react';
 import { useFlowEngineContext } from '../../../../provider';
 
@@ -19,6 +19,7 @@ export interface SelectWithTitleProps {
   itemKey?: string;
   onChange?: (...args: any[]) => void;
   dropdownRender?: any;
+  tooltip?: any;
 }
 
 export function SelectWithTitle({
@@ -28,6 +29,7 @@ export function SelectWithTitle({
   options,
   fieldNames,
   itemKey,
+  tooltip,
   ...others
 }: SelectWithTitleProps) {
   const [open, setOpen] = useState(false);
@@ -66,6 +68,17 @@ export function SelectWithTitle({
     setValue(val);
     onChange?.({ [itemKey]: val });
   };
+  const titleNode = (
+    <span
+      style={{
+        whiteSpace: 'nowrap', // 不换行
+        flexShrink: 0, // 不被挤压
+      }}
+    >
+      {title}
+    </span>
+  );
+
   return (
     <div
       style={{ alignItems: 'center', display: 'flex', justifyContent: 'space-between' }}
@@ -79,14 +92,13 @@ export function SelectWithTitle({
         }, 200);
       }}
     >
-      <span
-        style={{
-          whiteSpace: 'nowrap', // 不换行
-          flexShrink: 0, // 不被挤压
-        }}
-      >
-        {title}
-      </span>
+      {tooltip ? (
+        <Tooltip title={tooltip} placement="top" destroyTooltipOnHide>
+          {titleNode}
+        </Tooltip>
+      ) : (
+        titleNode
+      )}
       <Select
         {...others}
         open={open}

package/src/models/__tests__/flowModel.test.ts

@@ -1855,7 +1855,7 @@ describe('FlowModel', () => {
     });
 
     describe('serialization', () => {
-      test('should serialize basic model data, excluding props and flowEngine', () => {
+      test('should serialize basic model data with the latest props, excluding flowEngine', () => {
         model.sortIndex = 5;
         model.setProps({ name: 'Test Model', value: 42 });
         model.setStepParams({
@@ -1867,13 +1867,12 @@ describe('FlowModel', () => {
         expect(serialized).toEqual(
           expect.objectContaining({
             uid: model.uid,
+            props: expect.objectContaining({ name: 'Test Model', value: 42 }),
             stepParams: expect.objectContaining({ flow1: { step1: { param1: 'value1' } } }),
             sortIndex: 5,
             subModels: expect.any(Object),
           }),
         );
-        // props should be excluded from serialization
-        expect(serialized.props).toBeUndefined();
         expect(serialized.flowEngine).toBeUndefined();
       });
 
@@ -1892,6 +1891,7 @@ describe('FlowModel', () => {
         expect(serialized).toEqual(
           expect.objectContaining({
             uid: 'empty-model',
+            props: expect.objectContaining({ foo: 'bar' }),
             stepParams: expect.any(Object),
             sortIndex: expect.any(Number),
             subModels: expect.any(Object),
@@ -1899,6 +1899,22 @@ describe('FlowModel', () => {
         );
         expect(serialized.flowEngine).toBeUndefined();
       });
+
+      test('should serialize the latest props after multiple updates', () => {
+        model.setProps({ fieldNames: { title: 'name' }, searchable: true });
+        model.setProps({ fieldNames: { title: 'age' } });
+        model.setProps('defaultExpandAll', false);
+
+        const serialized = model.serialize();
+
+        expect(serialized.props).toEqual(
+          expect.objectContaining({
+            fieldNames: { title: 'age' },
+            searchable: true,
+            defaultExpandAll: false,
+          }),
+        );
+      });
     });
   });
 

package/src/models/flowModel.tsx

@@ -762,6 +762,8 @@ export class FlowModel<Structure extends DefaultStructure = DefaultStructure> {
     } else {
       this.props = { ...this.props, ...props };
     }
+
+    this._options.props = { ...this.props };
   }
 
   getProps(): ReadonlyModelProps {
@@ -1509,6 +1511,7 @@ export class FlowModel<Structure extends DefaultStructure = DefaultStructure> {
     const data = {
       uid: this.uid,
       ..._.omit(this._options, ['flowEngine']),
+      props: { ...this.props },
       stepParams: this.stepParams,
       sortIndex: this.sortIndex,
       flowRegistry: {},

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);
           }
         });