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

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

@@ -1,5 +1,4 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import { useEffect, useState } from 'react';
 import { Modal } from 'tea-component';
 import { ModalSearchH5 } from './modal-search-h5';
@@ -9,13 +8,13 @@ import { SelectedListH5 } from './selected-list-h5';
 import './index.css';
 import { OrgTreeH5 } from './org-tree-h5';
 import { UserListH5 } from './user-select-h5/user-list-h5';
-import { getNode, getBreadNode } from '../common/utils';
+import { getNode, getBreadNode, getPropertiesList } from '../common/utils';
 import debounce from '../../../../utils/debounce';
-import { CURRENT_CORP, fetchUsersByParentId, } from '../common/fetch-data-service';
+import { fetchSearchUser, fetchUserList } from '../common/fetch-data-service';
 const appendNode = { id: 'appendNode', content: '直属成员' };
 export const ModalSelectH5 = (props) => {
     var _a;
-    const { open, onClose, onConfirm, orgList, treeData, treeDataError, multiple = false, errorInfo, setErrorInfo, selectedUserList, setSelectedUserList, confirmUserList, request, filterParams, pageNo, setPageNo, pageSize, secondDisplay, } = props;
+    const { open, onClose, onConfirm, treeData, multiple = false, errorInfo, setErrorInfo, selectedUserList, setSelectedUserList, confirmUserList, request, filterParams, pageNo, setPageNo, pageSize, treeDataError, secondDisplay, } = props;
     const [loading, setLoading] = useState({ id: null, status: false });
     const [pageLoading, setPageLoading] = useState(false);
     const [listLoading, setListLoading] = useState(false);
@@ -62,19 +61,9 @@ export const ModalSelectH5 = (props) => {
             setBreadCrumbData([]);
             if (key && key.length > 0) {
                 setPageLoading(true);
-                fetchUsersByParentId({
-                    request,
-                    pageNumber: 1,
-                    pageSize: 200,
-                    searchCondition: { key, ...filterParams },
-                })
-                    .then(({ dataList }) => {
+                fetchSearchUser({ key, ...filterParams }, request).then((res) => {
                     setPageLoading(false);
-                    setUserList(dataList);
-                })
-                    .catch((err) => {
-                    setPageLoading(false);
-                    setErrorInfo({ errorStatus: true, errorMessage: err });
+                    setUserList(res);
                 });
             }
             else {
@@ -90,85 +79,30 @@ export const ModalSelectH5 = (props) => {
     const cancleSearch = () => {
         onrest();
     };
-    const resolveQuery = (orgId) => {
-        const query = {};
-        if (!orgId) {
-            return query;
-        }
-        const item = orgList.find((item) => item.id === orgId);
-        if (!item) {
-            return query;
-        }
-        if (item.type === 'corp') {
-            // 查询当前企业下的部门或用户时，corpId需要传空字符串
-            if (orgId === CURRENT_CORP.id) {
-                query.corpId = '';
-            }
-            else {
-                query.corpId = orgId;
-            }
-        }
-        else if (item.type === 'department') {
-            query.departmentId = orgId;
-        }
-        return query;
-    };
     const loadItem = (item) => {
         var _a;
         try {
-            setIsEnd(false);
             setPageNo(1);
             setLoading({ id: item === null || item === void 0 ? void 0 : item.id, status: true });
-            //【未关联部门用户】
-            if (item === null || item === void 0 ? void 0 : item.id.startsWith('isNoOrgList')) {
-                const query = {};
-                const parentCode = item === null || item === void 0 ? void 0 : item.parentCode;
-                if (parentCode === CURRENT_CORP.id) {
-                    // 查询当前企业用户后端接口要求传空
-                    query.corpId = '';
-                }
-                else {
-                    query.corpId = parentCode;
-                }
-                fetchUserData({
-                    request,
-                    pageNumber: pageNo,
-                    pageSize,
-                    ...query,
-                    searchCondition: { ...filterParams },
-                });
-                setBreadCrumbData(getBreadNode(breadCrumbData, item));
-                return;
-            }
             switch (item === null || item === void 0 ? void 0 : item.id) {
+                case 'isNoOrgList': {
+                    const orgId = item === null || item === void 0 ? void 0 : item.id;
+                    fetchUserData({ orgId, pageNo, pageSize, request, ...filterParams });
+                    setBreadCrumbData(getBreadNode(breadCrumbData, item));
+                    break;
+                }
                 case 'appendNode': {
                     const orgId = (_a = breadCrumbData[breadCrumbData.length - 1]) === null || _a === void 0 ? void 0 : _a.id;
-                    // fetchUserData({ orgId, pageNo, pageSize, request, ...filterParams });
-                    const query = resolveQuery(orgId);
-                    fetchUserData({
-                        request,
-                        pageNumber: pageNo,
-                        pageSize,
-                        ...query,
-                        searchCondition: {
-                            ...filterParams,
-                        },
-                    });
+                    fetchUserData({ orgId, pageNo, pageSize, request, ...filterParams });
                     break;
                 }
                 default: {
-                    const query = resolveQuery(item.id);
-                    fetchUsersByParentId({
-                        pageNumber: 1,
-                        pageSize: 1,
-                        ...query,
-                        searchCondition: { ...filterParams },
-                    }).then(({ total, dataList }) => {
+                    fetchUserList({ OrgId: item === null || item === void 0 ? void 0 : item.id, pageNo, pageSize, ...filterParams }, request).then((res) => {
                         setLoading({ id: null, status: false });
                         setListLoading(false);
-                        if (total > 0) {
-                            appendNode['children'] = dataList;
-                            appendNode['content'] = `直属成员(${total})`;
+                        if ((res === null || res === void 0 ? void 0 : res.total) > 0) {
+                            appendNode['children'] = res === null || res === void 0 ? void 0 : res.records;
+                            appendNode['content'] = `直属成员(${res === null || res === void 0 ? void 0 : res.total})`;
                             setShowTreeData((item === null || item === void 0 ? void 0 : item.children)
                                 ? [appendNode].concat(item === null || item === void 0 ? void 0 : item.children)
                                 : [appendNode]);
@@ -212,46 +146,49 @@ export const ModalSelectH5 = (props) => {
     const onScrollBottom = debounce(() => {
         var _a;
         if (!(keyWords && keyWords.length > 0)) {
-            // 滚动到底部时，未加载完毕，进行加载
-            if (!isEnd) {
-                const orgId = ((_a = breadCrumbData[breadCrumbData.length - 1]) === null || _a === void 0 ? void 0 : _a.id) || 'isNoOrgList';
-                setLoading({ id: orgId, status: true });
-                const query = resolveQuery(orgId);
-                fetchUserData({
-                    request,
-                    pageNumber: pageNo,
-                    pageSize,
-                    ...query,
-                    ...filterParams,
-                });
-            }
+            const orgId = ((_a = breadCrumbData[breadCrumbData.length - 1]) === null || _a === void 0 ? void 0 : _a.id) || 'isNoOrgList';
+            setLoading({ id: orgId, status: true });
+            fetchUserData({ orgId, pageNo, pageSize, request, ...filterParams });
         }
     }, 1000);
-    /**
-     * 拉取用户列表
-     */
-    const fetchUserData = (params) => {
-        if (!isEnd) {
-            const { request, corpId, departmentId, pageNumber, pageSize, searchCondition, } = params;
-            fetchUsersByParentId({
-                request,
-                corpId,
-                departmentId,
-                pageNumber,
-                pageSize,
-                searchCondition,
-            }).then(({ total, dataList }) => {
+    const fetchUserData = ({ orgId, pageNo, pageSize, request, ...resetProps }) => {
+        if (orgId && !isEnd) {
+            fetchUserList({ OrgId: orgId, pageNo, pageSize, ...resetProps }, request).then((res) => {
                 setLoading({ id: null, status: false });
-                if (total > 0) {
-                    const currentUserList = userList.concat(dataList);
-                    setUserList(currentUserList);
-                    setShowTreeData([]);
-                    if (total <= currentUserList.length) {
-                        setIsEnd(true);
-                    }
-                    else {
-                        setPageNo(pageNo + 1);
-                    }
+                if ((res === null || res === void 0 ? void 0 : res.total) > 0) {
+                    const currentUserData = userList.concat(res === null || res === void 0 ? void 0 : res.records);
+                    const userSchemaData = currentUserData.map((item) => {
+                        const properties = getPropertiesList(item.userExtend, item.userSchema);
+                        if (Array.isArray(properties) && properties.length) {
+                            return Promise.all(properties).then((value) => {
+                                return { ...item, userSchemaProps: value };
+                            });
+                        }
+                        else {
+                            return item;
+                        }
+                    });
+                    Promise.all(userSchemaData)
+                        .then((data) => {
+                        setUserList(data);
+                        setShowTreeData([]);
+                        if ((res === null || res === void 0 ? void 0 : res.total) <= data.length) {
+                            setIsEnd(true);
+                        }
+                        else {
+                            setPageNo(pageNo + 1);
+                        }
+                    })
+                        .catch(() => {
+                        setUserList(currentUserData);
+                        setShowTreeData([]);
+                        if ((res === null || res === void 0 ? void 0 : res.total) <= currentUserData.length) {
+                            setIsEnd(true);
+                        }
+                        else {
+                            setPageNo(pageNo + 1);
+                        }
+                    });
                 }
             });
         }
@@ -260,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,5 +1,4 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import { useMemo } from 'react';
 import { Tree } from 'tea-component';
 import { LoadingStatus, ErrorStatus } from './error-tips';
 import './index.css';
@@ -29,29 +28,14 @@ export const OrgTree = (props) => {
                 }
             }
         }
+        //}
     };
-    const handleOnActive = (ids, context) => {
-        var _a, _b;
-        if ((_a = context.data) === null || _a === void 0 ? void 0 : _a.disableSelect) {
-            return;
-        }
-        onChange(ids, context === null || context === void 0 ? void 0 : context.active, context === null || context === void 0 ? void 0 : context.nodeId, (_b = context === null || context === void 0 ? void 0 : context.data) === null || _b === void 0 ? void 0 : _b.selectable);
-    };
-    const handleOnSelect = (ids, context) => {
-        onChange(ids, context === null || context === void 0 ? void 0 : context.selected, context === null || context === void 0 ? void 0 : context.nodeId, true);
-    };
-    const TreeNodes = useMemo(() => {
-        const renderTreeNodes = (node) => {
-            if (!node.children || (node.children || []).length <= 0) {
-                return (_jsx(Tree.Node, { id: node.id, content: node.content, selectable: node.type !== 'corp' }));
-            }
-            return (_jsx(Tree.Node, { id: node.id, content: node.content, selectable: node.type !== 'corp', children: node.children.map((node) => {
-                    return renderTreeNodes(node);
-                }) }));
-        };
-        return treeData.map((node) => renderTreeNodes(node));
-    }, [treeData]);
-    return (_jsx(_Fragment, { children: treeDataError ? (_jsx(ErrorStatus, { description: treeDataError || null })) : (_jsx(_Fragment, { children: treeData && treeData.length > 0 && !treeDataError ? (_jsx(Tree, { className: "depart-tree", fullActivable: true, activable: true, selectable: selectable, selectedIds: selectedOrgId, activeIds: selectedOrgId, defaultExpandedIds: defaultExpandedIds, selectStrictly: true, onActive: handleOnActive, onSelect: handleOnSelect, 
+    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);
+                }, 
                 // 开启虚拟滚动，优化大数据量性能！！
-                height: 320, children: TreeNodes })) : (_jsx(LoadingStatus, {})) })) }));
+                height: 320 })) : (_jsx(LoadingStatus, {})) })) }));
 };

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

@@ -21,14 +21,14 @@ export const UserOrgList = ({ isUser = true, userOrgList, isOrg, loading, errorS
         }
     };
     return (_jsx(List, { className: "weda-ui-user-select-list", children: _jsx(List.Item, { children: loading ? (_jsx(LoadingStatus, {})) : (_jsx(_Fragment, { children: errorStatus ? (_jsx(ErrorStatus, { description: errorMessage || null })) : (_jsx(_Fragment, { children: userOrgList && userOrgList.length > 0 ? (_jsx(_Fragment, { children: multiple ? (_jsx("div", { children: _jsx(Checkbox.Group, { layout: "column", value: selectedIds, children: (userOrgList || []).map((item) => {
-                                    var _a, _b;
-                                    return (_jsxs(_Fragment, { children: [_jsxs(Checkbox, { className: 'weda-ui-user-select-list_box', name: item === null || item === void 0 ? void 0 : item.id, onChange: (value) => onChange(value, item), children: [_jsx("i", { className: 'weda-ui-user-select-list__user' }), item === null || item === void 0 ? void 0 : item.content, isOrg && isUser && (_jsx(Text, { theme: "label", className: Margin.Left['2n'], children: (_b = (_a = item === null || item === void 0 ? void 0 : item.mainOrg) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.OrgName }))] }), _jsx("span", { className: 'weda-ui-user-select-list__display', style: {
+                                    var _a;
+                                    return (_jsxs(_Fragment, { children: [_jsxs(Checkbox, { className: 'weda-ui-user-select-list_box', name: item === null || item === void 0 ? void 0 : item.id, onChange: (value) => onChange(value, item), children: [_jsx("i", { className: 'weda-ui-user-select-list__user' }), item === null || item === void 0 ? void 0 : item.content, isOrg && isUser && (_jsx(Text, { theme: "label", className: Margin.Left['2n'], children: (_a = item === null || item === void 0 ? void 0 : item.mainOrg[0]) === null || _a === void 0 ? void 0 : _a.OrgName }))] }), _jsx("span", { className: 'weda-ui-user-select-list__display', style: {
                                                     display: displayUserInfo(item, secondDisplay)
                                                         ? 'block'
                                                         : 'none',
                                                 }, children: displayUserInfo(item, secondDisplay) })] }));
                                 }) }) })) : (_jsx(_Fragment, { children: (userOrgList || []).map((item, index) => {
-                                var _a, _b;
+                                var _a;
                                 return (_jsxs(Radio.Group, { value: selectedIds[0], layout: "column", onChange: (value) => {
                                         // 被选中过，取消选中
                                         if ((selectedIds || []).indexOf(value) !== -1) {
@@ -44,7 +44,7 @@ export const UserOrgList = ({ isUser = true, userOrgList, isOrg, loading, errorS
                                                 : false;
                                             setSelectedList(list);
                                         }
-                                    }, children: [_jsxs(Radio, { name: item === null || item === void 0 ? void 0 : item.id, children: [_jsx("i", { className: 'weda-ui-user-select-list__user' }), item === null || item === void 0 ? void 0 : item.content, isOrg && isUser && (_jsx(Text, { theme: "label", className: Margin.Left['2n'], children: (_b = (_a = item === null || item === void 0 ? void 0 : item.mainOrg) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.OrgName }))] }), _jsx("span", { className: 'weda-ui-user-select-list__display weda-ui-user-select-list__display-radio', style: {
+                                    }, children: [_jsxs(Radio, { name: item === null || item === void 0 ? void 0 : item.id, children: [_jsx("i", { className: 'weda-ui-user-select-list__user' }), item === null || item === void 0 ? void 0 : item.content, isOrg && isUser && (_jsx(Text, { theme: "label", className: Margin.Left['2n'], children: (_a = item === null || item === void 0 ? void 0 : item.mainOrg[0]) === null || _a === void 0 ? void 0 : _a.OrgName }))] }), _jsx("span", { className: 'weda-ui-user-select-list__display weda-ui-user-select-list__display-radio', style: {
                                                 display: displayUserInfo(item, secondDisplay)
                                                     ? 'block'
                                                     : 'none',

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

@@ -4,15 +4,22 @@ 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 { useDepartDataNew } from '../../hooks/use-depart-data';
+import { useDepartData } from '../../hooks/use-depart-data';
+import { parseStrToArr } from '../../common/utils';
 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, // 辅助信息
+    /**
+     * 以下两个属性  不用在组件库，企业工作台使用该组件时支持外部定义样式
+     * naked: 单纯使用该组件，而不在FormCell中使用（该组件实现默认在在）
+     * containerClass: string
+     * triggerElement: React.ReactNode
+     */
+    naked = false, containerClass = '', triggerElement = null, } = props;
     const platform = usePlatform();
     const [errInfo, setErrInfo] = useState({
         errorStatus: false,
@@ -35,15 +42,11 @@ export default function UserTreeSelect(props) {
     //组织下展示用户页大小
     const pageSize = 200;
     const { filterParams } = useViewData(where);
-    const { orgList, 
-    // orgTreeData: treeData,
-    finalOrgTreeData: treeData, error, } = useDepartDataNew({
-        request,
-    });
+    const { treeData, error } = useDepartData({ request });
     // 默认选中第一个部门
     useEffect(() => {
         var _a;
-        if (treeData && treeData.length > 0 && !selectedOrgId) {
+        if (!selectedOrgId && treeData && treeData.length > 0) {
             setSelectedOrgId((_a = treeData[0]) === null || _a === void 0 ? void 0 : _a.id);
         }
     }, [selectedOrgId, treeData]);
@@ -69,30 +72,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);
         }
     };
-    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([]);
-                }
+    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);
             }
-            catch (e) {
-                setErrInfo({ errorStatus: true, errorMessage: e });
+            else {
+                setConfirmUserList([]);
             }
-        };
+        }
+        catch (e) {
+            setErrInfo({ errorStatus: true, errorMessage: e });
+        }
+    };
+    useEffect(() => {
         try {
             if (!isObjectEqual(prevDefaultRef.current, selectUserIds)) {
-                // getDefaultUser(selectUserIds);
+                getDefaultUser(selectUserIds);
                 prevDefaultRef.current = selectUserIds;
             }
         }
@@ -144,17 +147,23 @@ export default function UserTreeSelect(props) {
         platform,
         filterParams,
         treeData,
-        orgList,
         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值

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

@@ -9,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, orgList, treeData, error, onConfirmSelectUser, secondDisplay, }) {
+request = defaultRequest, onCancel, onConfirm, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, open, setOpen, filterParams, treeData, error, onConfirmSelectUser, secondDisplay, }) {
     const cls = classNames({
         'weda-ui': true,
         'weda-select-user-dept': true,
@@ -46,7 +46,7 @@ request = defaultRequest, onCancel, onConfirm, selectedUserList, setSelectedUser
                         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 })] }))({
+                    } }) }), _jsx(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, secondDisplay: secondDisplay })] }))({
         id,
         className: cls,
         style,

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

@@ -1,14 +1,13 @@
 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 { CURRENT_CORP, fetchUsersByParentId, } from '../../common/fetch-data-service';
+import { fetchUserList } from '../../common/fetch-data-service';
 import { UserOrgContext } from './user-select-pc';
 import { UserOrgList } from './../user-org-list';
-import { getNodeFromTree } from '../../common/utils';
+import { getPropertiesList } from '../../common/utils';
 import '../index.css';
 export const ModelUserList = ({ selectedOrgId, curPageUserList, setCurPageUserList, filterParams, secondDisplay, }) => {
-    const { selectedUserList, multiple, setSelectedUserList, request, pageNo, setPageNo, pageSize, selectedUserIds, setSelectedIds, treeData, } = React.useContext(UserOrgContext) || {};
+    const { selectedUserList, multiple, setSelectedUserList, request, pageNo, setPageNo, pageSize, selectedUserIds, setSelectedIds, } = React.useContext(UserOrgContext) || {};
     const [errInfo, setErrInfo] = useState({
         errorStatus: false,
         errorMessage: null,
@@ -20,57 +19,27 @@ export const ModelUserList = ({ selectedOrgId, curPageUserList, setCurPageUserLi
         try {
             if (selectedOrgId) {
                 setLoading(true);
-                // 判断点击的是企业、部门，还是虚拟部门【未关联部门用户】
-                const org = getNodeFromTree(treeData, selectedOrgId);
-                if (!org) {
+                fetchUserList({ OrgId: selectedOrgId, pageNo, pageSize, ...filterParams }, request).then((res) => {
                     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 = '';
+                    setTotal(res === null || res === void 0 ? void 0 : res.total);
+                    const userSchemaData = res.records.map((item) => {
+                        const properties = getPropertiesList(item.userExtend, item.userSchema);
+                        if (Array.isArray(properties) && properties.length) {
+                            return Promise.all(properties).then((value) => {
+                                return { ...item, userSchemaProps: value };
+                            });
                         }
                         else {
-                            query.corpId = selectedOrgId;
+                            return item;
                         }
-                    }
-                    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);
+                    });
+                    Promise.all(userSchemaData)
+                        .then((data) => {
+                        setCurPageUserList(data);
+                    })
+                        .catch(() => {
+                        setCurPageUserList(res.records);
+                    });
                 });
             }
         }

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { Tree } from 'tea-component';
 import { LoadingStatus, ErrorStatus } from './error-tips';
 import '../index.css';
@@ -6,5 +6,5 @@ export const OrgTree = (props) => {
     const { selectedOrgId, treeData, treeDataError, onActive, 
     //是否展示 Checkbox
     selectable = false, } = props;
-    return (React.createElement(React.Fragment, null, treeDataError ? (React.createElement(ErrorStatus, { description: treeDataError || null })) : (React.createElement(React.Fragment, null, treeData && treeData.length > 0 && !treeDataError ? (React.createElement(Tree, { className: "depart-tree", data: treeData, fullActivable: true, activable: true, selectable: selectable, selectedIds: [selectedOrgId], activeIds: [selectedOrgId], selectStrictly: true, onActive: (ids) => onActive(ids) })) : (React.createElement(LoadingStatus, null))))));
+    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], selectStrictly: true, onActive: (ids) => onActive(ids) })) : (_jsx(LoadingStatus, {})) })) }));
 };

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

@@ -6,7 +6,7 @@ import { UserOrgContext } from './user-select-pc';
 import { OrgTree } from '../org-tree';
 import { ModelUserList } from './model-user-list';
 import { SelectedList } from '../selected-list';
-import { fetchUsersByParentId } from '../../common/fetch-data-service';
+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, }) => {
@@ -30,22 +30,9 @@ export const UserModel = ({ open, onCancel, onConfirm, treeData, treeDataError,
         try {
             if (key && key.length > 0) {
                 setLoading(true);
-                fetchUsersByParentId({
-                    request,
-                    pageNumber: 1,
-                    pageSize: 200,
-                    searchCondition: {
-                        key,
-                        ...filterParams,
-                    },
-                })
-                    .then(({ dataList }) => {
+                fetchSearchUser({ key, ...filterParams }, request).then((res) => {
                     setLoading(false);
-                    setSearchUserList(dataList);
-                })
-                    .catch((e) => {
-                    setLoading(false);
-                    setErrInfo({ errorStatus: true, errorMessage: e });
+                    setSearchUserList(res);
                 });
             }
             else {
@@ -58,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) => {