@cloudbase/weda-ui 3.2.1 → 3.3.1

package/dist/src/web/components/form/uploaderFile/uploadFile.pc.js

@@ -61,6 +61,7 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
             (_c = events === null || events === void 0 ? void 0 : events.success) === null || _c === void 0 ? void 0 : _c.call(events, { value: pureFileIDList });
             fileRef.current = fileIDList;
         }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [fileIDList]);
     // 外层组件类
     const cls = classNames({
@@ -209,12 +210,9 @@ const TcbFileUpload = ({ file, disabled }) => {
         const title = (file === null || file === void 0 ? void 0 : file.name) || '';
         const uuid = file === null || file === void 0 ? void 0 : file._uuid;
         return { size, title, uuid };
-    }, [file === null || file === void 0 ? void 0 : file._uuid]);
-    React.useEffect(() => {
-        handleUpload(file);
-    }, [file === null || file === void 0 ? void 0 : file._uuid]);
+    }, [file === null || file === void 0 ? void 0 : file._uuid, file === null || file === void 0 ? void 0 : file.name, file === null || file === void 0 ? void 0 : file.size]);
     // 上传过程
-    const handleUpload = async (file) => {
+    const handleUpload = React.useCallback(async (file) => {
         const tcb = await getCloudInstance();
         try {
             setStatus('0');
@@ -235,7 +233,12 @@ const TcbFileUpload = ({ file, disabled }) => {
             setStatus('3');
             events.error && events.error(e);
         }
-    };
+    }, 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [size, uploadPath, uuid]);
+    React.useEffect(() => {
+        handleUpload(file);
+    }, [file, file._uuid, handleUpload]);
     return (React.createElement("div", { className: `${CLASS_PREFIX}--item ${CLASS_PREFIX}--item-body` },
         React.createElement("div", { className: `${CLASS_PREFIX}--item-title`, title: title }, cutFileTitle(title)),
         React.createElement("div", { className: `${CLASS_PREFIX}--item-size` }, size),

package/dist/src/web/components/form/userOrgSelect/comTool.js

@@ -10,7 +10,6 @@ export const DimTreeContent = (props) => {
     const loadDepartData = async (id) => {
         const node = getNode(treeData, id, 'id');
         if (node.children) {
-            //resolve();
             return;
         }
         try {
@@ -27,15 +26,13 @@ export const DimTreeContent = (props) => {
             }
             else {
                 //@ts-ignore jsx
-                const children = dealOrgData(Orgs).concat(needUser ? dealUserData(Users) : []);
+                const children = dealOrgData(Orgs).concat(needUser ? dealUserData(Users, false, node.orgId) : []);
                 Object.assign(node, { children });
             }
             setTreeData([...treeData]);
-            // resolve();
             return;
         }
         catch (error) {
-            //reject(error);
             return;
         }
     };
@@ -58,11 +55,8 @@ export const DimTreeContent = (props) => {
                 setLoading(false);
                 //@ts-ignore jsx
                 resData = dealOrgData(Orgs).concat(needUser ? dealUserData(Users) : []);
+                setTreeData(resData);
             }
-            else {
-                resData = dealOrgData((await request('SearchByCondition', {})) || []);
-            }
-            setTreeData(resData);
         }
         catch (e) {
             setLoading(false);
@@ -76,7 +70,7 @@ export const DimTreeContent = (props) => {
         !(treeData === null || treeData === void 0 ? void 0 : treeData.length) && !loading && !(errInfo === null || errInfo === void 0 ? void 0 : errInfo.errorStatus) && (React.createElement(Status, { className: "dim-tree-select--blank", icon: 'blank', size: 's', title: `暂无${needUser ? '成员' : '部门'}数据` })),
         !!(treeData === null || treeData === void 0 ? void 0 : treeData.length) && !loading && !(errInfo === null || errInfo === void 0 ? void 0 : errInfo.errorStatus) && (React.createElement(React.Fragment, null,
             React.createElement("div", { className: "tree-select-warp" },
-                React.createElement(Tree, { selectable: false, selectStrictly: true, activable: true, activeIds: activeIds, selectedIds: selectedIds, data: treeData, onLoad: loadDepartData, onActive: onActive, onSelect: onSelect, fullExpandable: needUser ? true : false, className: `tree-select ${treeClassName}` })),
+                React.createElement(Tree, { selectable: false, selectStrictly: true, activable: true, activeIds: activeIds, selectedIds: selectedIds, data: treeData, onLoad: loadDepartData, onActive: onActive, onSelect: onSelect, height: 324, fullExpandable: needUser ? true : false, className: `tree-select ${treeClassName}` })),
             React.createElement("div", { className: "dim-tree-footer" },
                 React.createElement(Button, { type: "weak", className: "din-btn din-btn--cancle", onClick: onCancel }, "\u53D6\u6D88"),
                 React.createElement(Button, { type: "primary", className: "din-btn din-btn--primary", onClick: onConfirm }, "\u786E\u5B9A"))))));

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

@@ -1,9 +1,9 @@
-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';
@@ -38,6 +38,21 @@ export function DepartTreeSelectH5({ id, className, style, events = emptyObject,
         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);
     };
@@ -87,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);
@@ -103,42 +120,34 @@ 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 {
-            setTitleText('选择部门');
-            const resData = (await request('InitRootOrgs', {})) || [];
-            const data = dealOrgData(resData);
-            setOrgsTreeData(data);
-            setOriginalOrgData([{ index: count, treeData: data, title: '选择部门' }]);
-        }
-        catch (e) {
-            setErrorInfo({ errorStatus: true, errorMessage: e });
-        }
-    };
     //点击部门节点，获取子部门节点
     const loadDepartData = async (node, count) => {
         try {
@@ -162,7 +171,11 @@ export function DepartTreeSelectH5({ id, className, style, events = emptyObject,
                 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);
             }

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

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { IDepartTreeSelec } from './departTreeSelect.h5';
 import '../userOrgSelect.css';
-export declare function DepartTreeSelectPC({ id, className, style, events, label, labelVisible, placeholder, defaultValue, confirmValue, defaultValueType, disabled, layout, requiredFlag, size, decorator, multiple, onChange, request, }: IDepartTreeSelec): JSX.Element;
+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/src/web/components/form/userOrgSelect/departTreeSelect/departTreeSelect.pc.js

@@ -4,13 +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 { 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, placeholder, 
-// name = 'formUserTreeSelect',
-defaultValue = '', confirmValue = '', defaultValueType = 'noneDepart', disabled = false, layout = 'horizontal', requiredFlag = false, size = 'l', decorator, multiple = false, onChange = null, request = defaultRequest, }) {
+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);
@@ -32,6 +30,36 @@ defaultValue = '', confirmValue = '', defaultValueType = 'noneDepart', disabled
         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)) ||
