@cloudbase/weda-ui 3.5.2 → 3.6.0

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

@@ -2,9 +2,13 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import { Tag, Icon, Text } from 'tea-component';
 import classNames from '../../../../utils/classnames';
 import { useConfig } from '../../../../utils/config-context';
+import { WdFormItemReadOnly } from '../../../wd-form-item';
 export const InputTags = ({ tagsList, placeholder, onClose, multiple, errInfo, disabled, platForm = 'pc', readOnly, }) => {
     const { classPrefix } = useConfig();
-    return (_jsx("div", { className: "weda-ui-user-select-input", children: _jsxs(_Fragment, { children: [tagsList && tagsList.length > 0 && !errInfo.errorStatus ? (_jsxs(_Fragment, { children: [_jsx("div", { className: classNames('weda-ui-user-select-input__values', readOnly ? `${classPrefix}-form-read-color` : ''), children: (tagsList || []).map((item) => (_jsx(_Fragment, { children: disabled ? (_jsx(Tag, { "data-testid": "defaultValueDisabled", children: (item === null || item === void 0 ? void 0 : item.content) || '-' }, item === null || item === void 0 ? void 0 : item.id)) : (_jsx(Tag, { onClose: (e) => onClose(e, item), "data-testid": "defaultValueText", children: (item === null || item === void 0 ? void 0 : item.content) || '-' }, item === null || item === void 0 ? void 0 : item.id)) }))) }), multiple && (_jsx("div", { className: disabled
-                                ? 'weda-ui-user-select-input__extra__disabled'
-                                : 'weda-ui-user-select-input__extra', children: platForm === 'pc' ? (_jsxs(_Fragment, { children: [_jsx(Icon, { type: "more" }), _jsxs(Text, { theme: "primary", children: ["\u5171", tagsList.length, "\u4E2A"] })] })) : (_jsxs("div", { className: "weda-select-user-dept__select-total", children: ["\u5171", tagsList.length, "\u4E2A", _jsx("i", { className: "lcap-icon lcap-icon-chevronright" })] })) }))] })) : (_jsx(Text, { className: "weda-ui-user-select-input__placeholder", children: readOnly ? '' : placeholder })), errInfo.errorStatus && (_jsx(Text, { className: "weda-ui-user-select-input__placeholder", children: errInfo.errorMessage }))] }) }));
+    const readValue = Array.isArray(tagsList)
+        ? tagsList.map((item) => (item === null || item === void 0 ? void 0 : item.content) || '-')
+        : tagsList;
+    return (_jsx(WdFormItemReadOnly, { readValue: readValue, children: _jsx("div", { className: "weda-ui-user-select-input", children: _jsxs(_Fragment, { children: [tagsList && tagsList.length > 0 && !errInfo.errorStatus ? (_jsxs(_Fragment, { children: [_jsx("div", { className: classNames('weda-ui-user-select-input__values', readOnly ? `${classPrefix}-form-read-color` : ''), children: (tagsList || []).map((item) => (_jsx(_Fragment, { children: disabled ? (_jsx(Tag, { "data-testid": "defaultValueDisabled", children: (item === null || item === void 0 ? void 0 : item.content) || '-' }, item === null || item === void 0 ? void 0 : item.id)) : (_jsx(Tag, { onClose: (e) => onClose(e, item), "data-testid": "defaultValueText", children: (item === null || item === void 0 ? void 0 : item.content) || '-' }, item === null || item === void 0 ? void 0 : item.id)) }))) }), multiple && (_jsx("div", { className: disabled
+                                    ? 'weda-ui-user-select-input__extra__disabled'
+                                    : 'weda-ui-user-select-input__extra', children: platForm === 'pc' ? (_jsxs(_Fragment, { children: [_jsx(Icon, { type: "more" }), _jsxs(Text, { theme: "primary", children: ["\u5171", tagsList.length, "\u4E2A"] })] })) : (_jsxs("div", { className: "weda-select-user-dept__select-total", children: ["\u5171", tagsList.length, "\u4E2A", _jsx("i", { className: "lcap-icon lcap-icon-chevronright" })] })) }))] })) : (_jsx(Text, { className: "weda-ui-user-select-input__placeholder", children: readOnly ? '' : placeholder })), errInfo.errorStatus && (_jsx(Text, { className: "weda-ui-user-select-input__placeholder", children: String(errInfo.errorMessage) }))] }) }) }));
 };

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

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare const ModalSearchH5: (props: any) => JSX.Element;

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import './index.css';
 export declare const ModalSearch: (props: any) => JSX.Element;

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import './index.css';
 export declare const ModalSelectH5: (props: any) => JSX.Element;

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

