@nocobase/plugin-flow-engine 2.1.0-alpha.17 → 2.1.0-alpha.19

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

@@ -51,6 +51,8 @@ var import_utils = require("@nocobase/utils");
 var import_lodash = __toESM(require("lodash"));
 var import_catalog = require("./catalog");
 var import_chart_config = require("./chart-config");
+var import_approval = require("./approval");
+var import_service_utils = require("./service-utils");
 const JS_BLOCK_DEFAULT_CODE = [
   "// Welcome to the JS block",
   "ctx.render(`",
@@ -208,14 +210,21 @@ function buildBlockTree(options) {
   const use = (0, import_catalog.resolveSupportedBlockCatalogItem)(
     {
       type: options.type,
-      use: options.use
+      use: options.use,
+      containerUse: options.containerUse
     },
     {
       requireCreateSupported: true
     }
   ).use;
   const defaults = buildBlockDefaults(use);
-  const baseStepParams = import_lodash.default.merge({}, import_lodash.default.cloneDeep(defaults.stepParams || {}), import_lodash.default.cloneDeep(options.stepParams || {}));
+  const approvalBlockDefaults = (0, import_approval.buildApprovalBlockDefaults)(use);
+  const baseStepParams = import_lodash.default.merge(
+    {},
+    import_lodash.default.cloneDeep(defaults.stepParams || {}),
+    import_lodash.default.cloneDeep((approvalBlockDefaults == null ? void 0 : approvalBlockDefaults.stepParams) || {}),
+    import_lodash.default.cloneDeep(options.stepParams || {})
+  );
   const normalizedResourceInit = import_lodash.default.pickBy(import_lodash.default.cloneDeep(options.resourceInit || {}), (value) => !import_lodash.default.isUndefined(value));
   if (use === "ChartBlockModel") {
     import_lodash.default.unset(baseStepParams, "resourceSettings");
@@ -248,11 +257,49 @@ function buildBlockTree(options) {
   }
   const model = {
     use,
-    props: import_lodash.default.merge({}, import_lodash.default.cloneDeep(defaults.props || {}), import_lodash.default.cloneDeep(options.props || {})),
-    decoratorProps: import_lodash.default.merge({}, import_lodash.default.cloneDeep(defaults.decoratorProps || {}), import_lodash.default.cloneDeep(options.decoratorProps || {})),
+    ...typeof (approvalBlockDefaults == null ? void 0 : approvalBlockDefaults.async) === "boolean" ? { async: approvalBlockDefaults.async } : {},
+    props: import_lodash.default.merge(
+      {},
+      import_lodash.default.cloneDeep(defaults.props || {}),
+      import_lodash.default.cloneDeep((approvalBlockDefaults == null ? void 0 : approvalBlockDefaults.props) || {}),
+      import_lodash.default.cloneDeep(options.props || {})
+    ),
+    decoratorProps: import_lodash.default.merge(
+      {},
+      import_lodash.default.cloneDeep(defaults.decoratorProps || {}),
+      import_lodash.default.cloneDeep((approvalBlockDefaults == null ? void 0 : approvalBlockDefaults.decoratorProps) || {}),
+      import_lodash.default.cloneDeep(options.decoratorProps || {})
+    ),
     stepParams: baseStepParams
   };
-  if (use === "TableBlockModel") {
+  const flowRegistry = import_lodash.default.merge(
+    {},
+    import_lodash.default.cloneDeep(defaults.flowRegistry || {}),
+    import_lodash.default.cloneDeep((approvalBlockDefaults == null ? void 0 : approvalBlockDefaults.flowRegistry) || {}),
+    import_lodash.default.cloneDeep(options.flowRegistry || {})
+  );
+  if (Object.keys(flowRegistry).length) {
+    model.flowRegistry = flowRegistry;
+  }
+  if (approvalBlockDefaults == null ? void 0 : approvalBlockDefaults.subModels) {
+    model.subModels = {};
+    const gridDefaults = (0, import_service_utils.getSingleNodeSubModel)(approvalBlockDefaults.subModels.grid);
+    if (gridDefaults == null ? void 0 : gridDefaults.use) {
+      model.subModels.grid = {
+        uid: (0, import_utils.uid)(),
+        use: gridDefaults.use
+      };
+    }
+    if (Array.isArray(approvalBlockDefaults.subModels.actions) && approvalBlockDefaults.subModels.actions.length) {
+      model.subModels.actions = approvalBlockDefaults.subModels.actions.map((action) => ({
+        uid: (0, import_utils.uid)(),
+        ...buildActionTree({
+          use: action.use,
+          containerUse: use
+        })
+      }));
+    }
+  } else if (use === "TableBlockModel") {
     model.subModels = {
       columns: [buildCanonicalTableActionsColumnNode()]
     };
@@ -359,6 +406,20 @@ function buildPopupPageTree(options) {
 function buildFieldTree(params) {
   const wrapperUid = params.uid || (0, import_utils.uid)();
   const innerUid = params.innerUid || (0, import_utils.uid)();
+  const fieldDefaults = getStandaloneFieldDefaults(params.fieldUse);
+  const approvalTree = (0, import_approval.buildApprovalFieldTree)({
+    ...params,
+    uid: wrapperUid,
+    innerUid,
+    fieldDefaults
+  });
+  if (approvalTree) {
+    return {
+      wrapperUid: approvalTree.wrapperUid,
+      innerUid: approvalTree.innerUid,
+      model: approvalTree.model
+    };
+  }
   const initPayload = import_lodash.default.pickBy(
     {
       dataSourceKey: params.dataSourceKey,
@@ -393,7 +454,7 @@ function buildFieldTree(params) {
           props: import_lodash.default.cloneDeep(params.fieldProps || {}),
           stepParams: import_lodash.default.merge(
             {},
-            getStandaloneFieldDefaults(params.fieldUse).stepParams || {},
+            fieldDefaults.stepParams || {},
             import_lodash.default.cloneDeep({
               fieldSettings: {
                 init: initPayload
@@ -492,14 +553,26 @@ function assignClientKeysToUids(spec, clientKeyToUid) {
 }
 function buildActionDefaults(options) {
   var _a, _b, _c;
-  const props = inferActionDefaultProps(options.use, options.catalogItem.scope);
+  const approvalDefaults = (0, import_approval.buildApprovalActionDefaults)(options.use);
+  const props = import_lodash.default.merge(
+    {},
+    inferActionDefaultProps(options.use, options.catalogItem.scope),
+    (approvalDefaults == null ? void 0 : approvalDefaults.props) || {}
+  );
   const normalizedProps = applyContainerActionStyle(props, options.containerUse);
-  const stepParams = {
+  const stepParams = import_lodash.default.merge({}, import_lodash.default.cloneDeep((approvalDefaults == null ? void 0 : approvalDefaults.stepParams) || {}), {
     buttonSettings: {
       general: pickButtonGeneralProps(normalizedProps)
     }
-  };
-  const subModels = {};
+  });
+  const subModels = import_lodash.default.cloneDeep((approvalDefaults == null ? void 0 : approvalDefaults.subModels) || {});
+  if (approvalDefaults) {
+    return {
+      props: normalizedProps,
+      stepParams,
+      ...Object.keys(subModels).length ? { subModels } : {}
+    };
+  }
   if ([
     "AddNewActionModel",
     "ViewActionModel",

package/dist/server/flow-surfaces/catalog.d.ts

@@ -8,6 +8,13 @@
  */
 import type { FlowSurfaceActionScope, FlowSurfaceCatalogItem, FlowSurfaceLayoutCapabilities, FlowSurfaceNodeContract, FlowSurfaceNodeDomain } from './types';
 export declare const READONLY_NODE_CONTRACT: FlowSurfaceNodeContract;
+export declare function getSupportedFieldComponentUseSet(input: {
+    containerUse: string;
+    field?: any;
+    enabledPackages?: ReadonlySet<string>;
+    dataSourceKey?: string;
+    getCollection?: (dataSourceKey: string, collectionName: string) => any;
+}): Set<any>;
 export declare function resolveSupportedFieldCapability(input: {
     containerUse: string;
     field?: any;
@@ -34,6 +41,7 @@ export declare function resolveSupportedFieldCapability(input: {
 };
 export declare function getAvailableActionCatalogItems(containerUse?: string, scope?: FlowSurfaceActionScope, enabledPackages?: ReadonlySet<string>): FlowSurfaceCatalogItem[];
 export declare const blockCatalog: FlowSurfaceCatalogItem[];
+export declare function getAvailableBlockCatalogItems(containerUse?: string, enabledPackages?: ReadonlySet<string>): FlowSurfaceCatalogItem[];
 export declare const actionCatalog: FlowSurfaceCatalogItem[];
 export declare const ACTION_PUBLIC_KEYS: string[];
 export declare const SERVICE_SUPPORTED_FLOW_SURFACE_BLOCK_KEYS: string[];
@@ -48,10 +56,12 @@ export declare function filterAvailableCatalogItems<T extends Pick<FlowSurfaceCa
 export declare function resolveSupportedBlockCatalogItem(input: {
     type?: string;
     use?: string;
+    containerUse?: string;
 }, options?: {
     context?: string;
     enabledPackages?: ReadonlySet<string>;
     requireCreateSupported?: boolean;
+    skipContainerValidation?: boolean;
 }): FlowSurfaceCatalogItem;
 export declare function resolveSupportedActionCatalogItem(input: {
     type?: string;