@cloudbase/weda-ui 3.4.11 → 3.4.12

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

@@ -1,6 +1,7 @@
 import { callWedaApi } from '../../../../utils/tcb';
 import destr from 'destr';
 import { node } from 'prop-types';
+import { textToString } from '../../../../utils/platform';
 // 处理用户数据格式
 export const dealUserData = (data = []) => {
     return data.map((user) => {
@@ -12,6 +13,7 @@ export const dealUserData = (data = []) => {
         const mainDep = (user === null || user === void 0 ? void 0 : user.MainOrg) ? [].concat(user === null || user === void 0 ? void 0 : user.MainOrg) : (user === null || user === void 0 ? void 0 : user.Orgs) || [];
         return {
             id: user === null || user === void 0 ? void 0 : user.UserId,
+            name: user === null || user === void 0 ? void 0 : user.Name,
             userName: name,
             content: name,
             userId: user === null || user === void 0 ? void 0 : user.UserId,
@@ -192,14 +194,8 @@ export const displayUserInfo = (item, secondDisplay) => {
             return list[0].label;
         }
     }
-    let value;
-    if (item === null || item === void 0 ? void 0 : item[secondDisplay]) {
-        value = item === null || item === void 0 ? void 0 : item[secondDisplay];
-    }
-    else if ((_b = item === null || item === void 0 ? void 0 : item.userExtend) === null || _b === void 0 ? void 0 : _b[secondDisplay]) {
-        value = (_c = item === null || item === void 0 ? void 0 : item.userExtend) === null || _c === void 0 ? void 0 : _c[secondDisplay];
-    }
-    return value;
+    const value = (_b = item === null || item === void 0 ? void 0 : item[secondDisplay]) !== null && _b !== void 0 ? _b : (_c = item === null || item === void 0 ? void 0 : item.userExtend) === null || _c === void 0 ? void 0 : _c[secondDisplay];
+    return textToString(value);
 };
 /**
  * 前端实现部门模糊搜索
@@ -306,3 +302,23 @@ export const formatTree = (nodes) => {
     }
     return [];
 };
+/**
+ * 根据code再树结构中查找节点
+ * @param treeData
+ * @param code
+ * @returns
+ */
+export const getNodeFromTreeByCode = (treeData, code) => {
+    for (const node of treeData) {
+        if (node.code === code) {
+            return node;
+        }
+        if (node.children) {
+            const result = getNodeFromTreeByCode(node.children, code);
+            if (result) {
+                return result;
+            }
+        }
+    }
+    return null;
+};

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

@@ -3,14 +3,12 @@ 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';
 import { InputTags } from '../../component/input-tags';
-import { filterStrList } from '../../../../../utils/platform';
 export const OrgTreeContext = React.createContext(null);
-export function DepartTreeSelectPC({ id, className, style, label = '部门选择', labelVisible = true, placeholder = '请选择部门', disabled = false, layout = 'horizontal', requiredFlag = false, size = 'l', multiple = false, decorator, request = defaultRequest, confirmOrgList, confirmOrgIds, setConfirmOrgList, selectedOrgIds, setSelectedOrgIds, selectedOrgList, setSelectedOrgList, errorInfo, setErrorInfo, treeData, orgList, error, defaultExpandedIds, }) {
+export function DepartTreeSelectPC({ id, className, style, label = '部门选择', labelVisible = true, placeholder = '请选择部门', disabled = false, layout = 'horizontal', requiredFlag = false, size = 'l', multiple = false, decorator, request = defaultRequest, confirmOrgList, setConfirmOrgList, selectedOrgList, setSelectedOrgList, errorInfo, setErrorInfo, treeData, orgList, error, defaultExpandedIds, }) {
     const [open, setOpen] = useState(false);
     // 外层组件类
     const cls = classNames({
@@ -25,21 +23,18 @@ export function DepartTreeSelectPC({ id, className, style, label = '部门选择
     };
     //取消 关闭弹窗
     const onCancel = () => {
-        setSelectedOrgList([]);
+        setSelectedOrgList(confirmOrgList);
         setOpen(false);
     };
     return renderDecorator(_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsx(OrgTreeContext.Provider, { value: {
-                selectedOrgList,
                 multiple,
                 setSelectedOrgList,
+                selectedOrgList,
                 confirmOrgList,
-                selectedOrgIds,
-                setSelectedOrgIds,
                 defaultExpandedIds,
                 request,
             }, children: _jsx(Dropdown, { className: classNames(`weda-ui-org-selected`, `size-${size}`), open: open, onOpenChange: (open) => {
                     setOpen(open);
-                    setSelectedOrgIds(filterStrList(confirmOrgIds));
                     setErrorInfo({ errorStatus: false, errorMessage: null });
                 }, appearance: 'button', button: _jsx(InputTags, { tagsList: confirmOrgList, placeholder: placeholder, multiple: multiple, errInfo: errorInfo, disabled: disabled, onClose: (e, item) => {
                         setConfirmOrgList(confirmOrgList.filter((l) => (l === null || l === void 0 ? void 0 : l.id) !== (item === null || item === void 0 ? void 0 : item.id)));

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

@@ -22,8 +22,6 @@ export default function DepartTreeSelect(props) {
     const prevDefaultRef = React.useRef(null);
     // 最终选定部门id
     const [confirmOrgIds, setConfirmOrgIds] = useSyncValue(defaultValue, isObjectEqual);
-    //弹窗中被选中部门id集合
-    const [selectedOrgIds, setSelectedOrgIds] = useState([]);
     // 最终选定部门集合
     const [confirmOrgList, setConfirmOrgList] = useState([]);
     //弹窗中被选中部门集合
@@ -61,23 +59,23 @@ export default function DepartTreeSelect(props) {
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [defaultValueType, confirmValue]);
-    const getDefaultOrg = async (ids) => {
-        try {
-            setErrorInfo({ errorStatus: false, errorMessage: null });
-            if (ids && ids.length !== 0 && !isInIde()) {
-                const { orgList } = await getDepartByIds({ ids, request });
-                setConfirmOrgList(orgList || []);
+    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([]);
+                }
             }
-            else {
+            catch (e) {
                 setConfirmOrgList([]);
+                setErrorInfo({ errorStatus: true, errorMessage: e });
             }
-        }
-        catch (e) {
-            setConfirmOrgList([]);
-            setErrorInfo({ errorStatus: true, errorMessage: e });
-        }
-    };
-    useEffect(() => {
+        };
         try {
             if (!isObjectEqual(prevDefaultRef.current, confirmOrgIds)) {
                 getDefaultOrg(confirmOrgIds);
@@ -116,8 +114,6 @@ export default function DepartTreeSelect(props) {
         confirmOrgIds,
         confirmOrgList,
         setConfirmOrgList,
-        selectedOrgIds,
-        setSelectedOrgIds,
         selectedOrgList,
         setSelectedOrgList,
         errorInfo,

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, useEffect } 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,7 +10,7 @@ import debounce from '../../../../../utils/debounce';
 import '../index.css';
 export const OrgModalPC = (props) => {
     const { open, setOpen, onCancel, onConfirm, treeData, orgList, treeDataError, } = props;
-    const { selectedOrgList, multiple, setSelectedOrgList, confirmOrgList, selectedOrgIds, setSelectedOrgIds, defaultExpandedIds, } = React.useContext(OrgTreeContext) || {};
+    const { multiple, setSelectedOrgList, selectedOrgList, confirmOrgList, defaultExpandedIds, } = React.useContext(OrgTreeContext) || {};
     const [searchOrgList, setSearchOrgList] = useState([]);
     // 是否有搜索项
     const [keyWords, setKeyWords] = useState('');
@@ -19,13 +19,7 @@ export const OrgModalPC = (props) => {
         errorMessage: null,
     });
     const [loading, setLoading] = useState(false);
-    useEffect(() => {
-        let selectOrgList = [];
-        []
-            .concat(selectedOrgIds)
-            .map((e) => (selectOrgList = selectOrgList.concat(orgList.filter((item) => (item === null || item === void 0 ? void 0 : item.id) === e))));
-        setSelectedOrgList(selectOrgList);
-    }, [selectedOrgIds]);
+    const selectedIds = useMemo(() => selectedOrgList.map((item) => item.id), [selectedOrgList]);
     //搜索值变化延迟响应，节流处理
     const onSearch = debounce((key) => {
         try {
@@ -45,12 +39,24 @@ export const OrgModalPC = (props) => {
             setErrInfo({ errorStatus: true, errorMessage: e });
         }
     }, 500);
-    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: setSelectedOrgIds, selectedIds: selectedOrgIds, 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: selectedOrgIds, mutiple: multiple, 
+    const handleSelectedIdsChange = useCallback((ids) => {
+        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);
+        }
+    }, [orgList, setSelectedOrgList]);
+    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) => {
-                                                setSelectedOrgIds(ids);
-                                            } }) }) }) }))] }), _jsx(SelectedList, { selectedList: selectedOrgList, isUser: false, onClose: (item) => {
-                            setSelectedOrgIds(selectedOrgIds.filter((e) => e !== (item === null || item === void 0 ? void 0 : item.id)));
+                                            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
                             ? '请选择部门'
                             : null, children: _jsx(Button, { type: "primary", onClick: onConfirm, disabled: selectedOrgList.length === 0 && confirmOrgList.length === 0, children: "\u786E\u5B9A" }) })] })] }));

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