@@ -197,7 +197,7 @@ export const ModalSelectH5 = (props) => {
     return (_jsxs(Modal, { disableEscape: true, maskClosable: false, 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) => {
+        }, 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: "\u9009\u62E9\u6210\u5458" }), _jsx(ModalSearchH5, { value: keyWords, onChange: (key) => {
                             setKeyWords(key);
                             onSearch(key);
                         }, onCancel: cancleSearch, isSearch: isSearch, onFocus: (e) => {

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import './index.css';
 export declare const OrgTreeH5: (props: any) => JSX.Element;

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import './index.css';
 export declare const OrgTree: (props: any) => JSX.Element;

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

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare const SelectedListH5: (props: any) => JSX.Element;

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

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

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import './index.css';
 export declare const SelectedList: (props: any) => JSX.Element;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.css';
 export declare const UserOrgList: ({ isUser, userOrgList, isOrg, loading, errorStatus, errorMessage, selectedList, multiple, setSelectedList, setSelectedIds, selectedIds, secondDisplay, }: {
     isUser?: boolean;

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useEffect, useRef, useCallback, useMemo, } from 'react';
 import { UserSelectPC } from '../user-select-pc/user-select-pc';
 import { UserTreeSelectH5 as UserSelectH5 } from './user-select-h5';
 import { isInIde, filterStrList, getUserInfo, usePlatform, } from '../../../../../utils/platform';
@@ -35,6 +35,7 @@ export default function UserTreeSelect(props) {
     const fetchRef = useRef({ version: '' });
     // 两次默认值不同, 需要刷新
     const prevDefaultRef = React.useRef(null);
+    const triggerEventRef = React.useRef(false);
     // 当前选中的部门id
     const [selectedOrgId, setSelectedOrgId] = useState(null);
     //弹窗中被选中用户集合
@@ -47,15 +48,11 @@ export default function UserTreeSelect(props) {
     const [pageNo, setPageNo] = useState(1);
     //组织下展示用户页大小
     const pageSize = 200;
-    const { filterParams } = useViewData(where);
-    const [corpScopes, setCorpScopes] = useState([]);
-    useEffect(() => {
-        if (!corpScope) {
-            return;
-        }
-        const corpScopes = filterStrList(parseStrToArr(corpScope));
-        setCorpScopes(corpScopes);
+    const corpScopes = useMemo(() => {
+        return corpScope ? filterStrList(parseStrToArr(corpScope)) : undefined;
     }, [corpScope]);
+    const { filterParams: _filterParams } = useViewData(where);
+    const filterParams = useMemo(() => Object.assign({ corpScopes }, _filterParams), [_filterParams, corpScopes]);
     const { treeData, error } = useDepartData({
         request,
         params: { corpScopes },
@@ -64,10 +61,10 @@ export default function UserTreeSelect(props) {
     // 默认选中第一个部门
     useEffect(() => {
         var _a;
-        if (!selectedOrgId && treeData && treeData.length > 0) {
+        if (Array.isArray(treeData)) {
             setSelectedOrgId((_a = treeData[0]) === null || _a === void 0 ? void 0 : _a.id);
         }
-    }, [selectedOrgId, treeData]);
+    }, [treeData]);
     useEffect(() => {
         // 仅执行一次
         if (defaultValueType === 'loginUser') {
@@ -132,7 +129,10 @@ export default function UserTreeSelect(props) {
         if (isObjectEqual(_value, defaultValue))
             return;
         onChange === null || onChange === void 0 ? void 0 : onChange(_value);
-        (_b = events === null || events === void 0 ? void 0 : events.change) === null || _b === void 0 ? void 0 : _b.call(events, _eventValue);
+        if (triggerEventRef.current) {
+            (_b = events === null || events === void 0 ? void 0 : events.change) === null || _b === void 0 ? void 0 : _b.call(events, _eventValue);
+            triggerEventRef.current = false;
+        }
     }, [confirmUserList === null || confirmUserList === void 0 ? void 0 : confirmUserList.map((user) => filterUserInfo(user))]);
     /** 点击确认时获取所选用户，调用confirmAction，将所选用户向外传出 */
     const onConfirmSelectUser = (selectedUserList) => {
@@ -141,6 +141,7 @@ export default function UserTreeSelect(props) {
     };
     //确定 关闭弹窗
     const onConfirm = () => {
+        triggerEventRef.current = true;
         onConfirmSelectUser(selectedUserList);
         setConfirmUserList(selectedUserList);
         setOpen(false);
@@ -152,6 +153,10 @@ export default function UserTreeSelect(props) {
         setOpen(false);
         closeAction === null || closeAction === void 0 ? void 0 : closeAction();
     };
+    // 删除
+    const onDelete = useCallback(() => {
+        triggerEventRef.current = true;
+    }, []);
     const restProps = {
         errInfo,
         open,
@@ -175,6 +180,7 @@ export default function UserTreeSelect(props) {
         error,
         onConfirmSelectUser,
         secondDisplay,
+        onDelete, // 手动触发
     };
     // 企业工作台使用该组件时，支持自定义样式
     const extraProps = {

package/dist/web/components/form/userOrgSelect/component/user-select-h5/style.d.ts

@@ -1,2 +1,3 @@
 import '../userOrgSelect.css';
+import '../../../../form/select/allTimePicker/index.css';
 import '../../../../style';

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

@@ -1,3 +1,4 @@
 import '../userOrgSelect.css';
+import '../../../../form/select/allTimePicker/index.css';
 // common style
 import '../../../../style';

package/dist/web/components/form/userOrgSelect/component/user-select-h5/user-list-h5.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import '../userOrgSelect.css';
 export declare const UserListH5: (props: any) => JSX.Element;

package/dist/web/components/form/userOrgSelect/component/user-select-h5/user-select-h5.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { IUserTreeSelect } from '../../common/types';
 export declare function UserTreeSelectH5({ id, className, style, label, labelVisible, placeholder, disabled, layout, requiredFlag, decorator, multiple, //是否多选
-outerRef, pageNo, setPageNo, pageSize, request, onCancel, onConfirm, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, open, setOpen, filterParams, treeData, error, onConfirmSelectUser, secondDisplay, readOnly, }: IUserTreeSelect): JSX.Element;
+outerRef, pageNo, setPageNo, pageSize, request, onCancel, onConfirm, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, open, setOpen, filterParams, treeData, error, onConfirmSelectUser, secondDisplay, readOnly, onDelete, }: IUserTreeSelect): JSX.Element;

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

@@ -9,7 +9,7 @@ import { InputTags } from '../input-tags';
 export function UserTreeSelectH5({ id, className, style, label = '成员选择', labelVisible = true, placeholder = '请选择成员', disabled = false, layout = 'horizontal', requiredFlag = false, decorator, multiple = false, //是否多选
 outerRef, pageNo, setPageNo, pageSize, 
 // platform,
-request = defaultRequest, onCancel, onConfirm, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, open, setOpen, filterParams, treeData, error, onConfirmSelectUser, secondDisplay, readOnly, }) {
+request = defaultRequest, onCancel, onConfirm, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, open, setOpen, filterParams, treeData, error, onConfirmSelectUser, secondDisplay, readOnly, onDelete, }) {
     const cls = classNames({
         'weda-ui': true,
         'weda-select-user-dept': true,
@@ -43,10 +43,11 @@ request = defaultRequest, onCancel, onConfirm, selectedUserList, setSelectedUser
     };
     return renderDecorator(_jsxs(ConfigProvider, { classPrefix: "wedatea2td", children: [_jsx("div", { className: subCls, onClick: onFocus, children: _jsx(InputTags, { tagsList: confirmUserList, placeholder: placeholder, multiple: multiple, errInfo: errorInfo, disabled: disabled, readOnly: readOnly, platForm: 'h5', 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));
+                        onDelete === null || onDelete === void 0 ? void 0 : onDelete();
                         setConfirmUserList(currentConfirmUserList);
                         onConfirmSelectUser(currentConfirmUserList);
                         e.stopPropagation();
-                    } }) }), _jsx(ModalSelectH5, { open: open, request: request, treeData: treeData, originalOrgData: originalOrgData, setOriginalOrgData: setOriginalOrgData, multiple: multiple, errorInfo: errorInfo, selectedUserList: selectedUserList, setSelectedUserList: setSelectedUserList, confirmUserList: confirmUserList, onClose: onCancel, onConfirm: onConfirm, setErrorInfo: setErrorInfo, filterParams: filterParams, pageNo: pageNo, setPageNo: setPageNo, pageSize: pageSize, treeDataError: error, secondDisplay: secondDisplay })] }))({
+                    } }) }), _jsx(ModalSelectH5, { open: open, request: request, treeData: treeData, originalOrgData: originalOrgData, setOriginalOrgData: setOriginalOrgData, multiple: multiple, errorInfo: errorInfo, selectedUserList: selectedUserList, setSelectedUserList: setSelectedUserList, confirmUserList: confirmUserList, onClose: onCancel, onConfirm: onConfirm, setErrorInfo: setErrorInfo, filterParams: filterParams, pageNo: pageNo, setPageNo: setPageNo, pageSize: pageSize, treeDataError: error, secondDisplay: secondDisplay })] }), decorator)({
         id,
         className: cls,
         style,
@@ -54,6 +55,5 @@ request = defaultRequest, onCancel, onConfirm, selectedUserList, setSelectedUser
         multiCell: false,
         requiredFlag,
         layout,
-        decorator,
     });
 }

package/dist/web/components/form/userOrgSelect/component/user-select-pc/error-tips.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const ErrorStatus: ({ description, title }: {
     description: any;
     title?: string;

package/dist/web/components/form/userOrgSelect/component/user-select-pc/model-user-list.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../index.css';
 export declare const ModelUserList: ({ selectedOrgId, curPageUserList, setCurPageUserList, filterParams, secondDisplay, }: {
     selectedOrgId: any;

package/dist/web/components/form/userOrgSelect/component/user-select-pc/org-tree.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import '../index.css';
 export declare const OrgTree: (props: any) => JSX.Element;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../index.css';
 import { IUserModel } from '../../common/types';
 export declare const UserModel: ({ open, onCancel, onConfirm, treeData, treeDataError, filterParams, secondDisplay, }: IUserModel) => JSX.Element;

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import React, { useState, useEffect } from 'react';
-import { Button, Modal, Bubble } from 'tea-component';
+import { Modal, Bubble } from 'tea-component';
 import { ModalSearch } from '../modal-search';
 import { UserOrgContext } from './user-select-pc';
 import { OrgTree } from '../org-tree';
@@ -9,6 +9,7 @@ import { SelectedList } from '../selected-list';
 import { fetchSearchUser } from '../../common/fetch-data-service';
 import debounce from '../../../../../utils/debounce';
 import '../index.css';
+import { WdButton } from '../../../../wd-button';
 export const UserModel = ({ open, onCancel, onConfirm, treeData, treeDataError, filterParams, secondDisplay, }) => {
     const { selectedOrgId, setSelectedOrgId, selectedUserList, setSelectedUserIds, request, selectedUserIds, setSelectedUserList, multiple, setPageNo, confirmUserList, } = React.useContext(UserOrgContext) || {};
     //当前页人员列表
@@ -45,13 +46,12 @@ export const UserModel = ({ open, onCancel, onConfirm, treeData, treeDataError,
             setErrInfo({ errorStatus: true, errorMessage: e });
         }
     }, 500);
+    const btnDisabled = selectedUserList.length === 0 && confirmUserList.length == 0;
     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) => {
                                                     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) => {
                             //检查是否当前页用户被关闭
                             setSelectedUserList(selectedUserList.filter((e) => (e === null || e === void 0 ? void 0 : e.id) !== (item === null || item === void 0 ? void 0 : item.id)));
-                        } })] }), _jsxs(Modal.Footer, { children: [_jsx(Button, { type: "weak", onClick: onCancel, children: "\u53D6\u6D88" }), _jsx(Bubble, { content: selectedUserList.length === 0 && confirmUserList.length == 0
-                            ? '请选择成员'
-                            : null, children: _jsx(Button, { type: "primary", onClick: onConfirm, disabled: selectedUserList.length === 0 && confirmUserList.length == 0, children: "\u786E\u5B9A" }) })] })] }));
+                        } })] }), _jsxs(Modal.Footer, { children: [_jsx(WdButton, { text: "\u53D6\u6D88", events: { tap: onCancel }, theme: "secondary", variant: "outline", className: "wd-btn__margin-right" }), _jsx(Bubble, { content: btnDisabled ? '请选择成员' : null, children: _jsx("span", { children: _jsx(WdButton, { text: "\u786E\u5B9A", events: { tap: onConfirm }, disabled: btnDisabled }) }) })] })] }));
 };

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

