@cloudbase/weda-ui 3.4.8 → 3.4.9

package/dist/web/components/flow/modules/operations/controls-items/approval-drawer/index.js

@@ -1,4 +1,5 @@
-import React, { useState } from 'react';
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { useState } from 'react';
 import { message } from 'tea-component';
 import { FlowButton } from '../../components';
 import { DrawerForm } from './drawer-form';
@@ -7,11 +8,20 @@ import './style.css';
  * 审批类型弹窗 可用于同意、拒绝、处理、转办 这几个操作
  */
 export function ApprovalDrawer(props) {
-    const { isH5 } = props.flowFrameCommonProps.flowLocalProps;
+    const { isH5 } = props.flowModulesProps;
     const [submitLoading, setSubmitLoading] = useState(false);
     const [visible, setVisible] = useState(false);
-    const onOpenDrawerForm = () => setVisible(true);
-    const onCloseDrawerForm = () => setVisible(false);
+    const onOpenDrawerForm = async () => {
+        const result = await props.flowControlModel.getApprovalFormData();
+        // 获取表单数据成功之后再显示审批抽屉
+        if (result) {
+            setVisible(true);
+        }
+    };
+    const onCloseDrawerForm = () => {
+        props.flowControlModel.clearFormData();
+        setVisible(false);
+    };
     const onDrawerFormSubmit = (formValues) => {
         let values = {};
         Object.keys(formValues).forEach((key) => {
@@ -41,7 +51,5 @@ export function ApprovalDrawer(props) {
             },
         });
     };
-    return (React.createElement(React.Fragment, null,
-        React.createElement(FlowButton, { ...props.buttonProps, buttonIcon: props.buttonIcon, id: props.id, onClick: onOpenDrawerForm }, props.label),
-        React.createElement(DrawerForm, { visible: visible, formInfo: props.approvalFormInfo, submit: onDrawerFormSubmit, isH5: isH5, submitLoading: submitLoading, onClose: onCloseDrawerForm })));
+    return (_jsxs(_Fragment, { children: [_jsx(FlowButton, { ...props.buttonProps, buttonIcon: props.buttonIcon, id: props.id, onClick: onOpenDrawerForm, children: props.label }), _jsx(DrawerForm, { visible: visible, formInfo: props.approvalFormInfo, submit: onDrawerFormSubmit, isH5: isH5, submitLoading: submitLoading, onClose: onCloseDrawerForm })] }));
 }

package/dist/web/components/flow/modules/operations/controls-items/approval-drawer/style.css

@@ -2,6 +2,7 @@
   width: 500px !important;
   top: 0 !important;
   background-color: #fff;
