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

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

@@ -1,4 +1,6 @@
-import React, { useEffect, useState } from 'react';
+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';
 import { ErrorStatus, LoadingStatus } from './error-tips';
@@ -9,11 +11,11 @@ import { OrgTreeH5 } from './org-tree-h5';
 import { UserListH5 } from './user-select-h5/user-list-h5';
 import { getNode, getBreadNode } from '../common/utils';
 import debounce from '../../../../utils/debounce';
-import { fetchSearchUser, fetchUserList } from '../common/fetch-data-service';
+import { CURRENT_CORP, fetchUsersByParentId, } from '../common/fetch-data-service';
 const appendNode = { id: 'appendNode', content: '直属成员' };
 export const ModalSelectH5 = (props) => {
     var _a;
-    const { open, onClose, onConfirm, treeData, multiple = false, errorInfo, setErrorInfo, selectedUserList, setSelectedUserList, confirmUserList, request, filterParams, pageNo, setPageNo, pageSize, treeDataError, } = props;
+    const { open, onClose, onConfirm, orgList, treeData, treeDataError, multiple = false, errorInfo, setErrorInfo, selectedUserList, setSelectedUserList, confirmUserList, request, filterParams, pageNo, setPageNo, pageSize, secondDisplay, } = props;
     const [loading, setLoading] = useState({ id: null, status: false });
     const [pageLoading, setPageLoading] = useState(false);
     const [listLoading, setListLoading] = useState(false);
@@ -60,9 +62,19 @@ export const ModalSelectH5 = (props) => {
             setBreadCrumbData([]);
             if (key && key.length > 0) {
                 setPageLoading(true);
-                fetchSearchUser({ key, ...filterParams }, request).then((res) => {
+                fetchUsersByParentId({
+                    request,
+                    pageNumber: 1,
+                    pageSize: 200,
+                    searchCondition: { key, ...filterParams },
+                })
+                    .then(({ dataList }) => {
                     setPageLoading(false);
-                    setUserList(res);
+                    setUserList(dataList);
+                })
+                    .catch((err) => {
+                    setPageLoading(false);
+                    setErrorInfo({ errorStatus: true, errorMessage: err });
                 });
             }
             else {
@@ -78,30 +90,85 @@ 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 });
-            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;
+            //【未关联部门用户】
+            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 'appendNode': {
                     const orgId = (_a = breadCrumbData[breadCrumbData.length - 1]) === null || _a === void 0 ? void 0 : _a.id;
-                    fetchUserData({ orgId, pageNo, pageSize, request, ...filterParams });
+                    // fetchUserData({ orgId, pageNo, pageSize, request, ...filterParams });
+                    const query = resolveQuery(orgId);
+                    fetchUserData({
+                        request,
+                        pageNumber: pageNo,
+                        pageSize,
+                        ...query,
+                        searchCondition: {
+                            ...filterParams,
+                        },
+                    });
                     break;
                 }
                 default: {
-                    fetchUserList({ OrgId: item === null || item === void 0 ? void 0 : item.id, pageNo, pageSize, ...filterParams }, request).then((res) => {
+                    const query = resolveQuery(item.id);
+                    fetchUsersByParentId({
+                        pageNumber: 1,
+                        pageSize: 1,
+                        ...query,
+                        searchCondition: { ...filterParams },
+                    }).then(({ total, dataList }) => {
                         setLoading({ id: null, status: false });
                         setListLoading(false);
-                        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})`;
+                        if (total > 0) {
+                            appendNode['children'] = dataList;
+                            appendNode['content'] = `直属成员(${total})`;
                             setShowTreeData((item === null || item === void 0 ? void 0 : item.children)
                                 ? [appendNode].concat(item === null || item === void 0 ? void 0 : item.children)
                                 : [appendNode]);
@@ -145,20 +212,41 @@ export const ModalSelectH5 = (props) => {
     const onScrollBottom = debounce(() => {
         var _a;
         if (!(keyWords && keyWords.length > 0)) {
-            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 });
+            // 滚动到底部时，未加载完毕，进行加载
+            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,
+                });
+            }
         }
     }, 1000);
-    const fetchUserData = ({ orgId, pageNo, pageSize, request, ...resetProps }) => {
-        if (orgId && !isEnd) {
-            fetchUserList({ OrgId: orgId, pageNo, pageSize, ...resetProps }, request).then((res) => {
+    /**
+     * 拉取用户列表
+     */
+    const fetchUserData = (params) => {
+        if (!isEnd) {
+            const { request, corpId, departmentId, pageNumber, pageSize, searchCondition, } = params;
+            fetchUsersByParentId({
+                request,
+                corpId,
+                departmentId,
+                pageNumber,
+                pageSize,
+                searchCondition,
+            }).then(({ total, dataList }) => {
                 setLoading({ id: null, status: false });
-                if ((res === null || res === void 0 ? void 0 : res.total) > 0) {
-                    const currentUserData = userList.concat(res === null || res === void 0 ? void 0 : res.records);
-                    setUserList(currentUserData);
+                if (total > 0) {
+                    const currentUserList = userList.concat(dataList);
+                    setUserList(currentUserList);
                     setShowTreeData([]);
-                    if ((res === null || res === void 0 ? void 0 : res.total) <= currentUserData.length) {
+                    if (total <= currentUserList.length) {
                         setIsEnd(true);
                     }
                     else {
@@ -172,30 +260,19 @@ export const ModalSelectH5 = (props) => {
         document.getElementById('wd-search-input').blur();
         e.stopPropagation();
     };
-    return (React.createElement(Modal, { visible: open, onClose: () => {
+    return (_jsxs(Modal, { visible: open, onClose: () => {
             onrest();
             onClose();
-        }, destroyOnClose: true, className: `weda-ui weda-select-user-dept__dialog` },
-        React.createElement(Modal.Body, { className: ((_a = selectedUserList[0]) === null || _a === void 0 ? void 0 : _a.userId) ? 'is-selected-value' : '' },
-            React.createElement("div", { className: "weda-select-user-dept__dialog-header" }, '选择成员'),
-            React.createElement(ModalSearchH5, { value: keyWords, onChange: (key) => {
-                    setKeyWords(key);
-                    onSearch(key);
-                }, onCancel: cancleSearch, isSearch: isSearch, onFocus: (e) => {
-                    handleFocus(true);
-                    e.stopPropagation();
-                } }),
-            (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.errorStatus) ? (React.createElement(ErrorStatus, { description: (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.errorMessage) || null })) : (React.createElement(React.Fragment, null, treeData && treeData.length > 0 && !pageLoading ? (React.createElement("div", { className: "weda-select-user-dept__dialog-content" },
-                !(keyWords && keyWords.length > 0) && (React.createElement(DepartBreadcrumb, { data: breadCrumbData, onBreadCrumbClick: (item) => onBreadCrumbClick(item) })),
-                listLoading ? (React.createElement(React.Fragment, null,
-                    React.createElement("div", { className: "weda-select-user-dept__dialog-list" },
-                        React.createElement(LoadingStatus, null)))) : (React.createElement(React.Fragment, null, showTreeData &&
-                    showTreeData.length > 0 &&
-                    !(keyWords && keyWords.length > 0) ? (React.createElement(OrgTreeH5, { treeData: showTreeData, loading: loading, loadItem: (item) => loadItem(item), treeDataError: treeDataError, onTouchMove: onTouchMove })) : (React.createElement(UserListH5, { userList: userList, selectedList: selectedUserList, setSelectedList: setSelectedUserList, loading: loading, multiple: multiple, isEnd: isEnd, isSearch: keyWords ? true : false, onScrollBottom: onScrollBottom, onTouchMove: onTouchMove })))))) : (React.createElement("div", { className: "weda-select-user-dept__dialog-list" },
-                React.createElement(LoadingStatus, null)))))),
-        React.createElement(Modal.Footer, null,
-            React.createElement(SelectedListH5, { selectedList: selectedUserList, setSelectedList: setSelectedUserList, confirmUserList: confirmUserList, onClose: () => {
-                    onrest();
-                    onClose();
-                }, onConfirm: onConfirm }))));
+        }, 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) => {
+                            setKeyWords(key);
+                            onSearch(key);
+                        }, onCancel: cancleSearch, isSearch: isSearch, onFocus: (e) => {
+                            handleFocus(true);
+                            e.stopPropagation();
+                        } }), (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.errorStatus) ? (_jsx(ErrorStatus, { description: (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.errorMessage) || null })) : (_jsx(_Fragment, { children: treeData && treeData.length > 0 && !pageLoading ? (_jsxs("div", { className: "weda-select-user-dept__dialog-content", children: [!(keyWords && keyWords.length > 0) && (_jsx(DepartBreadcrumb, { data: breadCrumbData, onBreadCrumbClick: (item) => onBreadCrumbClick(item) })), listLoading ? (_jsx(_Fragment, { children: _jsx("div", { className: "weda-select-user-dept__dialog-list", children: _jsx(LoadingStatus, {}) }) })) : (_jsx(_Fragment, { children: showTreeData &&
+                                        showTreeData.length > 0 &&
+                                        !(keyWords && keyWords.length > 0) ? (_jsx(OrgTreeH5, { treeData: showTreeData, loading: loading, loadItem: (item) => loadItem(item), treeDataError: treeDataError, onTouchMove: onTouchMove })) : (_jsx(UserListH5, { userList: userList, selectedList: selectedUserList, setSelectedList: setSelectedUserList, loading: loading, multiple: multiple, isEnd: isEnd, isSearch: keyWords ? true : false, onScrollBottom: onScrollBottom, onTouchMove: onTouchMove, secondDisplay: secondDisplay })) }))] })) : (_jsx("div", { className: "weda-select-user-dept__dialog-list", children: _jsx(LoadingStatus, {}) })) }))] }), _jsx(Modal.Footer, { children: _jsx(SelectedListH5, { selectedList: selectedUserList, setSelectedList: setSelectedUserList, confirmUserList: confirmUserList, secondDisplay: secondDisplay, onClose: () => {
+                        onrest();
+                        onClose();
+                    }, onConfirm: onConfirm }) })] }));
 };

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

@@ -1,19 +1,13 @@
-import React from 'react';
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { LoadingStatus, ErrorStatus } from './error-tips';
 import './index.css';
 import { IconFont } from 'tdesign-icons-react';
 import classNames from '../../../../utils/classnames';
 export const OrgTreeH5 = (props) => {
-    const { treeData, treeDataError, loading, loadItem, onTouchMove } = props;
-    return (React.createElement("div", { className: classNames('weda-select-user-dept__dialog-list'), onTouchMove: (e) => onTouchMove(e) }, treeDataError ? (React.createElement(ErrorStatus, { description: treeDataError || null })) : (React.createElement(React.Fragment, null, treeData && treeData.length > 0 && !treeDataError ? ((treeData || []).map((item, index) => (React.createElement("div", { className: "weda-select-user-dept__list-item", key: index + (item === null || item === void 0 ? void 0 : item.id), onClick: () => {
-            !(item === null || item === void 0 ? void 0 : item.isUser) ? loadItem(item) : null;
-        } },
-        React.createElement("div", { className: "weda-select-user-dept__list-item-wrap" },
-            React.createElement("div", { className: (item === null || item === void 0 ? void 0 : item.id) === 'appendNode'
-                    ? 'weda-select-user-dept__item-detail weda-select-user-dept__item-detail-is-user'
-                    : 'weda-select-user-dept__item-detail weda-select-user-dept__item-detail-is-org' },
-                React.createElement("div", { className: "item-name" }, item === null || item === void 0 ? void 0 : item.content),
-                loading.id !== item.id && (React.createElement("div", { className: "lcap-icon lcap-icon-chevronright" })),
-                loading.id === item.id && (loading === null || loading === void 0 ? void 0 : loading.status) && (React.createElement("div", null,
-                    React.createElement(IconFont, { name: "loading", className: `user_loading weda-grid-navigation__fonticon` }))))))))) : (React.createElement(LoadingStatus, null))))));
+    const { treeData, treeDataError, loading, loadItem, onTouchMove, isUser = true, } = props;
+    return (_jsx("div", { className: classNames('weda-select-user-dept__dialog-list'), onTouchMove: (e) => onTouchMove(e), children: treeDataError ? (_jsx(ErrorStatus, { description: treeDataError || null })) : (_jsx(_Fragment, { children: treeData && treeData.length > 0 && !treeDataError ? ((treeData || []).map((item, index) => (_jsx("div", { className: "weda-select-user-dept__list-item", onClick: () => {
+                    !(item === null || item === void 0 ? void 0 : item.isUser) ? loadItem(item) : null;
+                }, children: _jsx("div", { className: "weda-select-user-dept__list-item-wrap", children: _jsxs("div", { className: (item === null || item === void 0 ? void 0 : item.id) === 'appendNode'
+                            ? 'weda-select-user-dept__item-detail weda-select-user-dept__item-detail-is-user'
+                            : 'weda-select-user-dept__item-detail weda-select-user-dept__item-detail-is-org', children: [_jsx("div", { className: "item-name", children: item === null || item === void 0 ? void 0 : item.content }), (loading.id !== item.id || (!isUser && item.children)) && (_jsx("div", { className: "lcap-icon lcap-icon-chevronright" })), loading.id === item.id && (loading === null || loading === void 0 ? void 0 : loading.status) && (_jsx("div", { children: _jsx(IconFont, { name: "loading", className: `user_loading weda-grid-navigation__fonticon` }) }))] }) }) }, index + (item === null || item === void 0 ? void 0 : item.id))))) : (_jsx(LoadingStatus, {})) })) }));
 };

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

@@ -1,4 +1,5 @@
-import React from 'react';
+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';
@@ -7,27 +8,50 @@ export const OrgTree = (props) => {
     //是否展示 Checkbox
     selectable = false, 
     //是否多选
-    mutiple = false, } = props;
+    mutiple = false, 
+    //默认展开的节点
+    defaultExpandedIds = [], isUser = true, } = props;
     // 切换选中组织节点
-    const onChange = (ids, checked, nodeId) => {
-        //是否取消选中
-        if (selectedOrgId.indexOf(nodeId) !== -1) {
-            const actionIds = selectedOrgId.filter((e) => e !== nodeId);
-            onActive(actionIds);
-        }
-        else {
-            //单选情况下
-            if (!mutiple) {
-                onActive([nodeId]);
+    const onChange = (ids, checked, nodeId, selectable = true) => {
+        if (isUser || selectable) {
+            //是否取消选中
+            if (selectedOrgId.indexOf(nodeId) !== -1) {
+                const actionIds = selectedOrgId.filter((e) => e !== nodeId);
+                onActive(actionIds);
             }
             else {
-                onActive(selectedOrgId.concat([nodeId]));
+                //单选情况下
+                if (!mutiple) {
+                    onActive([nodeId]);
+                }
+                else {
+                    onActive(selectedOrgId.concat([nodeId]));
+                }
             }
         }
     };
-    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, context) => {
-            onChange(ids, context === null || context === void 0 ? void 0 : context.active, context === null || context === void 0 ? void 0 : context.nodeId);
-        }, onSelect: (ids, context) => {
-            onChange(ids, context === null || context === void 0 ? void 0 : context.selected, context === null || context === void 0 ? void 0 : context.nodeId);
-        } })) : (React.createElement(LoadingStatus, null))))));
+    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, 
+                // 开启虚拟滚动，优化大数据量性能！！
+                height: 320, children: TreeNodes })) : (_jsx(LoadingStatus, {})) })) }));
 };

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

@@ -1,44 +1,27 @@
-import React, { useState } from 'react';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useState } from 'react';
 import { Button as TButton, Popover, Tag, Bubble } from 'tea-component';
+import { displayUserInfo } from '../common/utils';
 export const SelectedListH5 = (props) => {
-    const { selectedList, setSelectedList, onClose, onConfirm, confirmUserList } = props;
+    const { selectedList, setSelectedList, onClose, onConfirm, confirmUserList, secondDisplay, } = props;
     const [showDetail, setShowDetail] = useState(false);
-    return (React.createElement("div", null,
-        selectedList.length > 0 && (React.createElement("div", { className: "weda-select-user-dept__select-result", onClick: () => {
-                setShowDetail(true);
-            } },
-            React.createElement("div", { className: "weda-select-user-dept__select-label" }, "\u5DF2\u9009\u62E9"),
-            React.createElement("div", { className: "weda-select-user-dept__result-list" }, selectedList.map((d) => (React.createElement(Tag, { key: (d === null || d === void 0 ? void 0 : d.userId) || (d === null || d === void 0 ? void 0 : d.value) }, d === null || d === void 0 ? void 0 : d.content)))),
-            React.createElement(Popover, { trigger: "click", visible: showDetail, popupContainer: () => document.querySelector('#tea-overlay-root'), overlay: React.createElement("div", { className: "weda-ui-custom-picker" },
-                    React.createElement("div", { className: "weda-ui-custom-backdrop", "data-testid": "allTime-backdrop" }),
-                    React.createElement("div", { className: "weda-ui-custom-picker__inner" },
-                        React.createElement("div", { className: "weda-ui-custom-picker__header" },
-                            React.createElement("div", { "data-testid": "allTime-cancel", className: "weda-ui-custom-picker__header-cancle", onClick: (e) => {
-                                    setShowDetail(false);
-                                    //onClose();
-                                    e.stopPropagation();
-                                } }, "\u53D6\u6D88"),
-                            React.createElement("div", { className: "weda-ui-custom-picker__header-title" }, "\u5DF2\u9009\u62E9"),
-                            React.createElement("div", { "data-testid": "allTime-confirm", className: "weda-ui-custom-picker__header-confirm", onClick: (e) => {
-                                    setShowDetail(false);
-                                    //onConfirm();
-                                    e.stopPropagation();
-                                } }, "\u786E\u8BA4")),
-                        React.createElement("div", { className: "weda-ui-custom-picker__body" },
-                            React.createElement("ul", { className: "weda-user-select-h5 weda-ui-custom-picker__list " }, selectedList.map((d) => (React.createElement("li", { className: "weda-ui-custom-picker__list-item", key: (d === null || d === void 0 ? void 0 : d.userId) || (d === null || d === void 0 ? void 0 : d.value) },
-                                React.createElement("span", { className: "weda-ui-custom-picker__list-label" }, d === null || d === void 0 ? void 0 : d.content),
-                                React.createElement("i", { className: "weda-ui-custom-picker__list-dismiss", onClick: () => {
-                                        setSelectedList(selectedList.filter((e) => (e === null || e === void 0 ? void 0 : e.userId) !== (d === null || d === void 0 ? void 0 : d.userId)));
-                                    } })))))))) },
-                React.createElement("div", { className: "weda-select-user-dept__select-total" },
-                    "\u5171",
-                    selectedList.length,
-                    "\u4EBA",
-                    React.createElement("i", { className: "lcap-icon lcap-icon-chevronright" }))))),
-        React.createElement("div", { className: "weda-select-user-dept__btn-group" },
-            React.createElement(TButton, { type: "weak", onClick: onClose, className: "wd-btn--outline" }, "\u53D6\u6D88"),
-            React.createElement(Bubble, { content: selectedList.length === 0 && confirmUserList.length === 0
-                    ? '请选择成员'
-                    : null, className: "weda-select-user-dept__bubble" },
-                React.createElement(TButton, { type: "primary", onClick: onConfirm, disabled: selectedList.length === 0 && confirmUserList.length == 0 }, "\u786E\u5B9A")))));
+    return (_jsxs("div", { children: [selectedList.length > 0 && (_jsxs("div", { className: "weda-select-user-dept__select-result", onClick: () => {
+                    setShowDetail(true);
+                }, children: [_jsx("div", { className: "weda-select-user-dept__select-label", children: "\u5DF2\u9009\u62E9" }), _jsx("div", { className: "weda-select-user-dept__result-list", children: selectedList.map((d) => (_jsx(Tag, { children: d === null || d === void 0 ? void 0 : d.content }, (d === null || d === void 0 ? void 0 : d.userId) || (d === null || d === void 0 ? void 0 : d.value)))) }), _jsx(Popover, { trigger: "click", visible: showDetail, popupContainer: () => document.querySelector('#tea-overlay-root'), overlay: _jsxs("div", { className: "weda-ui-custom-picker", children: [_jsx("div", { className: "weda-ui-custom-backdrop", "data-testid": "allTime-backdrop" }), _jsxs("div", { className: "weda-ui-custom-picker__inner", children: [_jsxs("div", { className: "weda-ui-custom-picker__header", children: [_jsx("div", { "data-testid": "allTime-cancel", className: "weda-ui-custom-picker__header-cancle", onClick: (e) => {
+                                                        setShowDetail(false);
+                                                        //onClose();
+                                                        e.stopPropagation();
+                                                    }, children: "\u53D6\u6D88" }), _jsx("div", { className: "weda-ui-custom-picker__header-title", children: "\u5DF2\u9009\u62E9" }), _jsx("div", { "data-testid": "allTime-confirm", className: "weda-ui-custom-picker__header-confirm", onClick: (e) => {
+                                                        setShowDetail(false);
+                                                        //onConfirm();
+                                                        e.stopPropagation();
+                                                    }, children: "\u786E\u8BA4" })] }), _jsx("div", { className: "weda-ui-custom-picker__body", children: _jsx("ul", { className: "weda-user-select-h5 weda-ui-custom-picker__list ", children: selectedList.map((d) => (_jsxs("li", { className: "weda-ui-custom-picker__list-item", children: [_jsxs("p", { className: 'weda-ui-custom-picker__list-item__content', children: [_jsx("span", { className: "weda-ui-custom-picker__list-label", children: d === null || d === void 0 ? void 0 : d.content }), _jsxs("span", { className: 'weda-ui-user-select-result__display-h5', style: {
+                                                                        display: displayUserInfo(d, secondDisplay)
+                                                                            ? 'inline'
+                                                                            : 'none',
+                                                                    }, children: ["(", displayUserInfo(d, secondDisplay), ")"] })] }), _jsx("i", { className: "weda-ui-custom-picker__list-dismiss", onClick: () => {
+                                                                setSelectedList(selectedList.filter((e) => (e === null || e === void 0 ? void 0 : e.userId) !== (d === null || d === void 0 ? void 0 : d.userId)));
+                                                            } })] }, (d === null || d === void 0 ? void 0 : d.userId) || (d === null || d === void 0 ? void 0 : d.value)))) }) })] })] }), children: _jsxs("div", { className: "weda-select-user-dept__select-total", children: ["\u5171", selectedList.length, "\u4EBA", _jsx("i", { className: "lcap-icon lcap-icon-chevronright" })] }) })] })), _jsxs("div", { className: "weda-select-user-dept__btn-group", children: [_jsx(TButton, { type: "weak", onClick: onClose, className: "wd-btn--outline", children: "\u53D6\u6D88" }), _jsx(Bubble, { content: selectedList.length === 0 && confirmUserList.length === 0
+                            ? '请选择成员'
+                            : null, className: "weda-select-user-dept__bubble", children: _jsx(TButton, { type: "primary", onClick: onConfirm, disabled: selectedList.length === 0 && confirmUserList.length == 0, children: "\u786E\u5B9A" }) })] })] }));
 };

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

@@ -1,15 +1,18 @@
-import React from 'react';
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { TagGroup, Tag, Text } from 'tea-component';
 import './index.css';
+import { displayUserInfo } from '../common/utils';
 export const SelectedList = (props) => {
-    const { selectedList, onClose, isUser = true } = props;
+    const { secondDisplay, selectedList, onClose, isUser = true } = props;
     // const { selectedList, setSelectedUserList } =
     //   React.useContext(UserOrgContext) || {};
     // const onClose = (item) => {
     //   //检查是否当前页用户被关闭
     //   setSelectedUserList(selectedUserList.filter((e) => e?.id !== item?.id));
     // };
-    return (React.createElement("div", { className: "weda-ui-user-select-result" }, selectedList && selectedList.length > 0 ? (React.createElement(TagGroup, null, (selectedList || []).map((item) => (React.createElement(Tag, { key: item === null || item === void 0 ? void 0 : item.id, onClose: () => onClose(item) }, item === null || item === void 0 ? void 0 : item.content))))) : (React.createElement(Text, { className: "weda-ui-user-select-input__placeholder", theme: "label" },
-        "\u65E0\u9009\u4E2D",
-        isUser ? '成员' : '部门'))));
+    return (_jsx("div", { className: "weda-ui-user-select-result", children: selectedList && selectedList.length > 0 ? (_jsx(TagGroup, { children: (selectedList || []).map((item) => (_jsxs(Tag, { onClose: () => onClose(item), children: [item === null || item === void 0 ? void 0 : item.content, _jsxs("span", { className: 'weda-ui-user-select-result__display', style: {
+                            display: displayUserInfo(item, secondDisplay)
+                                ? 'inherit'
+                                : 'none',
+                        }, children: ["(", displayUserInfo(item, secondDisplay), ")"] })] }, item === null || item === void 0 ? void 0 : item.id))) })) : (_jsxs(Text, { className: "weda-ui-user-select-input__placeholder", theme: "label", children: ["\u65E0\u9009\u4E2D", isUser ? '成员' : '部门'] })) }));
 };

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

@@ -1,10 +1,10 @@
-/* eslint-disable prettier/prettier */
-import React from 'react';
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Radio, List, Checkbox, useClassNames, Text } from 'tea-component';
 import './index.css';
 import { ErrorStatus, NullStatus, LoadingStatus } from './error-tips';
+import { displayUserInfo } from '../common/utils';
 // 用户组织展示列表
-export const UserOrgList = ({ isUser = true, userOrgList, isOrg, loading, errorStatus, errorMessage, selectedList, multiple, setSelectedList, setSelectedIds, selectedIds, }) => {
+export const UserOrgList = ({ isUser = true, userOrgList, isOrg, loading, errorStatus, errorMessage, selectedList, multiple, setSelectedList, setSelectedIds, selectedIds, secondDisplay, }) => {
     const { Margin } = useClassNames();
     const onChange = (value, item) => {
         if (value) {
@@ -20,36 +20,36 @@ export const UserOrgList = ({ isUser = true, userOrgList, isOrg, loading, errorS
             setSelectedList(selectedList.filter((e) => e.id !== (item === null || item === void 0 ? void 0 : item.id)));
         }
     };
-    return (React.createElement(List, { className: "weda-ui-user-select-list" },
-        React.createElement(List.Item, null, loading ? (React.createElement(LoadingStatus, null)) : (React.createElement(React.Fragment, null, errorStatus ? (React.createElement(ErrorStatus, { description: errorMessage || null })) : (React.createElement(React.Fragment, null, userOrgList && userOrgList.length > 0 ? (React.createElement(React.Fragment, null, multiple ? (React.createElement("div", null,
-            React.createElement(Checkbox.Group, { layout: "column", value: selectedIds }, (userOrgList || []).map((item) => {
-                var _a;
-                return (React.createElement(React.Fragment, null,
-                    React.createElement(Checkbox, { name: item === null || item === void 0 ? void 0 : item.id, onChange: (value) => onChange(value, item) }, item === null || item === void 0 ? void 0 :
-                        item.content,
-                        isOrg && isUser && (React.createElement(Text, { theme: "label", className: Margin.Left['2n'] }, (_a = item === null || item === void 0 ? void 0 : item.mainOrg[0]) === null || _a === void 0 ? void 0 : _a.OrgName)))));
-            })))) : (React.createElement(React.Fragment, null, (userOrgList || []).map((item, index) => {
-            var _a;
-            return (React.createElement(Radio.Group, { value: selectedIds[0], key: index, layout: "column", onChange: (value) => {
-                    // 被选中过，取消选中
-                    if ((selectedIds || []).indexOf(value) !== -1) {
-                        setSelectedIds
-                            ? setSelectedIds(selectedIds.filter((e) => e !== (item === null || item === void 0 ? void 0 : item.id)))
-                            : false;
-                        setSelectedList(selectedList.filter((e) => e.id !== value));
-                    }
-                    else {
-                        const list = [].concat([item]);
-                        setSelectedIds
-                            ? setSelectedIds([].concat([item === null || item === void 0 ? void 0 : item.id]))
-                            : false;
-                        setSelectedList(list);
-                    }
-                } },
-                React.createElement(Radio, { name: item === null || item === void 0 ? void 0 : item.id }, item === null || item === void 0 ? void 0 :
-                    item.content,
-                    isOrg && isUser && (React.createElement(Text, { theme: "label", className: Margin.Left['2n'] }, (_a = item === null || item === void 0 ? void 0 : item.mainOrg[0]) === null || _a === void 0 ? void 0 : _a.OrgName)))));
-        }))))) : (React.createElement(NullStatus, { description: isOrg
-                ? `无相关${isUser ? '成员' : '部门'}`
-                : `无可选${isUser ? '成员' : '部门'}`, size: 's' })))))))));
+    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: {
+                                                    display: displayUserInfo(item, secondDisplay)
+                                                        ? 'block'
+                                                        : 'none',
+                                                }, children: displayUserInfo(item, secondDisplay) })] }));
+                                }) }) })) : (_jsx(_Fragment, { children: (userOrgList || []).map((item, index) => {
+                                var _a, _b;
+                                return (_jsxs(Radio.Group, { value: selectedIds[0], layout: "column", onChange: (value) => {
+                                        // 被选中过，取消选中
+                                        if ((selectedIds || []).indexOf(value) !== -1) {
+                                            setSelectedIds
+                                                ? setSelectedIds(selectedIds.filter((e) => e !== (item === null || item === void 0 ? void 0 : item.id)))
+                                                : false;
+                                            setSelectedList(selectedList.filter((e) => e.id !== value));
+                                        }
+                                        else {
+                                            const list = [].concat([item]);
+                                            setSelectedIds
+                                                ? setSelectedIds([].concat([item === null || item === void 0 ? void 0 : item.id]))
+                                                : 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: {
+                                                display: displayUserInfo(item, secondDisplay)
+                                                    ? 'block'
+                                                    : 'none',
+                                            }, children: displayUserInfo(item, secondDisplay) })] }, index));
+                            }) })) })) : (_jsx(NullStatus, { description: isOrg
+                            ? `无相关${isUser ? '成员' : '部门'}`
+                            : `无可选${isUser ? '成员' : '部门'}`, size: 's' })) })) })) }) }));
 };