openxiangda 1.0.145 → 1.0.147

package/packages/sdk/dist/{dataManagementApi-DQKInwWS.d.mts → dataManagementApi-BCzfV88G.d.mts}

@@ -1,4 +1,4 @@
-import { F as FieldDefinition, a as FormRuntimeApi, R as RuntimeResponse, b as FormSchema } from './ProcessPreview-CUQFUDvw.mjs';
+import { F as FieldDefinition, a as FormRuntimeApi, R as RuntimeResponse, b as FormSchema } from './ProcessPreview-BoblxCUt.mjs';
 
 type DataManagementConfigScope = 'global' | 'personal';
 type DataManagementDensity = 'compact' | 'middle' | 'loose';

package/packages/sdk/dist/{dataManagementApi-CwBEmnXg.d.ts → dataManagementApi-_FFNPv2e.d.ts}

@@ -1,4 +1,4 @@
-import { F as FieldDefinition, a as FormRuntimeApi, R as RuntimeResponse, b as FormSchema } from './ProcessPreview-CUQFUDvw.js';
+import { F as FieldDefinition, a as FormRuntimeApi, R as RuntimeResponse, b as FormSchema } from './ProcessPreview-BoblxCUt.js';
 
 type DataManagementConfigScope = 'global' | 'personal';
 type DataManagementDensity = 'compact' | 'middle' | 'loose';

package/packages/sdk/dist/runtime/index.cjs

@@ -7686,6 +7686,30 @@ function createFormRuntimeApi(config) {
       });
       return response.data || response.result || [];
     },