+  z-index: 1001 !important;
 }
 
 .weda-flow-approval-drawer .wedatea2td-form {

package/dist/web/components/flow/modules/operations/controls-items/cancel-apply-btn.js

@@ -1,11 +1,11 @@
-import React from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
 import { getPageQuery } from '../../../../../utils/getPageQuery';
 import { FlowButton } from '../components';
 /**
  * 取消申请
  */
 export function CancelApplyBtn(props) {
-    return (React.createElement(FlowButton, { ...props.buttonProps, buttonIcon: props.buttonIcon, id: props.id, onClick: navigateToFlowCenter }, props.label));
+    return (_jsx(FlowButton, { ...props.buttonProps, buttonIcon: props.buttonIcon, id: props.id, onClick: navigateToFlowCenter, children: props.label }));
 }
 /** 返回流程中心 */
 function navigateToFlowCenter() {

package/dist/web/components/flow/modules/operations/controls-items/check-list-popup/index.js

@@ -1,11 +1,9 @@
-import React from 'react';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Button } from 'tea-component';
 import { FlowPopup } from '../../components';
 import './style.css';
 /** 单双选弹窗(Popup)容器 */
 export function FlowCheckListPopup(props) {
     const { confirmButtonProps, confirmButtonText = '确认', ...restProps } = props;
-    return (React.createElement(FlowPopup, { position: "bottom", closeable: true, className: "weda-flow-checklist-popup", closeContentPosition: "top-left", closeContent: "\u53D6\u6D88", ...restProps },
-        React.createElement("div", { className: "weda-flow-checklist-body" }, props.children || null),
-        React.createElement(Button, { type: "link", className: "weda-flow-checklist-confirm", ...confirmButtonProps }, confirmButtonText)));
+    return (_jsxs(FlowPopup, { position: "bottom", closeable: true, className: "weda-flow-checklist-popup", closeContentPosition: "top-left", closeContent: "\u53D6\u6D88", ...restProps, children: [_jsx("div", { className: "weda-flow-checklist-body", children: props.children || null }), _jsx(Button, { type: "link", className: "weda-flow-checklist-confirm", ...confirmButtonProps, children: confirmButtonText })] }));
 }

package/dist/web/components/flow/modules/operations/controls-items/flow-task-info-modal/index.js

@@ -0,0 +1,20 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { Modal, SelectMultiple, Button, Form, Checkbox } from 'tea-component';
+import { FlowCheckListPopup } from '../check-list-popup';
+import { useFlowTaskInfoModel } from './view-model';
+/**
+ * 选择下一节点审批人弹窗
+ */
+export const FlowTaskInfoModal = (props) => {
+    const { isH5, visible, assigneeOptions, selectedAssignees, setSelectedAssignees, onSubmitTaskIds, } = useFlowTaskInfoModel(props);
+    const renderModal = () => {
+        return (_jsxs(Modal, { visible: visible, caption: props.label, onClose: () => onSubmitTaskIds(), size: "auto", children: [_jsx(Modal.Body, { children: _jsx(Form, { style: { marginBottom: '5px' }, children: _jsx(Form.Item, { label: "\u9009\u62E9\u5904\u7406\u4EBA", children: _jsx(SelectMultiple, { searchable: true, matchButtonWidth: true, appearance: "button", size: "full", style: { width: 300 }, staging: false, options: assigneeOptions, value: selectedAssignees, onChange: (value) => setSelectedAssignees(value) }) }) }) }), _jsxs(Modal.Footer, { children: [_jsx(Button, { type: "primary", onClick: () => onSubmitTaskIds(false), disabled: !selectedAssignees.length, children: "\u786E\u5B9A" }), _jsx(Button, { type: "weak", onClick: () => onSubmitTaskIds(), children: "\u53D6\u6D88" })] })] }));
+    };
+    const renderPopup = () => {
+        return (_jsx(FlowCheckListPopup, { visible: visible, onClose: () => onSubmitTaskIds(), title: props.label, overlayStyle: { zIndex: 998 }, height: 550, confirmButtonProps: {
+                disabled: !selectedAssignees.length,
+                onClick: () => onSubmitTaskIds(false),
+            }, children: _jsx(Checkbox.Group, { value: selectedAssignees, onChange: (value) => setSelectedAssignees(value), layout: "column", children: assigneeOptions.map((option) => (_jsx(Checkbox, { name: option.value, children: option.text }, option.value))) }) }));
+    };
+    return _jsxs(_Fragment, { children: [" ", isH5 ? renderPopup() : renderModal()] });
+};

package/dist/web/components/flow/modules/operations/controls-items/flow-task-info-modal/view-model.js

@@ -0,0 +1,119 @@
+import { useRef, useEffect, useState } from 'react';
+import { flowRequest } from '../../../../common';
+/**
+ * 下一节点审批人model
+ */
+export function useFlowTaskInfoModel(params) {
+    const { isH5 } = params.flowModulesProps;
+    const { onAfterFinishFlowAction } = params.flowControlModel;
+    /** 弹框是否可见 */
+    const [visible, setVisible] = useState(false);
+    /** 审批人列表 */
+    const [assigneeOptions, setAssigneeOptions] = useState([]);
+    /** 审批人 - 任务 映射对象 */
+    const assigneeTasksMapRef = useRef({});
+    /** 集合任务id */
+    const taskIdRef = useRef([]);
+    /** 已选审批人数组 */
+    const [selectedAssignees, setSelectedAssignees] = useState([]);
+    const timer = useRef(null);
+    useEffect(() => {
+        return () => {
+            cleanTiming();
+        };
+    }, []);
+    useEffect(() => {
+        if (params.flowControlModel.triggerFlowTaskInfo) {
+            /** 获取下一节点审批人触发信息 */
+            const { toBeSubmittedFlowTaskInfo } = params.flowControlModel.triggerFlowTaskInfo || {};
+            /** 转化下一节点审批人触发信息 */
+            const { assigneeTasksMap, assigneeOptions, taskIds } = transFlowTaskInfo(toBeSubmittedFlowTaskInfo);
+            setVisible(true);
+            setAssigneeOptions(assigneeOptions);
+            assigneeTasksMapRef.current = assigneeTasksMap;
+            taskIdRef.current = taskIds;
+            timingSubmit();
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [params.flowControlModel.triggerFlowTaskInfo]);
+    const cleanTiming = () => {
+        clearTimeout(timer.current);
+    };
+    /** 审批人列表提交 */
+    const submitFlowTaskList = async (flowTaskIds) => {
+        const result = await flowRequest({
+            action: 'SubmitFlowTaskList',
+            data: { flowTaskIds },
+        });
+        if (result === null || result === void 0 ? void 0 : result.status) {
+            setVisible(false);
+            setSelectedAssignees([]);
+            cleanTiming();
+            // 执行完成后自定义动作
+            onAfterFinishFlowAction(params.actionKey, params.afterAction);
+        }
+    };
+    /** 定时提交 */
+    const timingSubmit = () => {
+        // eslint-disable-next-line rulesdir/no-timer
+        timer.current = setTimeout(() => {
+            submitFlowTaskList();
+        }, 600000);
+    };
+    /** 提交按钮动作 */
+    const onSubmitTaskIds = (isCancel = true) => {
+        const selectedTaskIds = getSelectAssigneeTask(assigneeTasksMapRef.current, selectedAssignees);
+        const taskIds = isCancel ? taskIdRef.current : selectedTaskIds;
+        submitFlowTaskList(taskIds);
+    };
+    return {
+        isH5,
+        visible,
+        assigneeOptions,
+        selectedAssignees,
+        setSelectedAssignees,
+        onSubmitTaskIds,
+    };
+}
+/**
+ * 转换下一节点审批人任务信息。
+ */
+function transFlowTaskInfo(flowTaskInfoList) {
+    return flowTaskInfoList.reduce((result, infoItem) => {
+        const { assignee, assigneeName, waitFlowTaskId } = infoItem;
+        // 设置选择列表options
+        if (!result.assigneeOptions.some((option) => option.value === assignee)) {
+            result.assigneeOptions.push({
+                text: assigneeName,
+                value: assignee,
+            });
+        }
+        /**
+         * 设置审批人 与 任务id 映射
+         * 一个审批人可能会因为并行网关的原因 会有多个任务id。也就是 并行网关下可能会存在两条及以上的审批线路，每个线路都可能会有同一个审批人进行审批
+         * 到时候选审批人的时候把这个人对应的所有任务id都传给后端
+         */
+        if (!result.assigneeTasksMap[assignee]) {
+            result.assigneeTasksMap[assignee] = [];
+        }
+        result.assigneeTasksMap[assignee].push(waitFlowTaskId);
+        // 添加任务id到任务id列表
+        result.taskIds.push(waitFlowTaskId);
+        return result;
+    }, {
+        /** 审批人 与 任务id 映射 */
+        assigneeTasksMap: {},
+        /** 审批人可选项 */
+        assigneeOptions: [],
+        /** 任务id集合 */
+        taskIds: [],
+    });
+}
+/** 获取已选审批人对应的任务 */
+function getSelectAssigneeTask(flowTaskInfoMap, selectedAssignees) {
+    return selectedAssignees.reduce((result, assignee) => {
+        const assigneeTask = flowTaskInfoMap[assignee];
+        result.push(...assigneeTask);
+        return result;
+    }, []);
+}

package/dist/web/components/flow/modules/operations/controls-items/initiation-btn.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
 import { message } from 'tea-component';
 import { FlowButton } from '../components';
 /**
@@ -6,9 +6,12 @@ import { FlowButton } from '../components';
  */
 export function InitiationBtn(props) {
     const { flowControlModel } = props;
-    const onClick = () => {
+    const onClick = async () => {
         var _a;
         const ccUserIds = (_a = flowControlModel.applyCcUser) === null || _a === void 0 ? void 0 : _a.join();
+        const result = await flowControlModel.getApprovalFormData();
+        if (!result)
+            return;
         flowControlModel.completeTask({
             actionKey: props.actionKey,
             buttonAction: props.buttonAction,
@@ -21,5 +24,5 @@ export function InitiationBtn(props) {
             },
         });
     };
-    return (React.createElement(FlowButton, { ...props.buttonProps, buttonIcon: props.buttonIcon, id: props.id, onClick: onClick }, props.label));
+    return (_jsx(FlowButton, { ...props.buttonProps, buttonIcon: props.buttonIcon, id: props.id, onClick: onClick, children: props.label }));
 }

package/dist/web/components/flow/modules/operations/controls-items/revoke-modal/index.js

@@ -1,11 +1,13 @@
-import React, { useState } from 'react';
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useState } from 'react';
 import { Button, Modal, message } from 'tea-component';
+import { flowRequest } from '../../../../common';
 import { FlowPopup, FlowButton } from '../../components';
 import './style.css';
+/** 撤回弹窗组件 */
 export function RevokeModal(props) {
-    const { flowFrameCommonProps, flowControlModel } = props;
-    const { flowRequest, isH5, currentPageType } = flowFrameCommonProps.flowLocalProps;
-    const { flowDetail } = flowFrameCommonProps.commonFlowData;
+    const { flowModulesProps, flowControlModel } = props;
+    const { isH5, currentPageType, processInstance } = flowModulesProps;
     const { onAfterFinishFlowAction } = flowControlModel;
     const [visible, setVisible] = useState(false);
     const onOpen = () => setVisible(true);
@@ -15,11 +17,11 @@ export function RevokeModal(props) {
         const result = await flowRequest({
             action: 'Revoke',
             data: {
-                flowCode: flowDetail.flowCode,
-                appVersion: flowDetail.flowVersion,
-                instanceId: flowDetail.instanceId,
+                flowCode: processInstance.flowCode,
+                appVersion: processInstance.flowVersion,
+                instanceId: processInstance.instanceId,
                 revokeType: currentPageType === 'CREATE' ? 2 : 1,
-                taskId: currentPageType === 'DONE' ? flowDetail.taskId : undefined,
+                taskId: currentPageType === 'DONE' ? processInstance.taskId : undefined,
             },
         });
         if (result) {
@@ -30,21 +32,10 @@ export function RevokeModal(props) {
         }
     };
     const renderModal = () => {
-        return (React.createElement(Modal, { visible: visible, caption: "\u64A4\u9500\u6D41\u7A0B\u63D0\u9192", onClose: onClose },
-            React.createElement(Modal.Body, null, "\u6D41\u7A0B\u6B63\u5728\u8FDB\u884C\u4E2D\uFF0C\u786E\u8BA4\u64A4\u9500\u6B64\u6D41\u7A0B\uFF1F"),
-            React.createElement(Modal.Footer, null,
-                React.createElement(Button, { type: "primary", onClick: revoke }, "\u786E\u5B9A"),
-                React.createElement(Button, { type: "weak", onClick: onClose }, "\u53D6\u6D88"))));
+        return (_jsxs(Modal, { visible: visible, caption: "\u64A4\u9500\u6D41\u7A0B\u63D0\u9192", onClose: onClose, children: [_jsx(Modal.Body, { children: "\u6D41\u7A0B\u6B63\u5728\u8FDB\u884C\u4E2D\uFF0C\u786E\u8BA4\u64A4\u9500\u6B64\u6D41\u7A0B\uFF1F" }), _jsxs(Modal.Footer, { children: [_jsx(Button, { type: "primary", onClick: revoke, children: "\u786E\u5B9A" }), _jsx(Button, { type: "weak", onClick: onClose, children: "\u53D6\u6D88" })] })] }));
     };
     const renderPopup = () => {
-        return (React.createElement(FlowPopup, { visible: visible, onClose: onClose, title: "\u64A4\u9500\u6D41\u7A0B\u63D0\u9192", overlayStyle: { zIndex: 998 }, width: "80%", className: "weda-flow-revoke-popup" },
-            React.createElement("div", { className: "weda-flow-revoke-tip" },
-                React.createElement("div", { className: "weda-flow-revoke-content" }, "\u6D41\u7A0B\u6B63\u5728\u8FDB\u884C\u4E2D\uFF0C\u786E\u8BA4\u64A4\u9500\u6B64\u6D41\u7A0B\uFF1F"),
-                React.createElement("div", { className: "weda-flow-revoke-confirm" },
-                    React.createElement(Button, { type: "text", onClick: onClose }, "\u53D6\u6D88"),
-                    React.createElement(Button, { type: "link", onClick: revoke }, "\u786E\u8BA4")))));
+        return (_jsx(FlowPopup, { visible: visible, onClose: onClose, title: "\u64A4\u9500\u6D41\u7A0B\u63D0\u9192", overlayStyle: { zIndex: 998 }, width: "80%", className: "weda-flow-revoke-popup", children: _jsxs("div", { className: "weda-flow-revoke-tip", children: [_jsx("div", { className: "weda-flow-revoke-content", children: "\u6D41\u7A0B\u6B63\u5728\u8FDB\u884C\u4E2D\uFF0C\u786E\u8BA4\u64A4\u9500\u6B64\u6D41\u7A0B\uFF1F" }), _jsxs("div", { className: "weda-flow-revoke-confirm", children: [_jsx(Button, { type: "text", onClick: onClose, children: "\u53D6\u6D88" }), _jsx(Button, { type: "link", onClick: revoke, children: "\u786E\u8BA4" })] })] }) }));
     };
-    return (React.createElement(React.Fragment, null,
-        React.createElement(FlowButton, { ...props.buttonProps, buttonIcon: props.buttonIcon, id: props.id, onClick: onOpen }, props.label),
-        isH5 ? renderPopup() : renderModal()));
+    return (_jsxs(_Fragment, { children: [_jsx(FlowButton, { ...props.buttonProps, buttonIcon: props.buttonIcon, id: props.id, onClick: onOpen, children: props.label }), isH5 ? renderPopup() : renderModal()] }));
 }

package/dist/web/components/flow/modules/operations/controls-items/roll-back-modal.js

@@ -1,35 +1,26 @@
-import React, { useEffect, useState } from 'react';
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useEffect, useState } from 'react';
 import { Button, Modal, Select, Form, Radio, message } from 'tea-component';
+import { flowRequest } from '../../../common';
 import { FlowCheckListPopup } from './check-list-popup';
 /** 回退弹窗 */
 export function RollbackModal(props) {
     const { visible, isH5, preElementList, selectedNodeId, setSelectedNodeId, onOpen, onClose, rollBack, } = useRollbackModel(props);
     const renderModal = () => {
-        return (React.createElement(Modal, { visible: visible, caption: '流程回退', onClose: onClose },
-            React.createElement(Modal.Body, null,
-                React.createElement(Form, null,
-                    React.createElement(Form.Item, { label: '选择回退节点' },
-                        React.createElement(Select, { size: "full", appearance: "button", matchButtonWidth: true, options: preElementList, value: selectedNodeId, onChange: (value) => setSelectedNodeId(value), style: { width: 200 } })))),
-            React.createElement(Modal.Footer, null,
-                React.createElement(Button, { type: "primary", disabled: (preElementList === null || preElementList === void 0 ? void 0 : preElementList.length) === 0 || !selectedNodeId, onClick: rollBack }, "\u786E\u5B9A"),
-                React.createElement(Button, { type: "weak", onClick: onClose }, "\u53D6\u6D88"))));
+        return (_jsxs(Modal, { visible: visible, caption: '流程回退', onClose: onClose, children: [_jsx(Modal.Body, { children: _jsx(Form, { children: _jsx(Form.Item, { label: '选择回退节点', children: _jsx(Select, { size: "full", appearance: "button", matchButtonWidth: true, options: preElementList, value: selectedNodeId, onChange: (value) => setSelectedNodeId(value), style: { width: 200 } }) }) }) }), _jsxs(Modal.Footer, { children: [_jsx(Button, { type: "primary", disabled: (preElementList === null || preElementList === void 0 ? void 0 : preElementList.length) === 0 || !selectedNodeId, onClick: rollBack, children: "\u786E\u5B9A" }), _jsx(Button, { type: "weak", onClick: onClose, children: "\u53D6\u6D88" })] })] }));
     };
     const renderPopup = () => {
-        return (React.createElement(FlowCheckListPopup, { visible: visible, onClose: onClose, title: "\u8BF7\u9009\u62E9\u56DE\u9000\u8282\u70B9", overlayStyle: { zIndex: 998 }, height: 550, confirmButtonProps: {
+        return (_jsx(FlowCheckListPopup, { visible: visible, onClose: onClose, title: "\u8BF7\u9009\u62E9\u56DE\u9000\u8282\u70B9", overlayStyle: { zIndex: 998 }, height: 550, confirmButtonProps: {
                 onClick: rollBack,
                 disabled: (preElementList === null || preElementList === void 0 ? void 0 : preElementList.length) === 0 || !selectedNodeId,
-            } },
-            React.createElement(Radio.Group, { value: selectedNodeId, onChange: (value) => setSelectedNodeId(value), layout: "column" }, preElementList.map((ele) => (React.createElement(Radio, { name: ele.value, key: ele.value }, ele.text))))));
+            }, children: _jsx(Radio.Group, { value: selectedNodeId, onChange: (value) => setSelectedNodeId(value), layout: "column", children: preElementList.map((ele) => (_jsx(Radio, { name: ele.value, children: ele.text }, ele.value))) }) }));
     };
-    return (React.createElement(React.Fragment, null,
-        React.createElement(Button, { ...props.buttonProps, id: props.id, onClick: onOpen }, props.label),
-        isH5 ? renderPopup() : renderModal()));
+    return (_jsxs(_Fragment, { children: [_jsx(Button, { ...props.buttonProps, id: props.id, onClick: onOpen, children: props.label }), isH5 ? renderPopup() : renderModal()] }));
 }
 /** 回退model */
 function useRollbackModel(params) {
-    const { flowFrameCommonProps, flowControlModel } = params;
-    const { flowRequest, isH5 } = flowFrameCommonProps.flowLocalProps;
-    const { flowDetail } = flowFrameCommonProps.commonFlowData;
+    const { flowModulesProps, flowControlModel } = params;
+    const { isH5, processInstance } = flowModulesProps;
     const { onAfterFinishFlowAction } = flowControlModel;
     const [visible, setVisible] = useState(false);
     /** 可回退节点列表 */
@@ -46,9 +37,10 @@ function useRollbackModel(params) {
         const result = await flowRequest({
             action: 'GetPreElementList',
             data: {
-                flowCode: flowDetail.flowCode,
-                appVersion: flowDetail.flowVersion,
-                instanceId: flowDetail.instanceId,
+                flowCode: processInstance.flowCode,
+                appVersion: processInstance.flowVersion,
+                instanceId: processInstance.instanceId,
+                nodeId: processInstance.currentNodeId,
             },
         });
         if (result === null || result === void 0 ? void 0 : result.data) {
@@ -74,11 +66,11 @@ function useRollbackModel(params) {
         const result = await flowRequest({
             action: 'RollBack',
             data: {
-                flowCode: flowDetail.flowCode,
-                appVersion: flowDetail.flowVersion,
-                instanceId: flowDetail.instanceId,
-                taskId: flowDetail.taskId,
-                nodeId: flowDetail.currentNodeId,
+                flowCode: processInstance.flowCode,
+                appVersion: processInstance.flowVersion,
+                instanceId: processInstance.instanceId,
+                taskId: processInstance.taskId,
+                nodeId: processInstance.currentNodeId,
                 sourceType: 1,
                 targetNodeId: selectedNodeId,
                 targetActTaskId: (_a = preElementList.find((item) => item.value === selectedNodeId)) === null || _a === void 0 ? void 0 : _a.actTaskId,

package/dist/web/components/flow/modules/operations/view-model.js

@@ -1,14 +1,11 @@
-import { useState } from 'react';
-import { PAGE_TYPE } from '../../constants';
-import { CommonFlowDataUtils, } from '../../frame';
+import { useState, useRef } from 'react';
+import { PAGE_TYPE, isInIde, flowRequest, } from '../../common';
 import { FLOW_CONTROL_ACTION_KEY, } from './config';
 /** 流程控制主model, 包含一些公共状态或方法 */
 export function useFlowControlModel(params) {
     //#region model入参
-    const { commonFlowData, flowLocalProps, ide, reload, setFormType } = params;
-    const { flowDetail, pageInfo } = commonFlowData;
-    const { flowRequest, isWedaIde } = flowLocalProps;
-    const { events } = ide || {};
+    const { processInstance, approvalPageDetail, wedaPlatformProps, updatePageType, reloadCommonFlowData, updateFlowFormType, } = params;
+    const { events } = wedaPlatformProps || {};
     //#endregion
     //#region hook
     /** 提交申请时的抄送列表 */
@@ -17,85 +14,57 @@ export function useFlowControlModel(params) {
     const [hasGoBack, setHasGoBack] = useState(false);
     /** 触发下一节点审批人操作 */
     const [triggerFlowTaskInfo, setTriggerFlowTaskInfo] = useState(null);
+    const { formDataRef, ...restFormDateModel } = useFormData(params);
     //#endregion
     //#region 流程操作请求
     /** 提交申请、保存草稿、同意、拒绝、处理、转办  时 调用此请求 */
-    const completeTask = (value) => {
+    const completeTask = async (value) => {
+        var _a, _b, _c;
         if (!value.buttonAction)
             return;
-        getFormData(async (formDataMap) => {
-            var _a, _b, _c;
-            const params = {
-                buttonAction: value.buttonAction,
-                flowCode: flowDetail.flowCode,
-                instanceId: flowDetail.instanceId,
-                nodeId: flowDetail.currentNodeId,
-                taskId: flowDetail.taskId,
-                appVersion: flowDetail.flowVersion,
-                appCode: flowDetail === null || flowDetail === void 0 ? void 0 : flowDetail.startAppCode,
-                variableInfos: translateVariableInfos(formDataMap, pageInfo),
-                ...(value.data || {}),
-            };
-            (_a = value === null || value === void 0 ? void 0 : value.setLoadingState) === null || _a === void 0 ? void 0 : _a.call(value, true);
-            const result = await flowRequest({ action: 'CompleteTask', data: params }, { upperCaseIgnoreKeys: ['variableInfos'] });
-            (_b = value === null || value === void 0 ? void 0 : value.setLoadingState) === null || _b === void 0 ? void 0 : _b.call(value, false);
-            if (result) {
-                (_c = value === null || value === void 0 ? void 0 : value.successCallback) === null || _c === void 0 ? void 0 : _c.call(value);
-                if (result === null || result === void 0 ? void 0 : result.toBeSubmittedFlowTaskFlag) {
-                    setTriggerFlowTaskInfo(result);
-                }
-                else {
-                    // 执行完成后自定义动作
-                    onAfterFinishFlowAction(value.actionKey, value.afterAction);
-                }
+        const params = {
+            buttonAction: value.buttonAction,
+            flowCode: processInstance.flowCode,
+            instanceId: processInstance.instanceId,
+            nodeId: processInstance.currentNodeId,
+            taskId: processInstance.taskId,
+            appVersion: processInstance.flowVersion,
+            appCode: processInstance === null || processInstance === void 0 ? void 0 : processInstance.startAppCode,
+            variableInfos: translateVariableInfos(formDataRef.current, approvalPageDetail),
+            ...(value.data || {}),
+        };
+        (_a = value === null || value === void 0 ? void 0 : value.setLoadingState) === null || _a === void 0 ? void 0 : _a.call(value, true);
+        const result = await flowRequest({ action: 'CompleteTask', data: params }, { upperCaseIgnoreKeys: ['variableInfos'] });
+        (_b = value === null || value === void 0 ? void 0 : value.setLoadingState) === null || _b === void 0 ? void 0 : _b.call(value, false);
+        // 请求成功后清空审批表单详情数据缓存
+        restFormDateModel.clearFormData();
+        if (result) {
+            (_c = value === null || value === void 0 ? void 0 : value.successCallback) === null || _c === void 0 ? void 0 : _c.call(value);
+            if (result === null || result === void 0 ? void 0 : result.toBeSubmittedFlowTaskFlag) {
+                setTriggerFlowTaskInfo(result);
             }
-        });
+            else {
+                // 执行完成后自定义动作
+                onAfterFinishFlowAction(value.actionKey, value.afterAction);
+            }
+        }
     };
     //#endregion
     //#region 辅助方法
-    /** 获取审批申请表单数据 */
-    const getFormData = (callback) => {
-        var _a;
-        if (isWedaIde) {
-            return;
-        }
-        (_a = events === null || events === void 0 ? void 0 : events.tap) === null || _a === void 0 ? void 0 : _a.call(events, {
-            onGetFormData: (formDataMap) => {
-                if (Object.values(formDataMap).some((item) => item === undefined)) {
-                    return;
-                }
-                callback === null || callback === void 0 ? void 0 : callback(formDataMap);
-            },
-        }, {
-            originEvent: null,
-        });
-    };
     /** 完成流程动作后的事件 */
     function onAfterFinishFlowAction(currentActionKey, afterAction) {
         const customizeFinishAction = events === null || events === void 0 ? void 0 : events[afterAction];
         if (customizeFinishAction) {
-            // 当前动作不是加签的话，需要切换URL参数
-            if (currentActionKey !== FLOW_CONTROL_ACTION_KEY.ADD_ASSIGNEE) {
-                // 默认切换页面类型为【我已处理】
-                let newPageType = PAGE_TYPE.DONE;
-                // 提交后需要切换页面类型为【我发起的】
-                if (currentActionKey === FLOW_CONTROL_ACTION_KEY.SUBMIT) {
-                    newPageType = PAGE_TYPE.CREATE;
-                }
-                // 保存草稿后切换页面类型为【草稿箱】
-                if (currentActionKey === FLOW_CONTROL_ACTION_KEY.SAVE_DRAFT) {
-                    newPageType = PAGE_TYPE.DRAFT;
-                }
-                CommonFlowDataUtils.updateUrlSearch({ pageType: newPageType });
-            }
+            const newPageType = getNewPageType(currentActionKey);
+            updatePageType(newPageType);
             // 操作类型不是回退的情况才reload数据 回退之后当前流程被销毁 故回退之后不刷新数据
             if (currentActionKey === FLOW_CONTROL_ACTION_KEY.ROLL_BACK) {
                 setHasGoBack(true);
-                setFormType('read');
+                updateFlowFormType('read');
             }
             else {
                 // 重新加载数据
-                reload();
+                reloadCommonFlowData(newPageType);
             }
             // 执行自定义事件
             customizeFinishAction === null || customizeFinishAction === void 0 ? void 0 : customizeFinishAction();
@@ -109,13 +78,52 @@ export function useFlowControlModel(params) {
         setApplyCcUser,
         completeTask,
         onAfterFinishFlowAction,
+        ...restFormDateModel,
+    };
+}
+/** 处理审批内容表单详情的hook */
+function useFormData(params) {
+    const { events } = (params === null || params === void 0 ? void 0 : params.wedaPlatformProps) || {};
+    // 审批表单详情数据缓存
+    const formDataRef = useRef(null);
+    /**
+     * 获取审批表单详情数据缓存
+     * @returns 返回表单内的数据，返回null说明在ide中或者是表单校验失败
+     */
+    const getApprovalFormData = () => {
+        return new Promise((resolve) => {
+            var _a;
+            if (isInIde()) {
+                resolve(null);
+            }
+            (_a = events === null || events === void 0 ? void 0 : events.tap) === null || _a === void 0 ? void 0 : _a.call(events, {
+                onGetFormData: (formDataMap) => {
+                    if (Object.values(formDataMap).some((item) => item === undefined)) {
+                        resolve(null);
+                    }
+                    formDataRef.current = formDataMap;
+                    resolve(formDataMap);
+                },
+            }, {
+                originEvent: null,
+            });
+        });
+    };
+    /** 清空审批表单详情数据缓存 */
+    const clearFormData = () => {
+        formDataRef.current = null;
+    };
+    return {
+        formDataRef,
+        getApprovalFormData,
+        clearFormData,
     };
 }
 /** 涉及提交申请表单时，转换variableInfos */
-function translateVariableInfos(currentFormData, pageInfo) {
+function translateVariableInfos(currentFormData, approvalPageDetail) {
     var _a;
-    const outEntityCodes = (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.outEntityCodes) || [];
-    const originObjectMap = ((_a = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.variableInfos) === null || _a === void 0 ? void 0 : _a.objectMap) || [];
+    const outEntityCodes = (approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.outEntityCodes) || [];
+    const originObjectMap = ((_a = approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.variableInfos) === null || _a === void 0 ? void 0 : _a.objectMap) || [];
     return outEntityCodes === null || outEntityCodes === void 0 ? void 0 : outEntityCodes.map((item) => {
         const originVariableInfo = originObjectMap === null || originObjectMap === void 0 ? void 0 : originObjectMap.find((info) => (info === null || info === void 0 ? void 0 : info.entityCode) === (item === null || item === void 0 ? void 0 : item.entityCode));
         const { recordId, fieldValueMap } = originVariableInfo || {};
@@ -135,3 +143,20 @@ function translateVariableInfos(currentFormData, pageInfo) {
         return variableInfo;
     });
 }
+/** 获取新页面类型 */
+function getNewPageType(currentActionKey) {
+    // 当前是加签的话不进行更新PageType操作
+    if (currentActionKey === FLOW_CONTROL_ACTION_KEY.ADD_ASSIGNEE)
+        return null;
+    // 当前动作不是加签的话，需要切换URL参数 默认切换页面类型为【我已处理】
+    let newPageType = PAGE_TYPE.DONE;
+    // 提交后需要切换页面类型为【我发起的】
+    if (currentActionKey === FLOW_CONTROL_ACTION_KEY.SUBMIT) {
+        newPageType = PAGE_TYPE.CREATE;
+    }
+    // 保存草稿后切换页面类型为【草稿箱】
+    if (currentActionKey === FLOW_CONTROL_ACTION_KEY.SAVE_DRAFT) {
+        newPageType = PAGE_TYPE.DRAFT;
+    }
+    return newPageType;
+}

package/dist/web/components/flow/process/components/comment-text/index.js

@@ -0,0 +1,24 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import './style.css';
+/** 评论内容文本标签 */
+export function CommentText(props) {
+    const { comment = '', highlightPositionList = [], arrowDirection = 'top', } = props;
+    // 高亮位置数组为空说明没有@用户信息，只有返回评论内容
+    if (!highlightPositionList.length)
+        return (_jsx(CommentPanel, { arrowDirection: arrowDirection, children: comment }));
+    let startIndex = 0;
+    let commentDom = '';
+    // 变量高亮位置数组 拼接dom
+    for (const [start, end] of highlightPositionList) {
+        const atUserName = comment === null || comment === void 0 ? void 0 : comment.substring(start + 1, end);
+        commentDom = (_jsxs(_Fragment, { children: [commentDom, _jsxs(_Fragment, { children: [comment === null || comment === void 0 ? void 0 : comment.substring(startIndex, start), _jsxs("span", { style: { color: '#0052d9' }, children: ["@", atUserName] })] })] }));
+        startIndex = end;
+    }
+    if (startIndex < (comment === null || comment === void 0 ? void 0 : comment.length)) {
+        commentDom = (_jsxs(_Fragment, { children: [commentDom, comment.substring(startIndex, comment.length)] }));
+    }
+    return (_jsx(CommentPanel, { arrowDirection: arrowDirection, children: commentDom }));
+}
+function CommentPanel(props) {
+    return (_jsx("div", { className: `weda-process-comment arrow-${props.arrowDirection}`, children: _jsx("span", { className: "weda-process-comment-content", children: props.children }) }));
+}