@cloudbase/weda-ui 3.4.8 → 3.4.9

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

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

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

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

package/dist/web/components/form/userOrgSelect/component/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/index.css

@@ -321,3 +321,55 @@
   color: rgba(0, 0, 0, 0.9);
   max-width: 100%;
 }
+
+.wedatea2td-form-check__label {
+  display: flex;
+  align-items: center;
+}
+
+.weda-ui-user-select-list__user {
+  background-image: url("data:image/svg+xml,%3Csvg width='14' height='14' viewBox='0 0 14 14' fill='none' xmlns='http://www.w3.org/2000/svg'%3E %3Cpath d='M10.5 4C10.5 5.933 8.933 7.5 7 7.5C5.067 7.5 3.5 5.933 3.5 4C3.5 2.067 5.067 0.5 7 0.5C8.933 0.5 10.5 2.067 10.5 4ZM9.5 4C9.5 2.61929 8.38071 1.5 7 1.5C5.61929 1.5 4.5 2.61929 4.5 4C4.5 5.38071 5.61929 6.5 7 6.5C8.38071 6.5 9.5 5.38071 9.5 4Z' fill='black' fill-opacity='0.9'/%3E %3Cpath d='M12.9631 9.85277C13.297 10.0122 13.5 10.3547 13.5 10.7246V13C13.5 13.2761 13.2761 13.5 13 13.5H1C0.723859 13.5 0.5 13.2761 0.5 13V10.7246C0.5 10.3547 0.703016 10.0122 1.03686 9.85277C2.8494 8.98708 4.86651 8.5 7 8.5C9.13349 8.5 11.1506 8.98708 12.9631 9.85277ZM7 9.5C5.0334 9.5 3.17435 9.94573 1.5 10.7398V12.5H12.5V10.7398C10.8257 9.94573 8.9666 9.5 7 9.5Z' fill='black' fill-opacity='0.9'/%3E %3C/svg%3E ");
+  background-repeat: no-repeat;
+  width: 15px;
+  height: 15px;
+  display: inline-block;
+  margin-right: 7.5px;
+  margin-top: 2px;
+}
+
+.weda-ui-user-select-list__display {
+  margin-left: 47px;
+  color: #000000;
+  opacity: 0.6;
+  display: inline-block;
+  white-space: nowrap;
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  font-size: 14px;
+  margin-bottom: 5px;
+}
+
+.weda-ui-user-select-list__display-radio {
+  margin-left: 24px;
+  margin-bottom: 10px;
+}
+
+.weda-ui-user-select-result__display {
+  color: #000000;
+  opacity: 0.6;
+  margin: 0 5px;
+}
+
+.weda-ui-user-select-result__display-h5 {
+  color: #000000;
+  opacity: 0.6;
+}
+
+.weda-ui-custom-picker__list-item__content {
+  display: inline-block;
+  white-space: nowrap;
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}

package/dist/web/components/form/userOrgSelect/component/input-tags.js

