@cloudbase/weda-ui 3.4.4 → 3.4.5

package/dist/web/components/flow/modules/control/ControlMobile.js

@@ -6,14 +6,16 @@ import { useControlContext } from './provider';
 import { ACTION_TYPE } from './constants';
 import { ApprovalPopup } from './ApprovalPopup';
 import { ButtonLayout } from './Control';
+import { setOperationButtonId } from './utils';
+import { FlowTaskInfoModal } from './FlowTaskInfoModal';
 import './ControlMobile.css';
 export const FlowControlMobile = (props) => {
     const { commonFlowData, flowLocalProps, ide } = props;
     const { pageInfo, flowDetail } = commonFlowData;
-    const { safeJsonParse, currentPageType } = flowLocalProps;
+    const { isWedaIde, safeJsonParse, currentPageType } = flowLocalProps;
     const { 
     // ControlModel
-    submitApplyLoading, showMoreAction, ifSubmitAndCc, ccUsers, onControlChick, onShowMoreVisibleChange, loadingAssign, onBackFlowCenter, 
+    submitApplyLoading, showMoreAction, ifSubmitAndCc, hasGoBack, ccUsers, onControlChick, onShowMoreVisibleChange, loadingAssign, onBackFlowCenter, 
     // RevokeModel
     showRevokeModal, showBackModal, backNodeList, backNode, setShowRevokeModal, doneRevokeFn, doneBackFn, setShowBackModal, getNodeList, setBackNode, onUserSelectModalInfoChange, setUserSelectModelVisible, userSelectApproveField, userSelectModelVisible, userSelectMode, } = useControlContext();
     const onClickRollBack = async () => {
@@ -29,6 +31,7 @@ export const FlowControlMobile = (props) => {
         showTurnToPerson: {
             label: '转办',
             action: (e) => onControlChick(ACTION_TYPE.TRANSFER, e),
+            operationName: 'turn_to_person',
         },
         showRollBack: {
             label: '回退',
@@ -36,6 +39,7 @@ export const FlowControlMobile = (props) => {
                 await getNodeList();
                 setShowBackModal(true);
             },
+            operationName: 'roll_back',
         },
         showAddAssignee: {
             label: '加签',
@@ -55,39 +59,50 @@ export const FlowControlMobile = (props) => {
                     mode: 'multiple',
                 });
             },
+            operationName: 'add_assignee',
         },
     };
     const renderButtonGroup = () => {
-        var _a;
+        var _a, _b;
+        if (hasGoBack)
+            return null;
+        if (((_a = ide.bindMetadata) === null || _a === void 0 ? void 0 : _a.approvalPageType) === 'apply' && isWedaIde) {
+            return (React.createElement("div", { className: "mf-progress-mb--footer" },
+                React.createElement(ButtonLayout, { gap: 10 },
+                    React.createElement(Button, { type: "primary" }, "\u63D0\u4EA4\u7533\u8BF7"),
+                    React.createElement(Button, { type: "weak" }, "\u4FDD\u5B58\u8349\u7A3F"),
+                    React.createElement(Button, { type: "weak" }, "\u53D6\u6D88"))));
+        }
         if (['CREATE', 'DONE'].includes(currentPageType) && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showRevoke)) {
             return (React.createElement("div", { className: "mf-progress-mb--footer" },
-                React.createElement(Button, { type: "primary", onClick: () => setShowRevokeModal(true) }, "\u64A4\u9500")));
+                React.createElement(Button, { type: "primary", onClick: () => setShowRevokeModal(true), id: setOperationButtonId('revoke') }, "\u64A4\u9500")));
         }
         if (['DRAFT', 'CREATEFLOW', 'TODO'].includes(currentPageType) &&
             (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.show)) {
             return (React.createElement("div", { className: "mf-progress-mb--footer" }, (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showSubmitApp) ? (React.createElement(ButtonLayout, { gap: 10 },
-                flowDetail.canDelete ? (React.createElement(Button, { type: "link", onClick: () => onControlChick(ACTION_TYPE.SAVE_DRAFT) }, "\u4FDD\u5B58\u8349\u7A3F")) : null,
-                ifSubmitAndCc ? (React.createElement(Button, { type: "link", onClick: onClickAddCcUser },
+                flowDetail.canDelete ? (React.createElement(Button, { type: "link", onClick: () => onControlChick(ACTION_TYPE.SAVE_DRAFT), id: setOperationButtonId('save_draft') }, "\u4FDD\u5B58\u8349\u7A3F")) : null,
+                ifSubmitAndCc ? (React.createElement(Button, { type: "link", onClick: onClickAddCcUser, id: setOperationButtonId('cc') },
                     "+\u6284\u9001\u4EBA(",
                     ccUsers.length || 0,
                     ")")) : null,
-                React.createElement(Button, { type: "primary", loading: submitApplyLoading, onClick: () => onControlChick(ACTION_TYPE.SUBMIT) }, ((_a = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.buttons) === null || _a === void 0 ? void 0 : _a[3]) || '提交申请'),
+                React.createElement(Button, { type: "primary", loading: submitApplyLoading, onClick: () => onControlChick(ACTION_TYPE.SUBMIT), id: setOperationButtonId('submit') }, ((_b = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.buttons) === null || _b === void 0 ? void 0 : _b[3]) || '提交申请'),
                 flowDetail.canDelete ? (React.createElement(Button, { type: "weak", onClick: onBackFlowCenter }, "\u53D6\u6D88")) : null)) : (React.createElement(ButtonLayout, { gap: 10 },
                 ['showTurnToPerson', 'showRollBack', 'showAddAssignee'].filter((key) => pageInfo[key]).length >= 2 ? (React.createElement(Button, { type: "link", onClick: onShowMoreVisibleChange }, "\u66F4\u591A")) : (['showTurnToPerson', 'showRollBack', 'showAddAssignee']
                     .filter((key) => pageInfo[key])
                     .map((key, actionIndex) => {
-                    const { label, action } = buttonActionMap[key];
-                    return (React.createElement(Button, { key: `actionItem-${actionIndex}`, className: "apa-height-xl tea-mr-4n tea-mt-1n", type: "link", onClick: action }, label));
+                    const { label, action, operationName } = buttonActionMap[key];
+                    return (React.createElement(Button, { key: `actionItem-${actionIndex}`, className: "apa-height-xl tea-mr-4n tea-mt-1n", type: "link", onClick: action, id: setOperationButtonId(operationName) }, label));
                 })),
-                flowDetail.userTaskType === 2 ? (React.createElement(Button, { type: "primary", style: { flex: 3 }, onClick: (e) => onControlChick(ACTION_TYPE.HANDLE, e) }, flowDetail.operationName)) : (React.createElement(React.Fragment, null,
-                    React.createElement(Button, { onClick: (e) => onControlChick(ACTION_TYPE.REJECT, e) }, (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.buttons) ? pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.buttons[2] : '拒绝'),
-                    React.createElement(Button, { type: "primary", onClick: (e) => onControlChick(ACTION_TYPE.AGREE, e) }, (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.buttons) ? pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.buttons[1] : '同意')))))));
+                flowDetail.userTaskType === 2 ? (React.createElement(Button, { type: "primary", style: { flex: 3 }, onClick: (e) => onControlChick(ACTION_TYPE.HANDLE, e), id: setOperationButtonId('handle') }, flowDetail.operationName)) : (React.createElement(React.Fragment, null,
+                    React.createElement(Button, { onClick: (e) => onControlChick(ACTION_TYPE.REJECT, e), id: setOperationButtonId('reject') }, (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.buttons) ? pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.buttons[2] : '拒绝'),
+                    React.createElement(Button, { type: "primary", onClick: (e) => onControlChick(ACTION_TYPE.AGREE, e), id: setOperationButtonId('agree') }, (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.buttons) ? pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.buttons[1] : '同意')))))));
         }
     };
     return (
     // eslint-disable-next-line react/jsx-props-no-spreading
     React.createElement("div", { ...ide },
         renderButtonGroup(),
+        React.createElement(FlowTaskInfoModal, { layout: "vertical" }),
         React.createElement(Popup, { className: "cp-mobile-dialog apa-m-overlay approval-progress__more--dialog", visible: showMoreAction, onClose: onShowMoreVisibleChange, 
             // disableCloseIcon={true}
             closeIcon: false, position: "bottom" },
@@ -128,6 +143,6 @@ export const FlowControlMobile = (props) => {
                     } }, "\u5B8C\u6210")),
             (backNodeList === null || backNodeList === void 0 ? void 0 : backNodeList.length) ? (React.createElement("ul", { className: "list-content" }, backNodeList === null || backNodeList === void 0 ? void 0 : backNodeList.map((item) => (React.createElement("li", { key: item.value, className: backNode === item.value ? 'list-checked' : '', onClick: () => setBackNode(item.value) },
                 React.createElement("span", null, item.text)))))) : (React.createElement(Status, { icon: "blank", size: "l", title: "\u6682\u65E0\u53EF\u56DE\u9000\u8282\u70B9" }))),
