@nocobase/plugin-flow-engine 2.0.0-alpha.24 → 2.0.0-alpha.26

package/dist/externalVersion.js

@@ -8,14 +8,14 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.0.0-alpha.24",
+  "@nocobase/client": "2.0.0-alpha.26",
   "lodash": "4.17.21",
-  "@nocobase/database": "2.0.0-alpha.24",
-  "@nocobase/data-source-manager": "2.0.0-alpha.24",
-  "@nocobase/resourcer": "2.0.0-alpha.24",
-  "@nocobase/server": "2.0.0-alpha.24",
-  "@nocobase/utils": "2.0.0-alpha.24",
-  "@nocobase/cache": "2.0.0-alpha.24",
-  "@nocobase/plugin-localization": "2.0.0-alpha.24",
-  "@nocobase/actions": "2.0.0-alpha.24"
+  "@nocobase/database": "2.0.0-alpha.26",
+  "@nocobase/data-source-manager": "2.0.0-alpha.26",
+  "@nocobase/resourcer": "2.0.0-alpha.26",
+  "@nocobase/server": "2.0.0-alpha.26",
+  "@nocobase/utils": "2.0.0-alpha.26",
+  "@nocobase/cache": "2.0.0-alpha.26",
+  "@nocobase/plugin-localization": "2.0.0-alpha.26",
+  "@nocobase/actions": "2.0.0-alpha.26"
 };

package/dist/node_modules/ses/package.json

