@nocobase/flow-engine 2.1.0-alpha.4 → 2.1.0-alpha.40

package/lib/components/settings/wrappers/contextual/useFloatToolbarVisibility.js

@@ -0,0 +1,315 @@
+/**
+ * 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 __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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var useFloatToolbarVisibility_exports = {};
+__export(useFloatToolbarVisibility_exports, {
+  useFloatToolbarVisibility: () => useFloatToolbarVisibility
+});
+module.exports = __toCommonJS(useFloatToolbarVisibility_exports);
+var import_react = require("react");
+var import_dnd = require("../../../dnd");
+const TOOLBAR_HIDE_DELAY = 180;
+const CHILD_FLOAT_MENU_ACTIVITY_EVENT = "nb-float-menu-child-activity";
+const isNodeWithin = /* @__PURE__ */ __name((target, container) => {
+  return target instanceof Node && !!(container == null ? void 0 : container.contains(target));
+}, "isNodeWithin");
+const getToolbarModelUidFromTarget = /* @__PURE__ */ __name((target) => {
+  var _a;
+  if (!(target instanceof Element)) {
+    return null;
+  }
+  return ((_a = target.closest(".nb-toolbar-container[data-model-uid]")) == null ? void 0 : _a.getAttribute("data-model-uid")) || null;
+}, "getToolbarModelUidFromTarget");
+const isNodeWithinDescendantFloatToolbar = /* @__PURE__ */ __name((target, container, currentModelUid) => {
+  const targetModelUid = getToolbarModelUidFromTarget(target);
+  if (!container || !targetModelUid || targetModelUid === currentModelUid) {
+    return false;
+  }
+  return Array.from(
+    container.querySelectorAll('[data-has-float-menu="true"][data-float-menu-model-uid]')
+  ).some(
+    (hostElement) => hostElement !== container && hostElement.getAttribute("data-float-menu-model-uid") === targetModelUid
+  );
+}, "isNodeWithinDescendantFloatToolbar");
+const useFloatToolbarVisibility = /* @__PURE__ */ __name(({
+  modelUid,
+  containerRef,
+  toolbarContainerRef,
+  updatePortalRect,
+  schedulePortalRectUpdate
+}) => {
+  const [hideMenu, setHideMenu] = (0, import_react.useState)(false);
+  const [isHostHovered, setIsHostHovered] = (0, import_react.useState)(false);
+  const [isToolbarHovered, setIsToolbarHovered] = (0, import_react.useState)(false);
+  const [isDraggingToolbar, setIsDraggingToolbar] = (0, import_react.useState)(false);
+  const [isDraggingToolbarItem, setIsDraggingToolbarItem] = (0, import_react.useState)(false);
+  const [isToolbarPinned, setIsToolbarPinned] = (0, import_react.useState)(false);
+  const [isHidePending, setIsHidePending] = (0, import_react.useState)(false);
+  const [activeChildToolbarIds, setActiveChildToolbarIds] = (0, import_react.useState)([]);
+  const hideToolbarTimerRef = (0, import_react.useRef)(null);
+  const reportedChildActivityToAncestorsRef = (0, import_react.useRef)(false);
+  const isHostHoveredRef = (0, import_react.useRef)(false);
+  const isToolbarHoveredRef = (0, import_react.useRef)(false);
+  const isDraggingToolbarRef = (0, import_react.useRef)(false);
+  const isDraggingToolbarItemRef = (0, import_react.useRef)(false);
+  const isToolbarPinnedRef = (0, import_react.useRef)(false);
+  const setHostHovered = (0, import_react.useCallback)((value) => {
+    isHostHoveredRef.current = value;
+    setIsHostHovered(value);
+  }, []);
+  const setToolbarHovered = (0, import_react.useCallback)((value) => {
+    isToolbarHoveredRef.current = value;
+    setIsToolbarHovered(value);
+  }, []);
+  const setDraggingToolbar = (0, import_react.useCallback)((value) => {
+    isDraggingToolbarRef.current = value;
+    setIsDraggingToolbar(value);
+  }, []);
+  const setDraggingToolbarItem = (0, import_react.useCallback)((value) => {
+    isDraggingToolbarItemRef.current = value;
+    setIsDraggingToolbarItem(value);
+  }, []);
+  const setToolbarPinned = (0, import_react.useCallback)((value) => {
+    isToolbarPinnedRef.current = value;
+    setIsToolbarPinned(value);
+  }, []);
+  const hasActiveChildToolbar = activeChildToolbarIds.length > 0;
+  const isToolbarVisible = !hideMenu && !hasActiveChildToolbar && (isHostHovered || isToolbarHovered || isDraggingToolbar || isDraggingToolbarItem || isToolbarPinned);
+  const shouldRenderToolbar = isToolbarVisible || isToolbarPinned || isDraggingToolbar || isDraggingToolbarItem;
+  const isToolbarInteractionActive = isHostHovered || isToolbarHovered || isDraggingToolbar || isDraggingToolbarItem || isToolbarPinned || isHidePending;
+  const clearHideToolbarTimer = (0, import_react.useCallback)(() => {
+    if (hideToolbarTimerRef.current !== null) {
+      window.clearTimeout(hideToolbarTimerRef.current);
+      hideToolbarTimerRef.current = null;
+    }
+    setIsHidePending(false);
+  }, []);
+  const scheduleHideToolbar = (0, import_react.useCallback)(() => {
+    clearHideToolbarTimer();
+    setIsHidePending(true);
+    hideToolbarTimerRef.current = window.setTimeout(() => {
+      hideToolbarTimerRef.current = null;
+      setIsHidePending(false);
+      if (isDraggingToolbarRef.current || isDraggingToolbarItemRef.current || isToolbarPinnedRef.current) {
+        return;
+      }
+      setHostHovered(false);
+      setToolbarHovered(false);
+    }, TOOLBAR_HIDE_DELAY);
+  }, [clearHideToolbarTimer, setHostHovered, setToolbarHovered]);
+  const handleSettingsMenuOpenChange = (0, import_react.useCallback)(
+    (open) => {
+      setToolbarPinned(open);
+    },
+    [setToolbarPinned]
+  );
+  (0, import_react.useEffect)(() => {
+    const hostElement = containerRef.current;
+    if (!hostElement) {
+      return;
+    }
+    const handleChildToolbarActivity = /* @__PURE__ */ __name((event) => {
+      var _a;
+      const customEvent = event;
+      if (!(customEvent.target instanceof HTMLElement) || customEvent.target === hostElement) {
+        return;
+      }
+      const childModelUid = (_a = customEvent.detail) == null ? void 0 : _a.modelUid;
+      if (!childModelUid) {
+        return;
+      }
+      setActiveChildToolbarIds((prevIds) => {
+        var _a2;
+        return ((_a2 = customEvent.detail) == null ? void 0 : _a2.active) ? prevIds.includes(childModelUid) ? prevIds : [...prevIds, childModelUid] : prevIds.filter((id) => id !== childModelUid);
+      });
+    }, "handleChildToolbarActivity");
+    hostElement.addEventListener(CHILD_FLOAT_MENU_ACTIVITY_EVENT, handleChildToolbarActivity);
+    return () => {
+      hostElement.removeEventListener(CHILD_FLOAT_MENU_ACTIVITY_EVENT, handleChildToolbarActivity);
+    };
+  }, [containerRef]);
+  (0, import_react.useEffect)(() => {
+    const hostElement = containerRef.current;
+    const ownerDocument = hostElement == null ? void 0 : hostElement.ownerDocument;
+    if (!ownerDocument) {
+      return;
+    }
+    const handleToolbarDragActivity = /* @__PURE__ */ __name((event) => {
+      var _a, _b;
+      const customEvent = event;
+      if (((_a = customEvent.detail) == null ? void 0 : _a.modelUid) !== modelUid) {
+        return;
+      }
+      if ((_b = customEvent.detail) == null ? void 0 : _b.active) {
+        clearHideToolbarTimer();
+        setDraggingToolbarItem(true);
+        return;
+      }
+      setDraggingToolbarItem(false);
+      if (isHostHoveredRef.current || isToolbarHoveredRef.current || isToolbarPinnedRef.current) {
+        clearHideToolbarTimer();
+        return;
+      }
+      scheduleHideToolbar();
+    }, "handleToolbarDragActivity");
+    ownerDocument.addEventListener(import_dnd.TOOLBAR_DRAG_ACTIVITY_EVENT, handleToolbarDragActivity);
+    return () => {
+      ownerDocument.removeEventListener(import_dnd.TOOLBAR_DRAG_ACTIVITY_EVENT, handleToolbarDragActivity);
+    };
+  }, [clearHideToolbarTimer, containerRef, modelUid, scheduleHideToolbar, setDraggingToolbarItem]);
+  (0, import_react.useEffect)(() => {
+    const hostElement = containerRef.current;
+    if (!hostElement || reportedChildActivityToAncestorsRef.current === isToolbarInteractionActive) {
+      return;
+    }
+    reportedChildActivityToAncestorsRef.current = isToolbarInteractionActive;
+    hostElement.dispatchEvent(
+      new CustomEvent(CHILD_FLOAT_MENU_ACTIVITY_EVENT, {
+        bubbles: true,
+        detail: { active: isToolbarInteractionActive, modelUid }
+      })
+    );
+  }, [containerRef, isToolbarInteractionActive, modelUid]);
+  (0, import_react.useEffect)(() => {
+    const hostElement = containerRef.current;
+    return () => {
+      if (hostElement && reportedChildActivityToAncestorsRef.current) {
+        hostElement.dispatchEvent(
+          new CustomEvent(CHILD_FLOAT_MENU_ACTIVITY_EVENT, {
+            bubbles: true,
+            detail: { active: false, modelUid }
+          })
+        );
+        reportedChildActivityToAncestorsRef.current = false;
+      }
+      clearHideToolbarTimer();
+    };
+  }, [clearHideToolbarTimer, containerRef, modelUid]);
+  (0, import_react.useEffect)(() => {
+    if (isToolbarPinned) {
+      clearHideToolbarTimer();
+      updatePortalRect();
+    }
+  }, [clearHideToolbarTimer, isToolbarPinned, updatePortalRect]);
+  const handleChildHover = (0, import_react.useCallback)(
+    (e) => {
+      const target = e.target;
+      const childWithMenu = target.closest("[data-has-float-menu]");
+      const isCurrentHostTarget = !childWithMenu || childWithMenu === containerRef.current;
+      if (isCurrentHostTarget) {
+        clearHideToolbarTimer();
+        setHostHovered(true);
+      }
+      setHideMenu(!!childWithMenu && childWithMenu !== containerRef.current);
+    },
+    [clearHideToolbarTimer, containerRef, setHostHovered]
+  );
+  const handleHostMouseEnter = (0, import_react.useCallback)(() => {
+    clearHideToolbarTimer();
+    setHideMenu(false);
+    updatePortalRect();
+    setHostHovered(true);
+  }, [clearHideToolbarTimer, setHostHovered, updatePortalRect]);
+  const handleHostMouseLeave = (0, import_react.useCallback)(
+    (e) => {
+      if (isToolbarPinnedRef.current) {
+        setHostHovered(false);
+        return;
+      }
+      if (isNodeWithin(e.relatedTarget, toolbarContainerRef.current)) {
+        clearHideToolbarTimer();
+        setHostHovered(false);
+        setToolbarHovered(true);
+        return;
+      }
+      if (isNodeWithinDescendantFloatToolbar(e.relatedTarget, containerRef.current, modelUid)) {
+        clearHideToolbarTimer();
+        setHideMenu(false);
+        setHostHovered(true);
+        return;
+      }
+      scheduleHideToolbar();
+    },
+    [
+      clearHideToolbarTimer,
+      containerRef,
+      modelUid,
+      scheduleHideToolbar,
+      setHostHovered,
+      setToolbarHovered,
+      toolbarContainerRef
+    ]
+  );
+  const handleToolbarMouseEnter = (0, import_react.useCallback)(() => {
+    clearHideToolbarTimer();
+    updatePortalRect();
+    setHostHovered(false);
+    setToolbarHovered(true);
+  }, [clearHideToolbarTimer, setHostHovered, setToolbarHovered, updatePortalRect]);
+  const handleToolbarMouseLeave = (0, import_react.useCallback)(
+    (e) => {
+      if (isToolbarPinnedRef.current || isDraggingToolbarItemRef.current) {
+        clearHideToolbarTimer();
+        setToolbarHovered(false);
+        return;
+      }
+      setToolbarHovered(false);
+      if (isNodeWithin(e.relatedTarget, containerRef.current)) {
+        clearHideToolbarTimer();
+        setHostHovered(true);
+        return;
+      }
+      scheduleHideToolbar();
+    },
+    [clearHideToolbarTimer, containerRef, scheduleHideToolbar, setHostHovered, setToolbarHovered]
+  );
+  const handleResizeDragStart = (0, import_react.useCallback)(() => {
+    updatePortalRect();
+    setDraggingToolbar(true);
+    schedulePortalRectUpdate();
+  }, [schedulePortalRectUpdate, setDraggingToolbar, updatePortalRect]);
+  const handleResizeDragEnd = (0, import_react.useCallback)(() => {
+    setDraggingToolbar(false);
+    schedulePortalRectUpdate();
+  }, [schedulePortalRectUpdate, setDraggingToolbar]);
+  return {
+    isToolbarVisible,
+    shouldRenderToolbar,
+    handleSettingsMenuOpenChange,
+    handleChildHover,
+    handleHostMouseEnter,
+    handleHostMouseLeave,
+    handleToolbarMouseEnter,
+    handleToolbarMouseLeave,
+    handleResizeDragStart,
+    handleResizeDragEnd
+  };
+}, "useFloatToolbarVisibility");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  useFloatToolbarVisibility
+});

