@cloudbase/weda-ui 3.4.10 → 3.4.11

package/dist/configs/components/wd-table.js

@@ -20,7 +20,7 @@ const commonProperties = {
         'x-linkages': [
             {
                 type: 'value:state',
-                target: '*( filterFields,bindMetadata,queryCondition,orderBy,orderType,defaultPageSize)',
+                target: '*( filterFields,bindMetadata,queryCondition,orderBy,orderType,defaultPageSize,defaultPageIndex)',
                 condition: "{{$self.value !='custom-connector'}}",
                 state: {
                     display: true,

package/dist/web/components/calendar/index.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState, useEffect, useMemo } from 'react';
+import React, { useState, useEffect, useMemo } from 'react';
 import { usePlatform } from '../../utils/platform';
 import { ConfigProvider, Select } from 'tea-component';
 import * as PropTypes from 'prop-types';

package/dist/web/components/form/enumSelect/MultipleSelect.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
 import { SelectMultiple } from 'tea-component';
 import SelectContainer from './SelectContainer';
 import { normalProps } from './props/defaultProps';

package/dist/web/components/form/enumSelect/SelectContainer.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
 import classNames from '../../../utils/classnames';
 import { selectContainerPropsTypes } from './props/propsTypes';
 import { renderDecorator } from '../renderDecorator';

package/dist/web/components/form/input/index.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import * as React from 'react';
 import classNames from '../../../utils/classnames';
 import { usePlatform } from '../../../utils/platform';
@@ -59,14 +59,20 @@ label = '标题', labelVisible = true, name = 'formInput', defaultValue = '', pa
         e.preventDefault();
     };
     const onKeyDown = function (e) {
-        var _a;
+        var _a, _b;
         // 确认逻辑
         if (e.key === 'enter' || e.keyCode === 13) {
             (_a = events === null || events === void 0 ? void 0 : events.confirm) === null || _a === void 0 ? void 0 : _a.call(events, { value: e.target.value }, { originEvent: e });
         }
         // 数字类型的键盘, 不能输入e
-        if (inputType === 'number' && e.key === 'e') {
-            e.preventDefault();
+        if (inputType === 'number') {
+            if (e.key === 'e') {
+                e.preventDefault();
+            }
+            // 不能输入 -
+            if (e.key === '-' && ((_b = e.target.value) === null || _b === void 0 ? void 0 : _b.length) > 0) {
+                e.preventDefault();
+            }
         }
     };
     const onFocus = function (e) {
@@ -79,7 +85,7 @@ label = '标题', labelVisible = true, name = 'formInput', defaultValue = '', pa
         (_a = events === null || events === void 0 ? void 0 : events.blur) === null || _a === void 0 ? void 0 : _a.call(events, { value: e.target.value }, { originEvent: e });
         setIsFocus(false);
     };
-    const fieldEl = platform === 'h5' ? (_jsx("div", { className: subCls, children: _jsxs("div", { className: "weui-cell__bd weui-flex", children: [_jsx("input", { className: "weui-input", "data-testid": "weui-input-test", type: inputType, placeholder: placeholder, value: value, disabled: disabled, name: name, autoFocus: autoFocus, onChange: onChange, onFocus: onFocus, onBlur: onBlur, onKeyDown: onKeyDown, role: "input" }), clearable && (_jsx("button", { "data-testid": "weui-btn_input-clear-test", className: "weui-btn_reset weui-btn_icon weui-btn_input-clear", onMouseDown: onClear, children: _jsx("i", { className: "weui-icon-clear" }) }))] }) })) : (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsxs("div", { className: 'weui-pc-input', children: [_jsx(TeaInput, { "data-testid": "weui-input-test-pc", className: 'pc-input', size: size, type: inputType, placeholder: placeholder, value: value, disabled: disabled, name: name, autoFocus: autoFocus, onChange: onChange, onFocus: onFocus, onBlur: onBlur, onKeyDown: onKeyDown }), showPcClear && (_jsx(Icon, { "data-testid": "weui-input-test-pc-clear", className: 'pc-clear', type: "dismiss", size: "s", onMouseDown: onClear }))] }) }));
+    const fieldEl = platform === 'h5' ? (_jsx(_Fragment, { children: _jsx("div", { className: subCls, children: _jsxs("div", { className: "weui-cell__bd weui-flex", children: [_jsx("input", { className: "weui-input", "data-testid": "weui-input-test", type: inputType, placeholder: placeholder, value: value, disabled: disabled, name: name, autoFocus: autoFocus, onChange: onChange, onFocus: onFocus, onBlur: onBlur, onKeyDown: onKeyDown, role: "input" }), clearable && (_jsx("button", { "data-testid": "weui-btn_input-clear-test", className: "weui-btn_reset weui-btn_icon weui-btn_input-clear", onMouseDown: onClear, children: _jsx("i", { className: "weui-icon-clear" }) }))] }) }) })) : (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsxs("div", { className: 'weui-pc-input', children: [_jsx(TeaInput, { "data-testid": "weui-input-test-pc", className: 'pc-input', size: size, type: inputType, placeholder: placeholder, value: value, disabled: disabled, name: name, autoFocus: autoFocus, onChange: onChange, onFocus: onFocus, onBlur: onBlur, onKeyDown: onKeyDown }), showPcClear && (_jsx(Icon, { "data-testid": "weui-input-test-pc-clear", className: 'pc-clear', type: "dismiss", size: "s", onMouseDown: onClear }))] }) }));
     return renderDecorator(fieldEl, decorator)({
         id,
         className: cls,

package/dist/web/components/form/location/components/LocationPC/Header.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import * as React from 'react';
 import { Button } from 'tea-component';
 import classNames from '../../../../../utils/classnames';
 const Header = ({ onClick, isEdit, info, disabled, showLngLat, locationType, dataSourceStatus, apiKeyStatus, currentLocStatus, }) => {

package/dist/web/components/form/location/index.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
 import { ConfigProvider } from 'tea-component';
 import './index.css';
 import { usePlatform } from '../../../utils/platform';

package/dist/web/components/form/select/request.js

@@ -30,10 +30,22 @@ export const requestFatherRelatedOption = async (params, pageNo, type, searchVal
     let realWhere = [];
     if (searchValue) {
         if (type === RequestOptionType.SEARCH) {
-            realWhere = [{ key: primaryField, val: searchValue, rel: 'search' }];
+            realWhere = [
+                {
+                    [primaryField]: {
+                        $search: searchValue,
+                    },
+                },
+            ];
         }
         else if (type === RequestOptionType.EQUAL) {
-            realWhere = [{ key: '_id', val: searchValue, rel: 'eq' }];
+            realWhere = [
+                {
+                    _id: {
+                        $eq: searchValue,
+                    },
+                },
+            ];
         }
     }
     realWhere = [{ $and: [...getWhereList(where), ...realWhere] }];

package/dist/web/components/form/uploader/uploader.h5.js

@@ -137,7 +137,7 @@ export function ImageUploaderH5({ title: label, maxUploadCount, maxSize = 10, ac
                                         if (!islegalType(files, accepts))
                                             return;
                                         if (files.some((f) => f.size > maxSize * 1024 * 1024)) {
-                                            weui.alert('请上传不超过10M的图片');
+                                            weui.alert(`请上传不超过 ${maxSize}M 的图片`);
                                             return false;
                                         }
                                         if (files.length > finalMaxImgCount) {

package/dist/web/components/form/uploader/uploader.pc.js

@@ -36,7 +36,8 @@ export function UploaderPC({ layout, className, id, style, title, tips, ...props
 export function UploaderPCInner(props) {
     var _a;
     const { tips = '', btnTitle = '上传图片', maxUploadCount = 9, maxSize = 10, defaultValue, // 需要兼容 cloud:和https: 协议，需要兼容 字符串和字符串数组
-    acceptTypes = IMAGE_TYPES, uploadPath = 'weda-uploader', events = emptyObject, single = false, disabled = false, onChange, imgTypeCls, $node, } = props;
+    acceptTypes = IMAGE_TYPES, uploadPath = 'weda-uploader', events = emptyObject, single = false, disabled = false, onChange, imgTypeCls, $node, value, // 数据管理后台中，formily使用此字段传默认值
+     } = props;
     // 上传中
     const [uploading, setUploading] = React.useState(false);
     //上传进度
@@ -47,7 +48,7 @@ export function UploaderPCInner(props) {
     const formType = ((_a = getParentForm($node)) === null || _a === void 0 ? void 0 : _a.formType) || 'create';
     React.useEffect(() => {
         let initialValue = []
-            .concat(defaultValue)
+            .concat(value ? value : defaultValue)
             .filter((d) => typeof d === 'string' && d !== '');
         if (single) {
             initialValue = initialValue[0] ? [initialValue[0]] : [];

package/dist/web/components/form/uploaderFile/index.js

@@ -1,4 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+/* eslint-disable react/prop-types */
+import * as React from 'react';
 import { usePlatform } from '../../../utils/platform';
 import { UploadFileH5 as UploaderH5 } from './uploadFile.h5';
 import { UploadFilePc } from './uploadFile.pc';

package/dist/web/components/form/userOrgSelect/common/fetch-data-service.js

@@ -42,26 +42,23 @@ export const errorHandle = (error, action) => {
  */
 export const fetchUserListByIds = async (selectUserIds = [], request) => {
     try {
-        const PAGE_SIZE = 50;
-        const total = selectUserIds.length;
-        const records = [];
-        const promises = [];
-        for (let index = 1; index <= Math.ceil(total / PAGE_SIZE); index++) {
-            const start = (index - 1) * PAGE_SIZE;
-            const end = start + PAGE_SIZE;
-            promises.push(request('DescribeWedaUsersRuntime', {
-                UserIds: selectUserIds.slice(start, end),
+        let pageNo = 1;
+        const pageSize = 50;
+        let records = [];
+        let total = 9999;
+        for (let index = 0; index < Math.floor(total / pageSize) + 1; index++) {
+            const data = await request('DescribeWedaUsersRuntime', {
+                pageNo: pageNo,
+                pageSize: pageSize,
+                UserIds: selectUserIds || [],
                 UserType: 'internalUser',
                 NeedPrimaryColumn: true,
                 IsNoRelatedOrgFlag: false,
-            }));
-        }
-        const results = await Promise.all(promises);
-        for (const res of results) {
-            if (res.UserList &&
-                Array.isArray(res.UserList) &&
-                res.UserList.length > 0) {
-                records.push(...res.UserList);
+            });
+            pageNo = pageNo + 1;
+            if (data === null || data === void 0 ? void 0 : data.UserList) {
+                total = (data === null || data === void 0 ? void 0 : data.Total) || 0;
+                records = records.concat(data === null || data === void 0 ? void 0 : data.UserList);
             }
         }
         return records;
@@ -175,36 +172,43 @@ async function fetchUsersByOrgId(params, request) {
     }
 }
 /**
- *获取全量组织数据
+ * 获取当前组织列表总数
  */
-export const DescribeOrgs = async (request) => {
+export const fetchOrgTotal = async (request) => {
     try {
-        const PAGE_SIZE = 1000;
-        const { Total = 0, DataList = [] } = await request('DescribeOrgs', {
+        return await request('DescribeOrgs', {
             pageNo: 1,
-            pageSize: PAGE_SIZE,
+            pageSize: 1,
+        }).then((data) => {
+            return (data === null || data === void 0 ? void 0 : data.Total) || 0;
         });
-        const total = Number(Total);
-        // 一页拉取了全部数据，直接返回
-        if (total <= PAGE_SIZE) {
-            return DataList;
-        }
-        const records = [...DataList];
-        const promises = [];
-        // 从第二页开始，并发拉取所有
-        for (let index = 2; index <= Math.ceil(total / PAGE_SIZE); index++) {
-            promises.push(request('DescribeOrgs', {
-                pageNo: index,
-                pageSize: PAGE_SIZE,
-            }));
-        }
-        const results = await Promise.all(promises);
-        for (const res of results) {
-            if (res.DataList &&
-                Array.isArray(res.DataList) &&
-                res.DataList.length > 0) {
-                records.push(...res.DataList);
+    }
+    catch (error) {
+        console.error('错误', error);
+        throw errorHandle(error, 'fetchOrgTotal');
+    }
+};
+/**
+ *获取全量组织数据
+ */
+export const DescribeOrgs = async (request) => {
+    try {
+        const total = await fetchOrgTotal(request);
+        let records = [];
+        if (total > 0) {
+            const resultPromise = [];
+            for (let index = 1; index <= Math.ceil(total / 1000); index++) {
+                const DescribeOrgsByPage = request('DescribeOrgs', {
+                    pageNo: index,
+                    pageSize: 1000,
+                }) || {};
+                resultPromise.push(DescribeOrgsByPage);
             }
+            await Promise.all(resultPromise).then((data) => {
+                (data || []).map((item) => {
+                    records = records.concat(item === null || item === void 0 ? void 0 : item.DataList);
+                });
+            });
         }
         return records;
     }
@@ -252,6 +256,6 @@ export const fetchViewList = async () => {
     }
     catch (error) {
         console.error('错误', error);
-        throw errorHandle(error, 'fetchViewList');
+        throw errorHandle(error, 'DescribeOrgs');
     }
 };

package/dist/web/components/form/userOrgSelect/common/utils.js

@@ -306,23 +306,3 @@ export const formatTree = (nodes) => {
     }
     return [];
 };
-/**
- * 根据code再树结构中查找节点
- * @param treeData
- * @param code
- * @returns
- */
-export const getNodeFromTreeByCode = (treeData, code) => {
-    for (const node of treeData) {
-        if (node.code === code) {
-            return node;
-        }
-        if (node.children) {
-            const result = getNodeFromTreeByCode(node.children, code);
-            if (result) {
-                return result;
-            }
-        }
-    }
-    return null;
-};

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

@@ -3,12 +3,14 @@ import React, { useState } from 'react';
 import { renderDecorator } from '../../../renderDecorator';
 import classNames from '../../../../../utils/classnames';
 import { Dropdown, ConfigProvider } from 'tea-component';
+//import {dealOrgData } from '../../utils';
 import { defaultRequest } from '../../common/fetch-data-service';
 import '../index.css';
 import { OrgModalPC } from './org-modal-pc';
 import { InputTags } from '../../component/input-tags';
+import { filterStrList } from '../../../../../utils/platform';
 export const OrgTreeContext = React.createContext(null);
-export function DepartTreeSelectPC({ id, className, style, label = '部门选择', labelVisible = true, placeholder = '请选择部门', disabled = false, layout = 'horizontal', requiredFlag = false, size = 'l', multiple = false, decorator, request = defaultRequest, confirmOrgList, setConfirmOrgList, selectedOrgList, setSelectedOrgList, errorInfo, setErrorInfo, treeData, orgList, error, defaultExpandedIds, }) {
+export function DepartTreeSelectPC({ id, className, style, label = '部门选择', labelVisible = true, placeholder = '请选择部门', disabled = false, layout = 'horizontal', requiredFlag = false, size = 'l', multiple = false, decorator, request = defaultRequest, confirmOrgList, confirmOrgIds, setConfirmOrgList, selectedOrgIds, setSelectedOrgIds, selectedOrgList, setSelectedOrgList, errorInfo, setErrorInfo, treeData, orgList, error, defaultExpandedIds, }) {
     const [open, setOpen] = useState(false);
     // 外层组件类
     const cls = classNames({
@@ -23,18 +25,21 @@ export function DepartTreeSelectPC({ id, className, style, label = '部门选择
     };
     //取消 关闭弹窗
     const onCancel = () => {
-        setSelectedOrgList(confirmOrgList);
+        setSelectedOrgList([]);
         setOpen(false);
     };
     return renderDecorator(_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsx(OrgTreeContext.Provider, { value: {
+                selectedOrgList,
                 multiple,
                 setSelectedOrgList,
-                selectedOrgList,
                 confirmOrgList,
+                selectedOrgIds,
+                setSelectedOrgIds,
                 defaultExpandedIds,
                 request,
             }, children: _jsx(Dropdown, { className: classNames(`weda-ui-org-selected`, `size-${size}`), open: open, onOpenChange: (open) => {
                     setOpen(open);
+                    setSelectedOrgIds(filterStrList(confirmOrgIds));
                     setErrorInfo({ errorStatus: false, errorMessage: null });
                 }, appearance: 'button', button: _jsx(InputTags, { tagsList: confirmOrgList, placeholder: placeholder, multiple: multiple, errInfo: errorInfo, disabled: disabled, onClose: (e, item) => {
                         setConfirmOrgList(confirmOrgList.filter((l) => (l === null || l === void 0 ? void 0 : l.id) !== (item === null || item === void 0 ? void 0 : item.id)));

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

@@ -22,6 +22,8 @@ export default function DepartTreeSelect(props) {
     const prevDefaultRef = React.useRef(null);
     // 最终选定部门id
     const [confirmOrgIds, setConfirmOrgIds] = useSyncValue(defaultValue, isObjectEqual);
+    //弹窗中被选中部门id集合
+    const [selectedOrgIds, setSelectedOrgIds] = useState([]);
     // 最终选定部门集合
     const [confirmOrgList, setConfirmOrgList] = useState([]);
     //弹窗中被选中部门集合
@@ -59,23 +61,23 @@ export default function DepartTreeSelect(props) {
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [defaultValueType, confirmValue]);
-    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([]);
-                }
+    const getDefaultOrg = async (ids) => {
+        try {
+            setErrorInfo({ errorStatus: false, errorMessage: null });
+            if (ids && ids.length !== 0 && !isInIde()) {
+                const { orgList } = await getDepartByIds({ ids, request });
+                setConfirmOrgList(orgList || []);
             }
-            catch (e) {
+            else {
                 setConfirmOrgList([]);
-                setErrorInfo({ errorStatus: true, errorMessage: e });
             }
-        };
+        }
+        catch (e) {
+            setConfirmOrgList([]);
+            setErrorInfo({ errorStatus: true, errorMessage: e });
+        }
+    };
+    useEffect(() => {
         try {
             if (!isObjectEqual(prevDefaultRef.current, confirmOrgIds)) {
                 getDefaultOrg(confirmOrgIds);
@@ -114,6 +116,8 @@ export default function DepartTreeSelect(props) {
         confirmOrgIds,
         confirmOrgList,
         setConfirmOrgList,
+        selectedOrgIds,
+        setSelectedOrgIds,
         selectedOrgList,
         setSelectedOrgList,
         errorInfo,

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import React, { useState, useCallback, useMemo } from 'react';
+import React, { useState, useEffect } from 'react';
 import { Button, Modal, Bubble } from 'tea-component';
 import { ModalSearch } from '../modal-search';
 import { OrgTreeContext } from './depart-select-pc';
@@ -10,7 +10,7 @@ import debounce from '../../../../../utils/debounce';
 import '../index.css';
 export const OrgModalPC = (props) => {
     const { open, setOpen, onCancel, onConfirm, treeData, orgList, treeDataError, } = props;
-    const { multiple, setSelectedOrgList, selectedOrgList, confirmOrgList, defaultExpandedIds, } = React.useContext(OrgTreeContext) || {};
+    const { selectedOrgList, multiple, setSelectedOrgList, confirmOrgList, selectedOrgIds, setSelectedOrgIds, defaultExpandedIds, } = React.useContext(OrgTreeContext) || {};
     const [searchOrgList, setSearchOrgList] = useState([]);
     // 是否有搜索项
     const [keyWords, setKeyWords] = useState('');
@@ -19,7 +19,13 @@ export const OrgModalPC = (props) => {
         errorMessage: null,
     });
     const [loading, setLoading] = useState(false);
-    const selectedIds = useMemo(() => selectedOrgList.map((item) => item.id), [selectedOrgList]);
+    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 onSearch = debounce((key) => {
         try {
@@ -39,24 +45,12 @@ export const OrgModalPC = (props) => {
             setErrInfo({ errorStatus: true, errorMessage: e });
         }
     }, 500);
-    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, 
+    return (_jsxs(Modal, { 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: setSelectedOrgIds, selectedIds: selectedOrgIds, 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: selectedOrgIds, 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)));
+                                            isUser: false, treeData: treeData, treeDataError: treeDataError, selectable: true, defaultExpandedIds: defaultExpandedIds, onActive: (ids) => {
+                                                setSelectedOrgIds(ids);
+                                            } }) }) }) }))] }), _jsx(SelectedList, { selectedList: selectedOrgList, isUser: false, onClose: (item) => {
+                            setSelectedOrgIds(selectedOrgIds.filter((e) => e !== (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/modal-select-h5.js

@@ -197,7 +197,7 @@ export const ModalSelectH5 = (props) => {
         document.getElementById('wd-search-input').blur();
         e.stopPropagation();
     };
-    return (_jsxs(Modal, { disableEscape: true, maskClosable: false, visible: open, onClose: () => {
+    return (_jsxs(Modal, { visible: open, onClose: () => {
             onrest();
             onClose();
         }, destroyOnClose: true, className: `weda-ui weda-select-user-dept__dialog`, children: [_jsxs(Modal.Body, { className: ((_a = selectedUserList[0]) === null || _a === void 0 ? void 0 : _a.userId) ? 'is-selected-value' : '', children: [_jsx("div", { className: "weda-select-user-dept__dialog-header", children: '选择成员' }), _jsx(ModalSearchH5, { value: keyWords, onChange: (key) => {

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

@@ -35,7 +35,5 @@ export const OrgTree = (props) => {
                     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, {})) })) }));
+                } })) : (_jsx(LoadingStatus, {})) })) }));
 };

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

@@ -12,14 +12,7 @@ import { useViewData } from '../../hooks/use-views-data';
 import { useDepartData } from '../../hooks/use-depart-data';
 import { parseStrToArr } from '../../common/utils';
 export default function UserTreeSelect(props) {
-    const { events = emptyObject, defaultValue = emptyArray, confirmValue = '', defaultValueType = 'noneUser', onChange = null, multiple = false, request = defaultRequest, where, confirmAction, closeAction, secondDisplay, // 辅助信息
-    /**
-     * 以下两个属性  不用在组件库，企业工作台使用该组件时支持外部定义样式
-     * naked: 单纯使用该组件，而不在FormCell中使用（该组件实现默认在在）
-     * containerClass: string
-     * triggerElement: React.ReactNode
-     */
-    naked = false, containerClass = '', triggerElement = null, } = props;
+    const { events = emptyObject, defaultValue = emptyArray, confirmValue = '', defaultValueType = 'noneUser', onChange = null, multiple = false, request = defaultRequest, where, confirmAction, closeAction, } = props;
     const platform = usePlatform();
     const [errInfo, setErrInfo] = useState({
         errorStatus: false,
@@ -29,8 +22,6 @@ export default function UserTreeSelect(props) {
     const [selectUserIds, setSelectUserIds] = useSyncValue(defaultValue, isObjectEqual);
     // 两次默认值不同, 需要刷新
     const prevDefaultRef = React.useRef(null);
-    // 当前选中的部门id
-    const [selectedOrgId, setSelectedOrgId] = useState(null);
     //弹窗中被选中用户集合
     const [selectedUserList, setSelectedUserList] = useState([]);
     //弹窗中被选中用户id集合
@@ -43,13 +34,6 @@ export default function UserTreeSelect(props) {
     const pageSize = 200;
     const { filterParams } = useViewData(where);
     const { treeData, error } = useDepartData({ request });
-    // 默认选中第一个部门
-    useEffect(() => {
-        var _a;
-        if (!selectedOrgId && treeData && treeData.length > 0) {
-            setSelectedOrgId((_a = treeData[0]) === null || _a === void 0 ? void 0 : _a.id);
-        }
-    }, [selectedOrgId, treeData]);
     useEffect(() => {
         // 仅执行一次
         if (defaultValueType === 'loginUser') {
@@ -131,8 +115,6 @@ export default function UserTreeSelect(props) {
         errInfo,
         open,
         setOpen,
-        selectedOrgId,
-        setSelectedOrgId,
         selectedUserList,
         setSelectedUserList,
         confirmUserList,
@@ -149,21 +131,14 @@ export default function UserTreeSelect(props) {
         treeData,
         error,
         onConfirmSelectUser,
-        secondDisplay,
-    };
-    // 企业工作台使用该组件时，支持自定义样式
-    const extraProps = {
-        naked,
-        containerClass,
-        triggerElement,
     };
     if ((props === null || props === void 0 ? void 0 : props.showType) === 'pc') {
-        return _jsx(UserSelectPC, { ...props, ...restProps, ...extraProps });
+        return _jsx(UserSelectPC, { ...restProps, ...props });
     }
     if ((props === null || props === void 0 ? void 0 : props.showType) === 'h5') {
-        return _jsx(UserSelectH5, { ...props, ...restProps, ...extraProps });
+        return _jsx(UserSelectH5, { ...restProps, ...props });
     }
-    return platform === 'h5' ? (_jsx(UserSelectH5, { ...props, ...restProps, ...extraProps })) : (_jsx(UserSelectPC, { ...props, ...restProps, ...extraProps }));
+    return platform === 'h5' ? (_jsx(UserSelectH5, { ...restProps, ...props })) : (_jsx(UserSelectPC, { ...restProps, ...props }));
 }
 /**
  * 设置onChange值

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

@@ -10,7 +10,9 @@ import { fetchSearchUser } from '../../common/fetch-data-service';
 import debounce from '../../../../../utils/debounce';
 import '../index.css';
 export const UserModel = ({ open, onCancel, onConfirm, treeData, treeDataError, filterParams, secondDisplay, }) => {
-    const { selectedOrgId, setSelectedOrgId, selectedUserList, setSelectedUserIds, request, selectedUserIds, setSelectedUserList, multiple, setPageNo, confirmUserList, } = React.useContext(UserOrgContext) || {};
+    var _a;
+    const { selectedUserList, setSelectedUserIds, request, selectedUserIds, setSelectedUserList, multiple, setPageNo, confirmUserList, } = React.useContext(UserOrgContext) || {};
+    const [selectedOrgId, setSelectedOrgId] = useState(null);
     //当前页人员列表
     const [curPageUserList, setCurPageUserList] = useState(null);
     const [searchUserList, setSearchUserList] = useState([]);
@@ -21,6 +23,9 @@ export const UserModel = ({ open, onCancel, onConfirm, treeData, treeDataError,
         errorMessage: null,
     });
     const [loading, setLoading] = useState(false);
+    treeData.length > 0 && !selectedOrgId
+        ? setSelectedOrgId((_a = treeData[0]) === null || _a === void 0 ? void 0 : _a.id)
+        : [];
     useEffect(() => {
         setSelectedUserIds((selectedUserList || []).map((e) => e === null || e === void 0 ? void 0 : e.id));
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -45,7 +50,7 @@ export const UserModel = ({ open, onCancel, onConfirm, treeData, treeDataError,
             setErrInfo({ errorStatus: true, errorMessage: e });
         }
     }, 500);
-    return (_jsxs(Modal, { disableEscape: true, maskClosable: false, visible: open, caption: "\u9009\u62E9\u6210\u5458", onClose: () => onCancel(null), className: "weda-ui weda-ui-user-select-modal", children: [_jsxs(Modal.Body, { children: [_jsxs("div", { className: "weda-ui-user-select-container", children: [_jsx(ModalSearch, { searchList: searchUserList, errInfo: errInfo, loading: loading, keyWords: keyWords, selectedList: selectedUserList, multiple: multiple, setSelectedList: setSelectedUserList, selectedIds: selectedUserIds, filterParams: filterParams, onSearch: (key) => onSearch(key), onReset: () => setSearchUserList([]) }), keyWords.length === 0 && (_jsx(_Fragment, { children: _jsxs("div", { className: "weda-ui-user-select-container-list", children: [_jsx("div", { className: "weda-ui-user-select-container-list__start", children: _jsx(OrgTree, { selectedOrgId: [selectedOrgId], treeData: treeData, treeDataError: treeDataError, onActive: (ids) => {
+    return (_jsxs(Modal, { visible: open, caption: "\u9009\u62E9\u6210\u5458", onClose: () => onCancel(null), className: "weda-ui weda-ui-user-select-modal", children: [_jsxs(Modal.Body, { children: [_jsxs("div", { className: "weda-ui-user-select-container", children: [_jsx(ModalSearch, { searchList: searchUserList, errInfo: errInfo, loading: loading, keyWords: keyWords, selectedList: selectedUserList, multiple: multiple, setSelectedList: setSelectedUserList, selectedIds: selectedUserIds, filterParams: filterParams, onSearch: (key) => onSearch(key), onReset: () => setSearchUserList([]) }), keyWords.length === 0 && (_jsx(_Fragment, { children: _jsxs("div", { className: "weda-ui-user-select-container-list", children: [_jsx("div", { className: "weda-ui-user-select-container-list__start", children: _jsx(OrgTree, { selectedOrgId: [selectedOrgId], treeData: treeData, treeDataError: treeDataError, onActive: (ids) => {
                                                     setSelectedOrgId(ids[0]);
                                                     setPageNo(1);
                                                 } }) }), _jsx("div", { className: "weda-ui-user-select-container-list__end", children: _jsx(ModelUserList, { selectedOrgId: selectedOrgId, curPageUserList: curPageUserList, setCurPageUserList: setCurPageUserList, filterParams: filterParams, secondDisplay: secondDisplay }) })] }) }))] }), _jsx(SelectedList, { selectedList: selectedUserList, secondDisplay: secondDisplay, onClose: (item) => {

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

@@ -11,7 +11,7 @@ export const UserOrgContext = React.createContext(null);
 export function UserSelectPC({ id, className, style, label = '人员选择', labelVisible = true, //标题显隐
 placeholder = '请选择人员', disabled = false, layout = 'horizontal', requiredFlag = false, size = 'l', multiple = false, //多选
 outerRef, request = defaultRequest, //接口请求
-decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelectedOrgId, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, selectedUserIds, setSelectedUserIds, pageNo, setPageNo, pageSize, filterParams, treeData, error, onConfirmSelectUser, secondDisplay, naked, containerClass, triggerElement, }) {
+decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, selectedUserIds, setSelectedUserIds, pageNo, setPageNo, pageSize, filterParams, treeData, error, onConfirmSelectUser, secondDisplay, }) {
     // 外层组件类
     const cls = classNames({
         'weda-ui': true,
@@ -32,8 +32,6 @@ decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelect
         };
     }, [setOpen]);
     return renderDecorator(_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsx(UserOrgContext.Provider, { value: {
-                selectedOrgId,
-                setSelectedOrgId,
                 selectedUserList,
                 multiple,
                 setSelectedUserList,
@@ -44,16 +42,16 @@ decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelect
                 pageNo,
                 setPageNo,
                 pageSize,
-            }, children: _jsx(Dropdown, { "data-testid": "userSelectDropdown", className: classNames(selectInputCls, `size-${size}`, containerClass), disabled: disabled, open: open, onOpenChange: (open) => {
+            }, children: _jsx(Dropdown, { "data-testid": "userSelectDropdown", className: classNames(selectInputCls, `size-${size}`), disabled: disabled, open: open, onOpenChange: (open) => {
                     if (open)
                         setSelectedUserList(confirmUserList);
                     setOpen(open);
-                }, appearance: 'button', button: triggerElement || (_jsx(InputTags, { tagsList: confirmUserList, placeholder: placeholder, multiple: multiple, errInfo: errInfo, disabled: disabled, onClose: (e, item) => {
+                }, appearance: 'button', button: _jsx(InputTags, { tagsList: confirmUserList, placeholder: placeholder, multiple: multiple, errInfo: errInfo, disabled: disabled, onClose: (e, item) => {
                         const currentConfirmUserList = confirmUserList.filter((l) => (l === null || l === void 0 ? void 0 : l.id) !== (item === null || item === void 0 ? void 0 : item.id));
                         setConfirmUserList(currentConfirmUserList);
                         onConfirmSelectUser(currentConfirmUserList);
                         e.stopPropagation();
-                    } })), overlayClassName: 'weda-ui-user-selected-overlay-hidden', style: { width: '100%' }, children: _jsx(UserModel, { open: open, setOpen: setOpen, onConfirm: onConfirm, onCancel: onCancel, treeData: treeData || [], treeDataError: error, filterParams: filterParams, secondDisplay: secondDisplay }) }) }) }), naked ? null : undefined)({
+                    } }), overlayClassName: 'weda-ui-user-selected-overlay-hidden', style: { width: '100%' }, children: _jsx(UserModel, { open: open, setOpen: setOpen, onConfirm: onConfirm, onCancel: onCancel, treeData: treeData || [], treeDataError: error, filterParams: filterParams, secondDisplay: secondDisplay }) }) }) }))({
         id,
         className: cls,
         style,