@nocobase/plugin-flow-engine 2.2.0-beta.1 → 2.2.0-beta.11

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

@@ -960,10 +960,14 @@ function resolveApplyBlueprintAssociationContext(input) {
   }
   const targetCollection = (0, import_service_helpers.resolveFieldTargetCollection)(field, dataSourceKey, input.getCollection);
   const targetCollectionName = normalizeMetadataText(input.targetCollectionName) || normalizeMetadataText((0, import_service_helpers.getCollectionName)(targetCollection)) || normalizeMetadataText((0, import_service_helpers.getFieldTarget)(field));
+  const resolvedAssociationName = (0, import_service_helpers.resolveAssociationNameFromField)(
+    field,
+    associationPath.includes(".") ? void 0 : sourceCollection
+  );
   return {
     dataSourceKey,
     surfaceCollectionName: targetCollectionName || void 0,
-    associationName: (associationPath.includes(".") ? `${sourceCollectionName}.${associationPath}` : void 0) || (0, import_service_helpers.resolveAssociationNameFromField)(field, sourceCollection) || `${sourceCollectionName}.${associationPath || associationFieldPath}`
+    associationName: resolvedAssociationName || `${sourceCollectionName}.${associationPath || associationFieldPath}`
   };
 }
 function getApplyBlueprintBlockResourceObject(block) {
@@ -1018,7 +1022,7 @@ function resolveApplyBlueprintBlockResourceContext(block, parentContext, getColl
     return {
       dataSourceKey,
       surfaceCollectionName: directCollectionName || (associatedContext == null ? void 0 : associatedContext.surfaceCollectionName) || (parentContext == null ? void 0 : parentContext.surfaceCollectionName),
-      associationName: (parentContext == null ? void 0 : parentContext.associationName) || (associatedContext == null ? void 0 : associatedContext.associationName)
+      associationName: (associatedContext == null ? void 0 : associatedContext.associationName) || (parentContext == null ? void 0 : parentContext.associationName)
     };
   }
   return {
@@ -1665,7 +1669,7 @@ function compileField(input, index, scopePrefix, assets, localBlockKeys, context
     hostBlock: popupOptions.hostBlock,
     dataSourceKey: (fieldAssociationContext == null ? void 0 : fieldAssociationContext.dataSourceKey) || popupOptions.dataSourceKey,
     surfaceCollectionName: (fieldAssociationContext == null ? void 0 : fieldAssociationContext.surfaceCollectionName) || popupOptions.surfaceCollectionName,
-    associationName: popupOptions.associationName || (fieldAssociationContext == null ? void 0 : fieldAssociationContext.associationName)
+    associationName: (fieldAssociationContext == null ? void 0 : fieldAssociationContext.associationName) || popupOptions.associationName
   });
   settings = resolvePopupTitleSettings(settings, popupResult.popupTitle);
   const popup = shouldAttachDefaultPopupMetadata(popupInput, void 0) ? attachCompiledPopupDefaults(popupResult.popup, popupDefaultsMetadata) : popupResult.popup;

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

@@ -83,19 +83,21 @@ 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, _B;
+  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, _C;
   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)) {
+  const layoutUid = (_a = document.navigation) == null ? void 0 : _a.layoutUid;
+  if (import_lodash.default.isPlainObject((_b = document.navigation) == null ? void 0 : _b.group) && import_lodash.default.isUndefined(document.navigation.group.routeId)) {
     steps.push({
       id: CREATE_MENU_GROUP_STEP_ID,
       action: "createMenu",
       values: (0, import_service_utils.buildDefinedPayload)({
-        title: (_c = (_b = document.navigation) == null ? void 0 : _b.group) == null ? void 0 : _c.title,
+        layoutUid,
+        title: (_d = (_c = document.navigation) == null ? void 0 : _c.group) == null ? void 0 : _d.title,
         type: "group",
-        icon: (_e = (_d = document.navigation) == null ? void 0 : _d.group) == null ? void 0 : _e.icon,
-        tooltip: (_g = (_f = document.navigation) == null ? void 0 : _f.group) == null ? void 0 : _g.tooltip,
-        hideInMenu: (_i = (_h = document.navigation) == null ? void 0 : _h.group) == null ? void 0 : _i.hideInMenu
+        icon: (_f = (_e = document.navigation) == null ? void 0 : _e.group) == null ? void 0 : _f.icon,
+        tooltip: (_h = (_g = document.navigation) == null ? void 0 : _g.group) == null ? void 0 : _h.tooltip,
+        hideInMenu: (_j = (_i = document.navigation) == null ? void 0 : _i.group) == null ? void 0 : _j.hideInMenu
       })
     });
   }
@@ -103,25 +105,27 @@ function compileCreatePlan(document, getCollection) {
     id: CREATE_MENU_ITEM_STEP_ID,
     action: "createMenu",
     values: (0, import_service_utils.buildDefinedPayload)({
-      title: ((_k = (_j = document.navigation) == null ? void 0 : _j.item) == null ? void 0 : _k.title) || chrome.pageTitle,
+      layoutUid,
+      title: ((_l = (_k = document.navigation) == null ? void 0 : _k.item) == null ? void 0 : _l.title) || chrome.pageTitle,
       type: "item",
-      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
+      icon: ((_n = (_m = document.navigation) == null ? void 0 : _m.item) == null ? void 0 : _n.icon) || ((_o = document.page) == null ? void 0 : _o.icon) || "FileOutlined",
+      tooltip: (_q = (_p = document.navigation) == null ? void 0 : _p.item) == null ? void 0 : _q.tooltip,
+      hideInMenu: (_s = (_r = document.navigation) == null ? void 0 : _r.item) == null ? void 0 : _s.hideInMenu,
+      parentMenuRouteId: import_lodash.default.isUndefined((_u = (_t = document.navigation) == null ? void 0 : _t.group) == null ? void 0 : _u.routeId) ? ((_w = (_v = document.navigation) == null ? void 0 : _v.group) == null ? void 0 : _w.title) ? { step: CREATE_MENU_GROUP_STEP_ID, path: "routeId" } : void 0 : (_y = (_x = document.navigation) == null ? void 0 : _x.group) == null ? void 0 : _y.routeId
     })
   });
   steps.push({
     id: CREATE_PAGE_STEP_ID,
     action: "createPage",
     values: (0, import_service_utils.buildDefinedPayload)({
+      layoutUid,
       menuRouteId: { step: CREATE_MENU_ITEM_STEP_ID, path: "routeId" },
       title: chrome.pageTitle,
-      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,
+      icon: (_z = document.page) == null ? void 0 : _z.icon,
+      documentTitle: (_A = document.page) == null ? void 0 : _A.documentTitle,
+      enableHeader: (_B = document.page) == null ? void 0 : _B.enableHeader,
       enableTabs: chrome.enableTabs,
-      displayTitle: (_B = document.page) == null ? void 0 : _B.displayTitle,
+      displayTitle: (_C = document.page) == null ? void 0 : _C.displayTitle,
       tabTitle: chrome.tabTitle,
       tabIcon: chrome.tabIcon,
       tabDocumentTitle: chrome.tabDocumentTitle,

package/dist/server/flow-surfaces/blueprint/export-document.d.ts

@@ -0,0 +1,50 @@
+/**
+ * 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 { FlowSurfaceApplyBlueprintDocument } from './public-types';
+export type FlowSurfaceExportBlueprintUnsupportedPolicy = 'error' | 'warn';
+export type FlowSurfaceExportBlueprintUnsupportedItem = {
+    kind: 'page' | 'tab' | 'block' | 'field' | 'action' | 'recordAction' | 'reaction' | 'layout' | 'popup';
+    use?: string;
+    type?: string;
+    path: string;
+    reasonCode: string;
+    manualAction: string;
+};
+export type FlowSurfaceExportBlueprintResult = {
+    document: FlowSurfaceApplyBlueprintDocument;
+    source: {
+        target: {
+            pageSchemaUid: string;
+        };
+        pageTitle?: string;
+    };
+    warnings: string[];
+    unsupported: FlowSurfaceExportBlueprintUnsupportedItem[];
+};
+type FlowSurfaceExportNode = Record<string, unknown> & {
+    uid?: string;
+    use?: string;
+    props?: Record<string, unknown>;
+    decoratorProps?: Record<string, unknown>;
+    stepParams?: Record<string, unknown>;
+    flowRegistry?: Record<string, unknown>;
+    template?: Record<string, unknown>;
+    fieldsTemplate?: Record<string, unknown>;
+    popup?: Record<string, unknown>;
+    subModels?: Record<string, unknown>;
+};
+export declare function exportFlowSurfaceBlueprintDocument(input: {
+    page: FlowSurfaceExportNode;
+    pageRoute?: Record<string, unknown>;
+    target: {
+        pageSchemaUid: string;
+    };
+    unsupportedPolicy?: FlowSurfaceExportBlueprintUnsupportedPolicy;
+}): FlowSurfaceExportBlueprintResult;
+export {};