@@ -5,4 +5,4 @@ export declare const UserOrgContext: React.Context<any>;
 export declare function UserSelectPC({ id, className, style, label, labelVisible, //标题显隐
 placeholder, disabled, layout, requiredFlag, size, multiple, //多选
 outerRef, request, //接口请求
-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, readOnly, formType, }: IUserTreeSelect): JSX.Element;
+decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelectedOrgId, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, selectedUserIds, setSelectedUserIds, pageNo, setPageNo, pageSize, filterParams, treeData, error, onConfirmSelectUser, secondDisplay, onDelete, naked, containerClass, triggerElement, readOnly, formType, }: IUserTreeSelect): JSX.Element;

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, readOnly, formType, }) {
+decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelectedOrgId, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, selectedUserIds, setSelectedUserIds, pageNo, setPageNo, pageSize, filterParams, treeData, error, onConfirmSelectUser, secondDisplay, onDelete, naked, containerClass, triggerElement, readOnly, formType, }) {
     // 外层组件类
     const cls = classNames({
         'weda-ui': true,
@@ -21,6 +21,7 @@ decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelect
     const selectInputCls = classNames({
         'weda-ui-user-selected': true,
     });
+    const unionDecorator = decorator !== undefined ? decorator : naked ? null : undefined;
     // 实例 ref 到外部
     useImperativeHandle(outerRef, () => {
         return {
@@ -46,6 +47,7 @@ decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelect
                 pageSize,
             }, children: readOnly && formType !== 'read' ? (_jsx(InputTags, { tagsList: confirmUserList, placeholder: placeholder, multiple: multiple, errInfo: errInfo, disabled: disabled, readOnly: readOnly, 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));
+                    onDelete === null || onDelete === void 0 ? void 0 : onDelete();
                     setConfirmUserList(currentConfirmUserList);
                     onConfirmSelectUser(currentConfirmUserList);
                     e.stopPropagation();
@@ -55,10 +57,11 @@ decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelect
                     setOpen(open);
                 }, appearance: 'button', button: triggerElement || (_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));
+                        onDelete === null || onDelete === void 0 ? void 0 : onDelete();
                         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 }) })) }) }), unionDecorator)({
         id,
         className: cls,
         style,
@@ -67,6 +70,5 @@ decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelect
         layout,
         multiCell: false,
         requiredFlag,
-        decorator,
     });
 }