@@ -197,7 +197,7 @@ export const ModalSelectH5 = (props) => {
         document.getElementById('wd-search-input').blur();
         e.stopPropagation();
     };
-    return (_jsxs(Modal, { visible: open, onClose: () => {
+    return (_jsxs(Modal, { disableEscape: true, maskClosable: false, visible: open, onClose: () => {
             onrest();
             onClose();
         }, destroyOnClose: true, className: `weda-ui weda-select-user-dept__dialog`, children: [_jsxs(Modal.Body, { className: ((_a = selectedUserList[0]) === null || _a === void 0 ? void 0 : _a.userId) ? 'is-selected-value' : '', children: [_jsx("div", { className: "weda-select-user-dept__dialog-header", children: '选择成员' }), _jsx(ModalSearchH5, { value: keyWords, onChange: (key) => {

package/dist/web/components/form/userOrgSelect/component/org-tree.js

@@ -1,6 +1,6 @@
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { Tree } from 'tea-component';
-import { LoadingStatus, ErrorStatus } from './error-tips';
+import { LoadingStatus, ErrorStatus, NullStatus } from './error-tips';
 import './index.css';
 export const OrgTree = (props) => {
     const { selectedOrgId = [], treeData, treeDataError, onActive, 
@@ -28,12 +28,24 @@ export const OrgTree = (props) => {
                 }
             }
         }
-        //}
     };
-    return (_jsx(_Fragment, { children: treeDataError ? (_jsx(ErrorStatus, { description: treeDataError || null })) : (_jsx(_Fragment, { children: treeData && treeData.length > 0 && !treeDataError ? (_jsx(Tree, { className: "depart-tree", data: treeData, fullActivable: true, activable: true, selectable: selectable, selectedIds: selectedOrgId, activeIds: selectedOrgId, defaultExpandedIds: defaultExpandedIds, selectStrictly: true, onActive: (ids, context) => {
-                    var _a;
-                    onChange(ids, context === null || context === void 0 ? void 0 : context.active, context === null || context === void 0 ? void 0 : context.nodeId, (_a = context === null || context === void 0 ? void 0 : context.data) === null || _a === void 0 ? void 0 : _a.selectable);
-                }, onSelect: (ids, context) => {
-                    onChange(ids, context === null || context === void 0 ? void 0 : context.selected, context === null || context === void 0 ? void 0 : context.nodeId, true);
-                } })) : (_jsx(LoadingStatus, {})) })) }));
+    if (treeDataError) {
+        return _jsx(ErrorStatus, { description: treeDataError || null });
+    }
+    if (!treeData) {
+        return _jsx(LoadingStatus, {});
+    }
+    if (treeData.length > 0) {
+        return (_jsx(Tree, { className: "depart-tree", data: treeData, fullActivable: true, activable: true, selectable: selectable, selectedIds: selectedOrgId, activeIds: selectedOrgId, defaultExpandedIds: defaultExpandedIds, selectStrictly: true, onActive: (ids, context) => {
+                var _a;
+                onChange(ids, context === null || context === void 0 ? void 0 : context.active, context === null || context === void 0 ? void 0 : context.nodeId, (_a = context === null || context === void 0 ? void 0 : context.data) === null || _a === void 0 ? void 0 : _a.selectable);
+            }, onSelect: (ids, context) => {
+                onChange(ids, context === null || context === void 0 ? void 0 : context.selected, context === null || context === void 0 ? void 0 : context.nodeId, true);
+            }, 
+            // 开启虚拟滚动，优化大数据量性能！！
+            height: 320 }));
+    }
+    else {
+        return _jsx(NullStatus, { description: "\u6682\u65E0\u6570\u636E", size: 's' });
+    }
 };

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

@@ -11,8 +11,17 @@ import { emptyArray, emptyObject } from '../../../../../utils/constant';
 import { useViewData } from '../../hooks/use-views-data';
 import { useDepartData } from '../../hooks/use-depart-data';
 import { parseStrToArr } from '../../common/utils';
+import { useDeepCompareEffect } from '@react-hookz/web';
 export default function UserTreeSelect(props) {
-    const { events = emptyObject, defaultValue = emptyArray, confirmValue = '', defaultValueType = 'noneUser', onChange = null, multiple = false, request = defaultRequest, where, confirmAction, closeAction, } = props;
+    const { events = emptyObject, defaultValue = emptyArray, confirmValue = '', defaultValueType = 'noneUser', onChange = null, multiple = false, request = defaultRequest, where, confirmAction, closeAction, secondDisplay, // 辅助信息
+    corpScope, // 展示企业范围
+    /**
+     * 以下两个属性  不用在组件库，企业工作台使用该组件时支持外部定义样式
+     * naked: 单纯使用该组件，而不在FormCell中使用（该组件实现默认在在）
+     * containerClass: string
+     * triggerElement: React.ReactNode
+     */
+    naked = false, containerClass = '', triggerElement = null, } = props;
     const platform = usePlatform();
     const [errInfo, setErrInfo] = useState({
         errorStatus: false,
@@ -22,6 +31,8 @@ export default function UserTreeSelect(props) {
     const [selectUserIds, setSelectUserIds] = useSyncValue(defaultValue, isObjectEqual);
     // 两次默认值不同, 需要刷新
     const prevDefaultRef = React.useRef(null);
+    // 当前选中的部门id
+    const [selectedOrgId, setSelectedOrgId] = useState(null);
     //弹窗中被选中用户集合
     const [selectedUserList, setSelectedUserList] = useState([]);
     //弹窗中被选中用户id集合
@@ -33,7 +44,25 @@ export default function UserTreeSelect(props) {
     //组织下展示用户页大小
     const pageSize = 200;
     const { filterParams } = useViewData(where);
-    const { treeData, error } = useDepartData({ request });
+    const [corpScopes, setCorpScopes] = useState([]);
+    useEffect(() => {
+        if (!corpScope) {
+            return;
+        }
+        const corpScopes = filterStrList(parseStrToArr(corpScope));
+        setCorpScopes(corpScopes);
+    }, [corpScope]);
+    const { treeData, error } = useDepartData({
+        request,
+        params: { corpScopes },
+    });
+    // 默认选中第一个部门
+    useEffect(() => {
+        var _a;
+        if (!selectedOrgId && treeData && treeData.length > 0) {
+            setSelectedOrgId((_a = treeData[0]) === null || _a === void 0 ? void 0 : _a.id);
+        }
+    }, [selectedOrgId, treeData]);
     useEffect(() => {
         // 仅执行一次
         if (defaultValueType === 'loginUser') {
@@ -86,13 +115,12 @@ export default function UserTreeSelect(props) {
         catch (e) { }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [defaultValueType, selectUserIds]);
-    useEffect(() => {
+    useDeepCompareEffect(() => {
         var _a;
         setSelectedUserList(confirmUserList);
         onChange === null || onChange === void 0 ? void 0 : onChange(setOnChangeValue(multiple, confirmUserList));
         (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, setOnChangeValue(multiple, confirmUserList, true));
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [confirmUserList]);
+    }, [confirmUserList === null || confirmUserList === void 0 ? void 0 : confirmUserList.map((user) => filterUserInfo(user))]);
     /** 点击确认时获取所选用户，调用confirmAction，将所选用户向外传出 */
     const onConfirmSelectUser = (selectedUserList) => {
         const selectedUser = setOnChangeValue(multiple, selectedUserList, true);
@@ -115,6 +143,8 @@ export default function UserTreeSelect(props) {
         errInfo,
         open,
         setOpen,
+        selectedOrgId,
+        setSelectedOrgId,
         selectedUserList,
         setSelectedUserList,
         confirmUserList,
@@ -131,14 +161,21 @@ export default function UserTreeSelect(props) {
         treeData,
         error,
         onConfirmSelectUser,
+        secondDisplay,
+    };
+    // 企业工作台使用该组件时，支持自定义样式
+    const extraProps = {
+        naked,
+        containerClass,
+        triggerElement,
     };
     if ((props === null || props === void 0 ? void 0 : props.showType) === 'pc') {
-        return _jsx(UserSelectPC, { ...restProps, ...props });
+        return _jsx(UserSelectPC, { ...props, ...restProps, ...extraProps });
     }
     if ((props === null || props === void 0 ? void 0 : props.showType) === 'h5') {
-        return _jsx(UserSelectH5, { ...restProps, ...props });
+        return _jsx(UserSelectH5, { ...props, ...restProps, ...extraProps });
     }
-    return platform === 'h5' ? (_jsx(UserSelectH5, { ...restProps, ...props })) : (_jsx(UserSelectPC, { ...restProps, ...props }));
+    return platform === 'h5' ? (_jsx(UserSelectH5, { ...props, ...restProps, ...extraProps })) : (_jsx(UserSelectPC, { ...props, ...restProps, ...extraProps }));
 }
 /**
  * 设置onChange值
@@ -156,11 +193,11 @@ function setOnChangeValue(multiple, confirmUserList, isEventChange = false) {
                         return e === null || e === void 0 ? void 0 : e.id;
                     })
                     : null,
-                data: confirmUserList,
+                data: confirmUserList.map((user) => filterUserInfo(user)),
             }
             : {
                 value: ((_a = confirmUserList[0]) === null || _a === void 0 ? void 0 : _a.id) || null,
-                data: confirmUserList[0] || null,
+                data: confirmUserList[0] ? filterUserInfo(confirmUserList[0]) : null,
             };
     }
     return multiple
@@ -171,3 +208,13 @@ function setOnChangeValue(multiple, confirmUserList, isEventChange = false) {
             : null
         : (_b = confirmUserList[0]) === null || _b === void 0 ? void 0 : _b.id;
 }
+function filterUserInfo(userInfo) {
+    return pick(userInfo || {}, ['id', 'userName', 'userId', 'type']);
+}
+function pick(obj = {}, keys) {
+    const ret = {};
+    for (const key of keys) {
+        ret[key] = obj[key];
+    }
+    return ret;
+}

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

@@ -10,9 +10,7 @@ import { fetchSearchUser } from '../../common/fetch-data-service';
 import debounce from '../../../../../utils/debounce';
 import '../index.css';
 export const UserModel = ({ open, onCancel, onConfirm, treeData, treeDataError, filterParams, secondDisplay, }) => {
-    var _a;
-    const { selectedUserList, setSelectedUserIds, request, selectedUserIds, setSelectedUserList, multiple, setPageNo, confirmUserList, } = React.useContext(UserOrgContext) || {};
-    const [selectedOrgId, setSelectedOrgId] = useState(null);
+    const { selectedOrgId, setSelectedOrgId, selectedUserList, setSelectedUserIds, request, selectedUserIds, setSelectedUserList, multiple, setPageNo, confirmUserList, } = React.useContext(UserOrgContext) || {};
     //当前页人员列表
     const [curPageUserList, setCurPageUserList] = useState(null);
     const [searchUserList, setSearchUserList] = useState([]);
@@ -23,9 +21,6 @@ export const UserModel = ({ open, onCancel, onConfirm, treeData, treeDataError,
         errorMessage: null,
     });
     const [loading, setLoading] = useState(false);
-    treeData.length > 0 && !selectedOrgId
-        ? setSelectedOrgId((_a = treeData[0]) === null || _a === void 0 ? void 0 : _a.id)
-        : [];
     useEffect(() => {
         setSelectedUserIds((selectedUserList || []).map((e) => e === null || e === void 0 ? void 0 : e.id));
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -50,7 +45,7 @@ export const UserModel = ({ open, onCancel, onConfirm, treeData, treeDataError,
             setErrInfo({ errorStatus: true, errorMessage: e });
         }
     }, 500);
-    return (_jsxs(Modal, { visible: open, caption: "\u9009\u62E9\u6210\u5458", onClose: () => onCancel(null), 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: searchUserList, errInfo: errInfo, loading: loading, keyWords: keyWords, selectedList: selectedUserList, multiple: multiple, setSelectedList: setSelectedUserList, selectedIds: selectedUserIds, filterParams: filterParams, onSearch: (key) => onSearch(key), onReset: () => setSearchUserList([]) }), keyWords.length === 0 && (_jsx(_Fragment, { children: _jsxs("div", { className: "weda-ui-user-select-container-list", children: [_jsx("div", { className: "weda-ui-user-select-container-list__start", children: _jsx(OrgTree, { selectedOrgId: [selectedOrgId], treeData: treeData, treeDataError: treeDataError, onActive: (ids) => {
+    return (_jsxs(Modal, { disableEscape: true, maskClosable: false, visible: open, caption: "\u9009\u62E9\u6210\u5458", onClose: () => onCancel(null), 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: searchUserList, errInfo: errInfo, loading: loading, keyWords: keyWords, selectedList: selectedUserList, multiple: multiple, setSelectedList: setSelectedUserList, selectedIds: selectedUserIds, filterParams: filterParams, onSearch: (key) => onSearch(key), onReset: () => setSearchUserList([]) }), keyWords.length === 0 && (_jsx(_Fragment, { children: _jsxs("div", { className: "weda-ui-user-select-container-list", children: [_jsx("div", { className: "weda-ui-user-select-container-list__start", children: _jsx(OrgTree, { selectedOrgId: [selectedOrgId], treeData: treeData, treeDataError: treeDataError, onActive: (ids) => {
                                                     setSelectedOrgId(ids[0]);
                                                     setPageNo(1);
                                                 } }) }), _jsx("div", { className: "weda-ui-user-select-container-list__end", children: _jsx(ModelUserList, { selectedOrgId: selectedOrgId, curPageUserList: curPageUserList, setCurPageUserList: setCurPageUserList, filterParams: filterParams, secondDisplay: secondDisplay }) })] }) }))] }), _jsx(SelectedList, { selectedList: selectedUserList, secondDisplay: secondDisplay, onClose: (item) => {

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

@@ -11,7 +11,7 @@ export const UserOrgContext = React.createContext(null);
 export function UserSelectPC({ id, className, style, label = '人员选择', labelVisible = true, //标题显隐
 placeholder = '请选择人员', disabled = false, layout = 'horizontal', requiredFlag = false, size = 'l', multiple = false, //多选
 outerRef, request = defaultRequest, //接口请求
-decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, selectedUserIds, setSelectedUserIds, pageNo, setPageNo, pageSize, filterParams, treeData, error, onConfirmSelectUser, secondDisplay, }) {
+decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelectedOrgId, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, selectedUserIds, setSelectedUserIds, pageNo, setPageNo, pageSize, filterParams, treeData, error, onConfirmSelectUser, secondDisplay, naked, containerClass, triggerElement, }) {
     // 外层组件类
     const cls = classNames({
         'weda-ui': true,
@@ -32,6 +32,8 @@ decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedUserList, setSel
         };
     }, [setOpen]);
     return renderDecorator(_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsx(UserOrgContext.Provider, { value: {
+                selectedOrgId,
+                setSelectedOrgId,
                 selectedUserList,
                 multiple,
                 setSelectedUserList,
@@ -42,16 +44,16 @@ decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedUserList, setSel
                 pageNo,
                 setPageNo,
                 pageSize,
-            }, children: _jsx(Dropdown, { "data-testid": "userSelectDropdown", className: classNames(selectInputCls, `size-${size}`), disabled: disabled, open: open, onOpenChange: (open) => {
+            }, children: _jsx(Dropdown, { "data-testid": "userSelectDropdown", className: classNames(selectInputCls, `size-${size}`, containerClass), disabled: disabled, open: open, onOpenChange: (open) => {
                     if (open)
                         setSelectedUserList(confirmUserList);
                     setOpen(open);
-                }, appearance: 'button', button: _jsx(InputTags, { tagsList: confirmUserList, placeholder: placeholder, multiple: multiple, errInfo: errInfo, disabled: disabled, onClose: (e, item) => {
+                }, appearance: 'button', button: triggerElement || (_jsx(InputTags, { tagsList: confirmUserList, placeholder: placeholder, multiple: multiple, errInfo: errInfo, disabled: disabled, onClose: (e, item) => {
                         const currentConfirmUserList = confirmUserList.filter((l) => (l === null || l === void 0 ? void 0 : l.id) !== (item === null || item === void 0 ? void 0 : item.id));
                         setConfirmUserList(currentConfirmUserList);
                         onConfirmSelectUser(currentConfirmUserList);
                         e.stopPropagation();
-                    } }), overlayClassName: 'weda-ui-user-selected-overlay-hidden', style: { width: '100%' }, children: _jsx(UserModel, { open: open, setOpen: setOpen, onConfirm: onConfirm, onCancel: onCancel, treeData: treeData || [], treeDataError: error, filterParams: filterParams, secondDisplay: secondDisplay }) }) }) }))({
+                    } })), overlayClassName: 'weda-ui-user-selected-overlay-hidden', style: { width: '100%' }, children: _jsx(UserModel, { open: open, setOpen: setOpen, onConfirm: onConfirm, onCancel: onCancel, treeData: treeData || [], treeDataError: error, filterParams: filterParams, secondDisplay: secondDisplay }) }) }) }), naked ? null : undefined)({
         id,
         className: cls,
         style,

package/dist/web/components/form/userOrgSelect/component/userOrgSelect.css

@@ -986,10 +986,13 @@
 
 .weda-select-user-dept .weda-select-user-dept__result-list,
 .weda-select-user-dept__dialog .weda-select-user-dept__result-list {
-  flex: 1 1 0px;
+  /* flex: 1 1 0px;
   display: flex;
   align-items: center;
-  overflow: hidden;
+  overflow: hidden; */
+  overflow-x: scroll;
+  width: 100%;
+  white-space: nowrap;
 }
 
 .weda-select-user-dept .weda-select-user-dept__result-list .wedatea2td-tag,
@@ -1042,6 +1045,9 @@
   font-size: 12px;
   line-height: 20px;
   color: rgba(0, 0, 0, 0.9);
+  position: relative;
+  display: inline-block;
+  margin-left: 6px;
 }
 
 .weda-select-user-dept__dialog

package/dist/web/components/form/userOrgSelect/departTreeSelect/departTreeSelect.h5.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 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 '../component/modal-search-h5';
 import { LoadingStatus, ErrorStatus } from '../component/error-tips';
@@ -23,24 +23,12 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
     });
     const [visible, setVisible] = React.useState(false);
     const [isSearch, setIsSearch] = useState(false);
-    // const [showTreeData, setShowTreeData] = useState([]);
     const [showTreeData, setShowTreeData] = useState([]);
-    const [originalOrgData, setOriginalOrgData] = useState([]);
-    const [count, setCount] = useState(1); //计数弹窗显示层级
+    // currentItem：到达当前页面是从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 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]);
     const handleFocus = (value) => {
         setIsSearch(value);
     };
@@ -48,8 +36,7 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
         setErrorInfo({ errorStatus: false, errorMessage: null });
         handleFocus(false);
         setSearchValue('');
-        setShowTreeData(treeNode);
-        // initOrgsData();
+        setShowTreeData(treeData);
     };
     const onSearch = debounce((key) => {
         try {
@@ -59,7 +46,7 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
                 setShowTreeData(res);
             }
             else {
-                setShowTreeData(treeNode);
+                setShowTreeData(treeData);
             }
         }
         catch (e) {
@@ -69,58 +56,45 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
     const onFocus = function () {
         setSearchValue('');
         setVisible(true);
-        setShowTreeData(treeNode);
+        setShowTreeData(treeData);
     };
     const onClose = () => {
         setErrorInfo({ errorStatus: false, errorMessage: null });
         setVisible(false);
-        setShowTreeData(treeNode);
-        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 || targetItem.parentcode === '!!ROOT') {
+            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: () => {