@nocobase/flow-engine 2.0.0-alpha.39 → 2.0.0-alpha.40

package/lib/acl/Acl.d.ts

@@ -18,6 +18,7 @@ export declare class ACL {
     private dataSources;
     private loaded;
     private loadingPromise;
+    private lastToken;
     constructor(flowEngine: FlowEngine);
     load(): Promise<void>;
     getActionAlias(actionName: string): any;

package/lib/acl/Acl.js

@@ -37,7 +37,17 @@ const _ACL = class _ACL {
   dataSources = {};
   loaded = false;
   loadingPromise = null;
+  // 用于识别当前鉴权状态（例如切换登录用户后应重新加载）
+  // 记录上一次用于鉴权的 token，用于识别登录态变更
+  lastToken = null;
   async load() {
+    var _a, _b, _c, _d;
+    const currentToken = ((_d = (_c = (_b = (_a = this.flowEngine) == null ? void 0 : _a.context) == null ? void 0 : _b.api) == null ? void 0 : _c.auth) == null ? void 0 : _d.token) || "";
+    if (this.loaded && this.lastToken !== currentToken) {
+      this.loaded = false;
+      this.loadingPromise = null;
+      this.dataSources = {};
+    }
     if (this.loaded) return;
     if (!this.loadingPromise) {
       this.loadingPromise = (async () => {
@@ -46,6 +56,7 @@ const _ACL = class _ACL {
         });
         this.dataSources = data || {};
         this.loaded = true;
+        this.lastToken = currentToken;
       })();
     }
     await this.loadingPromise;

package/lib/components/FieldModelRenderer.js

@@ -78,9 +78,11 @@ function FieldModelRenderer(props) {
   const handleCompositionStart = /* @__PURE__ */ __name(() => {
     composingRef.current = true;
   }, "handleCompositionStart");
-  const handleCompositionEnd = /* @__PURE__ */ __name((e) => {
+  const handleCompositionEnd = /* @__PURE__ */ __name((e, flag = true) => {
     composingRef.current = false;
-    props.onChange(e);
+    if (flag) {
+      props.onChange(e);
+    }
   }, "handleCompositionEnd");
   const modelProps = {
     ...import_lodash.default.omit(rest, flowModelRendererPropKeys),

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

@@ -83,6 +83,7 @@ const renderToolbarItems = /* @__PURE__ */ __name((model, showDeleteButton, show
     return /* @__PURE__ */ import_react.default.createElement(ItemComponent, { key: itemConfig.key, model });
   });
 }, "renderToolbarItems");
+const TOOLBAR_ITEM_WIDTH = 19;
 const toolbarPositionToCSS = {
   inside: `
     top: 2px;
@@ -90,7 +91,7 @@ const toolbarPositionToCSS = {
   above: `
     top: 0px;
     transform: translateY(-100%);
-    padding-bottom: 2px;
+    padding-bottom: 0px;
     margin-bottom: -2px;
   `,
   below: `
@@ -100,7 +101,7 @@ const toolbarPositionToCSS = {
     margin-top: -2px;
   `
 };
-const floatContainerStyles = /* @__PURE__ */ __name(({ showBackground, showBorder, ctx, toolbarPosition = "inside" }) => import_css.css`
+const floatContainerStyles = /* @__PURE__ */ __name(({ showBackground, showBorder, ctx, toolbarPosition = "inside", toolbarCount }) => import_css.css`
   position: relative;
   display: inline;
 
@@ -136,6 +137,7 @@ const floatContainerStyles = /* @__PURE__ */ __name(({ showBackground, showBorde
     border: ${showBorder ? "2px solid var(--colorBorderSettingsHover)" : ""};
     border-radius: ${ctx.themeToken.borderRadiusLG}px;
     pointer-events: none;
+    min-width: ${TOOLBAR_ITEM_WIDTH * toolbarCount}px;
 
     &.nb-in-template {
       background: var(--colorTemplateBgSettingsHover);
@@ -431,7 +433,13 @@ const FlowsFloatContextMenuWithModel = (0, import_react2.observer)(
       "div",
       {
         ref: containerRef,
-        className: `${floatContainerStyles({ showBackground, showBorder, ctx: model.context, toolbarPosition })} ${hideMenu ? "hide-parent-menu" : ""} ${hasButton ? "has-button-child" : ""} ${className || ""}`,
+        className: `${floatContainerStyles({
+          showBackground,
+          showBorder,
+          ctx: model.context,
+          toolbarPosition,
+          toolbarCount: getToolbarCount(flowEngine, extraToolbarItems)
+        })} ${hideMenu ? "hide-parent-menu" : ""} ${hasButton ? "has-button-child" : ""} ${className || ""}`,
         style: containerStyle,
         "data-has-float-menu": "true",
         onMouseMove: handleChildHover
@@ -492,6 +500,13 @@ const FlowsFloatContextMenuWithModelById = (0, import_react2.observer)(
     displayName: "FlowsFloatContextMenuWithModelById"
   }
 );
+function getToolbarCount(flowEngine, extraToolbarItems) {
+  var _a, _b;
+  const toolbarItems = ((_b = (_a = flowEngine == null ? void 0 : flowEngine.flowSettings) == null ? void 0 : _a.getToolbarItems) == null ? void 0 : _b.call(_a)) || [];
+  const allToolbarItems = [...toolbarItems, ...extraToolbarItems || []];
+  return allToolbarItems.length;
+}
+__name(getToolbarCount, "getToolbarCount");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   FlowsFloatContextMenu

package/lib/models/CollectionFieldModel.d.ts

@@ -40,6 +40,7 @@ export declare class CollectionFieldModel<T extends DefaultStructure = DefaultSt
     static getDefaultBindingByField(ctx: FlowEngineContext, collectionField: CollectionField, options?: {
         useStrict?: boolean;
         fallbackToTargetTitleField?: boolean;
+        targetCollectionTitleField?: CollectionField;
     }): BindingOptions | null;
     static bindModelToInterface(modelName: string, interfaceName: string | string[], options?: {
         isDefault?: boolean;

package/lib/models/CollectionFieldModel.js

@@ -159,8 +159,11 @@ const _CollectionFieldModel = class _CollectionFieldModel extends import_flowMod
     if (options.fallbackToTargetTitleField) {
       const binding = this.getDefaultBindingByField(ctx, collectionField, { useStrict: true });
       if (!binding) {
-        if (collectionField.isAssociationField() && collectionField.targetCollectionTitleField) {
-          return this.getDefaultBindingByField(ctx, collectionField.targetCollectionTitleField);
+        if (collectionField.isAssociationField() && (options == null ? void 0 : options.targetCollectionTitleField) || collectionField.targetCollectionTitleField) {
+          return this.getDefaultBindingByField(
+            ctx,
+            (options == null ? void 0 : options.targetCollectionTitleField) || collectionField.targetCollectionTitleField
+          );
         }
       }
       return binding;

package/lib/resources/multiRecordResource.js

@@ -146,21 +146,22 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
   }
   async update(filterByTk, data, options) {
     const collection = this.context.collection;
-    const filterTargetKey = collection.filterTargetKey;
-    let result = data;
+    const filterTargetKey = collection == null ? void 0 : collection.filterTargetKey;
     const tkData = collection == null ? void 0 : collection.getFilterByTK(this.context.record);
-    if (Array.isArray(filterTargetKey)) {
-      result = {
-        ...data,
-        ...tkData || {}
-      };
-    } else {
-      result = {
-        ...data,
-        [filterTargetKey]: tkData
-      };
+    let result = data;
+    if (collection && filterTargetKey) {
+      if (Array.isArray(filterTargetKey)) {
+        result = {
+          ...data,
+          ...tkData || {}
+        };
+      } else {
+        result = {
+          ...data,
+          [filterTargetKey]: tkData
+        };
+      }
     }
-    console.log(result);
     const config = this.mergeRequestConfig(
       {
         params: {

package/lib/resources/singleRecordResource.js

@@ -66,18 +66,20 @@ const _SingleRecordResource = class _SingleRecordResource extends import_baseRec
       config.params.filterByTk = this.getFilterByTk();
       actionName = "update";
       const collection = this.context.collection;
-      const filterTargetKey = collection.filterTargetKey;
+      const filterTargetKey = collection == null ? void 0 : collection.filterTargetKey;
       const tkData = collection == null ? void 0 : collection.getFilterByTK(this.context.record);
-      if (Array.isArray(filterTargetKey)) {
-        result = {
-          ...data,
-          ...tkData || {}
-        };
-      } else {
-        result = {
-          ...data,
-          [filterTargetKey]: tkData
-        };
+      if (collection && filterTargetKey) {
+        if (Array.isArray(filterTargetKey)) {
+          result = {
+            ...data,
+            ...tkData || {}
+          };
+        } else {
+          result = {
+            ...data,
+            [filterTargetKey]: tkData
+          };
+        }
       }
     }
     await this.runAction(actionName, {

package/package.json

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

package/src/acl/Acl.tsx

@@ -21,10 +21,23 @@ export class ACL {
   private dataSources: Record<string, any> = {};
   private loaded = false;
   private loadingPromise: Promise<void> | null = null;
+  // 用于识别当前鉴权状态（例如切换登录用户后应重新加载）
+  // 记录上一次用于鉴权的 token，用于识别登录态变更
+  private lastToken: string | null = null;
 
   constructor(private flowEngine: FlowEngine) {}
 
   async load() {
+    // 基于 token 识别登录态是否发生变化
+    const currentToken = this.flowEngine?.context?.api?.auth?.token || '';
+
+    // 已加载但登录态变更：强制重载
+    if (this.loaded && this.lastToken !== currentToken) {
+      this.loaded = false;
+      this.loadingPromise = null;
+      this.dataSources = {};
+    }
+
     if (this.loaded) return;
 
     if (!this.loadingPromise) {
@@ -34,6 +47,7 @@ export class ACL {
         });
         this.dataSources = data || {};
         this.loaded = true;
+        this.lastToken = currentToken;
       })();
     }
 

package/src/acl/__tests__/Acl.test.tsx

@@ -69,4 +69,47 @@ describe('ACL', () => {
     });
     expect(notOk).toBe(false);
   });
+
+  it('reloads permissions when auth token changes', async () => {
+    const payload1 = {
+      data: {
+        allowAll: false,
+        actionAlias: { remove: 'destroy' },
+        resources: ['posts'],
+        actions: {},
+        strategy: { actions: [] },
+      },
+    };
+    const payload2 = {
+      data: {
+        allowAll: false,
+        actionAlias: { remove: 'erase' },
+        resources: ['posts'],
+        actions: {},
+        strategy: { actions: [] },
+      },
+    };
+
+    const engine = new FlowEngine();
+    const api: any = {
+      auth: { token: 't1' },
+      request: vi.fn().mockImplementation(async () => {
+        // 返回依据当前 token 的不同 ACL 数据
+        return api.auth.token === 't1' ? { data: payload1 } : { data: payload2 };
+      }),
+    };
+    engine.context.defineProperty('api', { value: api });
+
+    const acl = new ACL(engine);
+    await acl.load();
+    expect(acl.getActionAlias('remove')).toBe('destroy');
+
+    // 切换 token，应触发下次校验时的 ACL 重载
+    api.auth.token = 't2';
+    await acl.aclCheck({ dataSourceKey: 'main', resourceName: 'posts', actionName: 'remove' });
+    expect(acl.getActionAlias('remove')).toBe('erase');
+
+    // 确认 roles:check 请求至少调用两次（初次 + 重载）
+    expect(api.request).toHaveBeenCalledTimes(2);
+  });
 });

package/src/components/FieldModelRenderer.tsx

@@ -54,9 +54,11 @@ export function FieldModelRenderer(props: any) {
     composingRef.current = true;
   };
 
-  const handleCompositionEnd = (e: React.CompositionEvent<HTMLInputElement>) => {
+  const handleCompositionEnd = (e: React.CompositionEvent<HTMLInputElement>, flag = true) => {
     composingRef.current = false;
-    props.onChange(e);
+    if (flag) {
+      props.onChange(e);
+    }
   };
 
   const modelProps = {

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

@@ -80,6 +80,9 @@ const renderToolbarItems = (
     });
 };
 
+// Width in pixels per toolbar item (icon width + spacing)
+const TOOLBAR_ITEM_WIDTH = 19;
+
 const toolbarPositionToCSS = {
   inside: `
     top: 2px;
@@ -87,7 +90,7 @@ const toolbarPositionToCSS = {
   above: `
     top: 0px;
     transform: translateY(-100%);
-    padding-bottom: 2px;
+    padding-bottom: 0px;
     margin-bottom: -2px;
   `,
   below: `
@@ -99,7 +102,7 @@ const toolbarPositionToCSS = {
 };
 
 // 使用与 NocoBase 一致的悬浮工具栏样式
-const floatContainerStyles = ({ showBackground, showBorder, ctx, toolbarPosition = 'inside' }) => css`
+const floatContainerStyles = ({ showBackground, showBorder, ctx, toolbarPosition = 'inside', toolbarCount }) => css`
   position: relative;
   display: inline;
 
@@ -135,6 +138,7 @@ const floatContainerStyles = ({ showBackground, showBorder, ctx, toolbarPosition
     border: ${showBorder ? '2px solid var(--colorBorderSettingsHover)' : ''};
     border-radius: ${ctx.themeToken.borderRadiusLG}px;
     pointer-events: none;
+    min-width: ${TOOLBAR_ITEM_WIDTH * toolbarCount}px;
 
     &.nb-in-template {
       background: var(--colorTemplateBgSettingsHover);
@@ -580,9 +584,13 @@ const FlowsFloatContextMenuWithModel: React.FC<ModelProvidedProps> = observer(
     return (
       <div
         ref={containerRef}
-        className={`${floatContainerStyles({ showBackground, showBorder, ctx: model.context, toolbarPosition })} ${
-          hideMenu ? 'hide-parent-menu' : ''
-        } ${hasButton ? 'has-button-child' : ''} ${className || ''}`}
+        className={`${floatContainerStyles({
+          showBackground,
+          showBorder,
+          ctx: model.context,
+          toolbarPosition,
+          toolbarCount: getToolbarCount(flowEngine, extraToolbarItems),
+        })} ${hideMenu ? 'hide-parent-menu' : ''} ${hasButton ? 'has-button-child' : ''} ${className || ''}`}
         style={containerStyle}
         data-has-float-menu="true"
         onMouseMove={handleChildHover}
@@ -668,3 +676,9 @@ const FlowsFloatContextMenuWithModelById: React.FC<ModelByIdProps> = observer(
 );
 
 export { FlowsFloatContextMenu };
+
+function getToolbarCount(flowEngine, extraToolbarItems) {
+  const toolbarItems = flowEngine?.flowSettings?.getToolbarItems?.() || [];
+  const allToolbarItems = [...toolbarItems, ...(extraToolbarItems || [])];
+  return allToolbarItems.length;
+}

package/src/models/CollectionFieldModel.tsx

@@ -159,13 +159,23 @@ export class CollectionFieldModel<T extends DefaultStructure = DefaultStructure>
   static getDefaultBindingByField(
     ctx: FlowEngineContext,
     collectionField: CollectionField,
-    options: { useStrict?: boolean; fallbackToTargetTitleField?: boolean } = {},
+    options: {
+      useStrict?: boolean;
+      fallbackToTargetTitleField?: boolean;
+      targetCollectionTitleField?: CollectionField;
+    } = {},
   ): BindingOptions | null {
     if (options.fallbackToTargetTitleField) {
       const binding = this.getDefaultBindingByField(ctx, collectionField, { useStrict: true });
       if (!binding) {
-        if (collectionField.isAssociationField() && collectionField.targetCollectionTitleField) {
-          return this.getDefaultBindingByField(ctx, collectionField.targetCollectionTitleField);
+        if (
+          (collectionField.isAssociationField() && options?.targetCollectionTitleField) ||
+          collectionField.targetCollectionTitleField
+        ) {
+          return this.getDefaultBindingByField(
+            ctx,
+            options?.targetCollectionTitleField || collectionField.targetCollectionTitleField,
+          );
         }
       }
       return binding;

package/src/resources/multiRecordResource.ts

@@ -131,21 +131,24 @@ export class MultiRecordResource<TDataItem = any> extends BaseRecordResource<TDa
 
   async update(filterByTk: string | number, data: Partial<TDataItem>, options?: AxiosRequestConfig): Promise<void> {
     const collection = this.context.collection;
-    const filterTargetKey = collection.filterTargetKey;
-    let result = data;
+    const filterTargetKey = collection?.filterTargetKey;
     const tkData = collection?.getFilterByTK(this.context.record);
-    if (Array.isArray(filterTargetKey)) {
-      result = {
-        ...data,
-        ...(tkData || {}),
-      };
-    } else {
-      result = {
-        ...data,
-        [filterTargetKey]: tkData,
-      };
+    let result = data;
+
+    // 安全处理 filterTargetKey & tkData
+    if (collection && filterTargetKey) {
+      if (Array.isArray(filterTargetKey)) {
+        result = {
+          ...data,
+          ...(tkData || {}),
+        };
+      } else {
+        result = {
+          ...data,
+          [filterTargetKey]: tkData,
+        };
+      }
     }
-    console.log(result);
 
     const config = this.mergeRequestConfig(
       {

package/src/resources/singleRecordResource.ts

@@ -40,18 +40,20 @@ export class SingleRecordResource<TData = any> extends BaseRecordResource<TData>
       config.params.filterByTk = this.getFilterByTk();
       actionName = 'update';
       const collection = this.context.collection;
-      const filterTargetKey = collection.filterTargetKey;
+      const filterTargetKey = collection?.filterTargetKey;
       const tkData = collection?.getFilterByTK(this.context.record);
-      if (Array.isArray(filterTargetKey)) {
-        result = {
-          ...data,
-          ...(tkData || {}),
-        };
-      } else {
-        result = {
-          ...data,
-          [filterTargetKey]: tkData,
-        };
+      if (collection && filterTargetKey) {
+        if (Array.isArray(filterTargetKey)) {
+          result = {
+            ...data,
+            ...(tkData || {}),
+          };
+        } else {
+          result = {
+            ...data,
+            [filterTargetKey]: tkData,
+          };
+        }
       }
     }
     await this.runAction(actionName, {