package/dist/web/components/form/userOrgSelect/component/userOrgSelect.css

@@ -195,7 +195,7 @@
   .wedatea2td-tree__node-content
   .wedatea2td-tree__label
   .wedatea2td-tree__label-title {
-  color: #0052d9;
+  color: var(--wd-color-brand, #0052d9);
 }
 
 /** select 框下的tree 树样式  end*/
@@ -228,7 +228,7 @@
 }
 
 .dim-tree-select .dim-tree-footer .din-btn--primary {
-  background: #0052d9;
+  background: var(--wd-color-brand, #0052d9);
   color: rgba(255, 255, 255, 0.9);
 }
 
@@ -305,7 +305,7 @@
   .wedatea2td-tabs__tabitem
   .wedatea2td-tabs__tab.is-active {
   font-weight: 600;
-  color: #0052d9;
+  color: var(--wd-color-brand, #0052d9);
 }
 
 .dim-tree-select.dim-tree-select--user
@@ -597,7 +597,7 @@
   line-height: 24px;
   text-align: center;
   font-size: 16px;
-  color: #0052d9;
+  color: var(--wd-color-brand, #0052d9);
   background-color: #fff;
   cursor: pointer;
   display: none;
@@ -845,6 +845,10 @@
   height: 10px;
   margin: -5px;
 }
+.wedatea2td-radio:checked + .wedatea2td-radio__dot,
+input[type='radio']:checked + .wedatea2td-radio__dot {
+  background-color: var(--wd-color-brand, #0052d9);
+}
 
 .weda-select-user-dept__dialog .wedatea2td-form-check__label {
   position: relative;
@@ -925,6 +929,20 @@
   > span {
   width: 100%;
 }
+.weda-select-user-dept__dialog
+  .wedatea2td-dialog__footer
+  .weda-select-user-dept__btn-group
+  .weda-select-user-dept__btn-item {
+  width: 50%;
+}
+.weda-select-user-dept__dialog
+  .wedatea2td-dialog__footer
+  .weda-select-user-dept__btn-group
+  .weda-select-user-dept__btn-item
+  .wd-btn {
+  width: 100%;
+}
+
 .weda-select-user-dept__dialog
   .wedatea2td-dialog__footer
   .wedatea2td-dialog__btnwrap
@@ -1128,7 +1146,7 @@
 .weda-select-user-dept__dialog
   .weda-select-user-dept-breadcrumb
   .weda-select-user-dept-breadcrumb__item.is-selected {
-  color: #0052d9;
+  color: var(--wd-color-brand, #0052d9);
 }
 
 .weda-select-user-dept-breadcrumb__separate {
@@ -1176,3 +1194,12 @@ input[type='radio']:checked {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
+:root .wedatea2td-radio:checked,
+:root input[type='radio']:checked,
+:root .wedatea2td-radio:focus,
+:root .wedatea2td-radio:hover,
+:root input[type='radio']:focus,
+:root input[type='radio']:hover {
+  border-color: var(--wd-color-brand, #0052d9);
+}

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

@@ -4,9 +4,10 @@ import { renderDecorator } from '../../renderDecorator';
 import { IconFont } from 'tdesign-icons-react';
 import classNames from '../../../../utils/classnames';
 import { fetchSearchOrg, getNodeFromTreeByCode } from '../common/utils';
-import { Modal, Button, ConfigProvider, Radio, Status, Bubble, } from 'tea-component';
+import { Modal, ConfigProvider, Radio, Status, Bubble } from 'tea-component';
 import { ModalSearchH5 } from '../component/modal-search-h5';
 import { LoadingStatus, ErrorStatus } from '../component/error-tips';
+import { WdButton } from '../../../wd-button';
 import debounce from '../../../../utils/debounce';
 export function DepartTreeSelectH5({ id, className, style, label = '部门选择', labelVisible = true, name = 'formDepartTreeSelect', placeholder = '请选择部门', disabled = false, layout = 'horizontal', requiredFlag = false, size = 'l', decorator, multiple = true, focus: autoFocus = false, confirmOrgList, setConfirmOrgList, selectedOrgList, setSelectedOrgList, errorInfo, setErrorInfo, treeData, }) {
     var _a;
@@ -20,6 +21,7 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
         'weui-cell_active': true,
         'weui-cell_form': true,
         'weui-cell_disabled': disabled,
+        'weui-depart-tree-select': true,
     });
     const [visible, setVisible] = React.useState(false);
     const [isSearch, setIsSearch] = useState(false);
@@ -92,6 +94,7 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
             setCurrentItem(parent);
         }
     };
+    const btnDisabled = selectedOrgList.length === 0 && confirmOrgList.length === 0;
     return renderDecorator(_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsxs("div", { className: subCls, children: [_jsx("div", { className: "weui-cell__bd weui-flex", children: _jsx("input", { className: "weui-input", placeholder: placeholder, 
                         //value={value}
                         value: (confirmOrgList || []).map((e) => e === null || e === void 0 ? void 0 : e.content).join(','), disabled: disabled, name: name, autoFocus: autoFocus, onClick: onFocus, readOnly: true, role: "input" }) }), _jsxs(Modal, { disableEscape: true, maskClosable: false, visible: visible, onClose: onClose, destroyOnClose: true, className: `weda-ui weda-select-user-dept__dialog`, children: [_jsxs(Modal.Body, { className: ((_a = selectedOrgList[0]) === null || _a === void 0 ? void 0 : _a.id) ? 'is-selected-value' : '', children: [_jsxs("div", { className: "weda-select-user-dept__dialog-header", children: [_jsx("div", { className: !currentItem ? '' : 'arrow-left', onClick: () => returnToLevelOfNode(currentItem) }), currentItem ? currentItem.content : '选择部门'] }), _jsx(ModalSearchH5, { value: searchValue, onChange: (key) => {
@@ -108,8 +111,10 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
                                                                     setSelectedOrgList(selectedOrgList.filter((e) => e.id !== value));
                                                                 }
                                                                 else {
-                                                                    selectedOrgList.push(item);
-                                                                    setSelectedOrgList(multiple ? [...selectedOrgList] : [item]);
+                                                                    const _ = multiple
+                                                                        ? [].concat(selectedOrgList, item)
+                                                                        : [item];
+                                                                    setSelectedOrgList(_);
                                                                 }
                                                             }, layout: "column", children: _jsx(_Fragment, { children: (item === null || item === void 0 ? void 0 : item.selectable) ? (_jsx(Radio, { name: item === null || item === void 0 ? void 0 : item.id, children: _jsxs("div", { className: "weda-select-user-dept__item-detail weda-select-user-dept__item-detail-is-org", onClick: () => {
                                                                             (item === null || item === void 0 ? void 0 : item.children) ? loadItem(item) : false;
@@ -119,10 +124,7 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
                                                                     }, children: [_jsx("div", { className: "item-name", children: item === null || item === void 0 ? void 0 : item.content }), (item === null || item === void 0 ? void 0 : item.children) && loading.id !== item.id && (_jsx("div", { className: "lcap-icon lcap-icon-chevronright" }))] })) }) }), loading.id === item.id && (loading === null || loading === void 0 ? void 0 : loading.status) && (_jsx("div", { children: _jsx(IconFont, { name: "loading", className: `weda-grid-navigation__fonticon depart_loading` }) }))] }) }, item === null || item === void 0 ? void 0 : item.id));
                                         }) })) : (_jsx(Status, { className: "dim-tree-select--blank", icon: 'blank', size: 's', title: `暂无部门数据` })) })) : (_jsx(LoadingStatus, {}))] }), _jsx(Modal.Footer, { children: _jsxs("div", { children: [selectedOrgList.length > 0 && (_jsxs("div", { className: "weda-select-user-dept__select-result", children: [_jsx("div", { className: "weda-select-user-dept__select-label", children: "\u5DF2\u9009\u62E9" }), _jsx("div", { className: "weda-select-user-dept__result-list", children: selectedOrgList.map((d) => (_jsxs("div", { className: "weda-select-user-dept__result-item", onClick: () => {
                                                         setSelectedOrgList(selectedOrgList.filter((e) => (e === null || e === void 0 ? void 0 : e.id) !== (d === null || d === void 0 ? void 0 : d.id)));
-                                                    }, children: [d === null || d === void 0 ? void 0 : d.content, _jsx("div", { className: "close" })] }, (d === null || d === void 0 ? void 0 : d.id) || (d === null || d === void 0 ? void 0 : d.value)))) })] })), _jsxs("div", { className: "weda-select-user-dept__btn-group", children: [_jsx(Button, { type: "weak", onClick: onClose, children: "\u53D6\u6D88" }), _jsx(Bubble, { content: selectedOrgList.length === 0 && confirmOrgList.length === 0
-                                                    ? '请选择部门'
-                                                    : null, className: "weda-select-user-dept__bubble", children: _jsx(Button, { type: "primary", onClick: () => onConfirm(selectedOrgList), disabled: selectedOrgList.length === 0 &&
-                                                        confirmOrgList.length === 0, children: "\u786E\u5B9A" }) })] })] }) })] })] }) }))({
+                                                    }, children: [d === null || d === void 0 ? void 0 : d.content, _jsx("div", { className: "close" })] }, (d === null || d === void 0 ? void 0 : d.id) || (d === null || d === void 0 ? void 0 : d.value)))) })] })), _jsxs("div", { className: "weda-select-user-dept__btn-group", children: [_jsx(WdButton, { variant: "outline", theme: "secondary", className: "weda-select-user-dept__btn-item", events: { tap: onClose }, text: "\u53D6\u6D88" }), _jsx(Bubble, { content: btnDisabled ? '请选择部门' : null, className: "weda-select-user-dept__bubble", children: _jsx("span", { className: "weda-select-user-dept__btn-item", children: _jsx(WdButton, { text: "\u786E\u5B9A", events: { tap: () => onConfirm(selectedOrgList) }, disabled: btnDisabled }) }) })] })] }) })] })] }) }), decorator)({
         id,
         className: cls,
         style,
@@ -131,6 +133,5 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
         requiredFlag,
         layout,
         size,
-        decorator,
     });
 }