@@ -40,7 +68,8 @@ defaultValue = '', confirmValue = '', defaultValueType = 'noneDepart', disabled
             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 });
@@ -49,37 +78,7 @@ defaultValue = '', confirmValue = '', defaultValueType = 'noneDepart', disabled
             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 () => {
-        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 });
-        }
-    };
+    }, [curSelectItem === null || curSelectItem === void 0 ? void 0 : curSelectItem.orgId, open, treeData]);
     const reset = (close, value = '') => {
         var _a;
         setSelectIds([]);

package/dist/src/web/{utils → components/form/userOrgSelect}/getUserService.js

@@ -1,4 +1,4 @@
-import { callWedaApi, callDataSource } from './tcb';
+import { callWedaApi, callDataSource } from '../../../utils/tcb';
 /**
  * 默认请求统一处理方法
  * @param {*} action
@@ -21,10 +21,10 @@ export const defaultRequest = async (action, params, type = 'callWedaApi') => {
             let pageNo = 1;
             const setInitUserDataHandle = async () => {
                 const res = await callWedaApi({
-                    action: 'DescribeWedaUserList',
+                    action: 'DescribeWedaUsersRuntime',
                     data: {
                         pageNo: pageNo,
-                        pageSize: 100,
+                        pageSize: 200,
                         UserIds: (params === null || params === void 0 ? void 0 : params.idList) || [],
                         UserType: 'internalUser',
                     },
@@ -34,9 +34,12 @@ export const defaultRequest = async (action, params, type = 'callWedaApi') => {
                     return {
                         value: item === null || item === void 0 ? void 0 : item.UserId,
                         data: {
-                            content: userInfo[datasource === null || datasource === void 0 ? void 0 : datasource.schema['x-primary-column']] ||
-                                (item === null || item === void 0 ? void 0 : item.UserId),
+                            content: (datasource === null || datasource === void 0 ? void 0 : datasource.schema['x-primary-column']) === 'name'
+                                ? item === null || item === void 0 ? void 0 : item.Name
+                                : userInfo[datasource === null || datasource === void 0 ? void 0 : datasource.schema['x-primary-column']] ||
+                                    (item === null || item === void 0 ? void 0 : item.UserId),
                         },
+                        orgs: item === null || item === void 0 ? void 0 : item.Orgs,
                     };
                 });
                 userInfoList.push.apply(userInfoList, resData);

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

@@ -1,8 +1,8 @@
 import React from 'react';
 import type { CommonFormPropsType } from '../types';
 import './userOrgSelect.css';
-export declare function UserTreeSelectH5({ id, className, style, events, label, labelVisible, name, placeholder, defaultValueType, defaultValue, confirmValue, disabled, layout, requiredFlag, multiple, //是否多选
-focus: autoFocus, onChange, decorator, request, }: IUserTreeSelec): JSX.Element;
+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;
@@ -22,5 +22,6 @@ export interface IUserTreeSelec extends CommonFormPropsType {
     dropDownStyle?: React.CSSProperties;
     onChange?: (v: any) => void;
     request?: any;
+    modelOpen?: boolean;
     getUserByIdRequest?: (v: any) => any;
 }

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

@@ -1,18 +1,18 @@
-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 { getUserInfo, defaultRequest } from '../../../utils/getUserService';
-import { dealUserData, dealOrgData } from './utils';
+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.css';
 import isObjectEqual from '../../../utils/isObjectEqual';
 import destr from 'destr';
 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, multiple = false, //是否多选
-focus: autoFocus = false, onChange = null, decorator, request = defaultRequest, }) {
+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,
@@ -79,20 +79,28 @@ focus: autoFocus = false, onChange = null, decorator, request = defaultRequest,
         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 &&
@@ -104,8 +112,9 @@ focus: autoFocus = false, onChange = null, decorator, request = defaultRequest,
             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 {
             //默认显示登录用户时
@@ -130,26 +139,39 @@ focus: autoFocus = false, onChange = null, decorator, request = defaultRequest,
                 const userSelectList = await request('getUserById', {
                     idList: userIdList || [],
                 }, 'callDataSource');
-                setValue([userSelectList[0].data.content]);
+                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, title: '选择成员' }]);
+            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);
@@ -215,9 +237,9 @@ focus: autoFocus = false, onChange = null, decorator, request = defaultRequest,
                             } },
                             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) => {
-                                        //多选情况，取消选中某元素时
-                                        if (multiple && searchValue.indexOf(value) !== -1) {
-                                            searchValue.splice(searchValue.indexOf(value), 1);
+                                        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 {
@@ -238,7 +260,7 @@ focus: autoFocus = false, onChange = null, decorator, request = defaultRequest,
                     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)));
                                 } }, d === null || d === void 0 ? void 0 :
                                 d.content,

package/dist/src/web/components/form/userOrgSelect/userTreeSelect.pc.d.ts

@@ -6,4 +6,4 @@ style, events, label, labelVisible, //标题显隐
 defaultValue, //默认值，支持数组
 confirmValue, placeholder, defaultValueType, disabled, layout, modelType, requiredFlag, size, multiple, //多选
 onChange, request, //接口请求
-decorator, matchButtonWidth, dropDownStyle, }: IUserTreeSelec): JSX.Element;
+decorator, matchButtonWidth, modelOpen, dropDownStyle, }: IUserTreeSelec): JSX.Element;