@cloudbase/weda-ui 3.3.0 → 3.3.2

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

@@ -1,15 +1,15 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useCallback } from 'react';
 import { emptyObject } from '../../../../utils/constant';
 import { renderDecorator } from '../../renderDecorator';
 import { IconFont } from 'tdesign-icons-react';
 import classNames from '../../../../utils/classnames';
-import { getDepartById, defaultRequest, } from '../../../../utils/getUserService';
+import { getDepartById, defaultRequest } from '../getUserService';
 import { dealOrgData } from '../utils';
 import { Modal, Button, ConfigProvider, Radio, Status } from 'tea-component';
 import isObjectEqual from '../../../../utils/isObjectEqual';
-import '../userOrgSelect.less';
-import { ErrorStatus } from '../comTool';
-export function DepartTreeSelectH5({ id, className, style, events = emptyObject, label = '部门选择', labelVisible = true, name = 'formDepartTreeSelect', placeholder = '请选择部门', defaultValueType = 'noneDepart', defaultValue = '', confirmValue = '', disabled = false, layout = 'horizontal', requiredFlag = false, size = 'l', decorator, request = defaultRequest, multiple = false, onChange = null, focus: autoFocus = false, getDepartByIdRequest = getDepartById, }) {
+import '../userOrgSelect.css';
+import { ErrorStatus, ModalSearch } from '../comTool';
+export function DepartTreeSelectH5({ id, className, style, events = emptyObject, label = '部门选择', labelVisible = true, name = 'formDepartTreeSelect', placeholder = '请选择部门', defaultValueType = 'noneDepart', defaultValue = '', confirmValue = '', disabled = false, layout = 'horizontal', requiredFlag = false, size = 'l', decorator, request = defaultRequest, onChange = null, focus: autoFocus = false, }) {
     const cls = classNames({
         'weda-ui': true,
         'weda-select-user-dept': true,
@@ -33,10 +33,26 @@ export function DepartTreeSelectH5({ id, className, style, events = emptyObject,
     const [selectItem, setSelectItem] = useState(null);
     const [searchValue, setSearchValue] = useState('');
     const [loading, setLoading] = useState({ id: null, status: false });
+    const [titleText, setTitleText] = useState('');
     const [errorInfo, setErrorInfo] = useState({
         errorStatus: false,
         errorMessage: null,
     });
+    // 初始化数据
+    const initOrgsData = useCallback(async () => {
+        try {
+            setTitleText('选择部门');
+            const resData = (await request('InitRootOrgs', {})) || [];
+            const data = dealOrgData(resData);
+            //初始化数据时，默认返回第一层组织结构
+            setCount(1);
+            setOrgsTreeData(data);
+            setOriginalOrgData([{ index: 1, treeData: data, title: '选择部门' }]);
+        }
+        catch (e) {
+            setErrorInfo({ errorStatus: true, errorMessage: e });
+        }
+    }, [request]);
     const handleFocus = (value) => {
         setIsSearch(value);
     };
@@ -53,7 +69,7 @@ export function DepartTreeSelectH5({ id, className, style, events = emptyObject,
             const sValue = (_a = event === null || event === void 0 ? void 0 : event.target) === null || _a === void 0 ? void 0 : _a.value;
             setSearchValue(sValue);
             if (sValue) {
-                const { Users = [], Orgs = [] } = await request('SearchByCondition', {
+                const { Orgs = [] } = await request('SearchByCondition', {
                     KeyWords: sValue.trim(),
                     SearchCondition: {
                         SearchType: 'SearchByOrg',
@@ -86,12 +102,14 @@ export function DepartTreeSelectH5({ id, className, style, events = emptyObject,
     const onClose = () => {
         setErrorInfo({ errorStatus: false, errorMessage: null });
         setVisible(false);
+        setOrgsTreeData([]);
         initOrgsData();
     };
     const onConfirm = (selectItem) => {
         var _a;
         setErrorInfo({ errorStatus: false, errorMessage: null });
         setValue(selectItem === null || selectItem === void 0 ? void 0 : selectItem.content);
+        setOrgsTreeData([]);
         onChange === null || onChange === void 0 ? void 0 : onChange(selectItem === null || selectItem === void 0 ? void 0 : selectItem.orgId);
         (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: selectItem === null || selectItem === void 0 ? void 0 : selectItem.orgId, data: selectItem });
         setVisible(false);
@@ -102,46 +120,39 @@ export function DepartTreeSelectH5({ id, className, style, events = emptyObject,
         if ((defaultValue &&
             !isObjectEqual(prevDefaultRef.current !== defaultValue)) ||
             (confirmValue && !isObjectEqual(prevConfirmRef.current !== confirmValue))) {
+            const getdefaultUser = async () => {
+                var _a;
+                try {
+                    if ((defaultValueType === 'confirmDepart' &&
+                        confirmValue.length !== 0) ||
+                        defaultValue.length !== 0) {
+                        const orgId = confirmValue.length !== 0 ? confirmValue : defaultValue;
+                        const defaultDepart = await getDepartById({
+                            _id: orgId,
+                        });
+                        setValue(defaultDepart);
+                        onChange === null || onChange === void 0 ? void 0 : onChange(orgId);
+                        (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, {
+                            value: orgId,
+                            data: { content: defaultDepart },
+                        });
+                    }
+                }
+                catch (e) {
+                    setErrorInfo({ errorStatus: true, errorMessage: e });
+                }
+            };
             getdefaultUser();
             prevDefaultRef.current = defaultValue;
             prevConfirmRef.current = confirmValue;
         }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [defaultValueType, confirmValue, defaultValue]);
-    const getdefaultUser = async () => {
-        var _a;
-        try {
-            if ((defaultValueType === 'confirmDepart' && confirmValue.length !== 0) ||
-                defaultValue.length !== 0) {
-                const orgId = confirmValue.length !== 0 ? confirmValue : defaultValue;
-                const defaultDepart = await getDepartById({
-                    _id: orgId,
-                });
-                setValue(defaultDepart);
-                onChange === null || onChange === void 0 ? void 0 : onChange(orgId);
-                (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: orgId, data: { content: defaultDepart } });
-            }
-        }
-        catch (e) {
-            setErrorInfo({ errorStatus: true, errorMessage: e });
-        }
-    };
-    // 初始化数据
-    const initOrgsData = async () => {
-        try {
-            const resData = (await request('InitRootOrgs', {})) || [];
-            const data = dealOrgData(resData);
-            setOrgsTreeData(data);
-            setOriginalOrgData([{ index: count, treeData: data }]);
-        }
-        catch (e) {
-            setErrorInfo({ errorStatus: true, errorMessage: e });
-        }
-    };
     //点击部门节点，获取子部门节点
     const loadDepartData = async (node, count) => {
         try {
             setLoading({ id: node.orgId, status: true });
-            const { Orgs = [], Users = [] } = await request('LazyDescribeOrgs', {
+            const { Orgs = [] } = await request('LazyDescribeOrgs', {
                 OrgId: node.orgId,
                 DescribeCondition: {
                     NeedUser: true,
@@ -158,8 +169,13 @@ export function DepartTreeSelectH5({ id, className, style, events = emptyObject,
             }
             else {
                 const children = dealOrgData(Orgs);
+                setTitleText(node === null || node === void 0 ? void 0 : node.content);
                 setOrgsTreeData(children);
-                originalOrgData.push({ index: count + 1, treeData: children });
+                originalOrgData.push({
+                    index: count + 1,
+                    treeData: children,
+                    title: node === null || node === void 0 ? void 0 : node.content,
+                });
                 setCount(count + 1);
                 setOriginalOrgData(originalOrgData);
             }
@@ -178,6 +194,7 @@ export function DepartTreeSelectH5({ id, className, style, events = emptyObject,
                     storageOriTreeData.push(item);
                     if ((item === null || item === void 0 ? void 0 : item.index) === count - 1) {
                         setCount(count - 1);
+                        setTitleText(item.title);
                         setOrgsTreeData((item === null || item === void 0 ? void 0 : item.treeData) || []);
                     }
                 }
@@ -199,37 +216,21 @@ export function DepartTreeSelectH5({ id, className, style, events = emptyObject,
                 React.createElement(Modal.Body, { className: (selectItem === null || selectItem === void 0 ? void 0 : selectItem.userId) ? 'is-selected-value' : '' },
                     React.createElement("div", { className: "weda-select-user-dept__dialog-header", id: count.toString() },
                         React.createElement("div", { className: count == 1 ? '' : 'arrow-left', onClick: () => retLevel(count) }),
-                        "\u9009\u62E9\u90E8\u95E8"),
-                    React.createElement("div", { className: classNames({
-                            'weda-select-user-dept__dialog-search': true,
-                            'weda-select-user-dept__dialog-search-focus': isSearch,
-                        }) },
-                        React.createElement("div", { className: "weda-select-user-dept__dialog-search-box" },
-                            React.createElement("input", { type: "text", onFocus: () => {
-                                    handleFocus(true);
-                                }, value: searchValue, onClick: (e) => {
-                                    e.stopPropagation();
-                                }, onChange: changeSearchValue, 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': searchValue,
-                                }) },
-                                React.createElement("span", { className: "search-icon" }),
-                                React.createElement("span", { className: "search-placeholder" }, "\u641C\u7D22")),
-                            searchValue && searchValue.length > 0 && (React.createElement("div", { className: "weda-select-user-dept__dialog-input-clear", onClick: changeSearchValue },
-                                React.createElement("p", { className: "weda-select-user-dept__dialog-input-clear-close" })))),
-                        React.createElement("span", { className: "weda-select-user-dept__dialog-search-cancel", onClick: cancleSearch }, "\u53D6\u6D88")),
-                    (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.errorStatus) ? (React.createElement(ErrorStatus, { size: "l", title: "\u63A5\u53E3\u8C03\u7528\u5931\u8D25", description: (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.errorMessage) || null })) : orgsTreeData && orgsTreeData.length > 0 ? (React.createElement("div", { className: classNames('weda-select-user-dept__dialog-list') }, orgsTreeData.map((item, index) => (React.createElement("div", { className: "weda-select-user-dept__list-item", key: item === null || item === void 0 ? void 0 : item.id },
+                        titleText),
+                    React.createElement(ModalSearch, { value: searchValue, onChange: changeSearchValue, onCancel: cancleSearch, isSearch: isSearch, onFocus: () => {
+                            handleFocus(true);
+                        } }),
+                    (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.errorStatus) ? (React.createElement(ErrorStatus, { size: "l", title: "\u63A5\u53E3\u8C03\u7528\u5931\u8D25", description: (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.errorMessage) || null })) : orgsTreeData && orgsTreeData.length > 0 ? (React.createElement("div", { className: classNames('weda-select-user-dept__dialog-list') }, orgsTreeData.map((item) => (React.createElement("div", { className: "weda-select-user-dept__list-item", key: item === null || item === void 0 ? void 0 : item.id },
                         React.createElement("div", { className: "weda-select-user-dept__list-item-wrap" },
-                            React.createElement(Radio.Group, { value: selectItem === null || selectItem === void 0 ? void 0 : selectItem.orgId, onChange: (value) => {
+                            React.createElement(Radio.Group, { value: selectItem === null || selectItem === void 0 ? void 0 : selectItem.orgId, onChange: () => {
                                     setSelectItem(item);
                                 }, layout: "column" },
                                 React.createElement(Radio, { name: item === null || item === void 0 ? void 0 : item.orgId },
                                     React.createElement("div", { className: "weda-select-user-dept__item-detail" },
-                                        React.createElement("div", { className: "item-name" }, item === null || item === void 0 ? void 0 : item.content)))),
-                            (item === null || item === void 0 ? void 0 : item.expandable) && loading.id !== item.orgId && (React.createElement("div", { className: "lcap-icon lcap-icon-chevronright", onClick: () => {
-                                    loadDepartData(item, count);
-                                } })),
+                                        React.createElement("div", { className: "item-name" }, item === null || item === void 0 ? void 0 : item.content),
+                                        (item === null || item === void 0 ? void 0 : item.expandable) && loading.id !== item.orgId && (React.createElement("div", { className: "lcap-icon lcap-icon-chevronright", onClick: () => {
+                                                loadDepartData(item, count);
+                                            } }))))),
                             loading.id === item.orgId && (loading === null || loading === void 0 ? void 0 : loading.status) && (React.createElement("div", null,
                                 React.createElement(IconFont, { name: "loading", className: `weda-grid-navigation__fonticon depart_loading` }))))))))) : (React.createElement(Status, { className: "dim-tree-select--blank", icon: 'blank', size: 's', title: `暂无部门数据` }))),
                 React.createElement(Modal.Footer, null,

package/dist/web/components/form/userOrgSelect/departTreeSelect/departTreeSelect.pc.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { IDepartTreeSelec } from './departTreeSelect.h5';
-import '../userOrgSelect.less';
-export declare function DepartTreeSelectPC({ id, className, style, events, label, labelVisible, name, defaultValue, confirmValue, placeholder, defaultValueType, disabled, layout, requiredFlag, size, multiple, onChange, decorator, relation, request, getDepartByIdRequest, }: IDepartTreeSelec): JSX.Element;
+import '../userOrgSelect.css';
+export declare function DepartTreeSelectPC({ id, className, style, events, label, labelVisible, defaultValue, confirmValue, placeholder, defaultValueType, disabled, layout, requiredFlag, size, multiple, onChange, decorator, request, }: IDepartTreeSelec): JSX.Element;

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

@@ -4,11 +4,11 @@ import { renderDecorator } from '../../renderDecorator';
 import classNames from 'classnames';
 import { Dropdown, ConfigProvider, Text } from 'tea-component';
 import { getNode, getRelationData, dealOrgData } from '../utils';
-import { getDepartById, defaultRequest, } from '../../../../utils/getUserService';
-import '../userOrgSelect.less';
+import { getDepartById, defaultRequest } from '../getUserService';
+import '../userOrgSelect.css';
 import { DimTreeContent } from '../comTool';
 import isObjectEqual from '../../../../utils/isObjectEqual';
-export function DepartTreeSelectPC({ id, className, style, events = emptyObject, label = '人员选择', labelVisible = true, name = 'formUserTreeSelect', defaultValue = '', confirmValue = '', placeholder = '请选择人员', defaultValueType = 'noneDepart', disabled = false, layout = 'horizontal', requiredFlag = false, size = 'l', multiple = false, onChange = null, decorator, relation, request = defaultRequest, getDepartByIdRequest = getDepartById, }) {
+export function DepartTreeSelectPC({ id, className, style, events = emptyObject, label = '人员选择', labelVisible = true, defaultValue = '', confirmValue = '', placeholder = '请选择部门', defaultValueType = 'noneDepart', disabled = false, layout = 'horizontal', requiredFlag = false, size = 'l', multiple = false, onChange = null, decorator, request = defaultRequest, }) {
     // 两次默认值不同, 需要刷新
     const prevDefaultRef = React.useRef(null);
     const prevConfirmRef = React.useRef(null);
@@ -30,6 +30,36 @@ export function DepartTreeSelectPC({ id, className, style, events = emptyObject,
         errorMessage: null,
     });
     useEffect(() => {
+        // 初始化数据
+        const initOrgsData = async () => {
+            try {
+                setErrorInfo({ errorStatus: false, errorMessage: null });
+                const resData = (await request('InitRootOrgs', {})) || [];
+                const data = dealOrgData(resData);
+                setTreeData(data);
+                setOriginalTreeData([...data]);
+            }
+            catch (e) {
+                setErrorInfo({ errorStatus: true, errorMessage: e });
+            }
+        };
+        const getdefaultUser = async () => {
+            var _a;
+            try {
+                if ((defaultValueType === 'confirmDepart' && confirmValue.length !== 0) ||
+                    defaultValue.length !== 0) {
+                    const orgId = confirmValue.length !== 0 ? confirmValue : defaultValue;
+                    const defaultUser = await getDepartById({
+                        _id: orgId,
+                    });
+                    setCurSelectItem({ orgId: orgId, content: defaultUser });
+                    (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: orgId, data: { content: defaultUser } });
+                }
+            }
+            catch (e) {
+                setErrorInfo({ errorStatus: true, errorMessage: e });
+            }
+        };
         initOrgsData();
         if ((defaultValue &&
             !isObjectEqual(prevDefaultRef.current !== defaultValue)) ||
@@ -38,7 +68,8 @@ export function DepartTreeSelectPC({ id, className, style, events = emptyObject,
             prevDefaultRef.current = defaultValue;
             prevConfirmRef.current = confirmValue;
         }
-    }, [defaultValueType, confirmValue, defaultValue]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [defaultValueType, confirmValue, defaultValue, request]);
     useEffect(() => {
         if (open) {
             setErrorInfo({ errorStatus: false, errorMessage: null });
@@ -47,43 +78,15 @@ export function DepartTreeSelectPC({ id, className, style, events = emptyObject,
             setActiveIds(node ? [node.id] : []);
             setSelectIds(node ? [node.id] : []);
         }
-    }, [open, treeData]);
-    // 初始化数据
-    const initOrgsData = async () => {
-        try {
-            setErrorInfo({ errorStatus: false, errorMessage: null });
-            const resData = (await request('InitRootOrgs', {})) || [];
-            const data = dealOrgData(resData);
-            setTreeData(data);
-            setOriginalTreeData([...data]);
-        }
-        catch (e) {
-            setErrorInfo({ errorStatus: true, errorMessage: e });
-        }
-    };
-    const getdefaultUser = async () => {
+    }, [curSelectItem === null || curSelectItem === void 0 ? void 0 : curSelectItem.orgId, open, treeData]);
+    const reset = (close, value = '') => {
         var _a;
-        try {
-            if ((defaultValueType === 'confirmDepart' && confirmValue.length !== 0) ||
-                defaultValue.length !== 0) {
-                const orgId = confirmValue.length !== 0 ? confirmValue : defaultValue;
-                const defaultUser = await getDepartByIdRequest({
-                    _id: orgId,
-                });
-                setCurSelectItem({ orgId: orgId, content: defaultUser });
-                (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: orgId, data: { content: defaultUser } });
-            }
-        }
-        catch (e) {
-            setErrorInfo({ errorStatus: true, errorMessage: e });
-        }
-    };
-    const reset = (close) => {
         setSelectIds([]);
         setCurSelectItem({ orgId: null, content: '' });
         setErrorInfo({ errorStatus: false, errorMessage: null });
         setActiveIds([]);
-        onChange === null || onChange === void 0 ? void 0 : onChange(null);
+        onChange === null || onChange === void 0 ? void 0 : onChange(value);
+        (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value });
         close && setOpen(false);
     };
     // 外层组件类
@@ -101,7 +104,7 @@ export function DepartTreeSelectPC({ id, className, style, events = emptyObject,
             React.createElement(Dropdown, { className: classNames(`department-tree-select`, `size-${size}`), destroyOnClose: false, open: open, onOpenChange: (open) => {
                     setOpen(open);
                     setErrorInfo({ errorStatus: false, errorMessage: null });
-                }, button: React.createElement(SelectViewContainer, { curSelectItem: curSelectItem, multiple: multiple, placeholder: "\u8BF7\u9009\u62E9\u90E8\u95E8", moveIn: moveIn, onChange: () => reset(true) }), style: { width: '100%' }, appearance: multiple ? 'pure' : 'button', clickClose: false, disabled: disabled }, () => (React.createElement("div", { className: "dim-tree-select" },
+                }, button: React.createElement(SelectViewContainer, { curSelectItem: curSelectItem, multiple: multiple, placeholder: placeholder, moveIn: moveIn, onChange: () => reset(true) }), style: { width: '100%' }, appearance: multiple ? 'pure' : 'button', clickClose: false, disabled: disabled }, () => (React.createElement("div", { className: "dim-tree-select" },
                 React.createElement(DimTreeContent, { data: treeData, setTreeData: setTreeData, selectedIds: selectIds, activeIds: activeIds, needUser: false, request: request, errorInfo: errorInfo, searchType: "SearchByOrg", onActive: (ids) => {
                         setActiveIds(ids);
                         setSelectIds(ids);
@@ -129,6 +132,7 @@ export function DepartTreeSelectPC({ id, className, style, events = emptyObject,
         multiCell: false,
         requiredFlag,
         size,
+        decorator,
     });
 }
 const SelectViewContainer = (props) => {

package/dist/web/components/form/userOrgSelect/userTreeSelect.h5.d.ts

@@ -1,12 +1,13 @@
 import React from 'react';
 import type { CommonFormPropsType } from '../types';
-import './userOrgSelect.less';
-export declare function UserTreeSelectH5({ id, className, modelClassName, style, modelStyle, events, label, labelVisible, name, placeholder, defaultValueType, defaultValue, confirmValue, disabled, layout, requiredFlag, size, decorator, multiple, //是否多选
-focus: autoFocus, onChange, initOrgRequest, request, getUserByIdRequest, }: IUserTreeSelec): JSX.Element;
+import './userOrgSelect.css';
+export declare function UserTreeSelectH5({ id, className, style, events, label, labelVisible, name, placeholder, defaultValueType, defaultValue, confirmValue, disabled, layout, requiredFlag, decorator, multiple, //是否多选
+focus: autoFocus, onChange, modelOpen, request, }: IUserTreeSelec): JSX.Element;
 export interface IUserTreeSelec extends CommonFormPropsType {
     defaultValue?: Readonly<string | string[]>;
     confirmValue?: string;
     placeholder?: string;
+    modelType?: string;
     defaultValueType?: 'noneUser' | 'confirmUser' | 'loginUser';
     maxLength?: number;
     focus?: boolean;
@@ -17,8 +18,10 @@ export interface IUserTreeSelec extends CommonFormPropsType {
     multiple?: boolean;
     relation?: object;
     isMuti?: boolean;
+    matchButtonWidth?: boolean;
+    dropDownStyle?: React.CSSProperties;
     onChange?: (v: any) => void;
-    initOrgRequest?: (action?: string, params?: object) => any;
     request?: any;
+    modelOpen?: boolean;
     getUserByIdRequest?: (v: any) => any;
 }

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

@@ -1,27 +1,24 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useCallback } from 'react';
 import { emptyObject, emptyArray } from '../../../utils/constant';
 import { renderDecorator } from '../renderDecorator';
 import { IconFont } from 'tdesign-icons-react';
 import classNames from '../../../utils/classnames';
-import { getUserById, getUserInfo, defaultRequest, } from '../../../utils/getUserService';
+import { getUserInfo, defaultRequest } from './getUserService';
 import { dealOrgData, dealUserData } from './utils';
 import { Modal, Button, ConfigProvider, Radio, Status } from 'tea-component';
 import { isInIde, filterStrList } from '../../../utils/platform';
-import './userOrgSelect.less';
+import './userOrgSelect.css';
 import isObjectEqual from '../../../utils/isObjectEqual';
 import destr from 'destr';
-import { ErrorStatus } from './comTool';
-export function UserTreeSelectH5({ id, className, modelClassName, style, modelStyle, events = emptyObject, label = '成员选择', labelVisible = true, name = 'formUserTreeSelect', placeholder = '请选择成员', defaultValueType = 'noneUser', defaultValue = emptyArray, confirmValue = '', disabled = false, layout = 'horizontal', requiredFlag = false, size = 'l', decorator, multiple = false, //是否多选
-focus: autoFocus = false, onChange = null, initOrgRequest = null, request = defaultRequest, getUserByIdRequest = getUserById, }) {
+import { ErrorStatus, ModalSearch } from './comTool';
+export function UserTreeSelectH5({ id, className, style, events = emptyObject, label = '成员选择', labelVisible = true, name = 'formUserTreeSelect', placeholder = '请选择成员', defaultValueType = 'noneUser', defaultValue = emptyArray, confirmValue = '', disabled = false, layout = 'horizontal', requiredFlag = false, decorator, multiple = false, //是否多选
+focus: autoFocus = false, onChange = null, modelOpen = false, request = defaultRequest, }) {
     var _a;
     const cls = classNames({
         'weda-ui': true,
         'weda-select-user-dept': true,
         [className]: className,
     });
-    const modelCls = classNames({
-        [className]: modelClassName,
-    });
     const subCls = classNames({
         'weui-cell': true,
         'weui-cell_active': true,
@@ -37,8 +34,6 @@ focus: autoFocus = false, onChange = null, initOrgRequest = null, request = defa
     const [orgsTreeData, setOrgsTreeData] = useState([]);
     const [originalOrgData, setOriginalOrgData] = useState([]);
     const [count, setCount] = useState(1); //计数弹窗显示层级
-    // 用户单选
-    const [curSelectItem, setCurSelectItem] = useState({});
     const [errorInfo, setErrorInfo] = useState({
         errorStatus: false,
         errorMessage: null,
@@ -57,7 +52,7 @@ focus: autoFocus = false, onChange = null, initOrgRequest = null, request = defa
             const sValue = (_a = event === null || event === void 0 ? void 0 : event.target) === null || _a === void 0 ? void 0 : _a.value;
             if (sValue) {
                 setSearchValue(multiple ? [...searchValue, sValue] : [sValue]);
-                const { Users = [], Roles = [] } = await request('SearchByCondition', {
+                const { Users = [] } = await request('SearchByCondition', {
                     KeyWords: sValue.trim(),
                     SearchCondition: {
                         SearchType: 'SearchByRole',
@@ -78,25 +73,34 @@ focus: autoFocus = false, onChange = null, initOrgRequest = null, request = defa
     const [selectItem, setSelectItem] = useState([]);
     const [searchValue, setSearchValue] = useState([]);
     const [loading, setLoading] = useState({ id: null, status: false });
+    const [titleText, setTitleText] = useState('');
     const onFocus = function () {
         setSearchValue([]);
         setVisible(true);
     };
     const onClose = () => {
+        setOrgsTreeData([]);
         initOrgsData();
         setErrorInfo({ errorStatus: false, errorMessage: null });
         setVisible(false);
     };
     const onConfirm = (selectItem = []) => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const contentList = selectItem.map((e) => e === null || e === void 0 ? void 0 : e.content);
         setValue([...contentList]);
-        prevDefaultRef.current = (_a = selectItem[0]) === null || _a === void 0 ? void 0 : _a.userId;
-        onChange === null || onChange === void 0 ? void 0 : onChange((_b = selectItem[0]) === null || _b === void 0 ? void 0 : _b.userId);
-        (_c = events === null || events === void 0 ? void 0 : events.change) === null || _c === void 0 ? void 0 : _c.call(events, { value: (_d = selectItem[0]) === null || _d === void 0 ? void 0 : _d.userId, data: selectItem });
+        const idList = selectItem.map((e) => e === null || e === void 0 ? void 0 : e.userId);
+        prevDefaultRef.current = [...idList];
+        onChange === null || onChange === void 0 ? void 0 : onChange(multiple ? idList : (_a = selectItem[0]) === null || _a === void 0 ? void 0 : _a.userId);
+        (_b = events === null || events === void 0 ? void 0 : events.change) === null || _b === void 0 ? void 0 : _b.call(events, multiple
+            ? { value: idList, data: selectItem }
+            : { value: (_c = selectItem[0]) === null || _c === void 0 ? void 0 : _c.userId, data: selectItem });
+        setOrgsTreeData([]);
         initOrgsData();
         setVisible(false);
     };
+    useEffect(() => {
+        setVisible(modelOpen);
+    }, [modelOpen]);
     useEffect(() => {
         initOrgsData();
         if ((defaultValue &&
@@ -108,8 +112,9 @@ focus: autoFocus = false, onChange = null, initOrgRequest = null, request = defa
             prevDefaultRef.current = defaultValue;
             prevConfirmRef.current = confirmValue;
         }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [defaultValueType, confirmValue, defaultValue]);
-    const getDefaultUser = async () => {
+    const getDefaultUser = useCallback(async () => {
         var _a;
         try {
             //默认显示登录用户时
@@ -131,34 +136,45 @@ focus: autoFocus = false, onChange = null, initOrgRequest = null, request = defa
             else if ((defaultValueType === 'confirmUser' && confirmValue.length !== 0) ||
                 defaultValue.length !== 0) {
                 const userIdList = filterStrList(confirmValue.length !== 0 ? confirmValue : defaultValue);
-                const userSelectList = [];
-                userIdList.forEach(async (userId) => {
-                    const UserItem = await getUserByIdRequest({
-                        _id: userId,
-                    });
-                    userSelectList.push({ value: userId, data: { content: UserItem } });
-                    setValue(UserItem ? [UserItem] : [userId]);
-                });
+                const userSelectList = await request('getUserById', {
+                    idList: userIdList || [],
+                }, 'callDataSource');
+                setValue(userSelectList.map((list) => { var _a; return (_a = list === null || list === void 0 ? void 0 : list.data) === null || _a === void 0 ? void 0 : _a.content; }));
+                setSelectItem(userSelectList.map((list) => {
+                    var _a;
+                    return { userId: list === null || list === void 0 ? void 0 : list.value, content: (_a = list === null || list === void 0 ? void 0 : list.data) === null || _a === void 0 ? void 0 : _a.content };
+                }));
             }
         }
         catch (e) {
             setErrorInfo({ errorStatus: true, errorMessage: e });
         }
-    };
+    }, [confirmValue, defaultValue, defaultValueType, request, events, onChange]);
     // 初始化数据
-    const initOrgsData = async () => {
+    const initOrgsData = useCallback(async () => {
         try {
             const resData = (await request('InitRootOrgs', {})) || [];
-            const data = dealOrgData(resData);
+            const pageNo = 1;
+            const noOrgUserData = await request('DescribeWedaUsersRuntime', {
+                pageNo: pageNo,
+                pageSize: 200,
+                IsNoRelatedOrgFlag: true,
+                UserType: 'internalUser',
+            });
+            const data = dealOrgData(resData).concat(dealUserData(noOrgUserData === null || noOrgUserData === void 0 ? void 0 : noOrgUserData.UserList));
+            //关闭弹窗时，默认返回第一层组织结构
+            setCount(1);
+            setTitleText('选择成员');
             setOrgsTreeData(destr(data));
-            setOriginalOrgData([{ index: count, treeData: data }]);
+            setOriginalOrgData([{ index: 1, treeData: data, title: '选择成员' }]);
         }
         catch (e) {
             setErrorInfo({ errorStatus: true, errorMessage: e });
         }
-    };
+    }, [request]);
     //点击部门节点，获取子部门节点
     const loadDepartData = async (node, count) => {
+        setTitleText(node === null || node === void 0 ? void 0 : node.content);
         setLoading({ id: node.orgId, status: true });
         const { Orgs = [], Users = [] } = await request('LazyDescribeOrgs', {
             OrgId: node.orgId,
@@ -170,7 +186,11 @@ focus: autoFocus = false, onChange = null, initOrgRequest = null, request = defa
         //@ts-ignore jsx
         const children = dealOrgData(Orgs).concat(dealUserData(Users));
         setOrgsTreeData(destr(children));
-        originalOrgData.push({ index: count + 1, treeData: children });
+        originalOrgData.push({
+            index: count + 1,
+            treeData: children,
+            title: node === null || node === void 0 ? void 0 : node.content,
+        });
         setCount(count + 1);
         setOriginalOrgData(originalOrgData);
         setLoading({ id: null, status: false });
@@ -178,13 +198,13 @@ focus: autoFocus = false, onChange = null, initOrgRequest = null, request = defa
     //判断当前页结构为第几层，如首次渲染则添加至orgsTreeData，二次进入刷新index数据
     const retLevel = (count) => {
         const storageOriTreeData = [];
-        const storageOrgShowData = [];
         if (count !== 1) {
             originalOrgData.map((item) => {
                 if ((item === null || item === void 0 ? void 0 : item.index) < count) {
                     storageOriTreeData.push(item);
                     if ((item === null || item === void 0 ? void 0 : item.index) === count - 1) {
                         setCount(count - 1);
+                        setTitleText(item === null || item === void 0 ? void 0 : item.title);
                         setOrgsTreeData(destr((item === null || item === void 0 ? void 0 : item.treeData) || []));
                     }
                 }
@@ -206,36 +226,20 @@ focus: autoFocus = false, onChange = null, initOrgRequest = null, request = defa
                 React.createElement(Modal.Body, { className: ((_a = selectItem[0]) === null || _a === void 0 ? void 0 : _a.userId) ? 'is-selected-value' : '' },
                     React.createElement("div", { className: "weda-select-user-dept__dialog-header", id: count.toString() },
                         React.createElement("div", { className: count == 1 ? '' : 'arrow-left', onClick: () => retLevel(count) }),
-                        "\u9009\u62E9\u6210\u5458"),
-                    React.createElement("div", { className: classNames({
-                            'weda-select-user-dept__dialog-search': true,
-                            'weda-select-user-dept__dialog-search-focus': isSearch,
-                        }) },
-                        React.createElement("div", { className: "weda-select-user-dept__dialog-search-box" },
-                            React.createElement("input", { type: "text", onFocus: () => {
-                                    handleFocus(true);
-                                }, onClick: (e) => {
-                                    e.stopPropagation();
-                                }, value: searchValue.join(), onChange: changeSearchValue, 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': searchValue[0],
-                                }) },
-                                React.createElement("span", { className: "search-icon" }),
-                                React.createElement("span", { className: "search-placeholder" }, "\u641C\u7D22")),
-                            searchValue && searchValue.length > 0 && (React.createElement("div", { className: "weda-select-user-dept__dialog-input-clear", onClick: cancleSearch },
-                                React.createElement("p", { className: "weda-select-user-dept__dialog-input-clear-close" })))),
-                        React.createElement("span", { className: "weda-select-user-dept__dialog-search-cancel", onClick: cancleSearch }, "\u53D6\u6D88")),
+                        titleText),
+                    React.createElement(ModalSearch, { value: searchValue.join(), onChange: changeSearchValue, onCancel: cancleSearch, isSearch: isSearch, onFocus: () => {
+                            handleFocus(true);
+                        } }),
                     (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.errorStatus) ? (React.createElement(ErrorStatus, { size: "l", title: "\u63A5\u53E3\u8C03\u7528\u5931\u8D25", description: (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.errorMessage) || null })) : orgsTreeData && orgsTreeData.length > 0 ? (React.createElement("div", { className: classNames('weda-select-user-dept__dialog-list') }, orgsTreeData.map((item, index) => {
                         var _a;
                         return (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) ? loadDepartData(item, count) : null;
                             } },
                             React.createElement("div", { className: "weda-select-user-dept__list-item-wrap" },
-                                (item === null || item === void 0 ? void 0 : item.isUser) && (React.createElement(Radio.Group, { value: (_a = selectItem.filter((e) => (e === null || e === void 0 ? void 0 : e.userId) === (item === null || item === void 0 ? void 0 : item.userId))[0]) === null || _a === void 0 ? void 0 : _a.userId, onChange: (value, context) => {
-                                        //多选情况，取消选中某元素时
-                                        if (multiple && searchValue.indexOf(value) !== -1) {
-                                            searchValue.splice(searchValue.indexOf(value), 1);
+                                (item === null || item === void 0 ? void 0 : item.isUser) && (React.createElement(Radio.Group, { value: (_a = selectItem.filter((e) => (e === null || e === void 0 ? void 0 : e.userId) === (item === null || item === void 0 ? void 0 : item.userId))[0]) === null || _a === void 0 ? void 0 : _a.userId, onChange: (value) => {
+                                        const ids = selectItem.map((item) => item === null || item === void 0 ? void 0 : item.userId);
+                                        // 多选情况，取消选中某元素时
+                                        if (ids.indexOf(value) !== -1) {
                                             setSelectItem(selectItem.filter((e) => e.userId !== value));
                                         }
                                         else {
@@ -256,9 +260,8 @@ focus: autoFocus = false, onChange = null, initOrgRequest = null, request = defa
                     React.createElement("div", null,
                         selectItem.length > 0 && (React.createElement("div", { className: "weda-select-user-dept__select-result" },
                             React.createElement("div", { className: "weda-select-user-dept__select-label" }, "\u5DF2\u9009\u62E9"),
-                            React.createElement("div", { className: "weda-select-user-dept__result-list" }, selectItem.map((d) => (React.createElement("div", { key: d === null || d === void 0 ? void 0 : d.userId, className: "weda-select-user-dept__result-item", onClick: () => {
+                            React.createElement("div", { className: "weda-select-user-dept__result-list" }, selectItem.map((d) => (React.createElement("div", { key: (d === null || d === void 0 ? void 0 : d.userId) || (d === null || d === void 0 ? void 0 : d.value), className: "weda-select-user-dept__result-item", onClick: () => {
                                     setSelectItem(selectItem.filter((e) => (e === null || e === void 0 ? void 0 : e.userId) !== (d === null || d === void 0 ? void 0 : d.userId)));
-                                    const valueList = searchValue.filter((e) => e !== (d === null || d === void 0 ? void 0 : d.userId));
                                 } }, d === null || d === void 0 ? void 0 :
                                 d.content,
                                 React.createElement("div", { className: "close" }))))))),
@@ -272,5 +275,6 @@ focus: autoFocus = false, onChange = null, initOrgRequest = null, request = defa
         multiCell: false,
         requiredFlag,
         layout,
+        decorator,
     });
 }