-        userSelectModelVisible ? (React.createElement(UserSelectModel, { visible: true, approveField: userSelectApproveField, mode: userSelectMode, close: () => setUserSelectModelVisible(false), mobileModel: true, values: ccUsers.map((user) => user.value) })) : null,
+        React.createElement(UserSelectModel, { visible: userSelectModelVisible, approveField: userSelectApproveField, mode: userSelectMode, close: () => setUserSelectModelVisible(false), mobileModel: true, values: ccUsers.map((user) => user.value) }),
         React.createElement(ApprovalPopup, { pageInfo: pageInfo, flowDetail: flowDetail, safeJsonParse: safeJsonParse })));
 };

package/dist/web/components/flow/modules/control/FlowTaskInfoModal.js

@@ -3,7 +3,7 @@ import { Modal, SelectMultiple, Button, Form } from 'tea-component';
 // import { history } from 'umi';
 import { useControlContext } from './provider';
 import './FlowTaskInfoModal.css';
-export const FlowTaskInfoModal = () => {
+export const FlowTaskInfoModal = ({ layout = 'default', }) => {
     // const { visible, setVisible, flowTaskInfoList, flowTaskIds, setFlowTaskIds, allInfos } = props;
     const { flowTaskInfoList, flowTaskInfoModalVisible, flowTaskIds, setFlowTaskIds, onCloseFlowTaskInfoModal, } = useControlContext();
     const [options, setOptions] = useState([]);
@@ -18,13 +18,13 @@ export const FlowTaskInfoModal = () => {
         });
         setOptions(tempOptions);
     }, [flowTaskInfoList]);