package/lib/components/subModel/AddSubModelButton.js

@@ -376,6 +376,21 @@ const AddSubModelButtonCore = /* @__PURE__ */ __name(function AddSubModelButton(
     }),
     [model, subModelKey, subModelType]
   );
+  import_react.default.useEffect(() => {
+    var _a, _b, _c;
+    const handleSubModelChanged = /* @__PURE__ */ __name(() => {
+      setRefreshTick((x) => x + 1);
+    }, "handleSubModelChanged");
+    (_a = model.emitter) == null ? void 0 : _a.on("onSubModelAdded", handleSubModelChanged);
+    (_b = model.emitter) == null ? void 0 : _b.on("onSubModelRemoved", handleSubModelChanged);
+    (_c = model.emitter) == null ? void 0 : _c.on("onSubModelReplaced", handleSubModelChanged);
+    return () => {
+      var _a2, _b2, _c2;
+      (_a2 = model.emitter) == null ? void 0 : _a2.off("onSubModelAdded", handleSubModelChanged);
+      (_b2 = model.emitter) == null ? void 0 : _b2.off("onSubModelRemoved", handleSubModelChanged);
+      (_c2 = model.emitter) == null ? void 0 : _c2.off("onSubModelReplaced", handleSubModelChanged);
+    };
+  }, [model]);
   const onClick = /* @__PURE__ */ __name(async (info) => {
     const clickedItem = info.originalItem || info;
     const item = clickedItem.originalItem || clickedItem;
@@ -415,7 +430,7 @@ const AddSubModelButtonCore = /* @__PURE__ */ __name(function AddSubModelButton(
     }
     let addedModel;
     try {
-      addedModel = model.flowEngine.createModel({
+      addedModel = await model.flowEngine.createModelAsync({
         ...import_lodash.default.cloneDeep(createOpts),
         parentId: model.uid,
         subKey: subModelKey,
@@ -461,6 +476,17 @@ const AddSubModelButtonCore = /* @__PURE__ */ __name(function AddSubModelButton(
     () => transformItems(finalItems, model, subModelKey, subModelType),
     [finalItems, model, subModelKey, subModelType]
   );
+  (0, import_react.useEffect)(() => {
+    const handleSubModelChange = /* @__PURE__ */ __name(() => {
+      setRefreshTick((x) => x + 1);
+    }, "handleSubModelChange");
+    model.emitter.on("onSubModelAdded", handleSubModelChange);
+    model.emitter.on("onSubModelRemoved", handleSubModelChange);
+    return () => {
+      model.emitter.off("onSubModelAdded", handleSubModelChange);
+      model.emitter.off("onSubModelRemoved", handleSubModelChange);
+    };
+  }, [model]);
   return /* @__PURE__ */ import_react.default.createElement(
     import_LazyDropdown.default,
     {

package/lib/components/subModel/LazyDropdown.js

@@ -253,6 +253,28 @@ 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 getLabelSearchText = /* @__PURE__ */ __name((label) => {
+  if (label === null || label === void 0 || typeof label === "boolean") {
+    return "";
+  }
+  if (typeof label === "string" || typeof label === "number") {
+    return String(label);
+  }
+  if (Array.isArray(label)) {
+    return label.map(getLabelSearchText).join(" ");
+  }
+  if (import_react.default.isValidElement(label)) {
+    return getLabelSearchText(label.props.children);
+  }
+  return "";
+}, "getLabelSearchText");
 const createSearchItem = /* @__PURE__ */ __name((item, searchKey, currentSearchValue, menuVisible, t, updateSearchValue) => ({
   key: `${searchKey}-search`,
   type: "group",
@@ -286,6 +308,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 +333,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 +365,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;
@@ -349,13 +393,9 @@ const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
     const currentSearchValue = searchValues[searchKey] || "";
     const filteredChildren = currentSearchValue ? (/* @__PURE__ */ __name(function deepFilter(items2) {
       const searchText = currentSearchValue.toLowerCase();
-      const tryString = /* @__PURE__ */ __name((v) => {
-        if (!v) return "";
-        return typeof v === "string" ? v : String(v);
-      }, "tryString");
       return items2.map((child) => {
-        const labelStr = tryString(child.label).toLowerCase();
-        const selfMatch = labelStr.includes(searchText) || child.key && String(child.key).toLowerCase().includes(searchText);
+        const labelStr = getLabelSearchText(child.label).toLowerCase();
+        const selfMatch = labelStr.includes(searchText);
         if (child.type === "group" && Array.isArray(child.children)) {
           const nested = deepFilter(child.children);
           if (selfMatch || nested.length > 0) {
@@ -419,51 +459,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 +553,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/components/subModel/index.d.ts

@@ -7,4 +7,5 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 export * from './AddSubModelButton';
+export { default as LazyDropdown } from './LazyDropdown';
 export * from './utils';

package/lib/components/subModel/index.js

@@ -7,10 +7,16 @@
  * 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 __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))
@@ -20,13 +26,26 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+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 subModel_exports = {};
+__export(subModel_exports, {
+  LazyDropdown: () => import_LazyDropdown.default
+});
 module.exports = __toCommonJS(subModel_exports);
 __reExport(subModel_exports, require("./AddSubModelButton"), module.exports);
+var import_LazyDropdown = __toESM(require("./LazyDropdown"));
 __reExport(subModel_exports, require("./utils"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  LazyDropdown,
   ...require("./AddSubModelButton"),
   ...require("./utils")
 });

package/lib/components/subModel/utils.d.ts

@@ -29,6 +29,6 @@ export declare function buildWrapperFieldChildren(ctx: FlowModelContext, options
     label: string;
     type: "group";
     searchable: boolean;
-    searchPlaceholder: any;
+    searchPlaceholder: string;
     children: SubModelItem[];
 }[];

package/lib/components/subModel/utils.js

@@ -44,7 +44,7 @@ __export(utils_exports, {
   buildWrapperFieldChildren: () => buildWrapperFieldChildren
 });
 module.exports = __toCommonJS(utils_exports);
-var _ = __toESM(require("lodash"));
+var import_lodash = __toESM(require("lodash"));
 var import_utils = require("../../utils");
 async function callHideFunction(hide, ctx) {
   if (typeof hide === "function") {
@@ -107,7 +107,7 @@ function buildSubModelChildren(M, ctx) {
             const extraArg = args && args.length > 0 ? args[args.length - 1] : void 0;
             const defaultOpts = await (0, import_utils.resolveCreateModelOptions)(meta == null ? void 0 : meta.createModelOptions, ctx, extraArg);
             const childOpts = await (0, import_utils.resolveCreateModelOptions)(src, ctx, extraArg);
-            return _.merge({}, _.cloneDeep(defaultOpts), childOpts);
+            return import_lodash.default.merge({}, import_lodash.default.cloneDeep(defaultOpts), childOpts);
           };
         }
         return node;
@@ -172,7 +172,7 @@ function buildSubModelItems(subModelBaseClass, exclude = []) {
 __name(buildSubModelItems, "buildSubModelItems");
 function buildSubModelGroups(subModelBaseClasses = []) {
   return async (ctx) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const items = [];
     const exclude = [];
     for (const subModelBaseClass of subModelBaseClasses) {
@@ -203,11 +203,15 @@ function buildSubModelGroups(subModelBaseClasses = []) {
       const baseKey = typeof subModelBaseClass === "string" ? subModelBaseClass : BaseClass.name;
       const menuType = ((_b = BaseClass == null ? void 0 : BaseClass.meta) == null ? void 0 : _b.menuType) || "group";
       const groupSort = ((_c = BaseClass == null ? void 0 : BaseClass.meta) == null ? void 0 : _c.sort) ?? 1e3;
+      const searchable = !!((_d = BaseClass == null ? void 0 : BaseClass.meta) == null ? void 0 : _d.searchable);
+      const searchPlaceholder = (_e = BaseClass == null ? void 0 : BaseClass.meta) == null ? void 0 : _e.searchPlaceholder;
       if (menuType === "submenu") {
         items.push({
           key: baseKey,
           label: groupLabel,
           sort: groupSort,
+          searchable,
+          searchPlaceholder,
           children
         });
       } else {
@@ -216,6 +220,8 @@ function buildSubModelGroups(subModelBaseClasses = []) {
           type: "group",
           label: groupLabel,
           sort: groupSort,
+          searchable,
+          searchPlaceholder,
           children
         });
       }