@@ -1 +1 @@
-{"name":"ses","version":"1.14.0","description":"Hardened JavaScript for Fearless Cooperation","keywords":["lockdown","harden","Compartment","assert","security","confinement","isolation","object capabilities","ocaps","secure execution","third-party code","prototype pollution","supply-chain attack","plugin"],"author":"Agoric","license":"Apache-2.0","homepage":"https://github.com/Agoric/SES-shim/tree/master/packages/ses#readme","repository":{"type":"git","url":"git+https://github.com/endojs/endo.git","directory":"packages/ses"},"bugs":{"url":"https://github.com/endojs/endo/issues"},"type":"module","main":"./dist/ses.cjs","module":"./index.js","unpkg":"./dist/ses.umd.js","types":"./types.d.ts","exports":{".":{"import":{"types":"./types.d.ts","xs":"./src-xs/index.js","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./lockdown":{"import":{"types":"./types.d.ts","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./hermes":{"require":{"types":"./dist/types.d.cts","default":"./dist/ses-hermes.cjs"}},"./tools.js":"./tools.js","./assert-shim.js":"./assert-shim.js","./lockdown-shim.js":{"xs":"./src-xs/lockdown-shim.js","default":"./lockdown-shim.js"},"./compartment-shim.js":{"xs":"./src-xs/compartment-shim.js","default":"./compartment-shim.js"},"./console-shim.js":"./console-shim.js","./package.json":"./package.json"},"scripts":{"build:vanilla":"node scripts/bundle.js","build:hermes":"node scripts/bundle.js hermes","build":"yarn build:vanilla && yarn build:hermes","clean":"rm -rf dist","cover":"c8 ava","demo":"python3 -m http.server","lint":"yarn lint:types && yarn lint:eslint","lint-fix":"eslint --fix .","lint:eslint":"eslint .","lint:types":"tsc","prepare":"npm run clean && npm run build","qt":"ava","test":"tsd && ava","test:hermes":"./scripts/hermes-test.sh","test:xs":"xst dist/ses.umd.js test/_lockdown-safe.js && node scripts/generate-test-xs.js && xst tmp/test-xs.js && rm -rf tmp","postpack":"git clean -fX \"*.d.ts*\" \"*.d.cts*\" \"*.d.mts*\" \"*.tsbuildinfo\""},"dependencies":{"@endo/cache-map":"^1.1.0","@endo/env-options":"^1.1.11","@endo/immutable-arraybuffer":"^1.1.2"},"devDependencies":{"@babel/generator":"^7.26.3","@babel/parser":"~7.26.2","@babel/traverse":"~7.25.9","@babel/types":"~7.26.0","@endo/compartment-mapper":"^1.6.3","@endo/module-source":"^1.3.3","@endo/test262-runner":"^0.1.48","@types/babel__traverse":"^7.20.5","ava":"^6.1.3","babel-eslint":"^10.1.0","c8":"^7.14.0","core-js":"^3.31.0","eslint":"^8.57.1","eslint-config-airbnb-base":"^15.0.0","eslint-config-prettier":"^9.1.0","eslint-plugin-eslint-comments":"^3.2.0","eslint-plugin-import":"^2.31.0","hermes-engine-cli":"^0.12.0","prettier":"^3.5.3","terser":"^5.16.6","tsd":"^0.31.2","typescript":"~5.8.3"},"files":["./*.d.ts","./*.js","./*.map","LICENSE*","SECURITY*","dist","lib","src","tools"],"publishConfig":{"access":"public"},"eslintConfig":{"extends":["plugin:@endo/ses"]},"ava":{"files":["test/**/*.test.*"],"timeout":"2m"},"typeCoverage":{"atLeast":81.17},"gitHead":"9815aea9541f241389d2135c6097a7442bdffa17","_lastModified":"2025-10-26T10:30:14.651Z"}
+{"name":"ses","version":"1.14.0","description":"Hardened JavaScript for Fearless Cooperation","keywords":["lockdown","harden","Compartment","assert","security","confinement","isolation","object capabilities","ocaps","secure execution","third-party code","prototype pollution","supply-chain attack","plugin"],"author":"Agoric","license":"Apache-2.0","homepage":"https://github.com/Agoric/SES-shim/tree/master/packages/ses#readme","repository":{"type":"git","url":"git+https://github.com/endojs/endo.git","directory":"packages/ses"},"bugs":{"url":"https://github.com/endojs/endo/issues"},"type":"module","main":"./dist/ses.cjs","module":"./index.js","unpkg":"./dist/ses.umd.js","types":"./types.d.ts","exports":{".":{"import":{"types":"./types.d.ts","xs":"./src-xs/index.js","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./lockdown":{"import":{"types":"./types.d.ts","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./hermes":{"require":{"types":"./dist/types.d.cts","default":"./dist/ses-hermes.cjs"}},"./tools.js":"./tools.js","./assert-shim.js":"./assert-shim.js","./lockdown-shim.js":{"xs":"./src-xs/lockdown-shim.js","default":"./lockdown-shim.js"},"./compartment-shim.js":{"xs":"./src-xs/compartment-shim.js","default":"./compartment-shim.js"},"./console-shim.js":"./console-shim.js","./package.json":"./package.json"},"scripts":{"build:vanilla":"node scripts/bundle.js","build:hermes":"node scripts/bundle.js hermes","build":"yarn build:vanilla && yarn build:hermes","clean":"rm -rf dist","cover":"c8 ava","demo":"python3 -m http.server","lint":"yarn lint:types && yarn lint:eslint","lint-fix":"eslint --fix .","lint:eslint":"eslint .","lint:types":"tsc","prepare":"npm run clean && npm run build","qt":"ava","test":"tsd && ava","test:hermes":"./scripts/hermes-test.sh","test:xs":"xst dist/ses.umd.js test/_lockdown-safe.js && node scripts/generate-test-xs.js && xst tmp/test-xs.js && rm -rf tmp","postpack":"git clean -fX \"*.d.ts*\" \"*.d.cts*\" \"*.d.mts*\" \"*.tsbuildinfo\""},"dependencies":{"@endo/cache-map":"^1.1.0","@endo/env-options":"^1.1.11","@endo/immutable-arraybuffer":"^1.1.2"},"devDependencies":{"@babel/generator":"^7.26.3","@babel/parser":"~7.26.2","@babel/traverse":"~7.25.9","@babel/types":"~7.26.0","@endo/compartment-mapper":"^1.6.3","@endo/module-source":"^1.3.3","@endo/test262-runner":"^0.1.48","@types/babel__traverse":"^7.20.5","ava":"^6.1.3","babel-eslint":"^10.1.0","c8":"^7.14.0","core-js":"^3.31.0","eslint":"^8.57.1","eslint-config-airbnb-base":"^15.0.0","eslint-config-prettier":"^9.1.0","eslint-plugin-eslint-comments":"^3.2.0","eslint-plugin-import":"^2.31.0","hermes-engine-cli":"^0.12.0","prettier":"^3.5.3","terser":"^5.16.6","tsd":"^0.31.2","typescript":"~5.8.3"},"files":["./*.d.ts","./*.js","./*.map","LICENSE*","SECURITY*","dist","lib","src","tools"],"publishConfig":{"access":"public"},"eslintConfig":{"extends":["plugin:@endo/ses"]},"ava":{"files":["test/**/*.test.*"],"timeout":"2m"},"typeCoverage":{"atLeast":81.17},"gitHead":"9815aea9541f241389d2135c6097a7442bdffa17","_lastModified":"2025-10-30T01:00:37.275Z"}

package/dist/server/variables/registry.js

@@ -43,6 +43,7 @@ module.exports = __toCommonJS(registry_exports);
 var import_lodash = __toESM(require("lodash"));
 var import_contexts = require("../template/contexts");
 var import_utils = require("@nocobase/utils");
+var import_selects = require("./selects");
 class VariableRegistry {
   vars = /* @__PURE__ */ new Map();
   register(def) {
@@ -128,8 +129,8 @@ function inferSelectsFromUsage(paths = [], _params) {
   const generatedFields = fieldSet.size ? Array.from(fieldSet) : void 0;
   return { generatedAppends, generatedFields };
 }
-async function fetchRecordWithRequestCache(koaCtx, dataSourceKey, collection, filterByTk, fields, appends) {
-  var _a, _b, _c, _d;
+async function fetchRecordWithRequestCache(koaCtx, dataSourceKey, collection, filterByTk, fields, appends, preferFullRecord) {
+  var _a, _b, _c, _d, _e;
   try {
     const log = (_b = (_a = koaCtx.app) == null ? void 0 : _a.logger) == null ? void 0 : _b.child({
       module: "plugin-flow-engine",
@@ -146,19 +147,24 @@ async function fetchRecordWithRequestCache(koaCtx, dataSourceKey, collection, fi
     const cm = ds.collectionManager;
     if (!(cm == null ? void 0 : cm.db)) return void 0;
     const repo = cm.db.getRepository(collection);
+    const modelInfo = (_c = repo.collection) == null ? void 0 : _c.model;
+    const pkAttr = modelInfo == null ? void 0 : modelInfo.primaryKeyAttribute;
+    const pkIsValid = pkAttr && (modelInfo == null ? void 0 : modelInfo.rawAttributes) && Object.prototype.hasOwnProperty.call(modelInfo.rawAttributes, pkAttr);
+    const fieldsWithPk = Array.isArray(fields) && fields.length > 0 && pkIsValid ? Array.from(/* @__PURE__ */ new Set([...fields, pkAttr])) : fields;
     const keyObj = {
       ds: dataSourceKey || "main",
       c: collection,
       tk: filterByTk,
-      f: Array.isArray(fields) ? [...fields].sort() : void 0,
-      a: Array.isArray(appends) ? [...appends].sort() : void 0
+      f: Array.isArray(fieldsWithPk) ? [...fieldsWithPk].sort() : void 0,
+      a: Array.isArray(appends) ? [...appends].sort() : void 0,
+      full: preferFullRecord ? true : void 0
     };
     const key = JSON.stringify(keyObj);
     if (cache) {
       if (cache.has(key)) {
         return cache.get(key);
       }
-      const needFields = Array.isArray(fields) ? [...new Set(fields)] : void 0;
+      const needFields = Array.isArray(fieldsWithPk) ? [...new Set(fieldsWithPk)] : void 0;
       const needAppends = Array.isArray(appends) ? new Set(appends) : void 0;
       for (const [cacheKey, cacheVal] of cache.entries()) {
         const parsed = JSON.parse(cacheKey);
@@ -173,23 +179,34 @@ async function fetchRecordWithRequestCache(koaCtx, dataSourceKey, collection, fi
           }
           return false;
         };
-        const fieldsOk = !needFields || needFields.every((f) => cachedFields.has(f) || fieldCoveredByAppends(f));
+        const fieldsOk = needFields ? needFields.every((f) => cachedFields.has(f) || fieldCoveredByAppends(f)) : parsed.f === void 0;
         const appendsOk = !needAppends || [...needAppends].every((a) => cachedAppends.has(a));
-        if (fieldsOk && appendsOk) {
+        const fullOk = preferFullRecord ? parsed.full === true : true;
+        if (fieldsOk && appendsOk && fullOk) {
           return cacheVal;
         }
       }
     }
     const rec = await repo.findOne({
       filterByTk,
-      fields,
+      fields: fieldsWithPk,
       appends
     });
-    const json = rec ? rec.toJSON() : void 0;
+    let json = rec ? rec.toJSON() : void 0;
+    if (preferFullRecord && json && typeof json === "object" && pkIsValid) {
+      const keys = Object.keys(json);
+      const pkOnly = keys.length === 1 && keys[0] === pkAttr;
+      const rawAttrs = modelInfo == null ? void 0 : modelInfo.rawAttributes;
+      const hasMoreAttrs = rawAttrs && Object.keys(rawAttrs).some((k) => k !== pkAttr);
+      if (pkOnly && hasMoreAttrs) {
+        const rec2 = await repo.findOne({ filterByTk });
+        json = rec2 ? rec2.toJSON() : json;
+      }
+    }
     if (cache) cache.set(key, json);
     return json;
   } catch (e) {
-    const log = (_d = (_c = koaCtx.app) == null ? void 0 : _c.logger) == null ? void 0 : _d.child({
+    const log = (_e = (_d = koaCtx.app) == null ? void 0 : _d.logger) == null ? void 0 : _e.child({
       module: "plugin-flow-engine",
       submodule: "variables.resolve",
       method: "fetchRecordWithRequestCache"
@@ -219,17 +236,26 @@ function attachGenericRecordVariables(flowCtx, koaCtx, usage, contextParams) {
     const topParams = import_lodash.default.get(contextParams, varName);
     if (isRecordParams(topParams)) {
       const { generatedAppends, generatedFields } = inferSelectsFromUsage(usedPaths, topParams);
+      const hasDirectRefTop = (usedPaths || []).some((p) => p === "");
       flowCtx.defineProperty(varName, {
         get: async () => {
           const dataSourceKey = (topParams == null ? void 0 : topParams.dataSourceKey) || "main";
-          return await fetchRecordWithRequestCache(
+          const fixed = (0, import_selects.adjustSelectsForCollection)(
             koaCtx,
             dataSourceKey,
             topParams.collection,
-            topParams.filterByTk,
             generatedFields,
             generatedAppends
           );
+          return await fetchRecordWithRequestCache(
+            koaCtx,
+            dataSourceKey,
+            topParams.collection,
+            topParams.filterByTk,
+            fixed.fields,
+            fixed.appends,
+            hasDirectRefTop
+          );
         },
         cache: true
       });
@@ -287,19 +313,27 @@ function attachGenericRecordVariables(flowCtx, koaCtx, usage, contextParams) {
       get: () => {
         const root = new import_contexts.ServerBaseContext();
         const definedFirstLevel = /* @__PURE__ */ new Set();
-        const defineRecordGetter = (container, key, recordParams, subPaths = []) => {
+        const defineRecordGetter = (container, key, recordParams, subPaths = [], preferFull) => {
           const { generatedAppends, generatedFields } = inferSelectsFromUsage(subPaths, recordParams);
           container.defineProperty(key, {
             get: async () => {
               const dataSourceKey = (recordParams == null ? void 0 : recordParams.dataSourceKey) || "main";
-              return await fetchRecordWithRequestCache(
+              const fixed = (0, import_selects.adjustSelectsForCollection)(
                 koaCtx,
                 dataSourceKey,
                 recordParams.collection,
-                recordParams.filterByTk,
                 generatedFields,
                 generatedAppends
               );
+              return await fetchRecordWithRequestCache(
+                koaCtx,
+                dataSourceKey,
+                recordParams.collection,
+                recordParams.filterByTk,
+                fixed.fields,
+                fixed.appends,
+                preferFull || ((subPaths == null ? void 0 : subPaths.length) ?? 0) === 0
+              );
             },
             cache: true
           });
@@ -330,7 +364,8 @@ function attachGenericRecordVariables(flowCtx, koaCtx, usage, contextParams) {
             ).filter((x) => !!x);
             if (all.length) effRemainders = all;
           }
-          defineRecordGetter(root, idx ?? seg, recordParams, effRemainders);
+          const hasDirectRefOne = (usedPaths || []).some((p) => p === seg || !!idx && p === `[${idx}]`);
+          defineRecordGetter(root, idx ?? seg, recordParams, effRemainders, hasDirectRefOne);
           definedFirstLevel.add(idx ?? seg);
         }
         for (const [relative, recordParams] of deepRecordMap.entries()) {
@@ -348,7 +383,8 @@ function attachGenericRecordVariables(flowCtx, koaCtx, usage, contextParams) {
           }
           const leaf = segs[segs.length - 1];
           const subPaths = (usedPaths || []).map((p) => p === relative ? "" : p.startsWith(relative + ".") ? p.slice(relative.length + 1) : "").filter((x) => x !== "");
-          defineRecordGetter(container, leaf, recordParams, subPaths);
+          const hasDirectRef = (usedPaths || []).some((p) => p === relative);
+          defineRecordGetter(container, leaf, recordParams, subPaths, hasDirectRef);
         }
         return root.createProxy();
       },

package/dist/server/variables/selects.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 { ResourcerContext } from '@nocobase/resourcer';
+/**
+ * 针对给定集合，修正 selects：
+ * - 若 fields 中包含单段且为关联名（如 'roles'），则将其从 fields 移到 appends。
+ * - 若 fields 中包含多段且首段为关联名（如 'roles.name'），确保 appends 包含该关联名，并将首段替换为模型真实关联名。
+ * - 非关联字段：仅当模型存在该属性（或其 snake/camel 变体）时才保留，否则丢弃以避免数据库错误。
+ */
+export declare function adjustSelectsForCollection(koaCtx: ResourcerContext, dataSourceKey: string, collection: string, fields?: string[], appends?: string[]): {
+    fields?: string[];
+    appends?: string[];
+};

package/dist/server/variables/selects.js

@@ -0,0 +1,80 @@
+/**
+ * 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 __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 selects_exports = {};
+__export(selects_exports, {
+  adjustSelectsForCollection: () => adjustSelectsForCollection
+});
+module.exports = __toCommonJS(selects_exports);
+function adjustSelectsForCollection(koaCtx, dataSourceKey, collection, fields, appends) {
+  var _a, _b, _c, _d;
+  const ds = koaCtx.app.dataSourceManager.get(dataSourceKey || "main");
+  const cm = ds.collectionManager;
+  const coll = (_b = (_a = cm == null ? void 0 : cm.db) == null ? void 0 : _a.getCollection) == null ? void 0 : _b.call(_a, collection);
+  const assocKeys = Object.keys(((_c = coll == null ? void 0 : coll.model) == null ? void 0 : _c.associations) || {});
+  const rawAttrs = ((_d = coll == null ? void 0 : coll.model) == null ? void 0 : _d.rawAttributes) || {};
+  const toCamel = (s) => s.replace(/_([a-zA-Z0-9])/g, (_m, c) => String(c).toUpperCase());
+  const toSnake = (s) => s.replace(/([A-Z])/g, "_$1").toLowerCase().replace(/^_/, "");
+  const assocMap = /* @__PURE__ */ new Map();
+  for (const k of assocKeys) {
+    assocMap.set(k, k);
+    assocMap.set(toSnake(k), k);
+    assocMap.set(toCamel(k), k);
+  }
+  const outFields = [];
+  const outAppends = new Set(appends || []);
+  for (const f of fields || []) {
+    const segs = String(f).split(".").filter(Boolean);
+    if (!segs.length) continue;
+    const first = segs[0];
+    const assocCanonical = assocMap.get(first) || assocMap.get(toCamel(first)) || assocMap.get(toSnake(first));
+    if (assocCanonical) {
+      outAppends.add(assocCanonical);
+      if (segs.length === 1) {
+        continue;
+      }
+      outFields.push([assocCanonical, ...segs.slice(1)].join("."));
+      continue;
+    }
+    if (rawAttrs[first]) {
+      outFields.push(f);
+    } else if (rawAttrs[toSnake(first)]) {
+      outFields.push([toSnake(first), ...segs.slice(1)].join("."));
+    } else if (rawAttrs[toCamel(first)]) {
+      outFields.push([toCamel(first), ...segs.slice(1)].join("."));
+    } else {
+      continue;
+    }
+  }
+  return {
+    fields: outFields.length ? outFields : void 0,
+    appends: outAppends.size ? Array.from(outAppends) : void 0
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  adjustSelectsForCollection
+});

package/dist/server/variables/utils.js

@@ -30,8 +30,9 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_registry = require("./registry");
+var import_selects = require("./selects");
 async function prefetchRecordsForResolve(koaCtx, items) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   try {
     const log = (_b = (_a = koaCtx.app) == null ? void 0 : _a.logger) == null ? void 0 : _b.child({ module: "plugin-flow-engine", submodule: "variables.prefetch" });
     const groupMap = /* @__PURE__ */ new Map();
@@ -69,7 +70,10 @@ async function prefetchRecordsForResolve(koaCtx, items) {
         const filterByTk = recordParams == null ? void 0 : recordParams.filterByTk;
         if (!collection || typeof filterByTk === "undefined") continue;
         const group = ensureGroup(dataSourceKey, collection, filterByTk);
-        const { generatedAppends, generatedFields } = (0, import_registry.inferSelectsFromUsage)(remainders);
+        let { generatedAppends, generatedFields } = (0, import_registry.inferSelectsFromUsage)(remainders);
+        const fixed = (0, import_selects.adjustSelectsForCollection)(koaCtx, dataSourceKey, collection, generatedFields, generatedAppends);
+        generatedFields = fixed.fields;
+        generatedAppends = fixed.appends;
         if (generatedFields == null ? void 0 : generatedFields.length) generatedFields.forEach((f) => group.fields.add(f));
         if (generatedAppends == null ? void 0 : generatedAppends.length) generatedAppends.forEach((a) => group.appends.add(a));
       }
@@ -86,6 +90,12 @@ async function prefetchRecordsForResolve(koaCtx, items) {
         const cm = ds.collectionManager;
         if (!(cm == null ? void 0 : cm.db)) continue;
         const repo = cm.db.getRepository(collection);
+        const modelInfo = (_d = repo.collection) == null ? void 0 : _d.model;
+        const pkAttr = modelInfo == null ? void 0 : modelInfo.primaryKeyAttribute;
+        const pkIsValid = pkAttr && (modelInfo == null ? void 0 : modelInfo.rawAttributes) && Object.prototype.hasOwnProperty.call(modelInfo.rawAttributes, pkAttr);
+        if (fields.size && pkIsValid) {
+          fields.add(pkAttr);
+        }
         const fld = fields.size ? Array.from(fields).sort() : void 0;
         const app = appends.size ? Array.from(appends).sort() : void 0;
         const rec = await repo.findOne({ filterByTk, fields: fld, appends: app });
@@ -104,7 +114,7 @@ async function prefetchRecordsForResolve(koaCtx, items) {
       }
     }
   } catch (e) {
-    (_f = (_e = (_d = koaCtx.app) == null ? void 0 : _d.logger) == null ? void 0 : _e.child({ module: "plugin-flow-engine", submodule: "variables.prefetch" })) == null ? void 0 : _f.debug("[variables.resolve] prefetch fatal error", { error: (e == null ? void 0 : e.message) || String(e) });
+    (_g = (_f = (_e = koaCtx.app) == null ? void 0 : _e.logger) == null ? void 0 : _f.child({ module: "plugin-flow-engine", submodule: "variables.prefetch" })) == null ? void 0 : _g.debug("[variables.resolve] prefetch fatal error", { error: (e == null ? void 0 : e.message) || String(e) });
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "前端流引擎",
   "description": "",
   "description.zh-CN": "",
-  "version": "2.0.0-alpha.24",
+  "version": "2.0.0-alpha.26",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
@@ -24,5 +24,5 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "4e6d1ae61143f01aba213355b4c416aab4d64077"
+  "gitHead": "3f9e6825dfefabec9640dc46783955174275df04"
 }