-    return (React.createElement(Modal, { visible: flowTaskInfoModalVisible, caption: '选择下一节点处理人', onClose: onCloseFlowTaskInfoModal },
+    return (React.createElement(Modal, { visible: flowTaskInfoModalVisible, caption: '选择下一节点处理人', onClose: onCloseFlowTaskInfoModal, size: "auto" },
         React.createElement(Modal.Body, null,
-            React.createElement(Form, { style: { marginBottom: '5px' } },
+            React.createElement(Form, { style: { marginBottom: '5px' }, layout: layout },
                 React.createElement(Form.Item, { label: '选择处理人', className: "flow_center_next_approve-form_item" },
                     React.createElement(SelectMultiple, { appearance: "button", size: 'full', searchable: true, matchButtonWidth: true, staging: false, options: options, onChange: (val) => {
                             setFlowTaskIds(val);
-                        }, value: flowTaskIds })))),
+                        }, value: flowTaskIds, style: { width: 200 } })))),
         React.createElement(Modal.Footer, null,
             React.createElement(Button, { type: "primary", onClick: onCloseFlowTaskInfoModal }, "\u786E\u5B9A"),
             React.createElement(Button, { type: "weak", onClick: onCloseFlowTaskInfoModal }, "\u53D6\u6D88"))));

package/dist/web/components/flow/modules/control/provider/useControlModel.js

