@cloudbase/weda-ui 3.4.9-alpha.1024 → 3.4.10

package/dist/web/components/form/userOrgSelect/common/utils.js

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import { callWedaApi } from '../../../../utils/tcb';
 import destr from 'destr';
 import { node } from 'prop-types';
@@ -204,12 +203,14 @@ export const displayUserInfo = (item, secondDisplay) => {
 };
 /**
  * 前端实现部门模糊搜索
+ * @param props
+ * @returns
  */
-export const fetchSearchOrg = ({ key, orgList, }) => {
+export const fetchSearchOrg = (props) => {
+    const { key, treeData } = props;
+    const orgList = treeToArray(treeData);
     if (Array.isArray(orgList) && orgList.length > 0) {
-        const arr = orgList.filter((item) => String((item === null || item === void 0 ? void 0 : item.content) || '').includes(key) &&
-            (item === null || item === void 0 ? void 0 : item.selectable) &&
-            item.type !== 'corp') || [];
+        const arr = orgList.filter((item) => (item === null || item === void 0 ? void 0 : item.content.indexOf(key)) >= 0 && (item === null || item === void 0 ? void 0 : item.selectable)) || [];
         return arr;
     }
     return [];
@@ -283,12 +284,12 @@ const arrayToTree = (items) => {
             res.push(newItem);
         }
         else {
-            if (!getHasOwnProperty(map, i.parentCode)) {
-                map[i.parentCode] = {
+            if (!getHasOwnProperty(map, i.parentcode)) {
+                map[i.parentcode] = {
                     children: [],
                 };
             }
-            map[i.parentCode].children.push(newItem);
+            map[i.parentcode].children.push(newItem);
         }
     }
     return res;
@@ -306,48 +307,18 @@ export const formatTree = (nodes) => {
     return [];
 };
 /**
- * 数组转树结构
- * @param list
- * @returns
- */
-export const buildTree = (list) => {
-    const idMap = {};
-    const tree = [];
-    for (const item of list) {
-        idMap[item.code] = { ...item };
-    }
-    for (const item of list) {
-        const { code, parentCode } = item;
-        if (!parentCode) {
-            tree.push(idMap[code]);
-        }
-        else {
-            if (idMap[parentCode]) {
-                idMap[parentCode].children
-                    ? idMap[parentCode].children.push(idMap[code])
-                    : (idMap[parentCode].children = [idMap[code]]);
-            }
-        }
-    }
-    return {
-        list,
-        idMap,
-        treeData: tree,
-    };
-};
-/**
- * 从树形结构中查找某个节点
+ * 根据code再树结构中查找节点
  * @param treeData
- * @param id
+ * @param code
  * @returns
  */
-export const getNodeFromTree = (treeData, id) => {
+export const getNodeFromTreeByCode = (treeData, code) => {
     for (const node of treeData) {
-        if (node.id === id) {
+        if (node.code === code) {
             return node;
         }
         if (node.children) {
-            const result = getNodeFromTree(node.children, id);
+            const result = getNodeFromTreeByCode(node.children, code);
             if (result) {
                 return result;
             }
@@ -355,18 +326,3 @@ export const getNodeFromTree = (treeData, id) => {
     }
     return null;
 };
-/**
- * 根据部门ids获取部门详情列表
- * @param param0
- * @returns
- */
-export const getOrgItemsByIds = ({ ids, orgList }) => {
-    const list = [];
-    for (const id of ids) {
-        const item = orgList.find((item) => item.id === id);
-        if (item) {
-            list.push(item);
-        }
-    }
-    return list;
-};

package/dist/web/components/form/userOrgSelect/component/OrgPaths.js

@@ -0,0 +1,12 @@
+import { Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { getTreePaths } from '../common/utils';
+export const OrgPaths = ({ nodeId, treeData }) => {
+    if (!nodeId || !treeData) {
+        return null;
+    }
+    const paths = getTreePaths(nodeId, treeData);
+    if (paths && paths.length > 0) {
+        return _jsxs(_Fragment, { children: ["(", paths.map((node) => node.content).join('/'), ")"] });
+    }
+    return null;
+};

package/dist/web/components/form/userOrgSelect/component/depart-select/depart-select-pc.js

@@ -3,7 +3,6 @@ import React, { useState } from 'react';
 import { renderDecorator } from '../../../renderDecorator';
 import classNames from '../../../../../utils/classnames';
 import { Dropdown, ConfigProvider } from 'tea-component';
-//import {dealOrgData } from '../../utils';
 import { defaultRequest } from '../../common/fetch-data-service';
 import '../index.css';
 import { OrgModalPC } from './org-modal-pc';
@@ -29,10 +28,9 @@ export function DepartTreeSelectPC({ id, className, style, label = '部门选择
     };
     return renderDecorator(_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsx(OrgTreeContext.Provider, { value: {
                 multiple,
-                selectedOrgList,
                 setSelectedOrgList,
+                selectedOrgList,
                 confirmOrgList,
-                setConfirmOrgList,
                 defaultExpandedIds,
                 request,
             }, children: _jsx(Dropdown, { className: classNames(`weda-ui-org-selected`, `size-${size}`), open: open, onOpenChange: (open) => {

package/dist/web/components/form/userOrgSelect/component/depart-select/departTreeSelect.h5.js

@@ -1,16 +1,17 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import React, { useState, useEffect, useLayoutEffect } from 'react';
+import React, { useState, useLayoutEffect } from 'react';
 import List from 'rc-virtual-list';
 import { renderDecorator } from '../../../renderDecorator';
 import { IconFont } from 'tdesign-icons-react';
 import classNames from '../../../../../utils/classnames';
-import { getNode, fetchSearchOrg } from '../../common/utils';
+import { fetchSearchOrg, getNodeFromTreeByCode } from '../../common/utils';
 import { Modal, Button, ConfigProvider, Radio, Status, Bubble, } from 'tea-component';
 import { ModalSearchH5 } from '../modal-search-h5';
 import { LoadingStatus, ErrorStatus } from '../error-tips';
 import debounce from '../../../../../utils/debounce';
 import '../userOrgSelect.css';
+import { OrgPaths } from '../OrgPaths';
 export function DepartTreeSelectH5({ id, className, style, label = '部门选择', labelVisible = true, name = 'formDepartTreeSelect', placeholder = '请选择部门', disabled = false, layout = 'horizontal', requiredFlag = false, size = 'l', decorator, multiple = true, focus: autoFocus = false, confirmOrgList, setConfirmOrgList, selectedOrgList, setSelectedOrgList, errorInfo, setErrorInfo, orgList, treeData, }) {
     var _a;
     const cls = classNames({
@@ -26,24 +27,14 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
     });
     const [visible, setVisible] = React.useState(false);
     const [isSearch, setIsSearch] = useState(false);
-    const [showTreeData, setShowTreeData] = useState([]);
-    const [originalOrgData, setOriginalOrgData] = useState([]);
-    const [count, setCount] = useState(1); //计数弹窗显示层级
+    // 当前显示的树结构
+    const [showTreeData, setShowTreeData] = useState(treeData);
+    // currentItem从那一个部门点击进到下个部门的
+    const [currentItem, setCurrentItem] = useState(null);
     const [searchValue, setSearchValue] = useState('');
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const [loading, setLoading] = useState({ id: null, status: false });
-    const [titleText, setTitleText] = useState('');
     const [listHeight, setListHeight] = useState(0);
-    const treeNode = getNode(treeData, 'root', 'id');
-    useEffect(() => {
-        // 仅执行一次
-        if (treeData) {
-            setShowTreeData(treeNode);
-            setOriginalOrgData([{ index: 1, treeData: treeNode, title: '选择部门' }]);
-            setTitleText('选择部门');
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [treeData]);
     useLayoutEffect(() => {
         const windowHeight = window.screen.height;
         const listHeight = windowHeight - 35 - 80 - 80 - 50; // 顶部标题35px，搜索框80px，底部按钮80px, 选择结果50px
@@ -56,7 +47,7 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
         setErrorInfo({ errorStatus: false, errorMessage: null });
         handleFocus(false);
         setSearchValue('');
-        setShowTreeData(treeNode);
+        setShowTreeData(treeData);
         // initOrgsData();
     };
     const onSearch = debounce((key) => {
@@ -67,7 +58,7 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
                 setShowTreeData(res);
             }
             else {
-                setShowTreeData(treeNode);
+                setShowTreeData(treeData);
             }
         }
         catch (e) {
@@ -77,65 +68,53 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
     const onFocus = function () {
         setSearchValue('');
         setVisible(true);
-        setShowTreeData(treeNode);
+        setShowTreeData(treeData);
     };
     const onClose = () => {
         setSelectedOrgList(confirmOrgList);
         setErrorInfo({ errorStatus: false, errorMessage: null });
         setVisible(false);
-        setShowTreeData(treeNode);
+        setShowTreeData(treeData);
     };
     const onConfirm = (selectedOrgList = []) => {
         setConfirmOrgList(selectedOrgList);
         setErrorInfo({ errorStatus: false, errorMessage: null });
-        setShowTreeData(treeNode);
+        setShowTreeData(treeData);
         setVisible(false);
     };
     // 获取某节点子部门
     const loadItem = (item) => {
         setShowTreeData((item === null || item === void 0 ? void 0 : item.children) ? [].concat(item === null || item === void 0 ? void 0 : item.children) : []);
-        originalOrgData.push({
-            index: count + 1,
-            treeData: item === null || item === void 0 ? void 0 : item.children,
-            title: item === null || item === void 0 ? void 0 : item.content,
-        });
-        setCount(count + 1);
-        setOriginalOrgData(originalOrgData);
-        setTitleText(item === null || item === void 0 ? void 0 : item.content);
+        setCurrentItem(item);
     };
-    //判断当前页结构为第几层，如首次渲染则添加至orgsTreeData，二次进入刷新index数据
-    const retLevel = (count) => {
-        const storageOriTreeData = [];
-        if (count !== 1) {
-            originalOrgData.map((item) => {
-                if ((item === null || item === void 0 ? void 0 : item.index) < count) {
-                    storageOriTreeData.push(item);
-                    if ((item === null || item === void 0 ? void 0 : item.index) === count - 1) {
-                        setCount(count - 1);
-                        setTitleText(item.title);
-                        setShowTreeData((item === null || item === void 0 ? void 0 : item.treeData) || []);
-                    }
-                }
-                else {
-                    return;
-                }
-            });
-            setOriginalOrgData(storageOriTreeData);
+    // 返回targetItem节点所在的层级
+    const returnToLevelOfNode = (targetItem) => {
+        if (!targetItem) {
+            return;
+        }
+        // 已经返回到根节点层级
+        if (!targetItem.parentCode) {
+            setShowTreeData(treeData);
+            setCurrentItem(null);
         }
         else {
-            onClose();
+            // 要返回targetItem所在的层级，需要找到targetItem的父节点parent，再显示parent的子节点即可
+            const parent = getNodeFromTreeByCode(treeData, targetItem.parentCode);
+            setShowTreeData((parent === null || parent === void 0 ? void 0 : parent.children) || []);
+            // 标记当前是从根节点进到这一层
+            setCurrentItem(parent);
         }
     };
     return renderDecorator(_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsxs("div", { className: subCls, children: [_jsx("div", { className: "weui-cell__bd weui-flex", children: _jsx("input", { className: "weui-input", placeholder: placeholder, 
                         //value={value}
-                        value: (confirmOrgList || []).map((e) => e === null || e === void 0 ? void 0 : e.content).join(','), disabled: disabled, name: name, autoFocus: autoFocus, onClick: onFocus, readOnly: true, role: "input" }) }), _jsxs(Modal, { visible: visible, onClose: onClose, destroyOnClose: true, className: `weda-ui weda-select-user-dept__dialog`, children: [_jsxs(Modal.Body, { className: ((_a = selectedOrgList[0]) === null || _a === void 0 ? void 0 : _a.id) ? 'is-selected-value' : '', children: [_jsxs("div", { className: "weda-select-user-dept__dialog-header", id: count.toString(), children: [_jsx("div", { className: count == 1 ? '' : 'arrow-left', onClick: () => retLevel(count) }), titleText] }), _jsx(ModalSearchH5, { value: searchValue, onChange: (key) => {
+                        value: (confirmOrgList || []).map((e) => e === null || e === void 0 ? void 0 : e.content).join(','), disabled: disabled, name: name, autoFocus: autoFocus, onClick: onFocus, readOnly: true, role: "input" }) }), _jsxs(Modal, { disableEscape: true, maskClosable: false, visible: visible, onClose: onClose, destroyOnClose: true, className: `weda-ui weda-select-user-dept__dialog`, children: [_jsxs(Modal.Body, { className: ((_a = selectedOrgList[0]) === null || _a === void 0 ? void 0 : _a.id) ? 'is-selected-value' : '', children: [_jsxs("div", { className: "weda-select-user-dept__dialog-header", children: [_jsx("div", { className: !currentItem ? '' : 'arrow-left', onClick: () => returnToLevelOfNode(currentItem) }), currentItem ? currentItem.content : '选择部门'] }), _jsx(ModalSearchH5, { value: searchValue, onChange: (key) => {
                                         onSearch(key);
                                         setSearchValue(key);
                                     }, onCancel: cancleSearch, isSearch: isSearch, onFocus: () => {
                                         handleFocus(true);
                                     } }), (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.errorStatus) ? (_jsx(ErrorStatus, { description: (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.errorMessage) || null })) : !(loading === null || loading === void 0 ? void 0 : loading.status) ? (_jsx(_Fragment, { children: showTreeData && showTreeData.length > 0 ? (_jsx(List, { className: classNames('weda-select-user-dept__dialog-list'), data: showTreeData, height: 400, itemHeight: 40, itemKey: "id", children: (item) => {
                                             var _a;
-                                            return (_jsx("div", { className: "weda-select-user-dept__list-item", children: _jsxs("div", { className: "weda-select-user-dept__list-item-wrap", children: [_jsx(Radio.Group, { value: (_a = selectedOrgList.filter((e) => (e === null || e === void 0 ? void 0 : e.id) === (item === null || item === void 0 ? void 0 : item.id))[0]) === null || _a === void 0 ? void 0 : _a.id, onChange: (value) => {
+                                            return (_jsx("div", { className: "weda-select-user-dept__list-item", children: _jsxs("div", { className: "weda-select-user-dept__list-item-wrap", children: [_jsxs(Radio.Group, { value: (_a = selectedOrgList.filter((e) => (e === null || e === void 0 ? void 0 : e.id) === (item === null || item === void 0 ? void 0 : item.id))[0]) === null || _a === void 0 ? void 0 : _a.id, onChange: (value) => {
                                                                 const ids = selectedOrgList.map((item) => item === null || item === void 0 ? void 0 : item.id);
                                                                 // 多选情况，取消选中某元素时
                                                                 if (ids.indexOf(value) !== -1) {
@@ -152,15 +131,15 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
                                                                         setSelectedOrgList([item]);
                                                                     }
                                                                 }
-                                                            }, layout: "column", children: _jsx(_Fragment, { children: item.type !== 'corp' && (item === null || item === void 0 ? void 0 : item.selectable) ? (_jsx(Radio, { name: item === null || item === void 0 ? void 0 : item.id, children: _jsxs("div", { className: "weda-select-user-dept__item-detail weda-select-user-dept__item-detail-is-org", onClick: () => {
+                                                            }, layout: "column", children: [_jsx(_Fragment, { children: item.type !== 'corp' && (item === null || item === void 0 ? void 0 : item.selectable) ? (_jsx(Radio, { name: item === null || item === void 0 ? void 0 : item.id, children: _jsxs("div", { className: "weda-select-user-dept__item-detail weda-select-user-dept__item-detail-is-org", onClick: () => {
+                                                                                (item === null || item === void 0 ? void 0 : item.children) ? loadItem(item) : false;
+                                                                            }, children: [_jsx("div", { className: "item-name", children: item === null || item === void 0 ? void 0 : item.content }), (item === null || item === void 0 ? void 0 : item.children) &&
+                                                                                    loading.id !== item.id && (_jsx("div", { className: "lcap-icon lcap-icon-chevronright" }))] }) })) : (_jsxs("div", { className: "weda-select-user-dept__item-detail weda-select-user-dept__item-detail-is-org", onClick: () => {
                                                                             (item === null || item === void 0 ? void 0 : item.children) ? loadItem(item) : false;
-                                                                        }, children: [_jsx("div", { className: "item-name", children: item === null || item === void 0 ? void 0 : item.content }), (item === null || item === void 0 ? void 0 : item.children) &&
-                                                                                loading.id !== item.id && (_jsx("div", { className: "lcap-icon lcap-icon-chevronright" }))] }) })) : (_jsxs("div", { className: "weda-select-user-dept__item-detail weda-select-user-dept__item-detail-is-org", onClick: () => {
-                                                                        (item === null || item === void 0 ? void 0 : item.children) ? loadItem(item) : false;
-                                                                    }, children: [_jsx("div", { className: "item-name", children: item === null || item === void 0 ? void 0 : item.content }), (item === null || item === void 0 ? void 0 : item.children) && loading.id !== item.id && (_jsx("div", { className: "lcap-icon lcap-icon-chevronright" }))] })) }) }), loading.id === (item === null || item === void 0 ? void 0 : item.id) && (loading === null || loading === void 0 ? void 0 : loading.status) && (_jsx("div", { children: _jsx(IconFont, { name: "loading", className: `weda-grid-navigation__fonticon depart_loading` }) }))] }) }, item === null || item === void 0 ? void 0 : item.id));
+                                                                        }, children: [_jsx("div", { className: "item-name", children: item === null || item === void 0 ? void 0 : item.content }), (item === null || item === void 0 ? void 0 : item.children) && loading.id !== item.id && (_jsx("div", { className: "lcap-icon lcap-icon-chevronright" }))] })) }), isSearch && searchValue && (_jsx("div", { className: "item-org-h5", children: _jsx(OrgPaths, { nodeId: item === null || item === void 0 ? void 0 : item.id, treeData: treeData }) }))] }), loading.id === (item === null || item === void 0 ? void 0 : item.id) && (loading === null || loading === void 0 ? void 0 : loading.status) && (_jsx("div", { children: _jsx(IconFont, { name: "loading", className: `weda-grid-navigation__fonticon depart_loading` }) }))] }) }, item === null || item === void 0 ? void 0 : item.id));
                                         } })) : (_jsx(Status, { className: "dim-tree-select--blank", icon: 'blank', size: 's', title: `暂无部门数据` })) })) : (_jsx(LoadingStatus, {}))] }), _jsx(Modal.Footer, { children: _jsxs("div", { children: [selectedOrgList.length > 0 && (_jsxs("div", { className: "weda-select-user-dept__select-result", children: [_jsx("div", { className: "weda-select-user-dept__select-label", children: "\u5DF2\u9009\u62E9" }), _jsx("div", { className: "weda-select-user-dept__result-list", children: selectedOrgList.map((d) => (_jsxs("div", { className: "weda-select-user-dept__result-item", onClick: () => {
                                                         setSelectedOrgList(selectedOrgList.filter((e) => (e === null || e === void 0 ? void 0 : e.id) !== (d === null || d === void 0 ? void 0 : d.id)));
-                                                    }, children: [d === null || d === void 0 ? void 0 : d.content, _jsx("div", { className: "close" })] }, (d === null || d === void 0 ? void 0 : d.id) || (d === null || d === void 0 ? void 0 : d.value)))) })] })), _jsxs("div", { className: "weda-select-user-dept__btn-group", children: [_jsx(Button, { type: "weak", onClick: onClose, children: "\u53D6\u6D88" }), _jsx(Bubble, { content: selectedOrgList.length === 0 && confirmOrgList.length === 0
+                                                    }, children: [_jsx("div", { children: d === null || d === void 0 ? void 0 : d.content }), _jsx("div", { className: "close" })] }, (d === null || d === void 0 ? void 0 : d.id) || (d === null || d === void 0 ? void 0 : d.value)))) })] })), _jsxs("div", { className: "weda-select-user-dept__btn-group", children: [_jsx(Button, { type: "weak", onClick: onClose, children: "\u53D6\u6D88" }), _jsx(Bubble, { content: selectedOrgList.length === 0 && confirmOrgList.length === 0
                                                     ? '请选择部门'
                                                     : null, className: "weda-select-user-dept__bubble", children: _jsx(Button, { type: "primary", onClick: () => onConfirm(selectedOrgList), disabled: selectedOrgList.length === 0 &&
                                                         confirmOrgList.length === 0, children: "\u786E\u5B9A" }) })] })] }) })] })] }) }))({

package/dist/web/components/form/userOrgSelect/component/depart-select/index.js

@@ -1,21 +1,27 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useState, useEffect } from 'react';
+import React, { useState, useEffect } from 'react';
 import { ConfigProvider } from 'tea-component';
 // import './index.less';
-import { usePlatform, isInIde, filterStrList, } from '../../../../../utils/platform';
+import { useSyncValue } from '../../../../../utils/hooks/useSyncValue';
+import { usePlatform, isInIde } from '../../../../../utils/platform';
 import { deepClone } from '../../../../../utils/tool';
+import isObjectEqual from '../../../../../utils/isObjectEqual';
 import { emptyObject, emptyArray } from '../../../../../utils/constant';
-import { DepartTreeSelectH5 as DepartSelectH5 } from './departTreeSelect.h5';
+import { DepartTreeSelectH5 as DepartSelectH5 } from '../../departTreeSelect/departTreeSelect.h5';
 import { DepartTreeSelectPC as DepartSelectPC } from './depart-select-pc';
-import { defaultRequest } from '../../common/fetch-data-service';
-import { setFlag, formatTree, parseStrToArr, setChildren, getOrgItemsByIds, } from '../../common/utils';
-import { useDepartDataNew } from '../../hooks/use-depart-data';
+import { defaultRequest, getDepartByIds, } from '../../common/fetch-data-service';
+import { setFlag, formatTree, parseStrToArr, setChildren, } from '../../common/utils';
+import { useDepartData } from '../../hooks/use-depart-data';
 export default function DepartTreeSelect(props) {
     const { events = emptyObject, defaultValue = emptyArray, //默认值，支持数组
     confirmValue = '', defaultValueType = 'noneDepart', multiple = false, onChange = null, 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     request = defaultRequest, departmentScope, } = props;
     const platform = usePlatform();
+    // 两次默认值不同, 需要刷新
+    const prevDefaultRef = React.useRef(null);
+    // 最终选定部门id
+    const [confirmOrgIds, setConfirmOrgIds] = useSyncValue(defaultValue, isObjectEqual);
     // 最终选定部门集合
     const [confirmOrgList, setConfirmOrgList] = useState([]);
     //弹窗中被选中部门集合
@@ -24,28 +30,11 @@ export default function DepartTreeSelect(props) {
         errorStatus: false,
         errorMessage: null,
     });
-    const { orgTreeData, orgList, error } = useDepartDataNew({
+    const { orgTreeData, orgList, error } = useDepartData({
         request,
     });
     const [treeData, setTreeData] = useState([]);
     const defaultExpandedIds = parseStrToArr(departmentScope);
-    useEffect(() => {
-        if (!isInIde()) {
-            const orgIds = filterStrList(parseStrToArr(defaultValue));
-            const defaultConfirmOrgList = getOrgItemsByIds({ ids: orgIds, orgList });
-            setConfirmOrgList(defaultConfirmOrgList);
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [JSON.stringify(defaultValue), orgList]);
-    useEffect(() => {
-        if (defaultValueType === 'confirmDepart' && !isInIde()) {
-            const confirmOrgList = getOrgItemsByIds({
-                ids: filterStrList(parseStrToArr(confirmValue)),
-                orgList,
-            });
-            setConfirmOrgList(confirmOrgList);
-        }
-    }, [confirmValue, defaultValueType, orgList]);
     useEffect(() => {
         if (orgTreeData) {
             // deepClone数组，变更对象指针，避免数据混乱
@@ -64,6 +53,38 @@ export default function DepartTreeSelect(props) {
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [orgTreeData, departmentScope]);
+    useEffect(() => {
+        if (defaultValueType === 'confirmDepart') {
+            setConfirmOrgIds(confirmValue);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [defaultValueType, confirmValue]);
+    useEffect(() => {
+        const getDefaultOrg = async (ids) => {
+            try {
+                setErrorInfo({ errorStatus: false, errorMessage: null });
+                if (ids && ids.length !== 0 && !isInIde()) {
+                    const { orgList } = await getDepartByIds({ ids, request });
+                    setConfirmOrgList(orgList || []);
+                }
+                else {
+                    setConfirmOrgList([]);
+                }
+            }
+            catch (e) {
+                setConfirmOrgList([]);
+                setErrorInfo({ errorStatus: true, errorMessage: e });
+            }
+        };
+        try {
+            if (!isObjectEqual(prevDefaultRef.current, confirmOrgIds)) {
+                getDefaultOrg(confirmOrgIds);
+                prevDefaultRef.current = confirmOrgIds;
+            }
+        }
+        catch (e) { }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [defaultValueType, confirmOrgIds]);
     useEffect(() => {
         var _a, _b, _c;
         setSelectedOrgList(confirmOrgList);
@@ -90,6 +111,7 @@ export default function DepartTreeSelect(props) {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [confirmOrgList]);
     const restProps = {
+        confirmOrgIds,
         confirmOrgList,
         setConfirmOrgList,
         selectedOrgList,

package/dist/web/components/form/userOrgSelect/component/depart-select/org-modal-pc.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import React, { useState, useMemo, useCallback } from 'react';
+import React, { useState, useCallback, useMemo } from 'react';
 import { Button, Modal, Bubble } from 'tea-component';
 import { ModalSearch } from '../modal-search';
 import { OrgTreeContext } from './depart-select-pc';
@@ -10,8 +10,7 @@ import debounce from '../../../../../utils/debounce';
 import '../index.css';
 export const OrgModalPC = (props) => {
     const { open, setOpen, onCancel, onConfirm, treeData, orgList, treeDataError, } = props;
-    const { multiple, selectedOrgList, setSelectedOrgList, confirmOrgList, defaultExpandedIds, } = React.useContext(OrgTreeContext) || {};
-    const selectedIds = useMemo(() => selectedOrgList.map((item) => item.id), [selectedOrgList]);
+    const { multiple, setSelectedOrgList, selectedOrgList, confirmOrgList, defaultExpandedIds, } = React.useContext(OrgTreeContext) || {};
     const [searchOrgList, setSearchOrgList] = useState([]);
     // 是否有搜索项
     const [keyWords, setKeyWords] = useState('');
@@ -20,12 +19,13 @@ export const OrgModalPC = (props) => {
         errorMessage: null,
     });
     const [loading, setLoading] = useState(false);
+    const selectedIds = useMemo(() => selectedOrgList.map((item) => item.id), [selectedOrgList]);
     //搜索值变化延迟响应，节流处理
     const onSearch = debounce((key) => {
         try {
             if (key && key.length > 0) {
                 setLoading(true);
-                const res = fetchSearchOrg({ key, orgList });
+                const res = fetchSearchOrg({ key, treeData });
                 setSearchOrgList(res);
                 setLoading(false);
             }
@@ -40,31 +40,22 @@ export const OrgModalPC = (props) => {
         }
     }, 500);
     const handleSelectedIdsChange = useCallback((ids) => {
-        // 取消选择所有
-        if (ids.length <= 0) {
-            setSelectedOrgList([]);
-        }
-        else {
-            const items = [];
+        const items = [];
+        if (ids.length > 0) {
             for (const id of ids) {
                 const item = orgList.find((i) => i.id === id);
                 if (item) {
                     items.push(item);
                 }
             }
-            if (items.length > 0) {
-                setSelectedOrgList(items);
-            }
-            else {
-                setSelectedOrgList([]);
-            }
+        }
+        if (items.length > 0) {
+            setSelectedOrgList(items);
         }
     }, [orgList, setSelectedOrgList]);
-    return (_jsxs(Modal, { visible: open, caption: "\u9009\u62E9\u90E8\u95E8", onClose: () => setOpen(false), className: "weda-ui weda-ui-user-select-modal", children: [_jsxs(Modal.Body, { children: [_jsxs("div", { className: "weda-ui-user-select-container", children: [_jsx(ModalSearch, { searchList: searchOrgList, errInfo: errInfo, loading: loading, keyWords: keyWords, selectedList: selectedOrgList, multiple: multiple, setSelectedList: setSelectedOrgList, setSelectedIds: handleSelectedIdsChange, selectedIds: selectedIds, onSearch: (key) => onSearch(key), onReset: () => setSearchOrgList([]), isUser: false }), keyWords.length === 0 && (_jsx(_Fragment, { children: _jsx("div", { className: "weda-ui-user-select-container-list", children: _jsx("div", { className: "weda-ui-user-select-container-list__start", children: _jsx(OrgTree, { selectedOrgId: selectedIds, mutiple: multiple, 
+    return (_jsxs(Modal, { disableEscape: true, maskClosable: false, visible: open, caption: "\u9009\u62E9\u90E8\u95E8", onClose: () => setOpen(false), className: "weda-ui weda-ui-user-select-modal", children: [_jsxs(Modal.Body, { children: [_jsxs("div", { className: "weda-ui-user-select-container", children: [_jsx(ModalSearch, { searchList: searchOrgList, errInfo: errInfo, loading: loading, keyWords: keyWords, selectedList: selectedOrgList, multiple: multiple, setSelectedList: setSelectedOrgList, setSelectedIds: handleSelectedIdsChange, selectedIds: selectedIds, onSearch: (key) => onSearch(key), onReset: () => setSearchOrgList([]), isUser: false }), keyWords.length === 0 && (_jsx(_Fragment, { children: _jsx("div", { className: "weda-ui-user-select-container-list", children: _jsx("div", { className: "weda-ui-user-select-container-list__start", children: _jsx(OrgTree, { selectedOrgId: selectedIds, mutiple: multiple, 
                                             //setSelectedOrgId={setSelectedOrgId}
-                                            isUser: false, treeData: treeData, treeDataError: treeDataError, selectable: true, defaultExpandedIds: defaultExpandedIds, onActive: (ids) => {
-                                                handleSelectedIdsChange(ids);
-                                            } }) }) }) }))] }), _jsx(SelectedList, { selectedList: selectedOrgList, isUser: false, onClose: (item) => {
+                                            isUser: false, treeData: treeData, treeDataError: treeDataError, selectable: true, defaultExpandedIds: defaultExpandedIds, onActive: (ids) => handleSelectedIdsChange(ids) }) }) }) }))] }), _jsx(SelectedList, { selectedList: selectedOrgList, isUser: false, onClose: (item) => {
                             setSelectedOrgList(selectedOrgList.filter((data) => data.id !== (item === null || item === void 0 ? void 0 : item.id)));
                         } })] }), _jsxs(Modal.Footer, { children: [_jsx(Button, { type: "weak", onClick: onCancel, children: "\u53D6\u6D88" }), _jsx(Bubble, { content: selectedOrgList.length === 0 && confirmOrgList.length === 0
                             ? '请选择部门'