@nocobase/flow-engine 2.0.55 → 2.0.57

package/lib/components/subModel/LazyDropdown.js

@@ -253,6 +253,21 @@ 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 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",
@@ -349,13 +364,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) {

package/lib/components/subModel/utils.js

@@ -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
         });
       }

package/lib/data-source/index.js

@@ -759,7 +759,7 @@ const _CollectionField = class _CollectionField {
       {
         ...import_lodash.default.omit(((_a = this.options.uiSchema) == null ? void 0 : _a["x-component-props"]) || {}, "fieldNames"),
         options: this.enum.length ? this.enum : void 0,
-        mode: this.type === "array" ? "multiple" : void 0,
+        mode: this.interface === "multipleSelect" ? "multiple" : void 0,
         multiple: target ? ["belongsToMany", "hasMany", "belongsToArray"].includes(type) : void 0,
         maxCount: target && !["belongsToMany", "hasMany", "belongsToArray"].includes(type) ? 1 : void 0,
         target,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.0.55",
+  "version": "2.0.57",
   "private": false,
   "description": "A standalone flow engine for NocoBase, managing workflows, models, and actions.",
   "main": "lib/index.js",
@@ -8,8 +8,8 @@
   "dependencies": {
     "@formily/antd-v5": "1.x",
     "@formily/reactive": "2.x",
-    "@nocobase/sdk": "2.0.55",
-    "@nocobase/shared": "2.0.55",
+    "@nocobase/sdk": "2.0.57",
+    "@nocobase/shared": "2.0.57",
     "ahooks": "^3.7.2",
     "axios": "^1.7.0",
     "dayjs": "^1.11.9",
@@ -37,5 +37,5 @@
   ],
   "author": "NocoBase Team",
   "license": "Apache-2.0",
-  "gitHead": "f8e14bcb84ed1ab8f2915441ef2208218c272ede"
+  "gitHead": "629bf05e63bca0cbd60fffb87057d45bda5d9222"
 }

package/src/components/subModel/LazyDropdown.tsx

@@ -358,6 +358,22 @@ const SearchInputWithAutoFocus: FC<InputProps & { visible: boolean }> = (props)
 
 const getKeyPath = (path: string[], key: string) => [...path, key].join('/');
 
+const getLabelSearchText = (label: React.ReactNode): string => {
+  if (label === null || label === undefined || typeof label === 'boolean') {
+    return '';
+  }
+  if (typeof label === 'string' || typeof label === 'number') {
+    return String(label);
+  }
+  if (Array.isArray(label)) {
+    return label.map(getLabelSearchText).join(' ');
+  }
+  if (React.isValidElement(label)) {
+    return getLabelSearchText(label.props.children);
+  }
+  return '';
+};
+
 const createSearchItem = (
   item: Item,
   searchKey: string,
@@ -498,15 +514,10 @@ const LazyDropdown: React.FC<Omit<DropdownProps, 'menu'> & { menu: LazyDropdownM
     const filteredChildren = currentSearchValue
       ? (function deepFilter(items: Item[]): Item[] {
           const searchText = currentSearchValue.toLowerCase();
-          const tryString = (v: any) => {
-            if (!v) return '';
-            return typeof v === 'string' ? v : String(v);
-          };
           return items
             .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) {

package/src/components/subModel/__tests__/AddSubModelButton.test.tsx

@@ -188,6 +188,50 @@ describe('transformItems - searchable flags', () => {
     expect(submenu.searchPlaceholder).toBe('Search blocks');
     expect(Array.isArray(submenu.children)).toBe(true);
   });
+
+  it('filters searchable field menus by display label instead of item key', async () => {
+    const engine = new FlowEngine();
+    engine.flowSettings.forceEnable();
+    const parent = engine.createModel<FlowModel>({ use: FlowModel });
+    const user = userEvent.setup();
+
+    const items = [
+      {
+        key: 'fields',
+        label: '',
+        type: 'group' as const,
+        searchable: true,
+        searchPlaceholder: 'Search fields',
+        children: [
+          { key: 'field_name', label: 'Field display name' },
+          { key: 'other_field', label: 'Other field' },
+        ],
+      },
+    ];
+
+    render(
+      <FlowEngineProvider engine={engine}>
+        <ConfigProvider>
+          <App>
+            <AddSubModelButton model={parent} items={items as any} subModelKey="items">
+              Open
+            </AddSubModelButton>
+          </App>
+        </ConfigProvider>
+      </FlowEngineProvider>,
+    );
+
+    await user.click(screen.getByText('Open'));
+    const searchInput = await screen.findByPlaceholderText('Search fields');
+    expect(screen.getByText('Field display name')).toBeInTheDocument();
+
+    await user.type(searchInput, 'field_name');
+    await waitFor(() => expect(screen.queryByText('Field display name')).not.toBeInTheDocument());
+
+    await user.clear(searchInput);
+    await user.type(searchInput, 'display');
+    await waitFor(() => expect(screen.getByText('Field display name')).toBeInTheDocument());
+  });
 });
 
 describe('transformItems - hide', () => {

package/src/components/subModel/__tests__/utils.test.ts

@@ -100,6 +100,30 @@ describe('subModel/utils', () => {
       expect(groups[0].children).toBeTruthy();
     });
 
+    it('preserves searchable meta on generated groups', async () => {
+      const engine = new FlowEngine();
+
+      class Base extends FlowModel {}
+      Base.define({
+        label: 'Base Group',
+        searchable: true,
+        searchPlaceholder: 'Search fields',
+      });
+      const BaseDC = attachDefineChildren(Base, async () => [{ key: 'title', label: 'Title' }]);
+
+      engine.registerModels({ Base: BaseDC });
+
+      const model = engine.createModel({ use: 'FlowModel' });
+      const ctx = model.context;
+
+      const groupsFactory = buildSubModelGroups([BaseDC]);
+      const groups = await groupsFactory(ctx);
+
+      expect(groups).toHaveLength(1);
+      expect(groups[0].searchable).toBe(true);
+      expect(groups[0].searchPlaceholder).toBe('Search fields');
+    });
+
     it('invokes buildSubModelItems when meta.children is false', async () => {
       const engine = new FlowEngine();
 

package/src/components/subModel/utils.ts

@@ -196,12 +196,16 @@ export function buildSubModelGroups(subModelBaseClasses: (string | ModelConstruc
       const baseKey = typeof subModelBaseClass === 'string' ? subModelBaseClass : BaseClass.name;
       const menuType = BaseClass?.meta?.menuType || 'group';
       const groupSort = BaseClass?.meta?.sort ?? 1000;
+      const searchable = !!BaseClass?.meta?.searchable;
+      const searchPlaceholder = BaseClass?.meta?.searchPlaceholder;
       if (menuType === 'submenu') {
         // 作为可点击的一级项，展开二级子菜单
         items.push({
           key: baseKey,
           label: groupLabel,
           sort: groupSort,
+          searchable,
+          searchPlaceholder,
           children,
         });
       } else {
@@ -211,6 +215,8 @@ export function buildSubModelGroups(subModelBaseClasses: (string | ModelConstruc
           type: 'group',
           label: groupLabel,
           sort: groupSort,
+          searchable,
+          searchPlaceholder,
           children,
         });
       }

package/src/data-source/index.ts

@@ -841,7 +841,7 @@ export class CollectionField {
       {
         ..._.omit(this.options.uiSchema?.['x-component-props'] || {}, 'fieldNames'),
         options: this.enum.length ? this.enum : undefined,
-        mode: this.type === 'array' ? 'multiple' : undefined,
+        mode: this.interface === 'multipleSelect' ? 'multiple' : undefined,
         multiple: target ? ['belongsToMany', 'hasMany', 'belongsToArray'].includes(type) : undefined,
         maxCount: target && !['belongsToMany', 'hasMany', 'belongsToArray'].includes(type) ? 1 : undefined,
         target: target,