@@ -90,9 +90,7 @@ export const useControlModel = (params) => {
     const onSaveDraft = () => {
         const params = {
             buttonAction: ACTION_TYPE_MAP[ACTION_TYPE.SAVE_DRAFT],
-            ccUserIds: (ccUsers === null || ccUsers === void 0 ? void 0 : ccUsers.length)
-                ? ccUsers.map(({ value }) => value).join(',')
-                : undefined,
+            ccUserIds: (ccUsers === null || ccUsers === void 0 ? void 0 : ccUsers.length) ? ccUsers.join(',') : undefined,
             flowCode: flowDetail.flowCode,
             instanceId: flowDetail.instanceId,
             nodeId: flowDetail.currentNodeId,
@@ -126,9 +124,7 @@ export const useControlModel = (params) => {
         setSubmitLoading(true);
         const params = {
             buttonAction: ACTION_TYPE_MAP[handleType],
-            ccUserIds: (ccUsers === null || ccUsers === void 0 ? void 0 : ccUsers.length)
-                ? ccUsers.map(({ value }) => value).join(',')
-                : undefined,
+            ccUserIds: (ccUsers === null || ccUsers === void 0 ? void 0 : ccUsers.length) ? ccUsers.join(',') : undefined,
             flowCode: flowDetail.flowCode,
             instanceId: flowDetail.instanceId,
             nodeId: flowDetail.currentNodeId,

package/dist/web/components/flow/modules/control/provider/useMobileModel.js

@@ -26,8 +26,6 @@ export const useMobileModel = (params, controlModel) => {
                 setApprovers(approvers || []);
                 setOpinionUserMap({ ...opinionUserMap });
                 setHighlightPositionMap({ ...highlightPositionMap });
-                setApprover(approver);
-                setApprovers(approvers);
                 setFileList(fileList);
                 if (ccUsers) {
                     setCcUsers(ccUserFormStorage.map((user) => ({

package/dist/web/components/flow/modules/control/provider/useRevokeAndBackHook.js

@@ -50,6 +50,8 @@ export const useRevokeAndBackHook = (params, controlModel) => {
     });
     const doneBackFn = () => {
         var _a;
+        if (!backNode)
+            return;
         // 调用回退接口
         rollBackFlow({
             flowCode: flowDetail.flowCode,

package/dist/web/components/flow/modules/control/utils/index.js

@@ -1,2 +1,3 @@
 import ControlModelUtils from './ControlModelUtils';
+export * from './tools';
 export { ControlModelUtils };

package/dist/web/components/flow/modules/control/utils/tools.js

@@ -0,0 +1,3 @@
+export function setOperationButtonId(operationName) {
+    return `weda_flow_${operationName}_btn`;
+}

package/dist/web/components/form/select/dropdown-select/h5.js

@@ -130,7 +130,7 @@ export function SelectPickerH5({ updateValue, selectedValue, options, isTurnPage
                                         setSearchValue('');
                                         updateValue(item, true, true);
                                     } },
-                                    React.createElement("p", null, item.label)));
+                                    React.createElement("p", { className: 'weda-ui-custom-picker__cloumn-item-text' }, item.label)));
                             }),
                             status === Status.LOADING && (React.createElement("li", { key: 'loading' },
                                 React.createElement(Loading, null))),

package/dist/web/components/form/select/dropdown-select/index.css

@@ -157,3 +157,10 @@
 .wedatea2td-search--simple .wedatea2td-input--search {
   caret-color: #000000;
 }
+
+.weda-ui-custom-picker__cloumn-item-text {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  margin-right: 40px;
+}

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

@@ -187,13 +187,8 @@ function SelectPc({ where, dataSourceName, viewId, format, primaryField, enumNam
                         setSelectedValue(value);
                     } }));
             case 'date': {
-                const now = moment();
-                const start = startDate
-                    ? decodeIsoDatetime(startDate, 'date')
-                    : `${now.year() - 20}-01-01`;
-                const end = endDate
-                    ? decodeIsoDatetime(endDate, 'date')
-                    : `${now.year() + 20}-12-31`;
+                const start = startDate ? decodeIsoDatetime(startDate, 'date') : null;
+                const end = endDate ? decodeIsoDatetime(endDate, 'date') : null;
                 const dateProps = {
                     range: [moment(start), moment(end)],
                     onChange: onDataChange,

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

@@ -24,7 +24,7 @@ label = '标题', labelVisible = true, defaultValue = '', placeholder = '请输
         'weui-cell_disabled': disabled,
     });
     // 两次默认值不同时, 需要刷新value
-    const [value, setValue] = useSyncValue(defaultValue);
+    const [value, setValue] = useSyncValue(defaultValue !== null && defaultValue !== void 0 ? defaultValue : '');
     const counter = React.useMemo(() => (value === null || value === void 0 ? void 0 : value.length) || 0, [value]);
     const onChange = function (e) {
         const text = typeof e === 'string' ? e : e.target.value;

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

@@ -274,7 +274,7 @@
 
 .weda-upload-file-mobile .weda-upload-file-mobile__item {
   width: 100%;
-  padding: 16px;
+  padding: 8px;
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -319,7 +319,7 @@
   .weda-upload-file-mobile__item
   .weda-upload-file-mobile__item-left {
   flex: 1;
-  margin-right: 16px;
+  margin-right: 4px;
   width: 70%;
 }
 
@@ -336,7 +336,7 @@
   font-size: 0.875em;
   line-height: 1.375em;
   color: rgba(0, 0, 0, 0.9);
-  max-width: 6.5rem;
+  max-width: 100%;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -345,8 +345,8 @@
 .weda-upload-file-mobile
   .weda-upload-file-mobile__item
   .weda-upload-file-mobile__file-status {
-  margin-left: 24px;
-  display: flex;
+  margin-left: 4px;
+  display: inline;
 }
 
 .weda-upload-file-mobile
@@ -399,6 +399,7 @@
   background-color: #e7e7e7;
   height: 3px !important;
   margin-bottom: 0;
+  display: inline;
 }
 
 .weda-upload-file-mobile

package/dist/web/components/form/uploaderFile/uploadFile.h5.js

@@ -2,7 +2,7 @@ import * as React from 'react';
 import weui from '../../../utils/weui';
 import isObjectEqual from '../../../utils/isObjectEqual';
 import { ConfigProvider, Button, Icon, Text, List, Progress, Tooltip, message, } from 'tea-component';
-import { filterStrList, isCloudFileID, isHttpFileID, transSize, downloadFile, transFileCloudidToName, randomStr, isInIde, } from '../../../utils/platform';
+import { filterStrList, isCloudFileID, isHttpFileID, transSize, downloadFile, transFileCloudidToName, randomStr, isInIde, isWebInMiniprogram, } from '../../../utils/platform';
 import { getCloudInstance } from '../../../utils/tcb';
 import classNames from '../../../utils/classnames';
 import { renderDecorator } from '../renderDecorator';
@@ -269,10 +269,9 @@ const UploadFileStatus = ({ status = 'UPLOAD_STATUS_SUCCESS', percent = 0, size,
         (status == 'UPLOAD_STATUS_PENDING' && percent)) {
         return (React.createElement(React.Fragment, null,
             React.createElement("div", { className: `${CLASS_PREFIX}__file-detail` },
-                React.createElement(Text, { className: `${CLASS_PREFIX}__file-name` }, title),
-                React.createElement("div", { className: `${CLASS_PREFIX}__file-status` },
-                    React.createElement("div", { className: `${CLASS_PREFIX}__file-status` },
-                        React.createElement(Progress, { percent: percent, theme: "default", strokeColor: '#0052D9', className: `${CLASS_PREFIX}__file-progress` })))),
+                React.createElement(Text, { className: `${CLASS_PREFIX}__file-name` }, title)),
+            React.createElement("div", null,
+                React.createElement(Progress, { percent: percent, theme: "default", strokeColor: '#0052D9', className: `${CLASS_PREFIX}__file-progress` })),
             React.createElement("div", { className: `${CLASS_PREFIX}__file-foot` },
                 React.createElement("div", null,
                     React.createElement(Text, null,
@@ -284,15 +283,15 @@ const UploadFileStatus = ({ status = 'UPLOAD_STATUS_SUCCESS', percent = 0, size,
     return (React.createElement(React.Fragment, null,
         React.createElement("div", { className: `${CLASS_PREFIX}__file-detail` },
             React.createElement(Tooltip, { title: title },
-                React.createElement(Text, { className: `${CLASS_PREFIX}__file-name` }, title)),
+                React.createElement(Text, { className: `${CLASS_PREFIX}__file-name` }, title))),
+        isEdit && (React.createElement("div", { className: `${CLASS_PREFIX}__file-foot` },
+            React.createElement("div", null,
+                React.createElement(Text, null, size)),
             isEdit && (React.createElement("div", { className: `${CLASS_PREFIX}__file-status` },
                 React.createElement(Icon, { type: ((_a = statusMap[status]) === null || _a === void 0 ? void 0 : _a.icon) ||
                         statusMap['UPLOAD_STATUS_PENDING'].icon }),
                 React.createElement(Text, { className: `${CLASS_PREFIX}__file-status--msg` }, ((_b = statusMap[status]) === null || _b === void 0 ? void 0 : _b.title) ||
-                    statusMap['UPLOAD_STATUS_PENDING'].title)))),
-        isEdit && (React.createElement("div", { className: `${CLASS_PREFIX}__file-foot` },
-            React.createElement("div", null,
-                React.createElement(Text, null, size))))));
+                    statusMap['UPLOAD_STATUS_PENDING'].title)))))));
 };
 /**
  * 操作列组件, onChange 从最外层 UploadFilePc 传进来
@@ -319,7 +318,7 @@ const UploadFileAction = ({ status = 'UPLOAD_STATUS_PENDING', fileID = '', uuid
             return (React.createElement(React.Fragment, null,
                 deleteVisible && renderDelete(),
                 ' ',
-                downloadVisible && renderDownLoad()));
+                downloadVisible && !isWebInMiniprogram() && renderDownLoad()));
         case 'UPLOAD_STATUS_ERROR':
             return (React.createElement(React.Fragment, null,
                 deleteVisible && renderDelete(),

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Upload, ConfigProvider, Button, message, Icon, Text, List, } from 'tea-component';
-import { filterStrList, isCloudFileID, isHttpFileID, transSize, downloadFile, cutFileTitle, transFileCloudidToName, randomStr, isInIde, } from '../../../utils/platform';
+import { filterStrList, isCloudFileID, isHttpFileID, transSize, downloadFile, cutFileTitle, transFileCloudidToName, randomStr, isInIde, isWebInMiniprogram, } from '../../../utils/platform';
 import { getCloudInstance } from '../../../utils/tcb';
 import classNames from '../../../utils/classnames';
 import { renderDecorator } from '../renderDecorator';
@@ -281,7 +281,8 @@ const UploadFileAction = ({ title = 'downfile', status = '0', fileID = '', uuid
             onReLoad === null || onReLoad === void 0 ? void 0 : onReLoad(file);
         } }, "\u91CD\u65B0\u4E0A\u4F20"));
     // 操作列按钮-下载
-    const renderDownLoad = () => downloadVisible && (React.createElement(Button, { type: "link", title: "\u70B9\u51FB\u4E0B\u8F7D\u6587\u4EF6", onClick: () => downloadFile(src, title) }, "\u4E0B\u8F7D"));
+    const renderDownLoad = () => downloadVisible &&
+        !isWebInMiniprogram && (React.createElement(Button, { type: "link", title: "\u70B9\u51FB\u4E0B\u8F7D\u6587\u4EF6", onClick: () => downloadFile(src, title) }, "\u4E0B\u8F7D"));
     switch (status) {
         case '0':
             return renderCancel();

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

@@ -11,7 +11,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, } = props;
+    const { events = emptyObject, defaultValue = emptyArray, confirmValue = '', defaultValueType = 'noneUser', onChange = null, multiple = false, request = defaultRequest, where, confirmAction, } = props;
     const platform = usePlatform();
     const [errInfo, setErrInfo] = useState({
         errorStatus: false,
@@ -86,32 +86,18 @@ export default function UserTreeSelect(props) {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [defaultValueType, selectUserIds]);
     useEffect(() => {
-        var _a, _b, _c;
+        var _a;
         setSelectedUserList(confirmUserList);
-        onChange === null || onChange === void 0 ? void 0 : onChange(multiple
-            ? confirmUserList.length > 0
-                ? confirmUserList.map((e) => {
-                    return e === null || e === void 0 ? void 0 : e.id;
-                })
-                : null
-            : (_a = confirmUserList[0]) === null || _a === void 0 ? void 0 : _a.id);
-        (_b = events === null || events === void 0 ? void 0 : events.change) === null || _b === void 0 ? void 0 : _b.call(events, multiple
-            ? {
-                value: confirmUserList.length > 0
-                    ? confirmUserList.map((e) => {
-                        return e === null || e === void 0 ? void 0 : e.id;
-                    })
-                    : null,
-                data: confirmUserList,
-            }
-            : {
-                value: ((_c = confirmUserList[0]) === null || _c === void 0 ? void 0 : _c.id) || null,
-                data: confirmUserList[0] || null,
-            });
+        onChange === null || onChange === void 0 ? void 0 : onChange(setOnChangeValue(multiple, confirmUserList));
+        (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, setOnChangeValue(multiple, confirmUserList, true));
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [confirmUserList]);
     //确定 关闭弹窗
     const onConfirm = () => {
+        confirmAction === null || confirmAction === void 0 ? void 0 : confirmAction({
+            userIds: setOnChangeValue(multiple, selectedUserList),
+            users: setOnChangeValue(multiple, selectedUserList, true),
+        });
         setConfirmUserList(selectedUserList);
         setOpen(false);
     };
@@ -149,3 +135,34 @@ export default function UserTreeSelect(props) {
     }
     return platform === 'h5' ? (React.createElement(UserSelectH5, { ...restProps, ...props })) : (React.createElement(UserSelectPC, { ...restProps, ...props }));
 }
+/**
+ * 设置onChange值
+ * @param multiple 是否是多选
+ * @param confirmUserList 已选用户列表
+ * @param isEventChange 是否是event事件
+ */
+function setOnChangeValue(multiple, confirmUserList, isEventChange = false) {
+    var _a, _b;
+    if (isEventChange) {
+        return multiple
+            ? {
+                value: confirmUserList.length > 0
+                    ? confirmUserList.map((e) => {
+                        return e === null || e === void 0 ? void 0 : e.id;
+                    })
+                    : null,
+                data: confirmUserList,
+            }
+            : {
+                value: ((_a = confirmUserList[0]) === null || _a === void 0 ? void 0 : _a.id) || null,
+                data: confirmUserList[0] || null,
+            };
+    }
+    return multiple
+        ? confirmUserList.length > 0
+            ? confirmUserList.map((e) => {
+                return e === null || e === void 0 ? void 0 : e.id;
+            })
+            : null
+        : (_b = confirmUserList[0]) === null || _b === void 0 ? void 0 : _b.id;
+}

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

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useImperativeHandle } from 'react';
 import { renderDecorator } from '../../../renderDecorator';
 import classNames from '../../../../../utils/classnames';
 import { defaultRequest } from '../../common/fetch-data-service';
@@ -6,7 +6,7 @@ import { ConfigProvider } from 'tea-component';
 import { ModalSelectH5 } from '../modal-select-h5';
 import { InputTags } from '../input-tags';
 export function UserTreeSelectH5({ id, className, style, label = '成员选择', labelVisible = true, placeholder = '请选择成员', disabled = false, layout = 'horizontal', requiredFlag = false, decorator, multiple = false, //是否多选
-pageNo, setPageNo, pageSize, 
+outerRef, pageNo, setPageNo, pageSize, 
 // platform,
 request = defaultRequest, onCancel, onConfirm, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, open, setOpen, filterParams, treeData, error, }) {
     const cls = classNames({
@@ -26,6 +26,15 @@ request = defaultRequest, onCancel, onConfirm, selectedUserList, setSelectedUser
         errorStatus: false,
         errorMessage: null,
     });
+    useImperativeHandle(outerRef, () => {
+        return {
+            methods: {
+                open: () => {
+                    setOpen(true);
+                },
+            },
+        };
+    }, [setOpen]);
     const onFocus = function () {
         setSelectedUserList(confirmUserList);
         if (!disabled)