@nocobase/flow-engine 2.0.0-alpha.14 → 2.0.0-alpha.16

package/lib/components/FieldSkeleton.d.ts

@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import React from 'react';
+export declare const FieldSkeleton: React.FC;

package/lib/components/FieldSkeleton.js

@@ -0,0 +1,64 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var FieldSkeleton_exports = {};
+__export(FieldSkeleton_exports, {
+  FieldSkeleton: () => FieldSkeleton
+});
+module.exports = __toCommonJS(FieldSkeleton_exports);
+var import_react = __toESM(require("react"));
+var import_provider = require("../provider");
+const FieldSkeleton = /* @__PURE__ */ __name(() => {
+  const flowEngine = (0, import_provider.useFlowEngine)();
+  const token = flowEngine.context.themeToken;
+  return /* @__PURE__ */ import_react.default.createElement(
+    "span",
+    {
+      style: {
+        display: "inline-block",
+        width: "100%",
+        height: 16,
+        backgroundColor: token.colorFillSecondary,
+        borderRadius: token.borderRadiusSM
+      }
+    }
+  );
+}, "FieldSkeleton");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  FieldSkeleton
+});

package/lib/components/FlowModelRenderer.js

@@ -42,7 +42,6 @@ __export(FlowModelRenderer_exports, {
 });
 module.exports = __toCommonJS(FlowModelRenderer_exports);
 var import_reactive_react = require("@formily/reactive-react");
-var import_antd = require("antd");
 var import_lodash = __toESM(require("lodash"));
 var import_react = __toESM(require("react"));
 var import_react_error_boundary = require("react-error-boundary");
