@nocobase/flow-engine 2.0.0-alpha.4 → 2.0.0-alpha.41

package/lib/utils/serverContextParams.d.ts

@@ -12,6 +12,7 @@ export type RecordRef = {
     id?: any;
     filterByTk?: any;
     dataSourceKey?: string;
+    sourceId?: any;
     fields?: string[];
     appends?: string[];
     record?: any;

package/lib/utils/translation.d.ts

@@ -14,5 +14,8 @@ import type { FlowModel } from '../models';
  * @returns 翻译函数，自动使用 flow-engine 命名空间
  */
 export declare function getT(model: FlowModel): (key: string, options?: any) => string;
+export declare function tExpr(text: TFuncKey | TFuncKey[], options?: TOptions): string;
+/**
+ * @deprecated use tExpr from `@nocobase/flow-engine` instead
+ */
 export declare function escapeT(text: TFuncKey | TFuncKey[], options?: TOptions): string;
-export { escapeT as tExpr };

package/lib/utils/translation.js

@@ -29,7 +29,7 @@ var translation_exports = {};
 __export(translation_exports, {
   escapeT: () => escapeT,
   getT: () => getT,
-  tExpr: () => escapeT
+  tExpr: () => tExpr
 });
 module.exports = __toCommonJS(translation_exports);
 var import_constants = require("./constants");
@@ -43,12 +43,16 @@ function getT(model) {
   return (key) => key;
 }
 __name(getT, "getT");
-function escapeT(text, options) {
+function tExpr(text, options) {
   if (options) {
     return `{{t(${JSON.stringify(text)}, ${JSON.stringify(options)})}}`;
   }
   return `{{t(${JSON.stringify(text)})}}`;
 }
+__name(tExpr, "tExpr");
+function escapeT(text, options) {
+  return tExpr(text, options);
+}
 __name(escapeT, "escapeT");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/utils/variablesParams.d.ts

@@ -6,11 +6,26 @@
  * 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 { FlowContext, PropertyMeta, PropertyMetaFactory } from '../flowContext';
-import type { JSONValue } from './params-resolvers';
+import { extractUsedVariableNames as _extractUsedVariableNames, extractUsedVariablePaths as _extractUsedVariablePaths } from '@nocobase/shared';
 import type { Collection } from '../data-source';
+import type { FlowContext, PropertyMeta, PropertyMetaFactory } from '../flowContext';
 import { type RecordRef, type ServerContextParams } from '../utils/serverContextParams';
+import type { JSONValue } from './params-resolvers';
 export declare function inferRecordRef(ctx: FlowContext): RecordRef | undefined;
+export declare function inferViewRecordRef(ctx: FlowContext): RecordRef | undefined;
+export declare function getViewRecordFromParent(flowContext: FlowContext, viewContext: FlowContext): unknown;
+export declare function createViewRecordResolveOnServer(ctx: FlowContext, getLocalRecord: () => unknown): (subPath: string) => boolean;
+/**
+ * 创建一个用于 “ctx.record” 变量的 resolveOnServer 判定函数：
+ * - 若本地 record 不存在：统一走服务端；
+ * - 若本地 record 存在：
+ *   - 访问空子路径（"{{ ctx.record }}"）时使用本地值，不走服务端；
+ *   - 访问非关联字段（如 id/title）：使用本地值；
+ *   - 访问关联字段：
+ *     - 若本地该字段无值（undefined/null），则交给服务端解析（无论是 "author" 还是 "author.name"）；
+ *     - 若本地已有值，则仅在访问子属性且本地缺少该子属性值时交给服务端。
+ */
+export declare function createRecordResolveOnServerWithLocal(collectionAccessor: () => Collection | null, valueAccessor: () => unknown): (subPath: string) => boolean;
 export declare function inferParentRecordRef(ctx: FlowContext): RecordRef | undefined;
 export type RecordParamsBuilder = (ctx: FlowContext) => RecordRef | Promise<RecordRef> | undefined;
 /**
@@ -27,12 +42,14 @@ export declare function createRecordMetaFactory(collectionAccessor: () => Collec
  * - Title: t('Current record')
  * - Params: inferRecordRef(ctx)
  */
-export declare function createCurrentRecordMetaFactory(ctx: FlowContext, collectionAccessor: () => Collection | null): PropertyMetaFactory;
+export declare function createCurrentRecordMetaFactory(ctx: FlowContext, collectionAccessor: () => Collection | null, options?: {
+    title?: string;
+}): PropertyMetaFactory;
 /**
  * Extract top-level ctx variable names used inside a JSON template.
  * Supports dot and bracket notations, e.g. {{ ctx.record.id }}, {{ ctx['parentRecord'].name }}.
  */
-export declare const extractUsedVariableNames: any;
+export declare const extractUsedVariableNames: typeof _extractUsedVariableNames;
 /**
  * Extract used top-level ctx variables with their subpaths.
  * Returns a map: varName -> string[] subPaths
@@ -42,7 +59,7 @@ export declare const extractUsedVariableNames: any;
  *  - {{ ctx.view.record.id }} => { view: ['record.id'] }
  *  - {{ ctx.twice(21) }}      => { twice: [''] } // method call -> empty subPath
  */
-export declare const extractUsedVariablePaths: any;
+export declare const extractUsedVariablePaths: typeof _extractUsedVariablePaths;
 /**
  * 根据模板中用到的 ctx 变量，收集并构建服务端解析所需的 contextParams。
  * - 通过 FlowContext 的 PropertyMeta.buildVariablesParams 收集 RecordRef

package/lib/utils/variablesParams.js

@@ -7,9 +7,11 @@
  * 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) => {
@@ -24,6 +26,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 variablesParams_exports = {};
 __export(variablesParams_exports, {
@@ -31,15 +41,21 @@ __export(variablesParams_exports, {
   collectContextParamsForTemplate: () => collectContextParamsForTemplate,
   createCurrentRecordMetaFactory: () => createCurrentRecordMetaFactory,
   createRecordMetaFactory: () => createRecordMetaFactory,
+  createRecordResolveOnServerWithLocal: () => createRecordResolveOnServerWithLocal,
+  createViewRecordResolveOnServer: () => createViewRecordResolveOnServer,
   extractUsedVariableNames: () => extractUsedVariableNames,
   extractUsedVariablePaths: () => extractUsedVariablePaths,
+  getViewRecordFromParent: () => getViewRecordFromParent,
   inferParentRecordRef: () => inferParentRecordRef,
-  inferRecordRef: () => inferRecordRef
+  inferRecordRef: () => inferRecordRef,
+  inferViewRecordRef: () => inferViewRecordRef
 });
 module.exports = __toCommonJS(variablesParams_exports);
-var import_createCollectionContextMeta = require("./createCollectionContextMeta");
+var import_shared = require("@nocobase/shared");
 var import_serverContextParams = require("../utils/serverContextParams");
-var import_client = require("@nocobase/utils/client");
+var import_createCollectionContextMeta = require("./createCollectionContextMeta");
+var import_associationObjectVariable = require("./associationObjectVariable");
+var import_lodash = __toESM(require("lodash"));
 function isObject(value) {
   return typeof value === "object" && value !== null;
 }
@@ -71,14 +87,94 @@ function inferRecordRef(ctx) {
   return { collection, dataSourceKey, filterByTk };
 }
 __name(inferRecordRef, "inferRecordRef");
+function inferViewRecordRef(ctx) {
+  var _a, _b, _c;
+  const view = ctx.view;
+  if (!view) return void 0;
+  const inputArgs = (view == null ? void 0 : view.inputArgs) || {};
+  const collection = (inputArgs == null ? void 0 : inputArgs.collectionName) || ((_a = view == null ? void 0 : view.record) == null ? void 0 : _a.collection);
+  const dataSourceKey = (inputArgs == null ? void 0 : inputArgs.dataSourceKey) || ((_b = view == null ? void 0 : view.record) == null ? void 0 : _b.dataSourceKey) || "main";
+  const filterByTk = (inputArgs == null ? void 0 : inputArgs.filterByTk) || ((_c = view == null ? void 0 : view.record) == null ? void 0 : _c.filterByTk);
+  const sourceId = inputArgs == null ? void 0 : inputArgs.sourceId;
+  if (!collection || typeof filterByTk === "undefined" || filterByTk === null) return void 0;
+  return { collection, dataSourceKey, filterByTk, sourceId };
+}
+__name(inferViewRecordRef, "inferViewRecordRef");
+function getViewRecordFromParent(flowContext, viewContext) {
+  var _a, _b, _c;
+  const parentRecord = (_a = flowContext.inputArgs) == null ? void 0 : _a.record;
+  const parentTk = (_b = flowContext.collection) == null ? void 0 : _b.filterTargetKey;
+  if (!parentRecord || !parentTk) return void 0;
+  const view = viewContext.view;
+  const viewFilterByTk = (_c = view == null ? void 0 : view.inputArgs) == null ? void 0 : _c.filterByTk;
+  const recordFilterByTk = parentRecord[parentTk];
+  if (viewFilterByTk == null || recordFilterByTk == null) return void 0;
+  if (viewFilterByTk !== recordFilterByTk) return void 0;
+  return import_lodash.default.cloneDeep(parentRecord);
+}
+__name(getViewRecordFromParent, "getViewRecordFromParent");
+function createViewRecordResolveOnServer(ctx, getLocalRecord) {
+  return (p) => {
+    var _a, _b, _c, _d;
+    if (!(p === "record" || p.startsWith("record."))) return false;
+    const local = getLocalRecord();
+    if (!local) return true;
+    if (p === "record") return false;
+    const ref = inferViewRecordRef(ctx);
+    const colName = ref == null ? void 0 : ref.collection;
+    const dsKey = (ref == null ? void 0 : ref.dataSourceKey) || "main";
+    if (!colName) return true;
+    const ds = (_b = (_a = ctx.dataSourceManager) == null ? void 0 : _a.getDataSource) == null ? void 0 : _b.call(_a, dsKey);
+    const collection = (_d = (_c = ds == null ? void 0 : ds.collectionManager) == null ? void 0 : _c.getCollection) == null ? void 0 : _d.call(_c, colName);
+    if (!collection) return true;
+    const resolver = (0, import_associationObjectVariable.createAssociationSubpathResolver)(
+      () => collection,
+      () => local
+    );
+    const subPath = p.startsWith("record.") ? p.slice("record.".length) : "";
+    if (!subPath) return false;
+    return resolver(subPath);
+  };
+}
+__name(createViewRecordResolveOnServer, "createViewRecordResolveOnServer");
+function createRecordResolveOnServerWithLocal(collectionAccessor, valueAccessor) {
+  const assocSubpathResolver = (0, import_associationObjectVariable.createAssociationSubpathResolver)(collectionAccessor, () => valueAccessor());
+  return (p) => {
+    var _a;
+    const local = valueAccessor();
+    if (!local) return true;
+    if (!p) return false;
+    const collection = collectionAccessor();
+    if (!p.includes(".")) {
+      const name = p;
+      let field;
+      if (collection) {
+        if (typeof collection.getField === "function") {
+          field = collection.getField(name);
+        }
+        if (!field && typeof collection.getFields === "function") {
+          const fields = collection.getFields() || [];
+          field = fields.find((f) => (f == null ? void 0 : f.name) === name);
+        }
+      }
+      const isAssoc = !!((_a = field == null ? void 0 : field.isAssociationField) == null ? void 0 : _a.call(field));
+      if (!isAssoc) return false;
+      const value = local == null ? void 0 : local[name];
+      if (value === void 0 || value === null) return true;
+      return false;
+    }
+    return assocSubpathResolver(p);
+  };
+}
+__name(createRecordResolveOnServerWithLocal, "createRecordResolveOnServerWithLocal");
 function inferParentRecordRef(ctx) {
   var _a, _b, _c, _d;
   const resource = getResource(ctx);
   const dataSourceKey = ((_a = getCollection(ctx)) == null ? void 0 : _a.dataSourceKey) || ((_b = resource == null ? void 0 : resource.getDataSourceKey) == null ? void 0 : _b.call(resource));
-  const rn = (_c = resource == null ? void 0 : resource.getResourceName) == null ? void 0 : _c.call(resource);
+  const resourceName = (_c = resource == null ? void 0 : resource.getResourceName) == null ? void 0 : _c.call(resource);
   const sourceId = (_d = resource == null ? void 0 : resource.getSourceId) == null ? void 0 : _d.call(resource);
-  if (!rn || typeof sourceId === "undefined" || sourceId === null) return void 0;
-  const parts = String(rn).split(".");
+  if (!resourceName || typeof sourceId === "undefined" || sourceId === null) return void 0;
+  const parts = String(resourceName).split(".");
   if (parts.length < 2) return void 0;
   return { collection: parts[0], dataSourceKey, filterByTk: sourceId };
 }
@@ -98,43 +194,39 @@ function createRecordMetaFactory(collectionAccessor, title, paramsBuilder) {
   return factory;
 }
 __name(createRecordMetaFactory, "createRecordMetaFactory");
-function createCurrentRecordMetaFactory(ctx, collectionAccessor) {
-  var _a;
-  const title = ((_a = ctx == null ? void 0 : ctx.t) == null ? void 0 : _a.call(ctx, "Current record")) || "Current record";
+function createCurrentRecordMetaFactory(ctx, collectionAccessor, options) {
+  var _a, _b;
+  const title = (options == null ? void 0 : options.title) ? ((_a = ctx.t) == null ? void 0 : _a.call(ctx, options.title)) || options.title : ((_b = ctx.t) == null ? void 0 : _b.call(ctx, "Current record")) || "Current record";
   return createRecordMetaFactory(collectionAccessor, title, (c) => inferRecordRef(c));
 }
 __name(createCurrentRecordMetaFactory, "createCurrentRecordMetaFactory");
-const extractUsedVariableNames = import_client.extractUsedVariableNames;
-const extractUsedVariablePaths = import_client.extractUsedVariablePaths;
+const extractUsedVariableNames = import_shared.extractUsedVariableNames;
+const extractUsedVariablePaths = import_shared.extractUsedVariablePaths;
 async function collectContextParamsForTemplate(ctx, template) {
   var _a;
-  try {
-    const usage = (0, import_client.extractUsedVariablePaths)(template) || {};
-    const varNames = Object.keys(usage);
-    if (!varNames.length) return void 0;
-    const input = {};
-    for (const key of varNames) {
-      const opt = (_a = ctx.getPropertyOptions) == null ? void 0 : _a.call(ctx, key);
-      const meta = opt == null ? void 0 : opt.meta;
-      if (!meta) continue;
-      let built;
-      try {
-        const resolvedMeta = typeof meta === "function" ? await meta() : meta;
-        const builder = resolvedMeta == null ? void 0 : resolvedMeta.buildVariablesParams;
-        if (typeof builder === "function") {
-          built = await builder(ctx);
-        }
-      } catch (err) {
-        continue;
-      }
-      if (built) {
-        input[key] = built;
+  const usage = (0, import_shared.extractUsedVariablePaths)(template) || {};
+  const varNames = Object.keys(usage);
+  if (!varNames.length) return void 0;
+  const input = {};
+  for (const key of varNames) {
+    const opt = (_a = ctx.getPropertyOptions) == null ? void 0 : _a.call(ctx, key);
+    const meta = opt == null ? void 0 : opt.meta;
+    if (!meta) continue;
+    let built;
+    try {
+      const resolvedMeta = typeof meta === "function" ? await meta() : meta;
+      const builder = resolvedMeta == null ? void 0 : resolvedMeta.buildVariablesParams;
+      if (typeof builder === "function") {
+        built = await builder(ctx);
       }
+    } catch (err) {
+      continue;
+    }
+    if (built) {
+      input[key] = built;
     }
-    return (0, import_serverContextParams.buildServerContextParams)(ctx, input);
-  } catch (_) {
-    return void 0;
   }
+  return (0, import_serverContextParams.buildServerContextParams)(ctx, input);
 }
 __name(collectContextParamsForTemplate, "collectContextParamsForTemplate");
 // Annotate the CommonJS export names for ESM import in node:
@@ -143,8 +235,12 @@ __name(collectContextParamsForTemplate, "collectContextParamsForTemplate");
   collectContextParamsForTemplate,
   createCurrentRecordMetaFactory,
   createRecordMetaFactory,
+  createRecordResolveOnServerWithLocal,
+  createViewRecordResolveOnServer,
   extractUsedVariableNames,
   extractUsedVariablePaths,
+  getViewRecordFromParent,
   inferParentRecordRef,
-  inferRecordRef
+  inferRecordRef,
+  inferViewRecordRef
 });

package/lib/views/DrawerComponent.js

@@ -42,12 +42,13 @@ __export(DrawerComponent_exports, {
 module.exports = __toCommonJS(DrawerComponent_exports);
 var import_antd = require("antd");
 var React = __toESM(require("react"));
+var import_MobilePopup = require("../components/MobilePopup");
 const DrawerComponent = React.forwardRef((props, ref) => {
   var _a;
-  const { children, footer: initialFooter, title, extra, hidden, ...drawerProps } = props;
+  const { children, footer: initialFooter, title, extra, hidden, isMobile, ...drawerProps } = props;
   const [open, setOpen] = React.useState(true);
   const [footer, setFooter] = React.useState(() => initialFooter);
-  const [header, setHeader] = React.useState({ title, extra });
+  const [header, setHeader] = React.useState({ title, extra, ...drawerProps.header });
   React.useImperativeHandle(
     ref,
     () => ({
@@ -75,6 +76,24 @@ const DrawerComponent = React.forwardRef((props, ref) => {
   const container = React.useMemo(() => {
     return document.querySelector("#nocobase-app-container");
   }, []);
+  if (isMobile) {
+    return /* @__PURE__ */ React.createElement(
+      import_MobilePopup.MobilePopup,
+      {
+        className: hidden ? "nb-hidden" : "",
+        visible: open,
+        ...drawerProps,
+        footer,
+        ...header,
+        onClose: () => {
+          var _a2;
+          setOpen(false);
+          (_a2 = drawerProps.afterClose) == null ? void 0 : _a2.call(drawerProps);
+        }
+      },
+      children
+    );
+  }
   return /* @__PURE__ */ React.createElement(
     import_antd.Drawer,
     {

package/lib/views/PageComponent.js

@@ -56,7 +56,8 @@ const PageComponent = (0, import_react.forwardRef)((props, ref) => {
     hidden,
     title: _title,
     styles = {},
-    zIndex
+    zIndex = 4
+    // 这个默认值是为了防止表格的阴影显示到子页面上面
   } = mergedProps;
   const closedRef = (0, import_react.useRef)(false);
   const flowEngine = (0, import_provider.useFlowEngine)();

package/lib/views/ViewNavigation.d.ts

@@ -7,16 +7,10 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { FlowEngineContext } from '../flowContext';
-interface ViewParam {
-    /** 视图唯一标识符，一般为某个 Model 实例的 uid */
+import { ViewParam as SharedViewParam } from '../utils';
+type ViewParam = Omit<SharedViewParam, 'viewUid'> & {
     viewUid?: string;
-    /** 标签页唯一标识符 */
-    tabUid?: string;
-    /** 弹窗记录的 id */
-    filterByTk?: string;
-    /** source Id */
-    sourceId?: string;
-}
+};
 /**
  * 将 ViewParam 数组转换为 pathname
  *

package/lib/views/ViewNavigation.js

@@ -31,6 +31,17 @@ __export(ViewNavigation_exports, {
   generatePathnameFromViewParams: () => generatePathnameFromViewParams
 });
 module.exports = __toCommonJS(ViewNavigation_exports);
+function encodeFilterByTk(val) {
+  if (val === void 0 || val === null) return "";
+  if (val && typeof val === "object" && !Array.isArray(val)) {
+    const pairs = Object.entries(val).map(([k, v]) => {
+      return `${encodeURIComponent(String(k))}=${encodeURIComponent(String(v))}`;
+    });
+    return encodeURIComponent(pairs.join("&"));
+  }
+  return encodeURIComponent(String(val));
+}
+__name(encodeFilterByTk, "encodeFilterByTk");
 function generatePathnameFromViewParams(viewParams) {
   if (!viewParams || viewParams.length === 0) {
     return "/admin";
@@ -44,8 +55,11 @@ function generatePathnameFromViewParams(viewParams) {
     if (viewParam.tabUid) {
       segments.push("tab", viewParam.tabUid);
     }
-    if (viewParam.filterByTk) {
-      segments.push("filterbytk", viewParam.filterByTk);
+    if (viewParam.filterByTk != null) {
+      const encoded = encodeFilterByTk(viewParam.filterByTk);
+      if (encoded) {
+        segments.push("filterbytk", encoded);
+      }
     }
     if (viewParam.sourceId) {
       segments.push("sourceid", viewParam.sourceId);

package/lib/views/createViewMeta.d.ts

@@ -7,10 +7,38 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import type { FlowContext, PropertyMetaFactory } from '../flowContext';
+import type { FlowView } from './FlowView';
 /**
  * Create a meta factory for ctx.view that includes:
  * - buildVariablesParams: { record } via inferRecordRef
  * - properties.record: full collection meta via buildRecordMeta
  * - type/preventClose/inputArgs/navigation fields for better variable selection UX
  */
-export declare function createViewMeta(ctx: FlowContext, getView: () => any): PropertyMetaFactory;
+export declare function createViewMeta(ctx: FlowContext): PropertyMetaFactory;
+/**
+ * 为 ctx.popup 构建元信息：
+ * - popup.record：当前弹窗记录（服务端解析）
+ * - popup.resource：数据源信息（前端解析）
+ * - popup.parent：上级弹窗（无限级，前端解析；不存在则禁用/为空）
+ */
+export declare function createPopupMeta(ctx: FlowContext, anchorView?: FlowView): PropertyMetaFactory;
+/**
+ * 根据视图堆栈构建 popup 运行时值（resource + parent 链）
+ */
+interface PopupNodeResource {
+    dataSourceKey: string;
+    collectionName?: string;
+    filterByTk?: any;
+    sourceId?: any;
+}
+interface PopupNode {
+    uid?: string;
+    resource: PopupNodeResource;
+    parent?: PopupNode;
+}
+export declare function buildPopupRuntime(ctx: FlowContext, view: FlowView): Promise<PopupNode | undefined>;
+/**
+ * 在视图上下文中注册 popup 变量（统一消除重复）
+ */
+export declare function registerPopupVariable(ctx: FlowContext, view: FlowView): void;
+export {};