@nocobase/plugin-flow-engine 2.1.0-beta.37 → 2.1.0-beta.40

package/dist/server/flow-surfaces/blueprint/compile-blocks.js

@@ -1305,6 +1305,19 @@ function attachDefaultActionPopupMetadata(popup, actionType, metadata) {
   const defaultPopup = actionType === "addChild" && import_lodash.default.isUndefined(popup) ? {} : popup;
   return attachCompiledPopupDefaults(defaultPopup, metadata);
 }
+function isFieldClickToOpenEnabled(settings) {
+  if (!import_lodash.default.isPlainObject(settings) || !Object.prototype.hasOwnProperty.call(settings, "clickToOpen")) {
+    return false;
+  }
+  const value = settings.clickToOpen;
+  return value === true || import_lodash.default.isPlainObject(value) && value.clickToOpen === true;
+}
+function buildGeneratedDefaultFieldPopup() {
+  return {
+    tryTemplate: true,
+    defaultType: "view"
+  };
+}
 function hasNestedDefaultPopupMetadata(value) {
   if (Array.isArray(value)) {
     return value.some((item) => hasNestedDefaultPopupMetadata(item));
@@ -1640,7 +1653,10 @@ function compileField(input, index, scopePrefix, assets, localBlockKeys, context
     parentContext: parentResourceContext,
     getCollection
   });
-  const popupResult = compilePopup(input.popup, `${key}.popup`, assets, `${context}[${index}].popup`, defaults, {
+  const shouldAutoCompleteClickPopup = import_lodash.default.isUndefined(input.popup) && isFieldClickToOpenEnabled(settings);
+  const popupInput = shouldAutoCompleteClickPopup ? buildGeneratedDefaultFieldPopup() : input.popup;
+  const shouldAutoRelationFieldPopup = import_lodash.default.isUndefined(input.popup) && !!fieldPath && !syntheticType;
+  const popupResult = compilePopup(popupInput, `${key}.popup`, assets, `${context}[${index}].popup`, defaults, {
     getCollection,
     mode: popupOptions.mode,
     popupDepth: popupOptions.popupDepth,
@@ -1652,7 +1668,7 @@ function compileField(input, index, scopePrefix, assets, localBlockKeys, context
     associationName: popupOptions.associationName || (fieldAssociationContext == null ? void 0 : fieldAssociationContext.associationName)
   });
   settings = resolvePopupTitleSettings(settings, popupResult.popupTitle);
-  const popup = shouldAttachDefaultPopupMetadata(input.popup, void 0) ? attachCompiledPopupDefaults(popupResult.popup, popupDefaultsMetadata) : popupResult.popup;
+  const popup = shouldAttachDefaultPopupMetadata(popupInput, void 0) ? attachCompiledPopupDefaults(popupResult.popup, popupDefaultsMetadata) : popupResult.popup;
   return (0, import_service_utils.buildDefinedPayload)({
     key,
     fieldPath,
@@ -1668,7 +1684,9 @@ function compileField(input, index, scopePrefix, assets, localBlockKeys, context
     showIndex: input.showIndex,
     target: resolveTargetBlockKey(input.target, localBlockKeys, `${context}[${index}].target`),
     settings: Object.keys(settings).length ? settings : void 0,
-    popup
+    popup,
+    __autoPopupForRelationField: shouldAutoRelationFieldPopup ? true : void 0,
+    ...shouldAutoRelationFieldPopup && popupDefaultsMetadata ? { [import_defaults.FLOW_SURFACE_APPLY_BLUEPRINT_POPUP_DEFAULTS_KEY]: import_lodash.default.cloneDeep(popupDefaultsMetadata) } : {}
   });
 }
 function compileAction(input, index, scopePrefix, assets, localBlockKeys, context, popupDefaultsMetadata, defaults, getCollection, options = {}) {

package/dist/server/flow-surfaces/blueprint/compile-plan.js

@@ -83,7 +83,7 @@ function buildTabSelectorFromUid(uid) {
   };
 }
 function compileCreatePlan(document, getCollection) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B;
   const steps = [];
   const chrome = buildPageChrome(document);
   if (import_lodash.default.isPlainObject((_a = document.navigation) == null ? void 0 : _a.group) && import_lodash.default.isUndefined(document.navigation.group.routeId)) {
@@ -105,10 +105,10 @@ function compileCreatePlan(document, getCollection) {
     values: (0, import_service_utils.buildDefinedPayload)({
       title: ((_k = (_j = document.navigation) == null ? void 0 : _j.item) == null ? void 0 : _k.title) || chrome.pageTitle,
       type: "item",
-      icon: (_m = (_l = document.navigation) == null ? void 0 : _l.item) == null ? void 0 : _m.icon,
-      tooltip: (_o = (_n = document.navigation) == null ? void 0 : _n.item) == null ? void 0 : _o.tooltip,
-      hideInMenu: (_q = (_p = document.navigation) == null ? void 0 : _p.item) == null ? void 0 : _q.hideInMenu,
-      parentMenuRouteId: import_lodash.default.isUndefined((_s = (_r = document.navigation) == null ? void 0 : _r.group) == null ? void 0 : _s.routeId) ? ((_u = (_t = document.navigation) == null ? void 0 : _t.group) == null ? void 0 : _u.title) ? { step: CREATE_MENU_GROUP_STEP_ID, path: "routeId" } : void 0 : (_w = (_v = document.navigation) == null ? void 0 : _v.group) == null ? void 0 : _w.routeId
+      icon: ((_m = (_l = document.navigation) == null ? void 0 : _l.item) == null ? void 0 : _m.icon) || ((_n = document.page) == null ? void 0 : _n.icon) || "FileOutlined",
+      tooltip: (_p = (_o = document.navigation) == null ? void 0 : _o.item) == null ? void 0 : _p.tooltip,
+      hideInMenu: (_r = (_q = document.navigation) == null ? void 0 : _q.item) == null ? void 0 : _r.hideInMenu,
+      parentMenuRouteId: import_lodash.default.isUndefined((_t = (_s = document.navigation) == null ? void 0 : _s.group) == null ? void 0 : _t.routeId) ? ((_v = (_u = document.navigation) == null ? void 0 : _u.group) == null ? void 0 : _v.title) ? { step: CREATE_MENU_GROUP_STEP_ID, path: "routeId" } : void 0 : (_x = (_w = document.navigation) == null ? void 0 : _w.group) == null ? void 0 : _x.routeId
     })
   });
   steps.push({
@@ -117,11 +117,11 @@ function compileCreatePlan(document, getCollection) {
     values: (0, import_service_utils.buildDefinedPayload)({
       menuRouteId: { step: CREATE_MENU_ITEM_STEP_ID, path: "routeId" },
       title: chrome.pageTitle,
-      icon: (_x = document.page) == null ? void 0 : _x.icon,
-      documentTitle: (_y = document.page) == null ? void 0 : _y.documentTitle,
-      enableHeader: (_z = document.page) == null ? void 0 : _z.enableHeader,
+      icon: (_y = document.page) == null ? void 0 : _y.icon,
+      documentTitle: (_z = document.page) == null ? void 0 : _z.documentTitle,
+      enableHeader: (_A = document.page) == null ? void 0 : _A.enableHeader,
       enableTabs: chrome.enableTabs,
-      displayTitle: (_A = document.page) == null ? void 0 : _A.displayTitle,
+      displayTitle: (_B = document.page) == null ? void 0 : _B.displayTitle,
       tabTitle: chrome.tabTitle,
       tabIcon: chrome.tabIcon,
       tabDocumentTitle: chrome.tabDocumentTitle,

package/dist/server/flow-surfaces/catalog.js

@@ -484,6 +484,7 @@ const KANBAN_SETTINGS_GROUP = {
 const TABLE_SETTINGS_GROUP = {
   allowedPaths: [
     "quickEdit.editable",
+    "enableRowSelection.enableRowSelection",
     "showRowNumbers.showIndex",
     "pageSize.pageSize",
     "dataScope.filter",
@@ -496,6 +497,7 @@ const TABLE_SETTINGS_GROUP = {
   ],
   eventBindingSteps: [
     "quickEdit",
+    "enableRowSelection",
     "showRowNumbers",
     "pageSize",
     "dataScope",
@@ -508,6 +510,7 @@ const TABLE_SETTINGS_GROUP = {
   ],
   pathSchemas: {
     "quickEdit.editable": BOOLEAN_SCHEMA,
+    "enableRowSelection.enableRowSelection": BOOLEAN_SCHEMA,
     "showRowNumbers.showIndex": BOOLEAN_SCHEMA,
     "pageSize.pageSize": NUMBER_SCHEMA,
     "dataScope.filter": FILTER_GROUP_SCHEMA,

package/dist/server/flow-surfaces/chart-config.js

@@ -64,6 +64,10 @@ __export(chart_config_exports, {
 module.exports = __toCommonJS(chart_config_exports);
 var import_lodash = __toESM(require("lodash"));
 var import_errors = require("./errors");
+const CHART_REPAIR_HINT = "This is a chart payload shape problem. Repair the current chart query/visual mappings and keep the chart block type. Do not change this block type to table, jsBlock, actionPanel, gridCard, or another block type. KPI / summary numbers should use jsBlock; charts are for trends, distributions, rankings, and visual analysis.";
+function withChartRepairMessage(message) {
+  return `${message}. ${CHART_REPAIR_HINT}`;
+}
 const CHART_DEFAULT_DATA_SOURCE_KEY = "main";
 const CHART_QUERY_MODES = ["builder", "sql"];
 const CHART_VISUAL_MODES = ["basic", "custom"];
@@ -1083,7 +1087,16 @@ function assertBasicVisualMappingsAgainstBuilderQuery(builderVisual, query) {
   for (const value of mappingValues) {
     if (!value || !allowedOutputs.has(value)) {
       throw new import_errors.FlowSurfaceBadRequestError(
-        `chart visual mappings only support query output fields: ${Array.from(allowedOutputs).join(", ")}`
+        withChartRepairMessage(
+          `chart visual mappings only support query output fields: ${Array.from(allowedOutputs).join(", ")}`
+        ),
+        void 0,
+        {
+          details: {
+            repairHint: CHART_REPAIR_HINT,
+            allowedOutputs: Array.from(allowedOutputs)
+          }
+        }
       );
     }
   }

package/dist/server/flow-surfaces/compose-compiler.d.ts

@@ -31,6 +31,8 @@ export type FlowSurfaceComposeNormalizedFieldSpec = {
     pageSize?: number;
     showIndex?: boolean;
     target?: string | Record<string, unknown>;
+    defaultTargetUid?: string;
+    targetBlockUid?: string;
     settings?: FlowSurfaceComposeObject;
     popup?: FlowSurfaceComposeObject;
     __autoPopupForRelationField?: boolean;

package/dist/server/flow-surfaces/compose-compiler.js

@@ -130,6 +130,8 @@ function buildComposeFieldCreatePayload(fieldSpec) {
     ...fieldSpec.popupSize ? { popupSize: fieldSpec.popupSize } : {},
     ...typeof fieldSpec.pageSize !== "undefined" ? { pageSize: fieldSpec.pageSize } : {},
     ...typeof fieldSpec.showIndex !== "undefined" ? { showIndex: fieldSpec.showIndex } : {},
+    ...fieldSpec.defaultTargetUid ? { defaultTargetUid: fieldSpec.defaultTargetUid } : {},
+    ...fieldSpec.targetBlockUid ? { targetBlockUid: fieldSpec.targetBlockUid } : {},
     ...fieldSpec.popup ? { popup: fieldSpec.popup } : {},
     ...fieldSpec.__autoPopupForRelationField ? { __autoPopupForRelationField: true } : {},
     ...fieldSpec[import_defaults.FLOW_SURFACE_APPLY_BLUEPRINT_POPUP_DEFAULTS_KEY] ? {

package/dist/server/flow-surfaces/compose-runtime.js

@@ -150,6 +150,8 @@ async function createFields(plan, deps, state) {
   for (const fieldTask of plan.fields) {
     const block = requireBlockState(fieldTask.blockKey, state);
     const targetUid = fieldTask.containerSource === "item" ? block.result.itemUid || block.result.uid : block.result.uid;
+    const targetKey = readComposeFieldTargetKey(fieldTask.spec.target);
+    const resolvedTargetUid = targetKey ? (0, import_compose_compiler.resolveComposeTargetKey)(targetKey, state.keyMap, "field") : fieldTask.spec.defaultTargetUid || fieldTask.spec.targetBlockUid;
     let createdField;
     try {
       createdField = await deps.createField(
@@ -158,13 +160,8 @@ async function createFields(plan, deps, state) {
             uid: targetUid
           },
           ...fieldTask.payload,
-          ...readComposeFieldTargetKey(fieldTask.spec.target) ? {
-            defaultTargetUid: (0, import_compose_compiler.resolveComposeTargetKey)(
-              readComposeFieldTargetKey(fieldTask.spec.target),
-              state.keyMap,
-              "field"
-            )
-          } : {}
+          ...resolvedTargetUid ? { defaultTargetUid: resolvedTargetUid } : {},
+          ...fieldTask.spec.targetBlockUid ? { targetBlockUid: fieldTask.spec.targetBlockUid } : {}
         },
         fieldTask.spec,
         block.result

package/dist/server/flow-surfaces/configure-options.js

@@ -163,6 +163,7 @@ const TABLE_OPTIONS = {
   resource: COMMON_RESOURCE,
   pageSize: numberOption("Page size", { example: 20 }),
   density: stringOption("Table density", { enum: ["large", "middle", "small"], example: "middle" }),
+  enableRowSelection: booleanOption("Whether to enable row selection checkboxes", { example: true }),
   showRowNumbers: booleanOption("Whether to display row numbers", { example: true }),
   sorting: SORTING,
   dataScope: FILTER_GROUP,
@@ -518,8 +519,15 @@ const FIELD_NODE_OPTIONS = {
   displayStyle: DISPLAY_STYLE,
   options: objectOption("Component options")
 };
+function omitConfigureOptions(options, keys) {
+  const next = { ...options };
+  for (const key of keys) {
+    delete next[key];
+  }
+  return next;
+}
 const JS_FIELD_NODE_OPTIONS = {
-  ...FIELD_NODE_OPTIONS,
+  ...omitConfigureOptions(FIELD_NODE_OPTIONS, ["openView"]),
   code: JS_CODE,
   version: JS_VERSION
 };
@@ -632,17 +640,20 @@ const ACTION_EMAIL_OPTIONS = {
 const ACTION_AI_EMPLOYEE_OPTIONS = {
   username: stringOption("AI employee username", { example: "dex" }),
   auto: booleanOption("Whether the single configured task is prepared automatically", { example: false }),
-  workContext: arrayOption("Top-level AI work context. Use target=self or a same-blueprint block key before write.", {
-    example: [{ type: "flow-model", target: "self" }]
-  }),
-  tasks: arrayOption("AI employee task definitions", {
+  workContext: arrayOption(
+    "Top-level AI work context. Use target=self or a same-blueprint block key before write; type defaults to flow-model.",
+    {
+      example: [{ target: "self" }]
+    }
+  ),
+  tasks: arrayOption("AI employee task definitions. prompt is accepted as an alias for message.user.", {
     example: [
       {
         title: "Analyze current record",
+        prompt: "Analyze the current record and suggest next steps.",
         message: {
           system: "Use the current UI context.",
-          user: "Analyze the current record and suggest next steps.",
-          workContext: [{ type: "flow-model", target: "self" }]
+          workContext: [{ target: "self" }]
         },
         autoSend: false,
         skillSettings: null,

package/dist/server/flow-surfaces/locator.js

@@ -49,7 +49,7 @@ class SurfaceLocator {
     this.repository = repository;
   }
   async resolve(target, options = {}) {
-    var _a;
+    var _a, _b;
     const transaction = options.transaction;
     if (target.uid) {
       return this.resolveByUid(target.uid, target, transaction);
@@ -68,7 +68,21 @@ class SurfaceLocator {
       if (isPageRoute(route)) {
         return this.resolvePageSchemaUid(route.get("schemaUid"), target, transaction);
       }
-      if ((_a = route == null ? void 0 : route.get) == null ? void 0 : _a.call(route, "schemaUid")) {
+      if (((_a = route == null ? void 0 : route.get) == null ? void 0 : _a.call(route, "type")) === "group") {
+        throw new import_errors.FlowSurfaceBadRequestError(
+          `flowSurfaces routeId '${target.routeId}' points to a menu group, not a page surface. Menu group routeIds can be used directly as navigation.group.routeId; do not use flowSurfaces:get to check whether a menu group exists.`,
+          void 0,
+          {
+            ruleId: "route-id-points-to-menu-group",
+            details: {
+              routeId: String(target.routeId),
+              title: route.get("title") ?? null,
+              type: "group"
+            }
+          }
+        );
+      }
+      if ((_b = route == null ? void 0 : route.get) == null ? void 0 : _b.call(route, "schemaUid")) {
         return this.resolveByUid(route.get("schemaUid"), target, transaction);
       }
     }