@nocobase/flow-engine 2.1.0-beta.32 → 2.1.0-beta.34

package/lib/components/dnd/index.d.ts

@@ -39,4 +39,15 @@ export declare const Droppable: FC<{
     model: FlowModel<any>;
     children: React.ReactNode;
 }>;
-export declare const DndProvider: FC<DndContextProps & PersistOptions>;
+export interface DndProviderProps extends DndContextProps, PersistOptions {
+    /**
+     * Whether to render the built-in `DragOverlay` (the "Dragging" pill that
+     * follows the cursor). Defaults to `true` for backwards compatibility with
+     * existing flow-engine drag interactions. Set to `false` when the
+     * surrounding UI already gives clear visual feedback (e.g. a drag-sort
+     * table that highlights the drop position) and the floating pill would be
+     * redundant.
+     */
+    showDragOverlay?: boolean;
+}
+export declare const DndProvider: FC<DndProviderProps>;

package/lib/components/dnd/index.js

@@ -274,6 +274,7 @@ const Droppable = /* @__PURE__ */ __name(({ model, children }) => {
 }, "Droppable");
 const DndProvider = /* @__PURE__ */ __name(({
   persist = true,
+  showDragOverlay = true,
   children,
   onDragStart,
   onDragEnd,
@@ -337,7 +338,7 @@ const DndProvider = /* @__PURE__ */ __name(({
       ...restProps
     },
     children,
-    typeof document !== "undefined" ? (0, import_react_dom.createPortal)(
+    showDragOverlay && typeof document !== "undefined" ? (0, import_react_dom.createPortal)(
       /* @__PURE__ */ import_react.default.createElement(
         import_core.DragOverlay,
         {

package/lib/components/subModel/LazyDropdown.js

@@ -253,6 +253,13 @@ const SearchInputWithAutoFocus = /* @__PURE__ */ __name((props) => {
   return /* @__PURE__ */ import_react.default.createElement(import_antd.Input, { ref: inputRef, ...rest });
 }, "SearchInputWithAutoFocus");
 const getKeyPath = /* @__PURE__ */ __name((path, key) => [...path, key].join("/"), "getKeyPath");
+const normalizeOpenKeys = /* @__PURE__ */ __name((nextOpenKeys) => {
+  const latestKey = nextOpenKeys[nextOpenKeys.length - 1];
+  if (!latestKey) {
+    return [];
+  }
+  return nextOpenKeys.filter((key) => latestKey === key || latestKey.startsWith(`${key}/`));
+}, "normalizeOpenKeys");
 const createSearchItem = /* @__PURE__ */ __name((item, searchKey, currentSearchValue, menuVisible, t, updateSearchValue) => ({
   key: `${searchKey}-search`,
   type: "group",
@@ -286,6 +293,10 @@ const createEmptyItem = /* @__PURE__ */ __name((itemKey, t) => ({
   label: /* @__PURE__ */ import_react.default.createElement("div", { style: { padding: "16px", textAlign: "center" } }, /* @__PURE__ */ import_react.default.createElement(import_antd.Empty, { image: import_antd.Empty.PRESENTED_IMAGE_SIMPLE, description: t("No data"), style: { margin: 0 } })),
   disabled: true
 }), "createEmptyItem");
+const KEEP_OPEN_LABEL_STYLE = {
+  display: "block",
+  width: "100%"
+};
 const DROPDOWN_PERSIST_TTL_MS = 350;
 const dropdownPersistRegistry = /* @__PURE__ */ new Map();
 const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
@@ -307,6 +318,19 @@ const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
   const { searchValues, isSearching, updateSearchValue } = useMenuSearch();
   const { requestKeepOpen, shouldPreventClose } = useKeepDropdownOpen();
   useSubmenuStyles(menuVisible, dropdownMaxHeight);
+  const handleMenuOpenChange = (0, import_react.useCallback)(
+    (nextOpenKeys) => {
+      var _a, _b;
+      if (!nextOpenKeys.length && shouldPreventClose()) {
+        (_a = dropdownMenuProps.onOpenChange) == null ? void 0 : _a.call(dropdownMenuProps, Array.from(openKeys));
+        return;
+      }
+      const normalized = normalizeOpenKeys(nextOpenKeys);
+      setOpenKeys(new Set(normalized));
+      (_b = dropdownMenuProps.onOpenChange) == null ? void 0 : _b.call(dropdownMenuProps, normalized);
+    },
+    [dropdownMenuProps, openKeys, shouldPreventClose]
+  );
   (0, import_react.useEffect)(() => {
     if (!persistKey) return;
     const until = dropdownPersistRegistry.get(persistKey) || 0;
@@ -326,6 +350,11 @@ const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
       }
     };
   }, [persistKey, menuVisible]);
+  (0, import_react.useEffect)(() => {
+    if (!menuVisible) {
+      setOpenKeys(/* @__PURE__ */ new Set());
+    }
+  }, [menuVisible]);
   (0, import_react.useEffect)(() => {
     const loadRootItems = /* @__PURE__ */ __name(async () => {
       let resolvedItems;
@@ -419,51 +448,66 @@ const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
       if (item.type === "divider") {
         return { type: "divider", key: keyPath };
       }
+      const label = typeof item.label === "string" ? t(item.label) : item.label;
       if (item.searchable && children) {
         return {
-          key: item.key,
-          label: typeof item.label === "string" ? t(item.label) : item.label,
+          key: keyPath,
+          label,
           onClick: /* @__PURE__ */ __name((info) => {
           }, "onClick"),
-          onMouseEnter: /* @__PURE__ */ __name(() => {
-            setOpenKeys((prev) => {
-              if (prev.has(keyPath)) return prev;
-              const next = new Set(prev);
-              next.add(keyPath);
-              return next;
-            });
-          }, "onMouseEnter"),
           children: buildSearchChildren(children, item, keyPath, path, menuVisible, resolveItems)
         };
       }
+      const itemShouldKeepOpen = !children && (item.keepDropdownOpen ?? keepDropdownOpen ?? false);
+      const handleLeafClick = /* @__PURE__ */ __name((info) => {
+        var _a;
+        if (children) {
+          return;
+        }
+        if (itemShouldKeepOpen) {
+          requestKeepOpen();
+        }
+        const extendedInfo = {
+          ...info,
+          key: (info == null ? void 0 : info.key) ?? keyPath,
+          keyPath: (info == null ? void 0 : info.keyPath) ?? [keyPath],
+          item: (info == null ? void 0 : info.item) || item,
+          originalItem: item,
+          keepDropdownOpen: itemShouldKeepOpen
+        };
+        (_a = menu.onClick) == null ? void 0 : _a.call(menu, extendedInfo);
+      }, "handleLeafClick");
       return {
         key: keyPath,
-        label: typeof item.label === "string" ? t(item.label) : item.label,
+        label: itemShouldKeepOpen ? /* @__PURE__ */ import_react.default.createElement(
+          "div",
+          {
+            style: KEEP_OPEN_LABEL_STYLE,
+            onMouseDown: (event) => {
+              event.stopPropagation();
+              requestKeepOpen();
+            },
+            onClick: (event) => {
+              event.stopPropagation();
+              handleLeafClick({
+                key: keyPath,
+                keyPath: [keyPath],
+                item,
+                domEvent: event
+              });
+            }
+          },
+          label
+        ) : label,
         onClick: /* @__PURE__ */ __name((info) => {
-          var _a;
-          if (children) {
+          if (!itemShouldKeepOpen) handleLeafClick(info);
+        }, "onClick"),
+        onMouseDown: /* @__PURE__ */ __name(() => {
+          if (!itemShouldKeepOpen) {
             return;
           }
-          const itemShouldKeepOpen = item.keepDropdownOpen ?? keepDropdownOpen ?? false;
-          if (itemShouldKeepOpen) {
-            requestKeepOpen();
-          }
-          const extendedInfo = {
-            ...info,
-            item: info.item || item,
-            originalItem: item,
-            keepDropdownOpen: itemShouldKeepOpen
-          };
-          (_a = menu.onClick) == null ? void 0 : _a.call(menu, extendedInfo);
-        }, "onClick"),
-        onMouseEnter: /* @__PURE__ */ __name(() => {
-          setOpenKeys((prev) => {
-            if (prev.has(keyPath)) return prev;
-            const next = new Set(prev);
-            next.add(keyPath);
-            return next;
-          });
-        }, "onMouseEnter"),
+          requestKeepOpen();
+        }, "onMouseDown"),
         children: children && children.length > 0 ? resolveItems(children, [...path, item.key]) : children && children.length === 0 ? [createEmptyItem(keyPath, t)] : void 0
       };
     });
@@ -498,9 +542,11 @@ const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
       placement: "bottomLeft",
       menu: {
         ...dropdownMenuProps,
+        openKeys: Array.from(openKeys),
         items,
         onClick: /* @__PURE__ */ __name(() => {
         }, "onClick"),
+        onOpenChange: handleMenuOpenChange,
         style: {
           maxHeight: dropdownMaxHeight,
           overflowY: "auto",

package/lib/executor/FlowExecutor.js

@@ -153,7 +153,7 @@ const _FlowExecutor = class _FlowExecutor {
         const stepDefaultParams = await (0, import_utils.resolveDefaultParams)(step.defaultParams, runtimeCtx);
         combinedParams = { ...stepDefaultParams };
       } else {
-        flowContext.logger.error(
+        flowContext.logger.warn(
           `BaseModel.applyFlow: Step '${stepKey}' in flow '${flowKey}' has neither 'use' nor 'handler'. Skipping.`
         );
         continue;

package/lib/flow-registry/DetachedFlowRegistry.d.ts

@@ -0,0 +1,21 @@
+/**
+ * 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 { FlowDefinition } from '../FlowDefinition';
+import { FlowDefinitionOptions } from '../types';
+import { BaseFlowRegistry, IFlowRepository } from './BaseFlowRegistry';
+export type FlowRegistryData = Record<string, Omit<FlowDefinitionOptions, 'key'> & {
+    key?: string;
+}>;
+export declare class DetachedFlowRegistry extends BaseFlowRegistry {
+    constructor(flows?: FlowRegistryData);
+    saveFlow(_flow: FlowDefinition): void;
+    destroyFlow(flowKey: string): void;
+}
+export declare function serializeFlowRegistry(registry: Pick<IFlowRepository, 'getFlows'>): FlowRegistryData;
+export declare function replaceFlowRegistry(registry: Pick<IFlowRepository, 'getFlows' | 'removeFlow' | 'addFlows'>, flows: FlowRegistryData): void;

package/lib/flow-registry/DetachedFlowRegistry.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 __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) => {
+  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 __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 DetachedFlowRegistry_exports = {};
+__export(DetachedFlowRegistry_exports, {
+  DetachedFlowRegistry: () => DetachedFlowRegistry,
+  replaceFlowRegistry: () => replaceFlowRegistry,
+  serializeFlowRegistry: () => serializeFlowRegistry
+});
+module.exports = __toCommonJS(DetachedFlowRegistry_exports);
+var import_lodash = __toESM(require("lodash"));
+var import_BaseFlowRegistry = require("./BaseFlowRegistry");
+const _DetachedFlowRegistry = class _DetachedFlowRegistry extends import_BaseFlowRegistry.BaseFlowRegistry {
+  constructor(flows = {}) {
+    super();
+    this.addFlows(import_lodash.default.cloneDeep(flows));
+  }
+  saveFlow(_flow) {
+  }
+  destroyFlow(flowKey) {
+    this.removeFlow(flowKey);
+  }
+};
+__name(_DetachedFlowRegistry, "DetachedFlowRegistry");
+let DetachedFlowRegistry = _DetachedFlowRegistry;
+function serializeFlowRegistry(registry) {
+  const flows = {};
+  for (const [key, flow] of registry.getFlows()) {
+    flows[key] = import_lodash.default.cloneDeep(flow.toData());
+  }
+  return flows;
+}
+__name(serializeFlowRegistry, "serializeFlowRegistry");
+function replaceFlowRegistry(registry, flows) {
+  for (const key of Array.from(registry.getFlows().keys())) {
+    registry.removeFlow(key);
+  }
+  registry.addFlows(import_lodash.default.cloneDeep(flows));
+}
+__name(replaceFlowRegistry, "replaceFlowRegistry");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DetachedFlowRegistry,
+  replaceFlowRegistry,
+  serializeFlowRegistry
+});

package/lib/flow-registry/index.d.ts

@@ -9,3 +9,4 @@
 export * from './BaseFlowRegistry';
 export * from './InstanceFlowRegistry';
 export * from './GlobalFlowRegistry';
+export * from './DetachedFlowRegistry';

package/lib/flow-registry/index.js

@@ -26,9 +26,11 @@ module.exports = __toCommonJS(flow_registry_exports);
 __reExport(flow_registry_exports, require("./BaseFlowRegistry"), module.exports);
 __reExport(flow_registry_exports, require("./InstanceFlowRegistry"), module.exports);
 __reExport(flow_registry_exports, require("./GlobalFlowRegistry"), module.exports);
+__reExport(flow_registry_exports, require("./DetachedFlowRegistry"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./BaseFlowRegistry"),
   ...require("./InstanceFlowRegistry"),
-  ...require("./GlobalFlowRegistry")
+  ...require("./GlobalFlowRegistry"),
+  ...require("./DetachedFlowRegistry")
 });

package/lib/index.d.ts

@@ -34,5 +34,7 @@ export { getSnippetBody, listSnippetsForContext, registerRunJSSnippet } from './
 export * from './views';
 export { DATA_SOURCE_DIRTY_EVENT, ENGINE_SCOPE_KEY, getEmitterViewActivatedVersion, VIEW_ACTIVATED_EVENT, VIEW_ACTIVATED_VERSION, VIEW_ENGINE_SCOPE, } from './views/viewEvents';
 export * from './FlowDefinition';
+export { DetachedFlowRegistry, replaceFlowRegistry, serializeFlowRegistry } from './flow-registry';
+export type { FlowRegistryData } from './flow-registry';
 export { createViewScopedEngine } from './ViewScopedFlowEngine';
 export { createBlockScopedEngine } from './BlockScopedFlowEngine';

package/lib/index.js

@@ -28,6 +28,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   DATA_SOURCE_DIRTY_EVENT: () => import_viewEvents.DATA_SOURCE_DIRTY_EVENT,
+  DetachedFlowRegistry: () => import_flow_registry.DetachedFlowRegistry,
   ENGINE_SCOPE_KEY: () => import_viewEvents.ENGINE_SCOPE_KEY,
   RunJSContextRegistry: () => import_registry.RunJSContextRegistry,
   VIEW_ACTIVATED_EVENT: () => import_viewEvents.VIEW_ACTIVATED_EVENT,
@@ -47,6 +48,8 @@ __export(src_exports, {
   registerRunJSContextContribution: () => import_contributions.registerRunJSContextContribution,
   registerRunJSLib: () => import_runjsLibs.registerRunJSLib,
   registerRunJSSnippet: () => import_snippets.registerRunJSSnippet,
+  replaceFlowRegistry: () => import_flow_registry.replaceFlowRegistry,
+  serializeFlowRegistry: () => import_flow_registry.serializeFlowRegistry,
   setupRunJSContexts: () => import_setup.setupRunJSContexts
 });
 module.exports = __toCommonJS(src_exports);
@@ -75,11 +78,13 @@ var import_snippets = require("./runjs-context/snippets");
 __reExport(src_exports, require("./views"), module.exports);
 var import_viewEvents = require("./views/viewEvents");
 __reExport(src_exports, require("./FlowDefinition"), module.exports);
+var import_flow_registry = require("./flow-registry");
 var import_ViewScopedFlowEngine = require("./ViewScopedFlowEngine");
 var import_BlockScopedFlowEngine = require("./BlockScopedFlowEngine");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DATA_SOURCE_DIRTY_EVENT,
+  DetachedFlowRegistry,
   ENGINE_SCOPE_KEY,
   RunJSContextRegistry,
   VIEW_ACTIVATED_EVENT,
@@ -99,6 +104,8 @@ var import_BlockScopedFlowEngine = require("./BlockScopedFlowEngine");
   registerRunJSContextContribution,
   registerRunJSLib,
   registerRunJSSnippet,
+  replaceFlowRegistry,
+  serializeFlowRegistry,
   setupRunJSContexts,
   ...require("./types"),
   ...require("./utils"),

package/lib/views/FlowView.js

@@ -47,11 +47,21 @@ const _FlowViewer = class _FlowViewer {
     if (this.types[type]) {
       zIndex += 1;
       const onClose = others.onClose;
+      let zIndexReleased = false;
+      const releaseZIndex = /* @__PURE__ */ __name(() => {
+        if (!zIndexReleased) {
+          zIndexReleased = true;
+          zIndex -= 1;
+        }
+      }, "releaseZIndex");
       const _zIndex = others.zIndex;
       others.onClose = (...args) => {
         onClose == null ? void 0 : onClose(...args);
-        zIndex -= 1;
+        releaseZIndex();
       };
+      if (type === "embed") {
+        others.onOpenCancelled = releaseZIndex;
+      }
       if (type !== "embed") {
         others.zIndex = _zIndex ?? this.getNextZIndex();
       }

package/lib/views/PageComponent.js

@@ -55,8 +55,9 @@ const PageComponent = (0, import_react.forwardRef)((props, ref) => {
     hidden,
     title: _title,
     styles = {},
-    zIndex = 4
+    zIndex = 4,
     // 这个默认值是为了防止表格的阴影显示到子页面上面
+    onClose
   } = mergedProps;
   const closedRef = (0, import_react.useRef)(false);
   const flowEngine = (0, import_provider.useFlowEngine)();
@@ -114,11 +115,12 @@ const PageComponent = (0, import_react.forwardRef)((props, ref) => {
           type: "text",
           size: "small",
           icon: /* @__PURE__ */ import_react.default.createElement(import_icons.CloseOutlined, null),
-          onClick: () => {
-            var _a;
+          onClick: async () => {
             if (!closedRef.current) {
-              closedRef.current = true;
-              (_a = props.onClose) == null ? void 0 : _a.call(props);
+              const closed = await (onClose == null ? void 0 : onClose());
+              if (closed !== false) {
+                closedRef.current = true;
+              }
             }
           },
           style: {
@@ -138,7 +140,7 @@ const PageComponent = (0, import_react.forwardRef)((props, ref) => {
       )),
       extra && /* @__PURE__ */ import_react.default.createElement("div", null, extra)
     );
-  }, [header, _title, flowEngine.context.themeToken, styles.header, props.onClose]);
+  }, [header, _title, flowEngine.context.themeToken, styles.header, onClose]);
   const FooterComponent = (0, import_react.useMemo)(() => {
     if (!footer) return null;
     const token = flowEngine.context.themeToken;

package/lib/views/usePage.d.ts

@@ -12,27 +12,20 @@ export declare const GLOBAL_EMBED_CONTAINER_ID = "nocobase-embed-container";
 /** Dataset key used to signal embed replacement in progress (skip style reset on close) */
 export declare const EMBED_REPLACING_DATA_KEY = "nocobaseEmbedReplacing";
 export declare function usePage(): (React.JSX.Element | {
-    open: (config: any, flowContext: any) => Promise<unknown> & {
+    open: (config: any, flowContext: any) => Promise<any> & {
         type: "embed";
         inputArgs: any;
         preventClose: boolean;
+        Header: any;
+        Footer: any;
         beforeClose: any;
+        close: (result?: any, force?: boolean) => Promise<any>;
         destroy: (result?: any) => void;
         update: (newConfig: any) => void;
-        close: (result?: any, force?: boolean) => Promise<boolean>;
-        Header: React.FC<{
-            title?: React.ReactNode;
-            extra?: React.ReactNode;
-        }>;
-        Footer: React.FC<{
-            children?: React.ReactNode;
-        }>;
         setFooter: (footer: React.ReactNode) => void;
         setHeader: (header: {
             title?: React.ReactNode;
             extra?: React.ReactNode;
         }) => void;
-        navigation: any;
-        readonly record: unknown;
     };
 })[];