@acorex/components 22.2.2 → 22.2.4

package/fesm2022/acorex-components-lookup.mjs

@@ -168,7 +168,7 @@ function createLookupTreeTableDataSource(source, options) {
         pageSize: 8,
         key: options.valueField,
         load: (query) => loadTreeTableRows(source, options, query, isCallback),
-        byKey: (key) => findTreeTableItem(source, options.valueField, key),
+        byKey: (key) => findTreeTableItem(source, options.valueField, key) ?? {},
     });
 }
 async function loadTreeTableRows(source, options, query, isCallback) {
@@ -183,7 +183,7 @@ async function loadTreeTableRows(source, options, query, isCallback) {
         : await loadRoots(source, isCallback);
     const roots = mapTreeNodes(rootNodes, options);
     const items = textFilter
-        ? prepareFilteredTreeTableRows(filterTreeNodes(roots, options.textField, String(textFilter.value ?? '')))
+        ? prepareFilteredTreeTableRows(filterTreeNodes(roots, options.searchFields?.length ? options.searchFields : options.textField, String(textFilter.value ?? '')))
         : roots;
     return { items, total: items.length };
 }
@@ -221,16 +221,39 @@ function mapTreeNode(node, options) {
  * all children. Every kept ancestor is a new object with `expanded: true` so
  * nested hits are visible without mutating the original tree.
  */
+/** Reads a possibly dotted field path off a node. */
+function readNodeField(node, field) {
+    if (!field.includes('.')) {
+        return node[field];
+    }
+    return field.split('.').reduce((current, segment) => {
+        if (current == null || typeof current !== 'object') {
+            return undefined;
+        }
+        return current[segment];
+    }, node);
+}
+/** Whether any of `fields` on the node matches the query. */
+function matchesLookupNode(node, fields, needle, translateText) {
+    return fields.some((field) => {
+        const value = readNodeField(node, field);
+        if (value == null) {
+            return false;
+        }
+        return matchesLookupText(String(value), needle, translateText);
+    });
+}
 function filterTreeNodes(nodes, textField, query, translateText) {
     const needle = query.trim().toLowerCase();
     if (!needle) {
         return nodes;
     }
+    const fields = (Array.isArray(textField) ? textField : [textField]).filter((field) => !!field);
     const result = [];
     for (const node of nodes) {
         const rawChildren = node['children'];
         const nested = Array.isArray(rawChildren) ? rawChildren : undefined;
-        const selfMatch = matchesLookupText(String(node[textField] ?? ''), needle, translateText);
+        const selfMatch = matchesLookupNode(node, fields, needle, translateText);
         if (selfMatch) {
             result.push({
                 ...node,
@@ -238,7 +261,7 @@ function filterTreeNodes(nodes, textField, query, translateText) {
             });
             continue;
         }
-        const children = nested ? filterTreeNodes(nested, textField, needle, translateText) : undefined;
+        const children = nested ? filterTreeNodes(nested, fields, needle, translateText) : undefined;
         if (children && children.length > 0) {
             result.push({
                 ...node,