@@ -1,21 +1,7 @@
-import React from 'react';
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { Tag, Icon, Text } from 'tea-component';
 export const InputTags = ({ tagsList, placeholder, onClose, multiple, errInfo, disabled, platForm = 'pc', }) => {
-    return (React.createElement("div", { className: "weda-ui-user-select-input" },
-        React.createElement(React.Fragment, null,
-            tagsList && tagsList.length > 0 && !errInfo.errorStatus ? (React.createElement(React.Fragment, null,
-                React.createElement("div", { className: "weda-ui-user-select-input__values" }, (tagsList || []).map((item) => (React.createElement(React.Fragment, null, disabled ? (React.createElement(Tag, { key: item === null || item === void 0 ? void 0 : item.id, "data-testid": "defaultValueDisabled" }, (item === null || item === void 0 ? void 0 : item.content) || '-')) : (React.createElement(Tag, { key: item === null || item === void 0 ? void 0 : item.id, onClose: (e) => onClose(e, item), "data-testid": "defaultValueText" }, (item === null || item === void 0 ? void 0 : item.content) || '-')))))),
-                multiple && (React.createElement("div", { className: disabled
-                        ? 'weda-ui-user-select-input__extra__disabled'
-                        : 'weda-ui-user-select-input__extra' }, platForm === 'pc' ? (React.createElement(React.Fragment, null,
-                    React.createElement(Icon, { type: "more" }),
-                    React.createElement(Text, { theme: "primary" },
-                        "\u5171",
-                        tagsList.length,
-                        "\u4E2A"))) : (React.createElement("div", { className: "weda-select-user-dept__select-total" },
-                    "\u5171",
-                    tagsList.length,
-                    "\u4E2A",
-                    React.createElement("i", { className: "lcap-icon lcap-icon-chevronright" }))))))) : (React.createElement(Text, { className: "weda-ui-user-select-input__placeholder" }, placeholder)),
-            errInfo.errorStatus && (React.createElement(Text, { className: "weda-ui-user-select-input__placeholder" }, errInfo.errorMessage)))));
+    return (_jsx("div", { className: "weda-ui-user-select-input", children: _jsxs(_Fragment, { children: [tagsList && tagsList.length > 0 && !errInfo.errorStatus ? (_jsxs(_Fragment, { children: [_jsx("div", { className: "weda-ui-user-select-input__values", children: (tagsList || []).map((item) => (_jsx(_Fragment, { children: disabled ? (_jsx(Tag, { "data-testid": "defaultValueDisabled", children: (item === null || item === void 0 ? void 0 : item.content) || '-' }, item === null || item === void 0 ? void 0 : item.id)) : (_jsx(Tag, { onClose: (e) => onClose(e, item), "data-testid": "defaultValueText", children: (item === null || item === void 0 ? void 0 : item.content) || '-' }, item === null || item === void 0 ? void 0 : item.id)) }))) }), multiple && (_jsx("div", { className: disabled
+                                ? 'weda-ui-user-select-input__extra__disabled'
+                                : 'weda-ui-user-select-input__extra', children: platForm === 'pc' ? (_jsxs(_Fragment, { children: [_jsx(Icon, { type: "more" }), _jsxs(Text, { theme: "primary", children: ["\u5171", tagsList.length, "\u4E2A"] })] })) : (_jsxs("div", { className: "weda-select-user-dept__select-total", children: ["\u5171", tagsList.length, "\u4E2A", _jsx("i", { className: "lcap-icon lcap-icon-chevronright" })] })) }))] })) : (_jsx(Text, { className: "weda-ui-user-select-input__placeholder", children: placeholder })), errInfo.errorStatus && (_jsx(Text, { className: "weda-ui-user-select-input__placeholder", children: errInfo.errorMessage }))] }) }));
 };

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

@@ -1,25 +1,17 @@
-import React from 'react';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from '../../../../utils/classnames';
 export const ModalSearchH5 = (props) => {
     const { value, onChange, onCancel, isSearch, onFocus } = props;
-    return (React.createElement("div", { className: classNames({
+    return (_jsxs("div", { className: classNames({
             'weda-select-user-dept__dialog-search-h5': true,
             'weda-select-user-dept__dialog-search-focus': isSearch,
-        }) },
-        React.createElement("div", { className: "weda-select-user-dept__dialog-search-box" },
-            React.createElement("input", { id: "wd-search-input", type: "text", onFocus: onFocus, value: value, onClick: (e) => {
-                    e.stopPropagation();
-                }, onChange: (e) => {
-                    var _a;
-                    onChange((_a = e === null || e === void 0 ? void 0 : e.target) === null || _a === void 0 ? void 0 : _a.value);
-                }, className: "weda-select-user-dept__dialog-search-input" }),
-            React.createElement("div", { className: classNames({
-                    'weda-select-user-dept__dialog-label': true,
-                    'weda-select-user-dept__dialog-label-value': value,
-                }) },
-                React.createElement("span", { className: "search-icon" }),
-                React.createElement("span", { className: "search-placeholder" }, "\u641C\u7D22")),
-            value && value.length > 0 && (React.createElement("div", { className: "weda-select-user-dept__dialog-input-clear", onClick: () => onChange('') },
-                React.createElement("p", { className: "weda-select-user-dept__dialog-input-clear-close" })))),
-        React.createElement("span", { className: "weda-select-user-dept__dialog-search-cancel", onClick: onCancel }, "\u53D6\u6D88")));
+        }), children: [_jsxs("div", { className: "weda-select-user-dept__dialog-search-box", children: [_jsx("input", { id: "wd-search-input", type: "text", onFocus: onFocus, value: value, onClick: (e) => {
+                            e.stopPropagation();
+                        }, onChange: (e) => {
+                            var _a;
+                            onChange((_a = e === null || e === void 0 ? void 0 : e.target) === null || _a === void 0 ? void 0 : _a.value);
+                        }, className: "weda-select-user-dept__dialog-search-input" }), _jsxs("div", { className: classNames({
+                            'weda-select-user-dept__dialog-label': true,
+                            'weda-select-user-dept__dialog-label-value': value,
+                        }), children: [_jsx("span", { className: "search-icon" }), _jsx("span", { className: "search-placeholder", children: "\u641C\u7D22" })] }), value && value.length > 0 && (_jsx("div", { className: "weda-select-user-dept__dialog-input-clear", onClick: () => onChange(''), children: _jsx("p", { className: "weda-select-user-dept__dialog-input-clear-close" }) }))] }), _jsx("span", { className: "weda-select-user-dept__dialog-search-cancel", onClick: onCancel, children: "\u53D6\u6D88" })] }));
 };

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