+    searchDepartments: async (params) => {
+      const page = params?.page ?? 1;
+      const pageSize = params?.pageSize ?? 50;
+      const response = await request({
+        url: "/department/search",
+        method: "get",
+        params: {
+          keyword: params?.keyword,
+          page,
+          pageSize,
+          includePath: params?.includePath ?? true
+        }
+      });
+      const data = response.data || response.result;
+      if (Array.isArray(data)) {
+        return { items: data, total: data.length, page, pageSize };
+      }
+      return {
+        items: data?.items || data?.list || [],
+        total: Number(data?.total ?? data?.count ?? data?.items?.length ?? 0),
+        page: Number(data?.page ?? page),
+        pageSize: Number(data?.pageSize ?? pageSize)
+      };
+    },
     getDepartmentParentDepartments: async (id) => {
       const response = await request({
         url: `/department/${id}/parentDepartments`,
@@ -13218,6 +13242,21 @@ var import_react53 = require("react");
 var import_react50 = require("react");
 var import_antd22 = require("antd");
 
+// packages/sdk/src/components/fields/shared/departmentSearch.ts
+function canSearchAllDepartments(api, configuredTreeData) {
+  return !configuredTreeData?.length && typeof api.searchDepartments === "function";
+}
+function normalizeDepartmentSearchItems(result) {
+  const data = result?.data || result?.result || result;
+  const source = Array.isArray(data) ? data : data?.items || data?.list || [];
+  return source.map((item) => normalizeDepartmentNode(item)).filter((item) => item.id);
+}
+function getDepartmentPathText(department, separator = "/") {
+  const path = Array.isArray(department?.path) ? department.path : [];
+  const pathText = path.map((item) => item?.name).filter(Boolean).join(separator);
+  return pathText || String(department?.fullPath || getDepartmentName(department) || "");
+}
+
 // packages/sdk/src/components/fields/shared/DepartmentPicker.tsx
 var import_react49 = require("react");
 var import_antd21 = require("antd");
@@ -13232,7 +13271,11 @@ var getMobileComponent2 = (name) => {
   }
 };
 function normalizeSelection(items) {
-  return items.map((item) => ({ id: String(item.id || ""), name: String(item.name || item.id || "") })).filter((item) => item.id);
+  return items.map((item) => ({
+    id: String(item.id || ""),
+    name: String(item.name || item.id || ""),
+    fullPath: item.fullPath
+  })).filter((item) => item.id);
 }
 function matchSearch(nodes, keyword) {
   if (!keyword) return nodes;
@@ -13253,7 +13296,12 @@ function DepartmentPickerPanel({
   treeData,
   onConfirm,
   onCancel,
-  mobile = false
+  mobile = false,
+  showSearch = true,
+  searchScope = "loaded",
+  showFullPath = false,
+  searchMinLength = 1,
+  searchDebounceMs = 300
 }) {
   const {
     treeData: loadedTreeData,
@@ -13267,11 +13315,53 @@ function DepartmentPickerPanel({
   const [selected, setSelected] = (0, import_react49.useState)(() => normalizeSelection(value));
   const [expandedKeys, setExpandedKeys] = (0, import_react49.useState)([]);
   const [currentDeptId, setCurrentDeptId] = (0, import_react49.useState)(null);
+  const [remoteSearchResults, setRemoteSearchResults] = (0, import_react49.useState)([]);
+  const [remoteSearchLoading, setRemoteSearchLoading] = (0, import_react49.useState)(false);
+  const [remoteSearchError, setRemoteSearchError] = (0, import_react49.useState)("");
+  const searchSeqRef = (0, import_react49.useRef)(0);
   const selectedIds = selected.map((item) => item.id);
   const MobileSearchBar = getMobileComponent2("SearchBar");
+  const trimmedKeyword = keyword.trim();
+  const canRemoteSearch = showSearch && searchScope === "all" && trimmedKeyword.length >= searchMinLength && canSearchAllDepartments(api, treeData);
+  const spinning = treeLoading || remoteSearchLoading;
+  (0, import_react49.useEffect)(() => {
+    if (!canRemoteSearch) {
+      searchSeqRef.current += 1;
+      setRemoteSearchResults([]);
+      setRemoteSearchLoading(false);
+      setRemoteSearchError("");
+      return;
+    }
+    const seq = searchSeqRef.current + 1;
+    searchSeqRef.current = seq;
+    setRemoteSearchLoading(true);
+    setRemoteSearchError("");
+    const timer = window.setTimeout(() => {
+      api.searchDepartments?.({
+        keyword: trimmedKeyword,
+        page: 1,
+        pageSize: 50,
+        includePath: true
+      }).then((result) => {
+        if (searchSeqRef.current !== seq) return;
+        setRemoteSearchResults(normalizeDepartmentSearchItems(result));
+      }).catch((error) => {
+        if (searchSeqRef.current !== seq) return;
+        setRemoteSearchResults([]);
+        setRemoteSearchError(error?.message || "\u641C\u7D22\u5931\u8D25");
+      }).finally(() => {
+        if (searchSeqRef.current === seq) {
+          setRemoteSearchLoading(false);
+        }
+      });
+    }, searchDebounceMs);
+    return () => {
+      window.clearTimeout(timer);
+    };
+  }, [api, canRemoteSearch, searchDebounceMs, trimmedKeyword]);
   const filteredTreeData = (0, import_react49.useMemo)(
-    () => matchSearch(loadedTreeData, keyword.trim()),
-    [keyword, loadedTreeData]
+    () => showSearch ? matchSearch(loadedTreeData, trimmedKeyword) : loadedTreeData,
+    [loadedTreeData, showSearch, trimmedKeyword]
   );
   const currentPath = (0, import_react49.useMemo)(() => {
     if (!currentDeptId) return [];
@@ -13286,13 +13376,36 @@ function DepartmentPickerPanel({
     return path;
   }, [currentDeptId, nodeMap, parentMap]);
   const mobileList = (0, import_react49.useMemo)(() => {
-    if (keyword.trim()) {
-      const lower = keyword.trim().toLowerCase();
+    if (canRemoteSearch) {
+      return remoteSearchResults;
+    }
+    if (showSearch && trimmedKeyword) {
+      const lower = trimmedKeyword.toLowerCase();
       return flatNodes.filter((item) => item.name.toLowerCase().includes(lower)).map((item) => item.node);
     }
     if (!currentDeptId) return loadedTreeData;
     return nodeMap.get(currentDeptId)?.children || [];
-  }, [currentDeptId, flatNodes, keyword, loadedTreeData, nodeMap]);
+  }, [
+    canRemoteSearch,
+    currentDeptId,
+    flatNodes,
+    loadedTreeData,
+    nodeMap,
+    remoteSearchResults,
+    showSearch,
+    trimmedKeyword
+  ]);
+  const getNodeValue = (node) => {
+    const id = getDepartmentId(node);
+    const name = getDepartmentName(node);
+    const fullPath = getDepartmentPathText(node);
+    return {
+      id,
+      name,
+      ...fullPath && fullPath !== name ? { fullPath } : {}
+    };
+  };
+  const getSelectedLabel = (item) => showFullPath ? item.fullPath || item.name : item.name;
   const upsertSelected = (department, checked) => {
     if (multiple) {
       setSelected((prev) => {
@@ -13309,14 +13422,14 @@ function DepartmentPickerPanel({
     const checkedKeys = Array.isArray(keys) ? keys : keys.checked;
     const next = checkedKeys.map((key) => {
       const node = nodeMap.get(String(key));
-      return node ? { id: getDepartmentId(node), name: getDepartmentName(node) } : void 0;
+      return node ? getNodeValue(node) : void 0;
     }).filter(Boolean);
     setSelected(next);
   };
   const handleTreeSelect = (keys) => {
     const id = String(keys[0] || "");
     const node = id ? nodeMap.get(id) : void 0;
-    setSelected(node ? [{ id, name: getDepartmentName(node) }] : []);
+    setSelected(node ? [getNodeValue(node)] : []);
   };
   const renderSelected = () => /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("div", { className: "sy-org-picker-selected", children: [
     /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("div", { className: "sy-org-picker-selected-head", children: [
@@ -13326,8 +13439,51 @@ function DepartmentPickerPanel({
       ] }),
       /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("button", { type: "button", onClick: () => setSelected([]), disabled: !selected.length, children: "\u6E05\u7A7A" })
     ] }),
-    selected.length ? /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("div", { className: "sy-org-picker-tags", children: selected.map((item) => /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(import_antd21.Tag, { closable: true, onClose: () => upsertSelected(item, false), children: item.name }, item.id)) }) : /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(import_antd21.Empty, { image: import_antd21.Empty.PRESENTED_IMAGE_SIMPLE, description: "\u6682\u65E0\u9009\u62E9" })
+    selected.length ? /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("div", { className: "sy-org-picker-tags", children: selected.map((item) => /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(import_antd21.Tag, { closable: true, onClose: () => upsertSelected(item, false), children: getSelectedLabel(item) }, item.id)) }) : /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(import_antd21.Empty, { image: import_antd21.Empty.PRESENTED_IMAGE_SIMPLE, description: "\u6682\u65E0\u9009\u62E9" })
   ] });
+  const renderRemoteSearchResults = () => /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
+    import_antd21.List,
+    {
+      dataSource: remoteSearchResults,
+      locale: { emptyText: remoteSearchError || "\u6682\u65E0\u90E8\u95E8" },
+      renderItem: (node) => {
+        const id = getDepartmentId(node);
+        const name = getDepartmentName(node);
+        const selectedNow = selectedIds.includes(id);
+        const pathText = getDepartmentPathText(node);
+        return /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
+          import_antd21.List.Item,
+          {
+            onClick: () => upsertSelected(getNodeValue(node), true),
+            actions: [
+              /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
+                import_antd21.Checkbox,
+                {
+                  checked: selectedNow,
+                  onChange: (event) => upsertSelected(getNodeValue(node), event.target.checked)
+                },
+                "select"
+              )
+            ],
+            children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
+              import_antd21.List.Item.Meta,
+              {
+                avatar: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(import_icons9.ApartmentOutlined, {}),
+                title: /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("span", { children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("span", { children: name }),
+                  showFullPath && pathText && pathText !== name ? /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("span", { className: "sy-org-picker-path", children: [
+                    " ",
+                    pathText
+                  ] }) : null
+                ] })
+              }
+            )
+          },
+          id
+        );
+      }
+    }
+  );
   if (mobile) {
     return /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("div", { className: "sy-org-picker sy-org-picker-mobile", children: [
       /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("div", { className: "sy-org-picker-mobile-head", children: [
@@ -13335,7 +13491,7 @@ function DepartmentPickerPanel({
         /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("strong", { children: "\u9009\u62E9\u90E8\u95E8" }),
         /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("button", { type: "button", onClick: () => onConfirm(selected), children: "\u786E\u5B9A" })
       ] }),
-      MobileSearchBar ? /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(MobileSearchBar, { placeholder: "\u641C\u7D22\u90E8\u95E8", value: keyword, onChange: setKeyword }) : /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("input", { value: keyword, onChange: (event) => setKeyword(event.target.value) }),
+      showSearch ? MobileSearchBar ? /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(MobileSearchBar, { placeholder: "\u641C\u7D22\u90E8\u95E8", value: keyword, onChange: setKeyword }) : /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("input", { value: keyword, onChange: (event) => setKeyword(event.target.value) }) : null,
       /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("div", { className: "sy-org-picker-breadcrumb", children: [
         /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("button", { type: "button", onClick: () => setCurrentDeptId(null), children: "\u90E8\u95E8" }),
         currentPath.map((item) => /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("button", { type: "button", onClick: () => setCurrentDeptId(item.id), children: [
@@ -13343,16 +13499,17 @@ function DepartmentPickerPanel({
           item.name
         ] }, item.id))
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(import_antd21.Spin, { spinning: treeLoading, children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(import_antd21.Spin, { spinning, children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
         import_antd21.List,
         {
           dataSource: mobileList,
-          locale: { emptyText: "\u6682\u65E0\u90E8\u95E8" },
+          locale: { emptyText: remoteSearchError || "\u6682\u65E0\u90E8\u95E8" },
           renderItem: (node) => {
             const id = getDepartmentId(node);
             const name = getDepartmentName(node);
             const selectedNow = selectedIds.includes(id);
-            const hasChildren = Boolean(node.hasChildren && !node.isLeaf);
+            const hasChildren = !canRemoteSearch && Boolean(node.hasChildren && !node.isLeaf);
+            const pathText = getDepartmentPathText(node);
             return /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
               import_antd21.List.Item,
               {
@@ -13361,7 +13518,7 @@ function DepartmentPickerPanel({
                     import_antd21.Checkbox,
                     {
                       checked: selectedNow,
-                      onChange: (event) => upsertSelected({ id, name }, event.target.checked)
+                      onChange: (event) => upsertSelected(getNodeValue(node), event.target.checked)
                     },
                     "select"
                   ),
@@ -13379,7 +13536,19 @@ function DepartmentPickerPanel({
                     "children"
                   ) : null
                 ],
-                children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(import_antd21.List.Item.Meta, { avatar: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(import_icons9.ApartmentOutlined, {}), title: name })
+                children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
+                  import_antd21.List.Item.Meta,
+                  {
+                    avatar: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(import_icons9.ApartmentOutlined, {}),
+                    title: /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("span", { children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("span", { children: name }),
+                      showFullPath && pathText && pathText !== name ? /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("span", { className: "sy-org-picker-path", children: [
+                        " ",
+                        pathText
+                      ] }) : null
+                    ] })
+                  }
+                )
               },
               id
             );
@@ -13392,7 +13561,7 @@ function DepartmentPickerPanel({
   return /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("div", { className: "sy-org-picker", children: [
     /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("div", { className: "sy-org-picker-main", children: [
       /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("div", { className: "sy-org-picker-tree", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
+        showSearch ? /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
           import_antd21.Input,
           {
             allowClear: true,
@@ -13401,8 +13570,8 @@ function DepartmentPickerPanel({
             value: keyword,
             onChange: (event) => setKeyword(event.target.value)
           }
-        ),
-        /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(import_antd21.Spin, { spinning: treeLoading, children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
+        ) : null,
+        /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(import_antd21.Spin, { spinning, children: canRemoteSearch ? renderRemoteSearchResults() : /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
           import_antd21.Tree,
           {
             checkable: multiple,
@@ -13492,6 +13661,17 @@ function convertTreeData(nodes) {
     children: node.children ? convertTreeData(node.children) : void 0
   }));
 }
+function convertSearchTreeData(nodes, showFullPath) {
+  return nodes.map((node) => {
+    const name = getDepartmentName(node);
+    const pathText = getDepartmentPathText(node);
+    return {
+      value: getDepartmentId(node),
+      title: showFullPath && pathText ? pathText : name,
+      isLeaf: true
+    };
+  });
+}
 function DepartmentSelectFieldPC({
   fieldId,
   behavior,
@@ -13501,6 +13681,11 @@ function DepartmentSelectFieldPC({
   treeData,
   allowClear = true,
   maxCount,
+  notFoundContent,
+  showSearch = true,
+  searchScope = "loaded",
+  searchMinLength = 1,
+  searchDebounceMs = 300,
   showFullPath,
   scopeType,
   specifiedDepts,
@@ -13514,6 +13699,11 @@ function DepartmentSelectFieldPC({
   const remoteLoadedRef = (0, import_react50.useRef)(false);
   const [loadedTreeData, setLoadedTreeData] = (0, import_react50.useState)(configuredTreeData);
   const [pickerOpen, setPickerOpen] = (0, import_react50.useState)(false);
+  const [searchKeyword, setSearchKeyword] = (0, import_react50.useState)("");
+  const [remoteSearchResults, setRemoteSearchResults] = (0, import_react50.useState)([]);
+  const [remoteSearchLoading, setRemoteSearchLoading] = (0, import_react50.useState)(false);
+  const [selectedPathMap, setSelectedPathMap] = (0, import_react50.useState)({});
+  const searchSeqRef = (0, import_react50.useRef)(0);
   (0, import_react50.useEffect)(() => {
     if (configuredTreeData.length) {
       setLoadedTreeData(configuredTreeData.map(normalizeDepartmentNode));
@@ -13525,22 +13715,87 @@ function DepartmentSelectFieldPC({
       (nodes) => setLoadedTreeData(nodes.map(normalizeDepartmentNode))
     );
   }, [api, configuredTreeData]);
+  const trimmedSearchKeyword = searchKeyword.trim();
+  const canRemoteSearch = showSearch && searchScope === "all" && trimmedSearchKeyword.length >= searchMinLength && canSearchAllDepartments(api, configuredTreeData);
+  (0, import_react50.useEffect)(() => {
+    if (!canRemoteSearch) {
+      searchSeqRef.current += 1;
+      setRemoteSearchResults([]);
+      setRemoteSearchLoading(false);
+      return;
+    }
+    const seq = searchSeqRef.current + 1;
+    searchSeqRef.current = seq;
+    setRemoteSearchLoading(true);
+    const timer = window.setTimeout(() => {
+      api.searchDepartments?.({
+        keyword: trimmedSearchKeyword,
+        page: 1,
+        pageSize: 50,
+        includePath: true
+      }).then((result) => {
+        if (searchSeqRef.current !== seq) return;
+        setRemoteSearchResults(normalizeDepartmentSearchItems(result));
+      }).catch(() => {
+        if (searchSeqRef.current !== seq) return;
+        setRemoteSearchResults([]);
+      }).finally(() => {
+        if (searchSeqRef.current === seq) {
+          setRemoteSearchLoading(false);
+        }
+      });
+    }, searchDebounceMs);
+    return () => {
+      window.clearTimeout(timer);
+    };
+  }, [api, canRemoteSearch, searchDebounceMs, trimmedSearchKeyword]);
   const scopedTreeData = filterTreeByScope(loadedTreeData, scopeType, specifiedDepts);
   const allDepts = flattenDepartments(scopedTreeData);
+  const scopedRemoteSearchResults = (0, import_react50.useMemo)(() => {
+    if (scopeType !== "specified" || !specifiedDepts?.length) {
+      return remoteSearchResults;
+    }
+    const specifiedSet = new Set(specifiedDepts);
+    return remoteSearchResults.filter((node) => {
+      const id = getDepartmentId(node);
+      if (specifiedSet.has(id)) return true;
+      return node.path?.some((item) => specifiedSet.has(item.id));
+    });
+  }, [remoteSearchResults, scopeType, specifiedDepts]);
+  const remoteDeptMap = (0, import_react50.useMemo)(() => {
+    const map = /* @__PURE__ */ new Map();
+    scopedRemoteSearchResults.forEach((node) => map.set(getDepartmentId(node), node));
+    return map;
+  }, [scopedRemoteSearchResults]);
   const handleChange = (selectedValue) => {
     const selectedValues = Array.isArray(selectedValue) ? selectedValue : selectedValue ? [selectedValue] : [];
+    const nextPathMap = { ...selectedPathMap };
     const selected = selectedValues.map((item) => {
       const id = String(item?.value ?? item);
       const label = item?.label;
-      const matched = allDepts.find((dept) => dept.id === id) ?? value.find((dept) => getDepartmentId(dept) === id);
+      const remoteDept = remoteDeptMap.get(id);
+      const matched = remoteDept ?? allDepts.find((dept) => dept.id === id)?.node ?? value.find((dept) => getDepartmentId(dept) === id);
+      if (remoteDept) {
+        nextPathMap[id] = getDepartmentPathText(remoteDept);
+      }
       const labelText = typeof label === "string" || typeof label === "number" ? String(label) : void 0;
-      return { id, name: labelText || matched?.name || id };
+      return { id, name: getDepartmentName(matched) || labelText || id };
     }).filter((item) => item.id);
     const result = (multiple ? selected.slice(0, maxCount ?? selected.length) : selected.slice(0, 1)).map(toDepartmentValue);
+    setSelectedPathMap(nextPathMap);
     setFieldValue(fieldId, result);
     onChange?.(result);
   };
   const handlePickerConfirm = (items) => {
+    setSelectedPathMap((current) => {
+      const next = { ...current };
+      items.forEach((item) => {
+        if (item.fullPath) {
+          next[item.id] = String(item.fullPath);
+        }
+      });
+      return next;
+    });
     const result = (multiple ? items.slice(0, maxCount ?? items.length) : items.slice(0, 1)).map(
       toDepartmentValue
     );
@@ -13548,12 +13803,19 @@ function DepartmentSelectFieldPC({
     onChange?.(result);
   };
   const treeDataConverted = convertTreeData(scopedTreeData);
+  const searchTreeDataConverted = convertSearchTreeData(scopedRemoteSearchResults, showFullPath);
+  const renderedTreeData = canRemoteSearch ? searchTreeDataConverted : treeDataConverted;
+  const getDisplayLabel2 = (dept) => {
+    const id = getDepartmentId(dept);
+    if (!showFullPath) return getDepartmentName(dept);
+    return getDepartmentFullPath(id, scopedTreeData) || selectedPathMap[id] || (remoteDeptMap.has(id) ? getDepartmentPathText(remoteDeptMap.get(id)) : "") || getDepartmentName(dept);
+  };
   const selectValue = multiple ? value.map((d) => ({
     value: getDepartmentId(d),
-    label: showFullPath ? getDepartmentFullPath(getDepartmentId(d), scopedTreeData) || getDepartmentName(d) : getDepartmentName(d)
+    label: getDisplayLabel2(d)
   })) : value[0] ? {
     value: getDepartmentId(value[0]),
-    label: showFullPath ? getDepartmentFullPath(getDepartmentId(value[0]), scopedTreeData) || getDepartmentName(value[0]) : getDepartmentName(value[0])
+    label: getDisplayLabel2(value[0])
   } : void 0;
   return /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)("div", { className: "sy-select-with-picker", children: [
     /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(
@@ -13565,9 +13827,14 @@ function DepartmentSelectFieldPC({
         maxCount,
         allowClear,
         labelInValue: true,
-        treeData: treeDataConverted,
+        showSearch,
+        searchValue: searchKeyword,
+        onSearch: setSearchKeyword,
+        filterTreeNode: canRemoteSearch ? false : void 0,
+        treeData: renderedTreeData,
         value: selectValue,
         placeholder,
+        notFoundContent: remoteSearchLoading ? "\u641C\u7D22\u4E2D..." : notFoundContent || "\u6682\u65E0\u90E8\u95E8",
         disabled,
         onChange: handleChange,
         loadData: async (node) => {
@@ -13611,6 +13878,11 @@ function DepartmentSelectFieldPC({
         multiple,
         value,
         treeData,
+        showSearch,
+        searchScope,
+        showFullPath,
+        searchMinLength,
+        searchDebounceMs,
         onConfirm: handlePickerConfirm,
         onCancel: () => void 0
       }
@@ -13643,6 +13915,10 @@ function DepartmentSelectFieldMobile({
   treeData,
   allowClear = true,
   maxCount,
+  showSearch = true,
+  searchScope = "loaded",
+  searchMinLength = 1,
+  searchDebounceMs = 300,
   showFullPath,
   scopeType,
   specifiedDepts,
@@ -13730,6 +14006,11 @@ function DepartmentSelectFieldMobile({
         multiple,
         value,
         treeData,
+        showSearch,
+        searchScope,
+        showFullPath,
+        searchMinLength,
+        searchDebounceMs,
         onConfirm: handleConfirm,
         onCancel: () => setShowPicker(false)
       }