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

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

@@ -1,15 +1,16 @@
+import { jsx as _jsx } from "react/jsx-runtime";
 import React, { useState, useEffect } from 'react';
 import { UserSelectPC } from '../user-select-pc/user-select-pc';
 import { UserTreeSelectH5 as UserSelectH5 } from './user-select-h5';
 import '../userOrgSelect.css';
 import { isInIde, filterStrList, getUserInfo, usePlatform, } from '../../../../../utils/platform';
+import { parseStrToArr } from '../../common/utils';
 import { useSyncValue } from '../../../../../utils/hooks/useSyncValue';
 import isObjectEqual from '../../../../../utils/isObjectEqual';
 import { getUserListByIds, defaultRequest, } from '../../common/fetch-data-service';
 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 { useDepartDataNew } from '../../hooks/use-depart-data';
 export default function UserTreeSelect(props) {
     const { events = emptyObject, defaultValue = emptyArray, confirmValue = '', defaultValueType = 'noneUser', onChange = null, multiple = false, request = defaultRequest, where, confirmAction, closeAction, } = props;
     const platform = usePlatform();
@@ -21,6 +22,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集合
@@ -32,7 +35,18 @@ export default function UserTreeSelect(props) {
     //组织下展示用户页大小
     const pageSize = 200;
     const { filterParams } = useViewData(where);
-    const { treeData, error } = useDepartData({ request });
+    const { orgList, 
+    // orgTreeData: treeData,
+    finalOrgTreeData: treeData, error, } = useDepartDataNew({
+        request,
+    });
+    // 默认选中第一个部门
+    useEffect(() => {
+        var _a;
+        if (treeData && treeData.length > 0 && !selectedOrgId) {
+            setSelectedOrgId((_a = treeData[0]) === null || _a === void 0 ? void 0 : _a.id);
+        }
+    }, [selectedOrgId, treeData]);
     useEffect(() => {
         // 仅执行一次
         if (defaultValueType === 'loginUser') {
@@ -55,30 +69,30 @@ export default function UserTreeSelect(props) {
             setSelectUserIds(multiple ? [logginUserInfo === null || logginUserInfo === void 0 ? void 0 : logginUserInfo.userId] : logginUserInfo === null || logginUserInfo === void 0 ? void 0 : logginUserInfo.userId);
         }
     };
-    const getDefaultUser = async (defaultValue) => {
-        try {
-            setErrInfo({ errorStatus: false, errorMessage: null });
-            // 避免ide mock值请求数据异常
-            if (defaultValue && defaultValue.length !== 0 && !isInIde()) {
-                const userSelectList = await getUserListByIds({
-                    selectUserIds: filterStrList(parseStrToArr(defaultValue)) || [],
-                    IsNoRelatedOrgFlag: false,
-                    request,
-                });
-                setConfirmUserList(userSelectList);
+    useEffect(() => {
+        const getDefaultUser = async (defaultValue) => {
+            try {
+                setErrInfo({ errorStatus: false, errorMessage: null });
+                // 避免ide mock值请求数据异常
+                if (defaultValue && defaultValue.length !== 0 && !isInIde()) {
+                    const userSelectList = await getUserListByIds({
+                        selectUserIds: filterStrList(parseStrToArr(defaultValue)) || [],
+                        IsNoRelatedOrgFlag: false,
+                        request,
+                    });
+                    setConfirmUserList(userSelectList);
+                }
+                else {
+                    setConfirmUserList([]);
+                }
             }
-            else {
-                setConfirmUserList([]);
+            catch (e) {
+                setErrInfo({ errorStatus: true, errorMessage: e });
             }
-        }
-        catch (e) {
-            setErrInfo({ errorStatus: true, errorMessage: e });
-        }
-    };
-    useEffect(() => {
+        };
         try {
             if (!isObjectEqual(prevDefaultRef.current, selectUserIds)) {
-                getDefaultUser(selectUserIds);
+                // getDefaultUser(selectUserIds);
                 prevDefaultRef.current = selectUserIds;
             }
         }
@@ -114,6 +128,8 @@ export default function UserTreeSelect(props) {
         errInfo,
         open,
         setOpen,
+        selectedOrgId,
+        setSelectedOrgId,
         selectedUserList,
         setSelectedUserList,
         confirmUserList,
@@ -128,16 +144,17 @@ export default function UserTreeSelect(props) {
         platform,
         filterParams,
         treeData,
+        orgList,
         error,
         onConfirmSelectUser,
     };
     if ((props === null || props === void 0 ? void 0 : props.showType) === 'pc') {
-        return React.createElement(UserSelectPC, { ...restProps, ...props });
+        return _jsx(UserSelectPC, { ...restProps, ...props });
     }
     if ((props === null || props === void 0 ? void 0 : props.showType) === 'h5') {
-        return React.createElement(UserSelectH5, { ...restProps, ...props });
+        return _jsx(UserSelectH5, { ...restProps, ...props });
     }
-    return platform === 'h5' ? (React.createElement(UserSelectH5, { ...restProps, ...props })) : (React.createElement(UserSelectPC, { ...restProps, ...props }));
+    return platform === 'h5' ? (_jsx(UserSelectH5, { ...restProps, ...props })) : (_jsx(UserSelectPC, { ...restProps, ...props }));
 }
 /**
  * 设置onChange值

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

@@ -1,9 +1,11 @@
-import React, { useState, useEffect } from 'react';
+import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { useState, useEffect } from 'react';
 import { Radio, Checkbox, List, StatusTip } from 'tea-component';
 import { NullStatus } from '../error-tips';
 import '../userOrgSelect.css';
+import { displayUserInfo } from '../../common/utils';
 export const UserListH5 = (props) => {
-    const { multiple, selectedList, setSelectedList, userList, isEnd, isSearch = false, onScrollBottom, loading, onTouchMove, } = props;
+    const { multiple, selectedList, setSelectedList, userList, isEnd, isSearch = false, onScrollBottom, loading, onTouchMove, secondDisplay, } = props;
     const [checkAll, setCheckAll] = useState(1); //1:未选中；2:半选；3:选中
     const [count, setCount] = useState(0);
     // 用户列表当前页全选逻辑
@@ -56,52 +58,36 @@ export const UserListH5 = (props) => {
             setCount(count);
         }
     }, [selectedList, multiple, userList]);
-    return (React.createElement(React.Fragment, null,
-        multiple && (React.createElement("div", { className: "weda-select-user-dept__dialog-list-multiple-all" },
-            React.createElement("div", { className: "weda-select-user-dept__list-multiple-all", onTouchMove: (e) => onTouchMove(e) },
-                React.createElement("div", { className: "weda-select-user-dept__list-item-wrap" },
-                    React.createElement("div", { className: "weda-select-user-dept__group" },
-                        React.createElement(Checkbox, { value: checkAll === 3 ? true : false, indeterminate: checkAll === 2, onChange: (value) => {
-                                onChange(value);
-                            } },
-                            "\u6279\u91CF\u9009\u62E9(",
-                            count,
-                            "/",
-                            userList.length,
-                            ")")))))),
-        React.createElement(List, { className: "weda-select-user-dept__dialog-list", onScrollBottom: onScrollBottom }, userList && userList.length > 0 ? (React.createElement(React.Fragment, null,
-            (userList || []).map((item, index) => {
-                var _a, _b;
-                return (React.createElement("div", { className: "weda-select-user-dept__list-item", key: index + (item === null || item === void 0 ? void 0 : item.id), onTouchMove: (e) => onTouchMove(e) },
-                    React.createElement("div", { className: "weda-select-user-dept__list-item-wrap" },
-                        React.createElement("div", { className: "weda-select-user-dept__group" },
-                            multiple ? (React.createElement("div", null,
-                                React.createElement(Checkbox.Group, { value: selectedList.map((e) => e === null || e === void 0 ? void 0 : e.id), layout: "column" },
-                                    React.createElement(Checkbox, { name: item === null || item === void 0 ? void 0 : item.userId, onChange: (value) => {
-                                            if (value) {
-                                                setSelectedList((selectedList || []).concat([item]));
-                                            }
-                                            else {
-                                                setSelectedList(selectedList.filter((e) => e.id !== (item === null || item === void 0 ? void 0 : item.id)));
-                                            }
-                                        } },
-                                        React.createElement("div", { className: "wedatea2td-form-check-select__user_h5" },
-                                            React.createElement("div", { className: "item-radio-name" }, item === null || item === void 0 ? void 0 : item.content)))))) : (React.createElement(Radio.Group, { value: (_a = selectedList.filter((e) => (e === null || e === void 0 ? void 0 : e.userId) === (item === null || item === void 0 ? void 0 : item.userId))[0]) === null || _a === void 0 ? void 0 : _a.userId, onChange: (value) => {
-                                    const ids = selectedList.map((item) => item === null || item === void 0 ? void 0 : item.userId);
-                                    // 多选情况，取消选中某元素时
-                                    if (ids.indexOf(value) !== -1) {
-                                        setSelectedList(selectedList.filter((e) => e.userId !== value));
-                                    }
-                                    else {
-                                        setSelectedList([item]);
-                                    }
-                                }, layout: "column" },
-                                React.createElement(Radio, { name: item === null || item === void 0 ? void 0 : item.userId },
-                                    React.createElement("div", { className: "wedatea2td-form-check-select__user_h5" },
-                                        React.createElement("div", { className: "item-radio-name" }, item === null || item === void 0 ? void 0 : item.content))))),
-                            isSearch && (item === null || item === void 0 ? void 0 : item.mainOrg) && (item === null || item === void 0 ? void 0 : item.mainOrg.length) > 0 && (React.createElement("div", { className: "item-org-h5" }, (_b = item === null || item === void 0 ? void 0 : item.mainOrg[0]) === null || _b === void 0 ? void 0 : _b.OrgName))))));
-            }),
-            isEnd && (React.createElement("div", { className: "weda-select-user-dept__load-completed" }, "\u5DF2\u7ECF\u5230\u5E95\u4E86")),
-            (loading === null || loading === void 0 ? void 0 : loading.status) && (React.createElement("div", { className: "weda-select-user-dept__load-completed" },
-                React.createElement(StatusTip, { status: 'loading' }))))) : (React.createElement(NullStatus, { description: '无可选成员', size: 's' })))));
+    return (_jsxs(_Fragment, { children: [multiple && (_jsx("div", { className: "weda-select-user-dept__dialog-list-multiple-all", children: _jsx("div", { className: "weda-select-user-dept__list-multiple-all", onTouchMove: (e) => onTouchMove(e), children: _jsx("div", { className: "weda-select-user-dept__list-item-wrap", children: _jsx("div", { className: "weda-select-user-dept__group", children: _jsxs(Checkbox, { value: checkAll === 3 ? true : false, indeterminate: checkAll === 2, onChange: (value) => {
+                                    onChange(value);
+                                }, children: ["\u6279\u91CF\u9009\u62E9(", count, "/", userList.length, ")"] }) }) }) }) })), _jsx(List, { className: "weda-select-user-dept__dialog-list", onScrollBottom: onScrollBottom, children: userList && userList.length > 0 ? (_jsxs(_Fragment, { children: [(userList || []).map((item, index) => {
+                            var _a, _b;
+                            return (_jsx("div", { className: "weda-select-user-dept__list-item", onTouchMove: (e) => onTouchMove(e), children: _jsx("div", { className: "weda-select-user-dept__list-item-wrap", children: _jsxs("div", { className: "weda-select-user-dept__group", children: [multiple ? (_jsx("div", { children: _jsxs(Checkbox.Group, { value: selectedList.map((e) => e === null || e === void 0 ? void 0 : e.id), layout: "column", children: [_jsxs(Checkbox, { name: item === null || item === void 0 ? void 0 : item.userId, onChange: (value) => {
+                                                                if (value) {
+                                                                    setSelectedList((selectedList || []).concat([item]));
+                                                                }
+                                                                else {
+                                                                    setSelectedList(selectedList.filter((e) => e.id !== (item === null || item === void 0 ? void 0 : item.id)));
+                                                                }
+                                                            }, children: [_jsx("i", { className: 'weda-ui-user-select-list__user' }), _jsx("div", { className: "wedatea2td-form-check-select__user_h5", children: _jsx("div", { className: "item-radio-name", children: item === null || item === void 0 ? void 0 : item.content }) })] }), _jsx("span", { className: 'weda-ui-user-select-list__display-h5', style: {
+                                                                display: !isSearch &&
+                                                                    !!displayUserInfo(item, secondDisplay)
+                                                                    ? 'inherit'
+                                                                    : 'none',
+                                                            }, children: displayUserInfo(item, secondDisplay) })] }) })) : (_jsxs(Radio.Group, { value: (_a = selectedList.filter((e) => (e === null || e === void 0 ? void 0 : e.userId) === (item === null || item === void 0 ? void 0 : item.userId))[0]) === null || _a === void 0 ? void 0 : _a.userId, onChange: (value) => {
+                                                    const ids = selectedList.map((item) => item === null || item === void 0 ? void 0 : item.userId);
+                                                    // 多选情况，取消选中某元素时
+                                                    if (ids.indexOf(value) !== -1) {
+                                                        setSelectedList(selectedList.filter((e) => e.userId !== value));
+                                                    }
+                                                    else {
+                                                        setSelectedList([item]);
+                                                    }
+                                                }, layout: "column", children: [_jsxs(Radio, { name: item === null || item === void 0 ? void 0 : item.userId, children: [_jsx("i", { className: 'weda-ui-user-select-list__user' }), _jsx("div", { className: "wedatea2td-form-check-select__user_h5", children: _jsx("div", { className: "item-radio-name", children: item === null || item === void 0 ? void 0 : item.content }) })] }), _jsx("span", { className: 'weda-ui-user-select-list__display-h5', style: {
+                                                            display: !isSearch &&
+                                                                !!displayUserInfo(item, secondDisplay)
+                                                                ? 'inherit'
+                                                                : 'none',
+                                                        }, children: displayUserInfo(item, secondDisplay) })] })), isSearch && (item === null || item === void 0 ? void 0 : item.mainOrg) && (item === null || item === void 0 ? void 0 : item.mainOrg.length) > 0 && (_jsx("div", { className: "item-org-h5", children: (_b = item === null || item === void 0 ? void 0 : item.mainOrg[0]) === null || _b === void 0 ? void 0 : _b.OrgName }))] }) }) }, index + (item === null || item === void 0 ? void 0 : item.id)));
+                        }), isEnd && (_jsx("div", { className: "weda-select-user-dept__load-completed", children: "\u5DF2\u7ECF\u5230\u5E95\u4E86" })), (loading === null || loading === void 0 ? void 0 : loading.status) && (_jsx("div", { className: "weda-select-user-dept__load-completed", children: _jsx(StatusTip, { status: 'loading' }) }))] })) : (_jsx(NullStatus, { description: '无可选成员', size: 's' })) })] }));
 };

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

@@ -1,4 +1,5 @@
-import React, { useState, useImperativeHandle } from 'react';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useState, useImperativeHandle } from 'react';
 import { renderDecorator } from '../../../renderDecorator';
 import classNames from '../../../../../utils/classnames';
 import { defaultRequest } from '../../common/fetch-data-service';
@@ -8,7 +9,7 @@ import { InputTags } from '../input-tags';
 export function UserTreeSelectH5({ id, className, style, label = '成员选择', labelVisible = true, placeholder = '请选择成员', disabled = false, layout = 'horizontal', requiredFlag = false, decorator, multiple = false, //是否多选
 outerRef, pageNo, setPageNo, pageSize, 
 // platform,
-request = defaultRequest, onCancel, onConfirm, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, open, setOpen, filterParams, treeData, error, onConfirmSelectUser, }) {
+request = defaultRequest, onCancel, onConfirm, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, open, setOpen, filterParams, orgList, treeData, error, onConfirmSelectUser, secondDisplay, }) {
     const cls = classNames({
         'weda-ui': true,
         'weda-select-user-dept': true,
@@ -40,15 +41,12 @@ request = defaultRequest, onCancel, onConfirm, selectedUserList, setSelectedUser
         if (!disabled)
             setOpen(true);
     };
-    return renderDecorator(React.createElement(ConfigProvider, { classPrefix: "wedatea2td" },
-        React.createElement("div", { className: subCls, onClick: onFocus },
-            React.createElement(InputTags, { tagsList: confirmUserList, placeholder: placeholder, multiple: multiple, errInfo: errorInfo, disabled: disabled, platForm: 'h5', 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();
-                } })),
-        React.createElement(ModalSelectH5, { open: open, request: request, treeData: treeData, originalOrgData: originalOrgData, setOriginalOrgData: setOriginalOrgData, multiple: multiple, errorInfo: errorInfo, selectedUserList: selectedUserList, setSelectedUserList: setSelectedUserList, confirmUserList: confirmUserList, onClose: onCancel, onConfirm: onConfirm, setErrorInfo: setErrorInfo, filterParams: filterParams, pageNo: pageNo, setPageNo: setPageNo, pageSize: pageSize, treeDataError: error })))({
+    return renderDecorator(_jsxs(ConfigProvider, { classPrefix: "wedatea2td", children: [_jsx("div", { className: subCls, onClick: onFocus, children: _jsx(InputTags, { tagsList: confirmUserList, placeholder: placeholder, multiple: multiple, errInfo: errorInfo, disabled: disabled, platForm: 'h5', 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();
+                    } }) }), _jsx(ModalSelectH5, { open: open, request: request, orgList: orgList, treeData: treeData, originalOrgData: originalOrgData, setOriginalOrgData: setOriginalOrgData, multiple: multiple, errorInfo: errorInfo, selectedUserList: selectedUserList, setSelectedUserList: setSelectedUserList, confirmUserList: confirmUserList, onClose: onCancel, onConfirm: onConfirm, setErrorInfo: setErrorInfo, filterParams: filterParams, pageNo: pageNo, setPageNo: setPageNo, pageSize: pageSize, treeDataError: error, secondDisplay: secondDisplay })] }))({
         id,
         className: cls,
         style,

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

@@ -1,11 +1,11 @@
-import React from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
 import { Status } from 'tea-component';
 export const ErrorStatus = ({ description, title = '接口调用失败' }) => {
-    return (React.createElement(Status, { icon: 'blank', size: 's', title: title, description: description }));
+    return (_jsx(Status, { icon: 'blank', size: 's', title: title, description: description }));
 };
 export const NullStatus = ({ title = null, size, description = null }) => {
-    return (React.createElement(Status, { icon: 'blank', size: size, title: title, description: description }));
+    return (_jsx(Status, { icon: 'blank', size: size, title: title, description: description }));
 };
 export const LoadingStatus = () => {
-    return React.createElement(Status, { icon: 'loading', size: 's', description: '加载中' });
+    return _jsx(Status, { icon: 'loading', size: 's', description: '加载中' });
 };

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

@@ -1,11 +1,14 @@
+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 } from 'react';
 import { Checkbox, Button, Text } from 'tea-component';
-import { fetchUserList } from '../../common/fetch-data-service';
+import { CURRENT_CORP, fetchUsersByParentId, } from '../../common/fetch-data-service';
 import { UserOrgContext } from './user-select-pc';
 import { UserOrgList } from './../user-org-list';
+import { getNodeFromTree } from '../../common/utils';
 import '../index.css';
-export const ModelUserList = ({ selectedOrgId, curPageUserList, setCurPageUserList, filterParams, }) => {
-    const { selectedUserList, multiple, setSelectedUserList, request, pageNo, setPageNo, pageSize, selectedUserIds, setSelectedIds, } = React.useContext(UserOrgContext) || {};
+export const ModelUserList = ({ selectedOrgId, curPageUserList, setCurPageUserList, filterParams, secondDisplay, }) => {
+    const { selectedUserList, multiple, setSelectedUserList, request, pageNo, setPageNo, pageSize, selectedUserIds, setSelectedIds, treeData, } = React.useContext(UserOrgContext) || {};
     const [errInfo, setErrInfo] = useState({
         errorStatus: false,
         errorMessage: null,
@@ -17,10 +20,57 @@ export const ModelUserList = ({ selectedOrgId, curPageUserList, setCurPageUserLi
         try {
             if (selectedOrgId) {
                 setLoading(true);
-                fetchUserList({ OrgId: selectedOrgId, pageNo, pageSize, ...filterParams }, request).then((res) => {
+                // 判断点击的是企业、部门，还是虚拟部门【未关联部门用户】
+                const org = getNodeFromTree(treeData, selectedOrgId);
+                if (!org) {
+                    setLoading(false);
+                    setCurPageUserList([]);
+                    return;
+                }
+                const query = {};
+                // 当前点击【未关联部门用户】这个虚拟部门
+                if (String(org.id).startsWith('isNoOrgList')) {
+                    const parentCode = org.parentCode;
+                    if (parentCode === CURRENT_CORP.id) {
+                        // 查询当前企业用户后端接口要求传空
+                        query.corpId = '';
+                    }
+                    else {
+                        query.corpId = parentCode;
+                    }
+                }
+                else {
+                    if (org.type === 'corp') {
+                        // 表示当前企业，后端接口corpId传空字符串
+                        if (selectedOrgId === CURRENT_CORP.id) {
+                            query.corpId = '';
+                        }
+                        else {
+                            query.corpId = selectedOrgId;
+                        }
+                    }
+                    else if (org.type === 'department') {
+                        query.departmentId = selectedOrgId;
+                    }
+                }
+                fetchUsersByParentId({
+                    request,
+                    pageNumber: pageNo,
+                    pageSize,
+                    ...query,
+                    searchCondition: {
+                        ...filterParams,
+                    },
+                })
+                    .then(({ total, dataList }) => {
+                    setTotal(total);
+                    setCurPageUserList([...dataList]);
+                })
+                    .catch((err) => {
+                    setErrInfo({ errorStatus: true, errorMessage: err });
+                })
+                    .finally(() => {
                     setLoading(false);
-                    setTotal(res === null || res === void 0 ? void 0 : res.total);
-                    setCurPageUserList(res.records);
                 });
             }
         }
@@ -81,19 +131,7 @@ export const ModelUserList = ({ selectedOrgId, curPageUserList, setCurPageUserLi
             setSelectedUserList([].concat(selectedUserList));
         }
     };
-    return (React.createElement(React.Fragment, null,
-        React.createElement("div", { className: "weda-ui-user-select-container-list-header" },
-            React.createElement("div", { className: "weda-ui-user-select-container-list-header__col" }, multiple && curPageUserList && curPageUserList.length > 0 && (React.createElement(Checkbox, { value: checkAll === 3 ? true : false, indeterminate: checkAll === 2, onChange: (value) => {
-                    onChange(value);
-                } }, "\u5168\u9009"))),
-            React.createElement("div", { className: "weda-ui-user-select-container-list-header__col" }, curPageUserList && curPageUserList.length > 0 && (React.createElement("div", { className: "weda-ui-user-select-container-list-header__statistics" },
-                React.createElement(Button, { type: "icon", icon: "arrowleft--line", disabled: pageNo <= 1, onClick: () => setPageNo(pageNo - 1) }),
-                React.createElement(Text, { reset: true },
-                    pageNo,
-                    ' ',
-                    React.createElement(Text, { theme: "label" },
-                        "/ ",
-                        Math.ceil(total / pageSize))),
-                React.createElement(Button, { type: "icon", icon: "arrowright--line", disabled: Math.ceil(total / pageSize) === pageNo, onClick: () => setPageNo(pageNo + 1) }))))),
-        React.createElement(UserOrgList, { userOrgList: curPageUserList, isOrg: false, loading: loading, errorStatus: errInfo === null || errInfo === void 0 ? void 0 : errInfo.errorStatus, errorMessage: errInfo === null || errInfo === void 0 ? void 0 : errInfo.errorMessage, selectedList: selectedUserList, multiple: multiple, setSelectedList: setSelectedUserList, selectedIds: selectedUserIds, setSelectedIds: setSelectedIds })));
+    return (_jsxs(_Fragment, { children: [_jsxs("div", { className: "weda-ui-user-select-container-list-header", children: [_jsx("div", { className: "weda-ui-user-select-container-list-header__col", children: multiple && curPageUserList && curPageUserList.length > 0 && (_jsx(Checkbox, { value: checkAll === 3 ? true : false, indeterminate: checkAll === 2, onChange: (value) => {
+                                onChange(value);
+                            }, children: "\u5168\u9009" })) }), _jsx("div", { className: "weda-ui-user-select-container-list-header__col", children: curPageUserList && curPageUserList.length > 0 && (_jsxs("div", { className: "weda-ui-user-select-container-list-header__statistics", children: [_jsx(Button, { type: "icon", icon: "arrowleft--line", disabled: pageNo <= 1, onClick: () => setPageNo(pageNo - 1) }), _jsxs(Text, { reset: true, children: [pageNo, ' ', _jsxs(Text, { theme: "label", children: ["/ ", Math.ceil(total / pageSize)] })] }), _jsx(Button, { type: "icon", icon: "arrowright--line", disabled: Math.ceil(total / pageSize) === pageNo, onClick: () => setPageNo(pageNo + 1) })] })) })] }), _jsx(UserOrgList, { userOrgList: curPageUserList, isOrg: false, loading: loading, errorStatus: errInfo === null || errInfo === void 0 ? void 0 : errInfo.errorStatus, errorMessage: errInfo === null || errInfo === void 0 ? void 0 : errInfo.errorMessage, selectedList: selectedUserList, multiple: multiple, setSelectedList: setSelectedUserList, selectedIds: selectedUserIds, setSelectedIds: setSelectedIds, secondDisplay: secondDisplay })] }));
 };

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

@@ -1,3 +1,4 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import React, { useState, useEffect } from 'react';
 import { Button, Modal, Bubble } from 'tea-component';
 import { ModalSearch } from '../modal-search';
@@ -5,13 +6,11 @@ import { UserOrgContext } from './user-select-pc';
 import { OrgTree } from '../org-tree';
 import { ModelUserList } from './model-user-list';
 import { SelectedList } from '../selected-list';
-import { fetchSearchUser } from '../../common/fetch-data-service';
+import { fetchUsersByParentId } from '../../common/fetch-data-service';
 import debounce from '../../../../../utils/debounce';
 import '../index.css';
-export const UserModel = ({ open, onCancel, onConfirm, treeData, treeDataError, filterParams, }) => {
-    var _a;
-    const { selectedUserList, setSelectedUserIds, request, selectedUserIds, setSelectedUserList, multiple, setPageNo, confirmUserList, } = React.useContext(UserOrgContext) || {};
-    const [selectedOrgId, setSelectedOrgId] = useState(null);
+export const UserModel = ({ open, onCancel, onConfirm, treeData, treeDataError, filterParams, secondDisplay, }) => {
+    const { selectedOrgId, setSelectedOrgId, selectedUserList, setSelectedUserIds, request, selectedUserIds, setSelectedUserList, multiple, setPageNo, confirmUserList, } = React.useContext(UserOrgContext) || {};
     //当前页人员列表
     const [curPageUserList, setCurPageUserList] = useState(null);
     const [searchUserList, setSearchUserList] = useState([]);
@@ -22,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
@@ -34,9 +30,22 @@ export const UserModel = ({ open, onCancel, onConfirm, treeData, treeDataError,
         try {
             if (key && key.length > 0) {
                 setLoading(true);
-                fetchSearchUser({ key, ...filterParams }, request).then((res) => {
+                fetchUsersByParentId({
+                    request,
+                    pageNumber: 1,
+                    pageSize: 200,
+                    searchCondition: {
+                        key,
+                        ...filterParams,
+                    },
+                })
+                    .then(({ dataList }) => {
                     setLoading(false);
-                    setSearchUserList(res);
+                    setSearchUserList(dataList);
+                })
+                    .catch((e) => {
+                    setLoading(false);
+                    setErrInfo({ errorStatus: true, errorMessage: e });
                 });
             }
             else {
@@ -49,27 +58,13 @@ export const UserModel = ({ open, onCancel, onConfirm, treeData, treeDataError,
             setErrInfo({ errorStatus: true, errorMessage: e });
         }
     }, 500);
-    return (React.createElement(Modal, { visible: open, caption: "\u9009\u62E9\u6210\u5458", onClose: () => onCancel(null), className: "weda-ui weda-ui-user-select-modal" },
-        React.createElement(Modal.Body, null,
-            React.createElement("div", { className: "weda-ui-user-select-container" },
-                React.createElement(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 && (React.createElement(React.Fragment, null,
-                    React.createElement("div", { className: "weda-ui-user-select-container-list" },
-                        React.createElement("div", { className: "weda-ui-user-select-container-list__start" },
-                            React.createElement(OrgTree, { selectedOrgId: [selectedOrgId], treeData: treeData, treeDataError: treeDataError, onActive: (ids) => {
-                                    setSelectedOrgId(ids[0]);
-                                    setPageNo(1);
-                                } })),
-                        React.createElement("div", { className: "weda-ui-user-select-container-list__end" },
-                            React.createElement(ModelUserList, { selectedOrgId: selectedOrgId, curPageUserList: curPageUserList, setCurPageUserList: setCurPageUserList, filterParams: filterParams })))))),
-            React.createElement(SelectedList, { selectedList: selectedUserList, onClose: (item) => {
-                    //检查是否当前页用户被关闭
-                    setSelectedUserList(selectedUserList.filter((e) => (e === null || e === void 0 ? void 0 : e.id) !== (item === null || item === void 0 ? void 0 : item.id)));
-                } })),
-        React.createElement(Modal.Footer, null,
-            React.createElement(Button, { type: "weak", onClick: onCancel }, "\u53D6\u6D88"),
-            React.createElement(Bubble, { content: selectedUserList.length === 0 && confirmUserList.length == 0
-                    ? '请选择成员'
-                    : null },
-                React.createElement(Button, { type: "primary", onClick: onConfirm, disabled: selectedUserList.length === 0 && confirmUserList.length == 0 }, "\u786E\u5B9A")))));
+    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) => {
+                                                    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) => {
+                            //检查是否当前页用户被关闭
+                            setSelectedUserList(selectedUserList.filter((e) => (e === null || e === void 0 ? void 0 : e.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: selectedUserList.length === 0 && confirmUserList.length == 0
+                            ? '请选择成员'
+                            : null, children: _jsx(Button, { type: "primary", onClick: onConfirm, disabled: selectedUserList.length === 0 && confirmUserList.length == 0, children: "\u786E\u5B9A" }) })] })] }));
 };

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

@@ -1,3 +1,4 @@
+import { jsx as _jsx } from "react/jsx-runtime";
 import React, { useImperativeHandle } from 'react';
 import { renderDecorator } from '../../../renderDecorator';
 import '../index.css';
@@ -10,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, }) {
+decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelectedOrgId, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, selectedUserIds, setSelectedUserIds, pageNo, setPageNo, pageSize, filterParams, treeData, orgList, error, onConfirmSelectUser, secondDisplay, }) {
     // 外层组件类
     const cls = classNames({
         'weda-ui': true,
@@ -30,8 +31,9 @@ decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedUserList, setSel
             },
         };
     }, [setOpen]);
-    return renderDecorator(React.createElement(ConfigProvider, { classPrefix: "wedatea2td" },
-        React.createElement(UserOrgContext.Provider, { value: {
+    return renderDecorator(_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsx(UserOrgContext.Provider, { value: {
+                selectedOrgId,
+                setSelectedOrgId,
                 selectedUserList,
                 multiple,
                 setSelectedUserList,
@@ -42,18 +44,18 @@ decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedUserList, setSel
                 pageNo,
                 setPageNo,
                 pageSize,
-            } },
-            React.createElement(Dropdown, { "data-testid": "userSelectDropdown", className: classNames(selectInputCls, `size-${size}`), disabled: disabled, open: open, onOpenChange: (open) => {
+                orgList,
+                treeData,
+            }, children: _jsx(Dropdown, { "data-testid": "userSelectDropdown", className: classNames(selectInputCls, `size-${size}`), disabled: disabled, open: open, onOpenChange: (open) => {
                     if (open)
                         setSelectedUserList(confirmUserList);
                     setOpen(open);
-                }, appearance: 'button', button: React.createElement(InputTags, { tagsList: confirmUserList, placeholder: placeholder, multiple: multiple, errInfo: errInfo, disabled: disabled, onClose: (e, item) => {
+                }, appearance: 'button', button: _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%' } },
-                React.createElement(UserModel, { open: open, setOpen: setOpen, onConfirm: onConfirm, onCancel: onCancel, treeData: treeData || [], treeDataError: error, filterParams: filterParams })))))({
+                    } }), 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 }) }) }) }))({
         id,
         className: cls,
         style,

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

@@ -989,7 +989,8 @@
   flex: 1 1 0px;
   display: flex;
   align-items: center;
-  overflow: hidden;
+  /* overflow: hidden; */
+  overflow-x: scroll;
 }
 
 .weda-select-user-dept .weda-select-user-dept__result-list .wedatea2td-tag,
@@ -1036,6 +1037,7 @@
 .weda-select-user-dept__dialog
   .weda-select-user-dept__result-list
   .weda-select-user-dept__result-item {
+  position: relative;
   background: #e3e6eb;
   border-radius: 3px;
   padding: 2px 30px 2px 8px;
@@ -1158,3 +1160,15 @@
 input[type='radio']:checked {
   background-color: #fff;
 }
+
+.weda-ui-user-select-list__display-h5 {
+  color: #000000;
+  opacity: 0.4;
+  margin-top: 4px;
+  display: inline-block;
+  padding-left: 55px;
+  white-space: nowrap;
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}