@nocobase/flow-engine 2.0.0-alpha.42 → 2.0.0-alpha.44

package/lib/components/settings/wrappers/contextual/FlowsFloatContextMenu.js

@@ -103,7 +103,6 @@ const toolbarPositionToCSS = {
 };
 const floatContainerStyles = /* @__PURE__ */ __name(({ showBackground, showBorder, ctx, toolbarPosition = "inside", toolbarCount }) => import_css.css`
   position: relative;
-  display: inline;
 
   /* 当检测到button时使用inline-block */
   &.has-button-child {

package/lib/components/subModel/utils.d.ts

@@ -10,7 +10,7 @@ import type { Collection } from '../../data-source';
 import { FlowModelContext } from '../../flowContext';
 import { ModelConstructor } from '../../types';
 import { SubModelItem } from './AddSubModelButton';
-export declare function buildSubModelItem(M: ModelConstructor, ctx: FlowModelContext, skipHide?: boolean): SubModelItem;
+export declare function buildSubModelItem(M: ModelConstructor, ctx: FlowModelContext, skipHide?: boolean): Promise<SubModelItem | undefined>;
 export declare function buildItems(subModelBaseClass: string | ModelConstructor): (ctx: FlowModelContext) => Promise<any>;
 export declare function buildSubModelItems(subModelBaseClass: string | ModelConstructor, exclude?: any[]): (ctx: FlowModelContext) => Promise<SubModelItem[]>;
 export declare function buildSubModelGroups(subModelBaseClasses?: (string | ModelConstructor)[]): (ctx: FlowModelContext) => Promise<SubModelItem[]>;

package/lib/components/subModel/utils.js

@@ -46,9 +46,16 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var _ = __toESM(require("lodash"));
 var import_utils = require("../../utils");
-function buildSubModelItem(M, ctx, skipHide = false) {
+async function callHideFunction(hide, ctx) {
+  if (typeof hide === "function") {
+    return await hide(ctx);
+  }
+  return hide;
+}
+__name(callHideFunction, "callHideFunction");
+async function buildSubModelItem(M, ctx, skipHide = false) {
   const meta = M.meta ?? {};
-  if (meta.hide && !skipHide) {
+  if (await callHideFunction(meta.hide, ctx) && !skipHide) {
     return;
   }
   const item = {
@@ -127,12 +134,15 @@ function buildItems(subModelBaseClass) {
 __name(buildItems, "buildItems");
 function buildSubModelItems(subModelBaseClass, exclude = []) {
   return async (ctx) => {
-    var _a;
+    var _a, _b;
     const SubModelClasses = ctx.engine.getSubclassesOf(subModelBaseClass);
-    let candidates = Array.from(SubModelClasses.values()).filter((C) => {
-      var _a2;
-      return !((_a2 = C.meta) == null ? void 0 : _a2.hide);
-    }).filter((C) => {
+    let candidates = [];
+    for (const C of Array.from(SubModelClasses.values())) {
+      if (!await callHideFunction((_a = C.meta) == null ? void 0 : _a.hide, ctx)) {
+        candidates.push(C);
+      }
+    }
+    candidates = candidates.filter((C) => {
       for (const P of exclude) {
         if (typeof P === "string") {
           if (C.name === P) return false;
@@ -142,18 +152,18 @@ function buildSubModelItems(subModelBaseClass, exclude = []) {
       }
       return true;
     }).sort((A, B) => {
-      var _a2, _b;
-      return (((_a2 = A.meta) == null ? void 0 : _a2.sort) ?? 1e3) - (((_b = B.meta) == null ? void 0 : _b.sort) ?? 1e3);
+      var _a2, _b2;
+      return (((_a2 = A.meta) == null ? void 0 : _a2.sort) ?? 1e3) - (((_b2 = B.meta) == null ? void 0 : _b2.sort) ?? 1e3);
     });
     if (candidates.length === 0) {
       const BaseClass = typeof subModelBaseClass === "string" ? ctx.engine.getModelClass(subModelBaseClass) : subModelBaseClass;
-      if (BaseClass && !((_a = BaseClass.meta) == null ? void 0 : _a.hide)) {
+      if (BaseClass && !await callHideFunction((_b = BaseClass.meta) == null ? void 0 : _b.hide, ctx)) {
         candidates = [BaseClass];
       }
     }
     const items = [];
     for (const M of candidates) {
-      const item = buildSubModelItem(M, ctx);
+      const item = await buildSubModelItem(M, ctx);
       if (item) items.push(item);
     }
     return items;

package/lib/models/flowModel.d.ts

@@ -18,9 +18,9 @@ import { ModelEventRegistry } from '../event-registry/ModelEventRegistry';
 import { GlobalFlowRegistry } from '../flow-registry/GlobalFlowRegistry';
 import { FlowDefinition } from '../FlowDefinition';
 import { FlowSettingsOpenOptions } from '../flowSettings';
-import type { EventDefinition, DispatchEventOptions } from '../types';
-import { ForkFlowModel } from './forkFlowModel';
 import type { ScheduleOptions } from '../scheduler/ModelOperationScheduler';
+import type { DispatchEventOptions, EventDefinition } from '../types';
+import { ForkFlowModel } from './forkFlowModel';
 export declare enum ModelRenderMode {
     ReactElement = "reactElement",
     RenderFunction = "renderFunction"
@@ -115,7 +115,7 @@ export declare class FlowModel<Structure extends DefaultStructure = DefaultStruc
      * 批量注册仅当前 FlowModel 类及其子类可用的 Events。
      */
     static registerEvents<TModel extends FlowModel = FlowModel>(events: Record<string, EventDefinition<TModel>>): void;
-    static buildChildrenFromModels(ctx: any, Models: Array<any>): import("..").SubModelItem[];
+    static buildChildrenFromModels(ctx: any, Models: Array<any>): Promise<import("..").SubModelItem[]>;
     get title(): any;
     setTitle(value: string): void;
     setHidden(value: boolean): void;

package/lib/models/flowModel.js

@@ -316,8 +316,8 @@ const _FlowModel = class _FlowModel {
   static registerEvents(events) {
     this.eventRegistry.registerEvents(events);
   }
-  static buildChildrenFromModels(ctx, Models) {
-    return Models.map((M) => (0, import_utils2.buildSubModelItem)(M, ctx, true));
+  static async buildChildrenFromModels(ctx, Models) {
+    return Promise.all(Models.map((M) => (0, import_utils2.buildSubModelItem)(M, ctx, true)));
   }
   get title() {
     var _a;
@@ -620,14 +620,10 @@ const _FlowModel = class _FlowModel {
     if (isBeforeRender) {
       this._lastAutoRunParams = [inputArgs, execOptions.useCache];
     }
-    let finalInputArgs = inputArgs;
-    if (this.context.record) {
-      finalInputArgs = { record: this.context.record, ...inputArgs };
-    }
     if (options == null ? void 0 : options.debounce) {
-      return this._dispatchEventWithDebounce(eventName, finalInputArgs, execOptions);
+      return this._dispatchEventWithDebounce(eventName, inputArgs, execOptions);
     }
-    return this._dispatchEvent(eventName, finalInputArgs, execOptions);
+    return this._dispatchEvent(eventName, inputArgs, execOptions);
   }
   /**
    * 按事件名获取对应的流程集合（保持 getFlows 的顺序，即按 sort 排序）。

package/lib/resources/multiRecordResource.d.ts

@@ -39,7 +39,9 @@ export declare class MultiRecordResource<TDataItem = any> extends BaseRecordReso
     next(): Promise<void>;
     previous(): Promise<void>;
     goto(page: number): Promise<void>;
-    create(data: TDataItem, options?: AxiosRequestConfig): Promise<void>;
+    create(data: TDataItem, options?: AxiosRequestConfig & {
+        refresh?: boolean;
+    }): Promise<void>;
     get(filterByTk: any): Promise<TDataItem | undefined>;
     update(filterByTk: string | number, data: Partial<TDataItem>, options?: AxiosRequestConfig): Promise<void>;
     destroySelectedRows(): Promise<void>;

package/lib/resources/multiRecordResource.js

@@ -129,9 +129,12 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
   }
   async create(data, options) {
     const config = this.mergeRequestConfig({ data }, this.createActionOptions, options);
-    await this.runAction("create", config);
+    const res = await this.runAction("create", config);
     this.emit("saved", data);
-    await this.refresh();
+    if ((options == null ? void 0 : options.refresh) !== false) {
+      await this.refresh();
+    }
+    return res;
   }
   async get(filterByTk) {
     const options = {
@@ -198,7 +201,7 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
     const currentPage = this.getPage();
     const lastPage = Math.ceil((this.getCount() - import_lodash.default.castArray(filterByTk).length) / this.getPageSize());
     if (currentPage > lastPage) {
-      this.setPage(lastPage);
+      this.setPage(lastPage || 1);
     }
     await this.refresh();
   }

package/lib/resources/singleRecordResource.js

@@ -82,7 +82,7 @@ const _SingleRecordResource = class _SingleRecordResource extends import_baseRec
         }
       }
     }
-    await this.runAction(actionName, {
+    const res = await this.runAction(actionName, {
       ...config,
       data: result
     });
@@ -90,6 +90,7 @@ const _SingleRecordResource = class _SingleRecordResource extends import_baseRec
     if ((options == null ? void 0 : options.refresh) !== false) {
       await this.refresh();
     }
+    return res;
   }
   async destroy(options) {
     const config = this.mergeRequestConfig(

package/lib/types.d.ts

@@ -9,8 +9,8 @@
 /// <reference types="react" />
 import { ISchema } from '@formily/json-schema';
 import { SubModelItem } from './components';
-import { FlowContext, FlowModelContext, FlowRuntimeContext, FlowSettingsContext } from './flowContext';
 import type { PropertyOptions } from './flowContext';
+import { FlowContext, FlowModelContext, FlowRuntimeContext, FlowSettingsContext } from './flowContext';
 import type { FlowEngine } from './flowEngine';
 import type { FlowModel } from './models';
 /**
@@ -366,7 +366,7 @@ export type FlowModelMeta = Pick<SubModelItem, 'key' | 'label' | 'icon' | 'child
      * 是否在菜单中隐藏该模型类
      * @default false
      */
-    hide?: boolean;
+    hide?: boolean | ((context: FlowModelContext) => boolean);
     eventList?: {
         label: string;
         value: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.0.0-alpha.42",
+  "version": "2.0.0-alpha.44",
   "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.0.0-alpha.42",
-    "@nocobase/shared": "2.0.0-alpha.42",
+    "@nocobase/sdk": "2.0.0-alpha.44",
+    "@nocobase/shared": "2.0.0-alpha.44",
     "ahooks": "^3.7.2",
     "dayjs": "^1.11.9",
     "dompurify": "^3.0.2",
@@ -36,5 +36,5 @@
   ],
   "author": "NocoBase Team",
   "license": "AGPL-3.0",
-  "gitHead": "9e96dd78d0c1445c8da76863e30f046be5b48d90"
+  "gitHead": "075bd484c270740fe9b02f1989818da91139b6b9"
 }

package/src/components/settings/wrappers/contextual/FlowsFloatContextMenu.tsx

@@ -104,7 +104,6 @@ const toolbarPositionToCSS = {
 // 使用与 NocoBase 一致的悬浮工具栏样式
 const floatContainerStyles = ({ showBackground, showBorder, ctx, toolbarPosition = 'inside', toolbarCount }) => css`
   position: relative;
-  display: inline;
 
   /* 当检测到button时使用inline-block */
   &.has-button-child {

package/src/components/subModel/__tests__/utils.test.ts

@@ -7,14 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { describe, it, expect } from 'vitest';
-import { buildItems, buildSubModelGroups, buildSubModelItem, buildSubModelItems } from '../utils';
-import { mergeSubModelItems } from '../AddSubModelButton';
+import { describe, expect, it } from 'vitest';
+import type { FlowModelContext } from '../../../flowContext';
 import { FlowEngine } from '../../../flowEngine';
 import { FlowModel } from '../../../models';
-import type { FlowModelContext } from '../../../flowContext';
-import type { SubModelItem } from '../AddSubModelButton';
 import type { ModelConstructor } from '../../../types';
+import type { SubModelItem } from '../AddSubModelButton';
+import { mergeSubModelItems } from '../AddSubModelButton';
+import { buildItems, buildSubModelGroups, buildSubModelItem, buildSubModelItems } from '../utils';
 
 type DefineChildren = (ctx: FlowModelContext) => SubModelItem[] | Promise<SubModelItem[]>;
 type WithDefineChildren<T extends ModelConstructor = ModelConstructor> = T & { defineChildren: DefineChildren };
@@ -153,7 +153,7 @@ describe('subModel/utils', () => {
   });
 
   describe('buildSubModelItem', () => {
-    it('returns undefined for hidden meta entries', () => {
+    it('returns undefined for hidden meta entries', async () => {
       const engine = new FlowEngine();
 
       class Parent extends FlowModel {}
@@ -163,7 +163,7 @@ describe('subModel/utils', () => {
       engine.registerModels({ Parent, HiddenChild });
       const parent = engine.createModel({ use: 'Parent', uid: 'parent-hidden' });
 
-      const item = buildSubModelItem(HiddenChild, parent.context);
+      const item = await buildSubModelItem(HiddenChild, parent.context);
       expect(item).toBeUndefined();
     });
 
@@ -194,7 +194,7 @@ describe('subModel/utils', () => {
       const parent = engine.createModel<Parent>({ use: 'Parent', uid: 'parent-child-group' });
       const ctx = parent.context;
 
-      const item = buildSubModelItem(ChildGroup, ctx, false);
+      const item = await buildSubModelItem(ChildGroup, ctx, false);
       expect(item).toBeTruthy();
       expect(item?.label).toBe('Child Group');
       expect(item?.searchable).toBe(true);
@@ -214,7 +214,7 @@ describe('subModel/utils', () => {
       expect(merged?.extra).toMatchObject({ fromTest: true });
     });
 
-    it('falls back to use=current class name when meta createModelOptions omitted', () => {
+    it('falls back to use=current class name when meta createModelOptions omitted', async () => {
       const engine = new FlowEngine();
 
       class Parent extends FlowModel {}
@@ -223,11 +223,11 @@ describe('subModel/utils', () => {
       engine.registerModels({ Parent, PlainChild });
       const parent = engine.createModel<Parent>({ use: 'Parent', uid: 'parent-default-create-options' });
 
-      const item = buildSubModelItem(PlainChild, parent.context);
+      const item = await buildSubModelItem(PlainChild, parent.context);
       expect(item?.createModelOptions).toEqual({ use: 'PlainChild' });
     });
 
-    it('still returns item when skipHide=true', () => {
+    it('still returns item when skipHide=true', async () => {
       const engine = new FlowEngine();
 
       class Parent extends FlowModel {}
@@ -237,7 +237,7 @@ describe('subModel/utils', () => {
       engine.registerModels({ Parent, HiddenChild });
       const parent = engine.createModel({ use: 'Parent', uid: 'parent-skip-hide' });
 
-      const item = buildSubModelItem(HiddenChild, parent.context, true);
+      const item = await buildSubModelItem(HiddenChild, parent.context, true);
       expect(item).toBeTruthy();
       expect(item?.label).toBe('Hidden but allowed');
     });

package/src/components/subModel/utils.ts

@@ -14,9 +14,23 @@ import { FlowModelMeta, ModelConstructor } from '../../types';
 import { isInheritedFrom, resolveCreateModelOptions } from '../../utils';
 import { SubModelItem } from './AddSubModelButton';
 
-export function buildSubModelItem(M: ModelConstructor, ctx: FlowModelContext, skipHide = false): SubModelItem {
+async function callHideFunction(
+  hide: boolean | ((context: FlowModelContext) => boolean | Promise<boolean>),
+  ctx: FlowModelContext,
+) {
+  if (typeof hide === 'function') {
+    return await hide(ctx);
+  }
+  return hide;
+}
+
+export async function buildSubModelItem(
+  M: ModelConstructor,
+  ctx: FlowModelContext,
+  skipHide = false,
+): Promise<SubModelItem | undefined> {
   const meta: FlowModelMeta = (M.meta ?? {}) as FlowModelMeta;
-  if (meta.hide && !skipHide) {
+  if ((await callHideFunction(meta.hide, ctx)) && !skipHide) {
     return;
   }
   // 判断是否为 CollectionBlockModel 的子类（用于集合选择层开启搜索）
@@ -102,8 +116,13 @@ export function buildSubModelItems(subModelBaseClass: string | ModelConstructor,
   return async (ctx: FlowModelContext) => {
     const SubModelClasses = ctx.engine.getSubclassesOf(subModelBaseClass);
     // Collect and sort subclasses by meta.sort (ascending), excluding hidden or inherited ones in `exclude`
-    let candidates = Array.from(SubModelClasses.values())
-      .filter((C) => !C.meta?.hide)
+    let candidates = [];
+    for (const C of Array.from(SubModelClasses.values())) {
+      if (!(await callHideFunction(C.meta?.hide, ctx))) {
+        candidates.push(C);
+      }
+    }
+    candidates = candidates
       .filter((C) => {
         for (const P of exclude as (string | ModelConstructor)[]) {
           if (typeof P === 'string') {
@@ -120,14 +139,14 @@ export function buildSubModelItems(subModelBaseClass: string | ModelConstructor,
     if (candidates.length === 0) {
       const BaseClass =
         typeof subModelBaseClass === 'string' ? ctx.engine.getModelClass(subModelBaseClass) : subModelBaseClass;
-      if (BaseClass && !BaseClass.meta?.hide) {
+      if (BaseClass && !(await callHideFunction(BaseClass.meta?.hide, ctx))) {
         candidates = [BaseClass];
       }
     }
 
     const items: SubModelItem[] = [];
     for (const M of candidates) {
-      const item = buildSubModelItem(M, ctx);
+      const item = await buildSubModelItem(M, ctx);
       if (item) items.push(item);
     }
     return items;

package/src/models/flowModel.tsx

@@ -50,9 +50,9 @@ import { ModelEventRegistry } from '../event-registry/ModelEventRegistry';
 import { GlobalFlowRegistry } from '../flow-registry/GlobalFlowRegistry';
 import { FlowDefinition } from '../FlowDefinition';
 import { FlowSettingsOpenOptions } from '../flowSettings';
-import type { EventDefinition, FlowEvent, DispatchEventOptions } from '../types';
-import { ForkFlowModel } from './forkFlowModel';
 import type { ScheduleOptions } from '../scheduler/ModelOperationScheduler';
+import type { DispatchEventOptions, EventDefinition, FlowEvent } from '../types';
+import { ForkFlowModel } from './forkFlowModel';
 
 // 使用 WeakMap 为每个类缓存一个 ModelActionRegistry 实例
 const classActionRegistries = new WeakMap<typeof FlowModel, ModelActionRegistry>();
@@ -352,8 +352,8 @@ export class FlowModel<Structure extends DefaultStructure = DefaultStructure> {
     this.eventRegistry.registerEvents(events);
   }
 
-  static buildChildrenFromModels(ctx, Models: Array<any>) {
-    return Models.map((M) => buildSubModelItem(M, ctx, true));
+  static async buildChildrenFromModels(ctx, Models: Array<any>) {
+    return Promise.all(Models.map((M) => buildSubModelItem(M, ctx, true)));
   }
 
   get title() {
@@ -749,15 +749,11 @@ export class FlowModel<Structure extends DefaultStructure = DefaultStructure> {
     if (isBeforeRender) {
       this._lastAutoRunParams = [inputArgs, execOptions.useCache];
     }
-    let finalInputArgs = inputArgs;
-    if (this.context.record) {
-      finalInputArgs = { record: this.context.record, ...inputArgs };
-    }
 
     if (options?.debounce) {
-      return this._dispatchEventWithDebounce(eventName, finalInputArgs, execOptions);
+      return this._dispatchEventWithDebounce(eventName, inputArgs, execOptions);
     }
-    return this._dispatchEvent(eventName, finalInputArgs, execOptions);
+    return this._dispatchEvent(eventName, inputArgs, execOptions);
   }
 
   /**

package/src/resources/multiRecordResource.ts

@@ -110,11 +110,14 @@ export class MultiRecordResource<TDataItem = any> extends BaseRecordResource<TDa
     }
   }
 
-  async create(data: TDataItem, options?: AxiosRequestConfig): Promise<void> {
+  async create(data: TDataItem, options?: AxiosRequestConfig & { refresh?: boolean }): Promise<void> {
     const config = this.mergeRequestConfig({ data }, this.createActionOptions, options);
-    await this.runAction('create', config);
+    const res = await this.runAction('create', config);
     this.emit('saved', data);
-    await this.refresh();
+    if (options?.refresh !== false) {
+      await this.refresh();
+    }
+    return res;
   }
 
   async get(filterByTk: any): Promise<TDataItem | undefined> {
@@ -191,7 +194,7 @@ export class MultiRecordResource<TDataItem = any> extends BaseRecordResource<TDa
     const currentPage = this.getPage();
     const lastPage = Math.ceil((this.getCount() - _.castArray(filterByTk).length) / this.getPageSize());
     if (currentPage > lastPage) {
-      this.setPage(lastPage);
+      this.setPage(lastPage || 1);
     }
     await this.refresh();
   }

package/src/resources/singleRecordResource.ts

@@ -56,7 +56,7 @@ export class SingleRecordResource<TData = any> extends BaseRecordResource<TData>
         }
       }
     }
-    await this.runAction(actionName, {
+    const res = await this.runAction(actionName, {
       ...config,
       data: result,
     });
@@ -64,6 +64,7 @@ export class SingleRecordResource<TData = any> extends BaseRecordResource<TData>
     if (options?.refresh !== false) {
       await this.refresh();
     }
+    return res;
   }
 
   async destroy(options?: AxiosRequestConfig): Promise<void> {

package/src/types.ts

@@ -9,8 +9,8 @@
 
 import { ISchema } from '@formily/json-schema';
 import { SubModelItem } from './components';
-import { FlowContext, FlowModelContext, FlowRuntimeContext, FlowSettingsContext } from './flowContext';
 import type { PropertyOptions } from './flowContext';
+import { FlowContext, FlowModelContext, FlowRuntimeContext, FlowSettingsContext } from './flowContext';
 import type { FlowEngine } from './flowEngine';
 import type { FlowModel } from './models';
 import { FilterGroupOptions } from './resources';
@@ -453,7 +453,7 @@ export type FlowModelMeta =
      * 是否在菜单中隐藏该模型类
      * @default false
      */
-    hide?: boolean;
+    hide?: boolean | ((context: FlowModelContext) => boolean);
     eventList?: { label: string; value: string }[]; // 支持的事件列表
   };