@@ -1,11 +1,8 @@
-import React from 'react';
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { SearchBox } from 'tea-component';
 import { UserOrgList } from './user-org-list';
 import './index.css';
 export const ModalSearch = (props) => {
     const { searchList, onReset, keyWords, onSearch, loading, errInfo, selectedList, multiple, setSelectedList, setSelectedIds, selectedIds, isUser = true, } = props;
-    return (React.createElement(React.Fragment, null,
-        React.createElement(SearchBox, { "data-testid": "SearchBox", onChange: onSearch, onSearch: (key) => onSearch(key), onClear: () => onReset(), placeholder: `搜索${isUser ? '成员' : '部门'}` }),
-        keyWords.length !== 0 && (React.createElement("div", { className: "weda-ui-user-select-container-list__end " },
-            React.createElement(UserOrgList, { isUser: isUser, userOrgList: searchList, isOrg: true, loading: loading, errorStatus: errInfo === null || errInfo === void 0 ? void 0 : errInfo.errorStatus, errorMessage: errInfo === null || errInfo === void 0 ? void 0 : errInfo.errorMessage, selectedList: selectedList, multiple: multiple, setSelectedIds: setSelectedIds, setSelectedList: setSelectedList, selectedIds: selectedIds })))));
+    return (_jsxs(_Fragment, { children: [_jsx(SearchBox, { "data-testid": "SearchBox", onChange: onSearch, onSearch: (key) => onSearch(key), onClear: () => onReset(), placeholder: `搜索${isUser ? '成员' : '部门'}` }), keyWords.length !== 0 && (_jsx("div", { className: "weda-ui-user-select-container-list__end ", children: _jsx(UserOrgList, { isUser: isUser, userOrgList: searchList, isOrg: true, loading: loading, errorStatus: errInfo === null || errInfo === void 0 ? void 0 : errInfo.errorStatus, errorMessage: errInfo === null || errInfo === void 0 ? void 0 : errInfo.errorMessage, selectedList: selectedList, multiple: multiple, setSelectedIds: setSelectedIds, setSelectedList: setSelectedList, selectedIds: selectedIds, secondDisplay: undefined }) }))] }));
 };

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

@@ -1,4 +1,5 @@
-import React, { useEffect, useState } from 'react';
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useState } from 'react';
 import { Modal } from 'tea-component';
 import { ModalSearchH5 } from './modal-search-h5';
 import { ErrorStatus, LoadingStatus } from './error-tips';
@@ -7,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 { fetchSearchUser, fetchUserList } 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, 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);
@@ -156,14 +157,38 @@ export const ModalSelectH5 = (props) => {
                 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);
-                    setShowTreeData([]);
-                    if ((res === null || res === void 0 ? void 0 : res.total) <= currentUserData.length) {
-                        setIsEnd(true);
-                    }
-                    else {
-                        setPageNo(pageNo + 1);
-                    }
+                    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);
+                        }
+                    });
                 }
             });
         }
@@ -172,30 +197,19 @@ export const ModalSelectH5 = (props) => {
         document.getElementById('wd-search-input').blur();
         e.stopPropagation();
     };
-    return (React.createElement(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` },
-        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,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';
@@ -7,27 +7,35 @@ 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))))));
+    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 })) : (_jsx(LoadingStatus, {})) })) }));
 };