@nocobase/flow-engine 2.1.0-beta.23 → 2.1.0-beta.25

package/lib/components/dnd/index.js

@@ -85,7 +85,7 @@ const resolveDraggableHostNode = /* @__PURE__ */ __name((activatorNode) => {
       `[data-has-float-menu="true"][data-float-menu-model-uid="${toolbarModelUid}"]`
     )
   );
-  const popupRoot = floatToolbarContainer.closest(MENU_SUBMENU_POPUP_SELECTOR);
+  const popupRoot = floatToolbarContainer == null ? void 0 : floatToolbarContainer.closest(MENU_SUBMENU_POPUP_SELECTOR);
   if (popupRoot) {
     return matchedHosts.find((hostNode) => hostNode.closest(MENU_SUBMENU_POPUP_SELECTOR) === popupRoot) || activatorNode;
   }
@@ -275,7 +275,9 @@ const Droppable = /* @__PURE__ */ __name(({ model, children }) => {
 const DndProvider = /* @__PURE__ */ __name(({
   persist = true,
   children,
+  onDragStart,
   onDragEnd,
+  onDragCancel,
   ...restProps
 }) => {
   const [activeId, setActiveId] = (0, import_react.useState)(null);
@@ -311,10 +313,10 @@ const DndProvider = /* @__PURE__ */ __name(({
   return /* @__PURE__ */ import_react.default.createElement(
     import_core.DndContext,
     {
+      ...restProps,
       onDragStart: (event) => {
-        var _a;
         setActiveId(event.active.id);
-        (_a = restProps.onDragStart) == null ? void 0 : _a.call(restProps, event);
+        onDragStart == null ? void 0 : onDragStart(event);
       },
       onDragEnd: (event) => {
         setActiveId(null);
@@ -328,10 +330,9 @@ const DndProvider = /* @__PURE__ */ __name(({
         }
       },
       onDragCancel: (event) => {
-        var _a;
         setActiveId(null);
         setDragAnchorPoint(null);
-        (_a = restProps.onDragCancel) == null ? void 0 : _a.call(restProps, event);
+        onDragCancel == null ? void 0 : onDragCancel(event);
       },
       ...restProps
     },
@@ -348,6 +349,7 @@ const DndProvider = /* @__PURE__ */ __name(({
         activeId && /* @__PURE__ */ import_react.default.createElement(
           "span",
           {
+            "data-testid": "flow-drag-preview",
             style: {
               display: "inline-flex",
               alignItems: "center",

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.23",
+  "version": "2.1.0-beta.25",
   "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.23",
-    "@nocobase/shared": "2.1.0-beta.23",
+    "@nocobase/sdk": "2.1.0-beta.25",
+    "@nocobase/shared": "2.1.0-beta.25",
     "ahooks": "^3.7.2",
     "axios": "^1.7.0",
     "dayjs": "^1.11.9",
@@ -37,5 +37,5 @@
   ],
   "author": "NocoBase Team",
   "license": "Apache-2.0",
-  "gitHead": "bb4c0d3551bf9eff505b63756dd24a0813231f16"
+  "gitHead": "824f8b8200e9fe086135768934d3ef427b212446"
 }

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