package/dist/web/components/form-date/index.d.ts

@@ -17,10 +17,10 @@ declare const FormDate: React.ForwardRefExoticComponent<CommonPropsType & import
     end: string;
     start: string;
     layout: "" | "vertical" | "horizontal";
-    mode: "datetime" | "month" | "year" | "day";
-    requiredFlag: boolean;
+    mode: "datetime" | "year" | "month" | "day";
     labelVisible: boolean;
     clearable: boolean;
+    requiredFlag: boolean;
     requiredMsg: string;
 }> & {
     onChange: (v: DataType['value']) => void;

package/dist/web/components/form-depart-tree-select/index.d.ts

@@ -16,12 +16,12 @@ declare const FormDepartTreeSelect: React.ForwardRefExoticComponent<CommonPropsT
     placeholder: string;
     layout: "" | "vertical" | "horizontal";
     multiple: boolean;
-    requiredFlag: boolean;
     labelVisible: boolean;
-    confirmValue: string;
-    defaultValueType: "noneDepart" | "confirmDepart";
     departmentScope: string[];
+    requiredFlag: boolean;
     requiredMsg: string;
+    confirmValue: string;
+    defaultValueType: "noneDepart" | "confirmDepart";
 }> & {
     onChange: (v: string) => void;
     disabled: boolean;

package/dist/web/components/form-email/index.d.ts

@@ -17,9 +17,9 @@ declare const FormEmail: React.ForwardRefExoticComponent<CommonPropsType & impor
     placeholder: string;
     layout: "" | "vertical" | "horizontal";
     focus: boolean;
-    requiredFlag: boolean;
     labelVisible: boolean;
     clearable: boolean;
+    requiredFlag: boolean;
     requiredMsg: string;
 }> & {
     onChange: (v: string) => void;

package/dist/web/components/form-image-uploader/index.d.ts

@@ -15,13 +15,13 @@ declare const FormImageUploader: React.ForwardRefExoticComponent<CommonPropsType
     layout: "" | "vertical" | "horizontal";
     single: boolean;
     maxUploadCount: number;
+    labelVisible: boolean;
+    isChooseAvatar: boolean;
+    showShape: "circular" | "ectangle" | "roundedTectangle";
+    acceptTypes: ("image/*" | "image/jpeg" | "image/png" | "image/bmp" | "image/gif")[];
     maxSize: number;
-    acceptTypes: ("image/png" | "image/bmp" | "image/jpeg" | "image/gif" | "image/*")[];
     requiredFlag: boolean;
-    labelVisible: boolean;
-    showShape: "circular" | "roundedTectangle" | "ectangle";
     requiredMsg: string;
-    isChooseAvatar: boolean;
     disableMultiSwitch: boolean;
 }> & {
     value: string | string[];

package/dist/web/components/form-input/index.d.ts

@@ -18,17 +18,17 @@ declare const WdInput: React.ForwardRefExoticComponent<CommonPropsType & import(
     placeholder: string;
     layout: "" | "vertical" | "horizontal";
     focus: boolean;
-    requiredFlag: boolean;
     labelVisible: boolean;
-    password: boolean;
-    clearable: boolean;
     isNickNameType: boolean;
+    clearable: boolean;
+    password: boolean;
     rules: {
         pattern: string;
         message: string;
         format: string;
     }[];
     validateStatus: "success" | "error" | "warn";
+    requiredFlag: boolean;
     requiredMsg: string;
 }> & {
     onChange: (v: string) => void;