@@ -180,7 +179,7 @@ const FlowModelRendererCore = (0, import_reactive_react.observer)(
 const FlowModelRenderer = (0, import_reactive_react.observer)(
   ({
     model,
-    fallback = /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton.Button, { size: "small" }),
+    fallback = null,
     showFlowSettings = false,
     flowSettingsVariant = "dropdown",
     hideRemoveInSettings = false,

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

@@ -59,7 +59,7 @@ const openStepSettingsDialog = /* @__PURE__ */ __name(async ({
   uiModeProps,
   cleanup
 }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f;
   const t = (0, import_utils.getT)(model);
   const message = model.context.message;
   if (!model) {
@@ -133,11 +133,11 @@ const openStepSettingsDialog = /* @__PURE__ */ __name(async ({
     destroyOnClose: true,
     ...(0, import_reactive.toJS)(uiModeProps),
     // 透传 navigation，便于变量元信息根据真实视图栈推断父级弹窗
-    inputArgs: {
-      ...((_e = (0, import_reactive.toJS)(uiModeProps)) == null ? void 0 : _e.inputArgs) || {},
-      navigation: ((_f = ctx == null ? void 0 : ctx.view) == null ? void 0 : _f.navigation) ?? ((_h = (_g = (0, import_reactive.toJS)(uiModeProps)) == null ? void 0 : _g.inputArgs) == null ? void 0 : _h.navigation),
-      __isSettingsPopup: true
-    },
+    inputArgs: (0, import_utils.buildSettingsViewInputArgs)(
+      model,
+      { ...((_e = (0, import_reactive.toJS)(uiModeProps)) == null ? void 0 : _e.inputArgs) || {}, __isSettingsPopup: true },
+      { navigationOverride: (_f = ctx == null ? void 0 : ctx.view) == null ? void 0 : _f.navigation }
+    ),
     onClose: /* @__PURE__ */ __name(() => {
       if (cleanup) {
         cleanup();

package/lib/flowSettings.js

@@ -603,6 +603,8 @@ const _FlowSettings = class _FlowSettings {
       zIndex: 5e3,
       // 允许透传其它 props（如 maskClosable、footer 等），但确保 content 由我们接管
       ...modeProps,
+      // 统一构造 settings 弹窗的 inputArgs（集合/记录/父导航/关联）
+      inputArgs: (0, import_utils.buildSettingsViewInputArgs)(model, modeProps == null ? void 0 : modeProps.inputArgs),
       content: /* @__PURE__ */ __name((currentView, viewCtx) => {
         viewCtx == null ? void 0 : viewCtx.defineMethod("getStepFormValues", (flowKey2, stepKey2) => {
           var _a2;

package/lib/models/flowModel.d.ts

@@ -42,6 +42,7 @@ export declare class FlowModel<Structure extends DefaultStructure = DefaultStruc
     private _options;
     protected _title: string;
     isNew: boolean;
+    skeleton: any;
     /**
      * 所有 fork 实例的引用集合。
      * 使用 Set 便于在销毁时主动遍历并调用 dispose，避免悬挂引用。

package/lib/models/flowModel.js

@@ -93,6 +93,7 @@ const _FlowModel = class _FlowModel {
     __publicField(this, "_title");
     __publicField(this, "isNew", false);
     // 标记是否为新建状态
+    __publicField(this, "skeleton", null);
     /**
      * 所有 fork 实例的引用集合。
      * 使用 Set 便于在销毁时主动遍历并调用 dispose，避免悬挂引用。

package/lib/provider.d.ts

@@ -17,6 +17,8 @@ export declare const FlowEngineProvider: React.FC<FlowEngineProviderProps>;
 export declare const FlowEngineGlobalsContextProvider: React.FC<{
     children: React.ReactNode;
 }>;
-export declare const useFlowEngine: () => FlowEngine;
+export declare const useFlowEngine: ({ throwError }?: {
+    throwError?: boolean;
+}) => FlowEngine;
 export declare const useFlowEngineContext: () => FlowEngineContext;
 export {};

package/lib/provider.js

@@ -93,9 +93,9 @@ const FlowEngineGlobalsContextProvider = /* @__PURE__ */ __name(({ children }) =
   }, [engine, drawer, modal, message, notification, config, popover, token, dialog, embed]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, children, contextHolder, popoverContextHolder, pageContextHolder, dialogContextHolder);
 }, "FlowEngineGlobalsContextProvider");
-const useFlowEngine = /* @__PURE__ */ __name(() => {
+const useFlowEngine = /* @__PURE__ */ __name(({ throwError = true } = {}) => {
   const context = (0, import_react.useContext)(FlowEngineReactContext);
-  if (!context) {
+  if (!context && throwError) {
     throw new Error(
       "useFlowEngine must be used within a FlowEngineProvider, and FlowEngineProvider must be supplied with an engine."
     );

package/lib/utils/buildSettingsViewInputArgs.d.ts

@@ -0,0 +1,19 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import type { FlowModel } from '../models';
+/**
+ * 统一构造设置弹窗 openView 的 inputArgs：
+ * - collectionName/dataSourceKey/filterByTk：优先从 model.context 推断；否则回退父视图 inputArgs
+ * - sourceId：优先从 resource.getSourceId()；否则回退父视图 inputArgs
+ * - associationName：来自 association.resourceName 或 resource.getResourceName()
+ * - navigation：父视图 navigation 或传入的 navigationOverride
+ */
+export declare function buildSettingsViewInputArgs(model: FlowModel, extra?: Record<string, any>, options?: {
+    navigationOverride?: any;
+}): Record<string, any>;

package/lib/utils/buildSettingsViewInputArgs.js

@@ -0,0 +1,75 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var buildSettingsViewInputArgs_exports = {};
+__export(buildSettingsViewInputArgs_exports, {
+  buildSettingsViewInputArgs: () => buildSettingsViewInputArgs
+});
+module.exports = __toCommonJS(buildSettingsViewInputArgs_exports);
+var import_variablesParams = require("./variablesParams");
+function buildSettingsViewInputArgs(model, extra, options) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+  const defaults = {};
+  try {
+    const ref = (0, import_variablesParams.inferRecordRef)(model.context);
+    if (ref == null ? void 0 : ref.collection) {
+      defaults.collectionName = ref.collection;
+      defaults.dataSourceKey = ref.dataSourceKey || "main";
+      defaults.filterByTk = ref.filterByTk;
+    }
+    const parentArgs = ((_b = (_a = model == null ? void 0 : model.context) == null ? void 0 : _a.view) == null ? void 0 : _b.inputArgs) || {};
+    if (!defaults.collectionName && (parentArgs == null ? void 0 : parentArgs.collectionName)) {
+      defaults.collectionName = parentArgs.collectionName;
+      defaults.dataSourceKey = parentArgs.dataSourceKey || defaults.dataSourceKey || "main";
+    }
+    if (defaults.filterByTk == null && (parentArgs == null ? void 0 : parentArgs.filterByTk) != null) {
+      defaults.filterByTk = parentArgs.filterByTk;
+    }
+    if (defaults.sourceId == null && (parentArgs == null ? void 0 : parentArgs.sourceId) != null) {
+      defaults.sourceId = parentArgs.sourceId;
+    }
+    const nav = (options == null ? void 0 : options.navigationOverride) ?? ((_d = (_c = model == null ? void 0 : model.context) == null ? void 0 : _c.view) == null ? void 0 : _d.navigation);
+    if (nav) {
+      defaults.navigation = nav;
+    }
+    const sid = (_g = (_f = (_e = model == null ? void 0 : model.context) == null ? void 0 : _e.resource) == null ? void 0 : _f.getSourceId) == null ? void 0 : _g.call(_f);
+    if (sid !== void 0 && sid !== null && String(sid) !== "") {
+      defaults.sourceId = sid;
+    }
+    const assocName = ((_i = (_h = model == null ? void 0 : model.context) == null ? void 0 : _h.association) == null ? void 0 : _i.resourceName) || ((_l = (_k = (_j = model == null ? void 0 : model.context) == null ? void 0 : _j.resource) == null ? void 0 : _k.getResourceName) == null ? void 0 : _l.call(_k));
+    if (typeof assocName === "string" && assocName) {
+      defaults.associationName = assocName;
+    }
+  } catch (_) {
+  }
+  return { ...defaults, ...extra || {} };
+}
+__name(buildSettingsViewInputArgs, "buildSettingsViewInputArgs");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildSettingsViewInputArgs
+});

package/lib/utils/index.d.ts

@@ -19,4 +19,5 @@ export { buildRecordMeta, collectContextParamsForTemplate, createCurrentRecordMe
 export { extractPropertyPath, formatPathToVariable, isVariableExpression } from './context';
 export { clearAutoFlowError, getAutoFlowError, setAutoFlowError, type AutoFlowError } from './autoFlowError';
 export { parsePathnameToViewParams, type ViewParam } from './parsePathnameToViewParams';
+export { buildSettingsViewInputArgs } from './buildSettingsViewInputArgs';
 export { createSafeDocument, createSafeWindow } from './safeGlobals';

package/lib/utils/index.js

@@ -32,6 +32,7 @@ __export(utils_exports, {
   FlowExitException: () => import_exceptions.FlowExitException,
   MENU_KEYS: () => import_constants.MENU_KEYS,
   buildRecordMeta: () => import_variablesParams.buildRecordMeta,
+  buildSettingsViewInputArgs: () => import_buildSettingsViewInputArgs.buildSettingsViewInputArgs,
   clearAutoFlowError: () => import_autoFlowError.clearAutoFlowError,
   collectContextParamsForTemplate: () => import_variablesParams.collectContextParamsForTemplate,
   compileUiSchema: () => import_schema_utils.compileUiSchema,
@@ -75,6 +76,7 @@ var import_variablesParams = require("./variablesParams");
 var import_context = require("./context");
 var import_autoFlowError = require("./autoFlowError");
 var import_parsePathnameToViewParams = require("./parsePathnameToViewParams");
+var import_buildSettingsViewInputArgs = require("./buildSettingsViewInputArgs");
 var import_safeGlobals = require("./safeGlobals");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -84,6 +86,7 @@ var import_safeGlobals = require("./safeGlobals");
   FlowExitException,
   MENU_KEYS,
   buildRecordMeta,
+  buildSettingsViewInputArgs,
   clearAutoFlowError,
   collectContextParamsForTemplate,
   compileUiSchema,

package/lib/views/createViewMeta.js

@@ -265,7 +265,7 @@ function createPopupMeta(ctx) {
         return out;
       }, "buildVariablesParams"),
       properties: /* @__PURE__ */ __name(async () => {
-        var _a;
+        var _a, _b, _c, _d, _e;
         const props = {};
         props.uid = { type: "string", title: t("Popup uid") };
         const base = await (0, import_variablesParams.buildRecordMeta)(
@@ -277,16 +277,30 @@ function createPopupMeta(ctx) {
         try {
           const inputArgs = ((_a = ctx.view) == null ? void 0 : _a.inputArgs) || {};
           const srcId = inputArgs == null ? void 0 : inputArgs.sourceId;
-          const assoc = inputArgs == null ? void 0 : inputArgs.associationName;
-          const dsKey = (inputArgs == null ? void 0 : inputArgs.dataSourceKey) || "main";
+          let assoc = inputArgs == null ? void 0 : inputArgs.associationName;
+          let dsKey = (inputArgs == null ? void 0 : inputArgs.dataSourceKey) || "main";
+          if (!assoc || typeof assoc !== "string" || !assoc.includes(".")) {
+            const nav = (_b = ctx.view) == null ? void 0 : _b.navigation;
+            const stack = Array.isArray(nav == null ? void 0 : nav.viewStack) ? nav.viewStack : [];
+            const last = stack == null ? void 0 : stack[stack.length - 1];
+            if (last == null ? void 0 : last.viewUid) {
+              let model = (_d = (_c = ctx == null ? void 0 : ctx.engine) == null ? void 0 : _c.getModel) == null ? void 0 : _d.call(_c, last.viewUid);
+              if (!model) {
+                model = await ctx.engine.loadModel({ uid: last.viewUid });
+              }
+              const p = ((_e = model == null ? void 0 : model.getStepParams) == null ? void 0 : _e.call(model, "popupSettings", "openView")) || {};
+              assoc = (p == null ? void 0 : p.associationName) || assoc;
+              dsKey = (p == null ? void 0 : p.dataSourceKey) || dsKey;
+            }
+          }
           if (srcId != null && srcId !== "" && assoc && typeof assoc === "string") {
             const parentCollectionName = String(assoc).includes(".") ? String(assoc).split(".")[0] : void 0;
             if (parentCollectionName) {
               const parentCollectionAccessor = /* @__PURE__ */ __name(() => {
-                var _a2, _b, _c, _d;
+                var _a2, _b2, _c2, _d2;
                 try {
-                  const ds = (_b = (_a2 = ctx.dataSourceManager) == null ? void 0 : _a2.getDataSource) == null ? void 0 : _b.call(_a2, dsKey);
-                  return ((_d = (_c = ds == null ? void 0 : ds.collectionManager) == null ? void 0 : _c.getCollection) == null ? void 0 : _d.call(_c, parentCollectionName)) || null;
+                  const ds = (_b2 = (_a2 = ctx.dataSourceManager) == null ? void 0 : _a2.getDataSource) == null ? void 0 : _b2.call(_a2, dsKey);
+                  return ((_d2 = (_c2 = ds == null ? void 0 : ds.collectionManager) == null ? void 0 : _c2.getCollection) == null ? void 0 : _d2.call(_c2, parentCollectionName)) || null;
                 } catch (_) {
                   return null;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.0.0-alpha.14",
+  "version": "2.0.0-alpha.16",
   "private": false,
   "description": "A standalone flow engine for NocoBase, managing workflows, models, and actions.",
   "main": "lib/index.js",
@@ -33,5 +33,5 @@
   ],
   "author": "NocoBase Team",
   "license": "AGPL-3.0",
-  "gitHead": "6b4785d03d0a551f1fe6815e9bcbc7a9f38901df"
+  "gitHead": "cc7ffb72d642e86eb95cc3d5831e77d73b788d6c"
 }

package/src/components/FieldSkeleton.tsx

@@ -0,0 +1,27 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import React from 'react';
+import { useFlowEngine } from '../provider';
+
+export const FieldSkeleton: React.FC = () => {
+  const flowEngine = useFlowEngine();
+  const token = flowEngine.context.themeToken;
+  return (
+    <span
+      style={{
+        display: 'inline-block',
+        width: '100%',
+        height: 16,
+        backgroundColor: token.colorFillSecondary,
+        borderRadius: token.borderRadiusSM,
+      }}
+    />
+  );
+};

package/src/components/FlowModelRenderer.tsx

@@ -43,7 +43,6 @@
  */
 
 import { observer } from '@formily/reactive-react';
-import { Skeleton, Spin } from 'antd';
 import _ from 'lodash';
 import React from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
@@ -329,7 +328,7 @@ const FlowModelRendererCore: React.FC<{
 export const FlowModelRenderer: React.FC<FlowModelRendererProps> = observer(
   ({
     model,
-    fallback = <Skeleton.Button size="small" />,
+    fallback = null,
     showFlowSettings = false,
     flowSettingsVariant = 'dropdown',
     hideRemoveInSettings = false,

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

@@ -14,7 +14,14 @@ import { Button, Space } from 'antd';
 import React, { useEffect } from 'react';
 import { FlowSettingsContextProvider, useFlowSettingsContext } from '../../../../hooks/useFlowSettingsContext';
 import { StepSettingsDialogProps } from '../../../../types';
-import { compileUiSchema, FlowExitException, getT, resolveDefaultParams, resolveStepUiSchema } from '../../../../utils';
+import {
+  compileUiSchema,
+  FlowExitException,
+  getT,
+  resolveDefaultParams,
+  resolveStepUiSchema,
+  buildSettingsViewInputArgs,
+} from '../../../../utils';
 
 const SchemaField = createSchemaField();
 
@@ -136,11 +143,11 @@ const openStepSettingsDialog = async ({
     destroyOnClose: true,
     ...toJS(uiModeProps),
     // 透传 navigation，便于变量元信息根据真实视图栈推断父级弹窗
-    inputArgs: {
-      ...(toJS(uiModeProps)?.inputArgs || {}),
-      navigation: ctx?.view?.navigation ?? toJS(uiModeProps)?.inputArgs?.navigation,
-      __isSettingsPopup: true,
-    },
+    inputArgs: buildSettingsViewInputArgs(
+      model as any,
+      { ...(toJS(uiModeProps)?.inputArgs || {}), __isSettingsPopup: true },
+      { navigationOverride: ctx?.view?.navigation },
+    ),
     onClose: () => {
       if (cleanup) {
         cleanup();

package/src/flowSettings.ts

@@ -29,6 +29,7 @@ import {
   resolveStepUiSchema,
   resolveUiMode,
   setupRuntimeContextSteps,
+  buildSettingsViewInputArgs,
 } from './utils';
 import { FlowStepContext } from './hooks/useFlowStep';
 
@@ -764,6 +765,8 @@ export class FlowSettings {
       zIndex: 5000,
       // 允许透传其它 props（如 maskClosable、footer 等），但确保 content 由我们接管
       ...modeProps,
+      // 统一构造 settings 弹窗的 inputArgs（集合/记录/父导航/关联）
+      inputArgs: buildSettingsViewInputArgs(model as any, (modeProps as any)?.inputArgs),
       content: (currentView, viewCtx) => {
         viewCtx?.defineMethod('getStepFormValues', (flowKey: string, stepKey: string) => {
           return forms.get(keyOf({ flowKey, stepKey }))?.values;

package/src/models/flowModel.tsx

@@ -89,6 +89,7 @@ export class FlowModel<Structure extends DefaultStructure = DefaultStructure> {
   private _options: FlowModelOptions<Structure>;
   protected _title: string;
   public isNew = false; // 标记是否为新建状态
+  public skeleton = null;
 
   /**
    * 所有 fork 实例的引用集合。

package/src/provider.tsx

@@ -84,10 +84,10 @@ export const FlowEngineGlobalsContextProvider: React.FC<{ children: React.ReactN
     </>
   );
 };
-
-export const useFlowEngine = (): FlowEngine => {
+// 不 throw Error 怎么处理？
+export const useFlowEngine = ({ throwError = true } = {}): FlowEngine => {
   const context = useContext(FlowEngineReactContext);
-  if (!context) {
+  if (!context && throwError) {
     // This error should ideally not be hit if FlowEngineProvider is used correctly at the root
     // and always supplied with an engine.
     throw new Error(

package/src/utils/buildSettingsViewInputArgs.ts

@@ -0,0 +1,72 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import type { FlowModel } from '../models';
+import { inferRecordRef } from './variablesParams';
+
+/**
+ * 统一构造设置弹窗 openView 的 inputArgs：
+ * - collectionName/dataSourceKey/filterByTk：优先从 model.context 推断；否则回退父视图 inputArgs
+ * - sourceId：优先从 resource.getSourceId()；否则回退父视图 inputArgs
+ * - associationName：来自 association.resourceName 或 resource.getResourceName()
+ * - navigation：父视图 navigation 或传入的 navigationOverride
+ */
+export function buildSettingsViewInputArgs(
+  model: FlowModel,
+  extra?: Record<string, any>,
+  options?: { navigationOverride?: any },
+): Record<string, any> {
+  const defaults: Record<string, any> = {};
+
+  try {
+    // 1) 当前记录/集合
+    const ref = inferRecordRef((model as any).context);
+    if (ref?.collection) {
+      defaults.collectionName = ref.collection;
+      defaults.dataSourceKey = ref.dataSourceKey || 'main';
+      defaults.filterByTk = ref.filterByTk;
+    }
+
+    // 2) 回退父视图 inputArgs（如在抽屉/页面中）
+    const parentArgs = (model as any)?.context?.view?.inputArgs || {};
+    if (!defaults.collectionName && parentArgs?.collectionName) {
+      defaults.collectionName = parentArgs.collectionName;
+      defaults.dataSourceKey = parentArgs.dataSourceKey || defaults.dataSourceKey || 'main';
+    }
+    if (defaults.filterByTk == null && parentArgs?.filterByTk != null) {
+      defaults.filterByTk = parentArgs.filterByTk;
+    }
+    if (defaults.sourceId == null && parentArgs?.sourceId != null) {
+      defaults.sourceId = parentArgs.sourceId;
+    }
+
+    // 3) 导航（用于推断“上级弹窗”）
+    const nav = options?.navigationOverride ?? (model as any)?.context?.view?.navigation;
+    if (nav) {
+      defaults.navigation = nav;
+    }
+
+    // 4) 直接从资源读取 sourceId（优先级高于父视图）
+    const sid = (model as any)?.context?.resource?.getSourceId?.();
+    if (sid !== undefined && sid !== null && String(sid) !== '') {
+      defaults.sourceId = sid;
+    }
+
+    // 5) 关联名（用于“上级记录”）
+    const assocName =
+      (model as any)?.context?.association?.resourceName || (model as any)?.context?.resource?.getResourceName?.();
+    if (typeof assocName === 'string' && assocName) {
+      defaults.associationName = assocName;
+    }
+  } catch (_) {
+    // 忽略推断异常
+  }
+
+  return { ...defaults, ...(extra || {}) };
+}

package/src/utils/index.ts

@@ -57,6 +57,7 @@ export { extractPropertyPath, formatPathToVariable, isVariableExpression } from
 
 export { clearAutoFlowError, getAutoFlowError, setAutoFlowError, type AutoFlowError } from './autoFlowError';
 export { parsePathnameToViewParams, type ViewParam } from './parsePathnameToViewParams';
+export { buildSettingsViewInputArgs } from './buildSettingsViewInputArgs';
 
 // 安全全局对象（window/document）
 export { createSafeDocument, createSafeWindow } from './safeGlobals';

package/src/views/createViewMeta.ts

@@ -287,8 +287,25 @@ export function createPopupMeta(ctx: FlowContext): PropertyMetaFactory {
         try {
           const inputArgs = (ctx.view as any)?.inputArgs || {};
           const srcId = inputArgs?.sourceId;
-          const assoc: string | undefined = inputArgs?.associationName;
-          const dsKey: string = inputArgs?.dataSourceKey || 'main';
+          let assoc: string | undefined = inputArgs?.associationName;
+          let dsKey: string = inputArgs?.dataSourceKey || 'main';
+
+          // 兜底：若 associationName 缺失或不含“.”，尝试从当前视图模型的 openView 参数推断
+          if (!assoc || typeof assoc !== 'string' || !assoc.includes('.')) {
+            const nav = (ctx.view as any)?.navigation;
+            const stack = Array.isArray(nav?.viewStack) ? nav.viewStack : [];
+            const last = stack?.[stack.length - 1];
+            if (last?.viewUid) {
+              let model: any = ctx?.engine?.getModel?.(last.viewUid);
+              if (!model) {
+                model = await ctx.engine.loadModel({ uid: last.viewUid });
+              }
+              const p = model?.getStepParams?.('popupSettings', 'openView') || {};
+              assoc = p?.associationName || assoc;
+              dsKey = p?.dataSourceKey || dsKey;
+            }
+          }
+
           if (srcId != null && srcId !== '' && assoc && typeof assoc === 'string') {
             const parentCollectionName = String(assoc).includes('.') ? String(assoc).split('.')[0] : undefined;
             if (parentCollectionName) {