@cloudbase/weda-ui 3.4.3 → 3.4.5

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

@@ -6,6 +6,7 @@ import { useControlContext } from './provider';
 import { ACTION_TYPE } from './constants';
 import { ApprovalDrawer } from './ApprovalDrawer';
 import { FlowTaskInfoModal } from './FlowTaskInfoModal';
+import { setOperationButtonId } from './utils';
 import './Control.css';
 export const FlowControl = (props) => {
     const { commonFlowData, flowLocalProps, ide } = props;
@@ -13,7 +14,7 @@ export const FlowControl = (props) => {
     const { isWedaIde, currentPageType } = flowLocalProps;
     const { 
     // ControlModel
-    userModalVisible, submitApplyLoading, ccUserModelVisible, ccUsers, ifSubmitAndCc, setCcUsers, setCcUserModelVisible, onControlChick, setUserModalVisible, onUserModalVisibleChange, onAddCounterSign, onBackFlowCenter, 
+    userModalVisible, submitApplyLoading, ccUserModelVisible, ccUsers, ifSubmitAndCc, hasGoBack, setCcUsers, setCcUserModelVisible, onControlChick, setUserModalVisible, onUserModalVisibleChange, onAddCounterSign, onBackFlowCenter, 
     // RevokeModel
     showRevokeModal, showBackModal, backNodeList, backNode, setShowRevokeModal, doneRevokeFn, doneBackFn, setShowBackModal, getNodeList, setBackNode, } = useControlContext();
     const onClickGoBack = async () => {
@@ -27,40 +28,54 @@ export const FlowControl = (props) => {
         'page-process__progress__app-page': !isWedaIde,
     });
     const renderButtonGroup = () => {
-        var _a, _b;
+        var _a, _b, _c;
+        if (hasGoBack)
+            return null;
+        /**
+         * 审批页面类型 - approval:审批页面，apply:提交审批页面
+         * 微搭编辑器中预览按钮区域根据审批页面类型展示不同的按钮，审批页面类型是提交审批页面 且在微搭编辑器中 的话 渲染提交申请按钮组
+         */
+        if (((_a = ide.bindMetadata) === null || _a === void 0 ? void 0 : _a.approvalPageType) === 'apply' && isWedaIde) {
+            return (React.createElement("div", { className: footerClassNames },
+                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: footerClassNames },
-                React.createElement(Button, { type: "weak", onClick: () => setShowRevokeModal(true) }, "\u64A4\u9500")));
+                React.createElement(Button, { type: "weak", onClick: () => setShowRevokeModal(true), id: setOperationButtonId('revoke') }, "\u64A4\u9500")));
         }
         if (['DRAFT', 'CREATEFLOW', 'TODO'].includes(currentPageType) &&
             (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.show)) {
             if (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showSubmitApp) {
                 return (React.createElement("div", { className: footerClassNames },
                     React.createElement(ButtonLayout, { gap: 10 },
-                        ifSubmitAndCc ? (React.createElement(Button, { type: "link", onClick: () => setCcUserModelVisible(true) },
+                        ifSubmitAndCc ? (React.createElement(Button, { type: "link", onClick: () => setCcUserModelVisible(true), id: setOperationButtonId('cc') },
                             "+\u6284\u9001\u4EBA(",
-                            ccUsers.length || 0,
+                            (ccUsers === null || ccUsers === void 0 ? void 0 : ccUsers.length) || 0,
                             ")")) : null,
-                        React.createElement(Button, { type: "primary", loading: submitApplyLoading, onClick: (e) => onControlChick(ACTION_TYPE.SUBMIT, e) }, ((_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: (e) => onControlChick(ACTION_TYPE.SUBMIT, e), id: setOperationButtonId('submit') }, ((_b = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.buttons) === null || _b === void 0 ? void 0 : _b[3]) || '提交申请'),
                         (flowDetail === null || flowDetail === void 0 ? void 0 : flowDetail.canDelete) && (React.createElement(React.Fragment, null,
-                            React.createElement(Button, { type: "weak", onClick: (e) => onControlChick(ACTION_TYPE.SAVE_DRAFT, e) }, "\u4FDD\u5B58\u8349\u7A3F"),
+                            React.createElement(Button, { type: "weak", onClick: (e) => onControlChick(ACTION_TYPE.SAVE_DRAFT, e), id: setOperationButtonId('save_draft') }, "\u4FDD\u5B58\u8349\u7A3F"),
                             React.createElement(Button, { type: "weak", onClick: onBackFlowCenter }, "\u53D6\u6D88"))))));
             }
             return (React.createElement("div", { className: footerClassNames },
                 React.createElement(ButtonLayout, null,
-                    (flowDetail === null || flowDetail === void 0 ? void 0 : flowDetail.userTaskType) === 2 ? (React.createElement(Button, { type: "primary", onClick: (e) => onControlChick(ACTION_TYPE.HANDLE, e) }, flowDetail === null || flowDetail === void 0 ? void 0 : flowDetail.operationName)) : (React.createElement(ButtonLayout, { gap: 10 },
-                        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] : '同意'),
-                        React.createElement(Button, { type: "weak", 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] : '拒绝'))),
-                    (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showTurnToPerson) ? (React.createElement(Button, { type: "weak", className: "mf-progress-footer__btn-line", onClick: (e) => onControlChick(ACTION_TYPE.TRANSFER, e) }, "\u8F6C\u529E")) : null,
-                    (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showRollBack) && (React.createElement(Button, { type: "weak", className: "mf-progress-footer__btn-line", onClick: onClickGoBack }, "\u56DE\u9000")),
-                    (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showAddAssignee) && (React.createElement(Button, { type: "weak", className: "mf-progress-footer__btn-line", onClick: onUserModalVisibleChange }, "\u52A0\u7B7E")))));
+                    (flowDetail === null || flowDetail === void 0 ? void 0 : flowDetail.userTaskType) === 2 ? (React.createElement(Button, { type: "primary", onClick: (e) => onControlChick(ACTION_TYPE.HANDLE, e), id: setOperationButtonId('handle') }, flowDetail === null || flowDetail === void 0 ? void 0 : flowDetail.operationName)) : (React.createElement(ButtonLayout, { gap: 10 },
+                        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] : '同意'),
+                        React.createElement(Button, { type: "weak", 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] : '拒绝'))),
+                    (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showTurnToPerson) ? (React.createElement(Button, { type: "weak", className: "mf-progress-footer__btn-line", onClick: (e) => onControlChick(ACTION_TYPE.TRANSFER, e), id: setOperationButtonId('turn_to_person') }, "\u8F6C\u529E")) : null,
+                    (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showRollBack) && (React.createElement(Button, { type: "weak", className: "mf-progress-footer__btn-line", onClick: onClickGoBack, id: setOperationButtonId('roll_back') }, "\u56DE\u9000")),
+                    (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showAddAssignee) && (React.createElement(Button, { type: "weak", className: "mf-progress-footer__btn-line", onClick: onUserModalVisibleChange, id: setOperationButtonId('add_assignee') }, "\u52A0\u7B7E")))));
         }
         if (['DRAFT', 'CREATEFLOW'].includes(currentPageType)) {
             return (React.createElement("div", { className: footerClassNames },
-                React.createElement(Button, { type: "primary", loading: submitApplyLoading, onClick: (e) => onControlChick(ACTION_TYPE.SUBMIT, e) }, ((_b = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.buttons) === null || _b === void 0 ? void 0 : _b[3]) || '提交申请'),
-                React.createElement(Button, { type: "weak", onClick: (e) => onControlChick(ACTION_TYPE.SAVE_DRAFT, e) }, "\u4FDD\u5B58\u8349\u7A3F"),
+                React.createElement(Button, { type: "primary", loading: submitApplyLoading, onClick: (e) => onControlChick(ACTION_TYPE.SUBMIT, e), id: setOperationButtonId('submit') }, ((_c = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.buttons) === null || _c === void 0 ? void 0 : _c[3]) || '提交申请'),
+                React.createElement(Button, { type: "weak", onClick: (e) => onControlChick(ACTION_TYPE.SAVE_DRAFT, e), id: setOperationButtonId('save_draft') }, "\u4FDD\u5B58\u8349\u7A3F"),
                 React.createElement(Button, { type: "weak", onClick: onBackFlowCenter }, "\u53D6\u6D88")));
         }
+        return null;
     };
     return (
     // eslint-disable-next-line react/jsx-props-no-spreading
@@ -81,7 +96,7 @@ export const FlowControl = (props) => {
                     React.createElement(Button, { type: "primary", onClick: doneRevokeFn }, "\u786E\u5B9A"),
                     React.createElement(Button, { type: "weak", onClick: () => setShowRevokeModal(false) }, "\u53D6\u6D88"))),
             React.createElement(UserSelectModel, { visible: userModalVisible, onChange: (val) => val.length && onAddCounterSign(val), onClose: () => setUserModalVisible(false) }),
-            React.createElement(UserSelectModel, { value: ccUsers, visible: ccUserModelVisible, onChange: (val) => val.length && setCcUsers(val), onClose: () => setCcUserModelVisible(false) }),
+            React.createElement(UserSelectModel, { value: ccUsers, visible: ccUserModelVisible, onUserIdChange: (ids) => setCcUsers(ids || []), onClose: () => setCcUserModelVisible(false) }),
             React.createElement(FlowTaskInfoModal, null),
             React.createElement(ApprovalDrawer, { pageInfo: pageInfo, flowDetail: flowDetail }))));
 };

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

@@ -1,6 +1,6 @@
 .mf-progress-mb--footer {
   background: #fff;
-  padding: 1.42857rem 0;
+  padding: 20px 0;
   text-align: center;
   width: 100%;
 }
@@ -9,7 +9,7 @@
   padding: 0;
   vertical-align: bottom;
   min-width: 100%;
-  border-radius: 0;
+  border-radius: 0px;
 }
 @media (max-width: 1024px) {
   .approval-progress__more--dialog .wedatea2td-dialog__inner {
@@ -18,25 +18,25 @@
 }
 .flow-popup {
   display: flex;
-  max-height: 28.57143rem;
+  max-height: 400px;
   flex-direction: column;
 }
 .flow-popup-title {
-  height: 2.85714rem;
+  height: 40px;
   display: flex;
   flex-shrink: 0;
   justify-content: space-between;
   align-items: center;
-  font-size: 1.14286rem;
+  font-size: 16px;
   font-weight: 400;
-  padding: 0 1.42857rem;
-  border-bottom: 0.07143rem solid #dcdee6;
+  padding: 0 20px;
+  border-bottom: 1px solid #dcdee6;
 }
 .flow-popup-title .left {
   color: #666;
 }
 .flow-popup-title .center {
-  font-size: 1rem;
+  font-size: 14px;
   color: #666;
 }
 .flow-popup-title .right {
@@ -53,8 +53,8 @@
   text-overflow: ellipsis;
 }
 .flow-popup_mb-group-list .apa-icon {
-  width: 1.14286rem;
-  height: 1.14286rem;
+  width: 16px;
+  height: 16px;
   display: inline-block;
   vertical-align: middle;
   background-repeat: no-repeat;
@@ -68,5 +68,34 @@
   background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTZweCIgaGVpZ2h0PSIxNnB4IiB2aWV3Qm94PSIwIDAgMTYgMTYiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDU4ICg4NDY2MykgLSBodHRwczovL3NrZXRjaC5jb20gLS0+CiAgICA8dGl0bGU+55S75p2/PC90aXRsZT4KICAgIDxkZXNjPkNyZWF0ZWQgd2l0aCBTa2V0Y2guPC9kZXNjPgogICAgPGcgaWQ9IueUu+advyIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPGcgaWQ9Iue8lue7hCI+CiAgICAgICAgICAgIDxyZWN0IGlkPSLnn6nlvaIiIHg9IjAiIHk9IjAiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PC9yZWN0PgogICAgICAgICAgICA8cGF0aCBkPSJNOC40NDgzNjgwNCwxLjcwODQ5Mjg4IEwxMC4zNTExNDEsNS41NjM5MzIwMiBMMTAuMzUxMTQxLDUuNTYzOTMyMDIgTDE0LjYwNTg3MDcsNi4xODIxODA0NCBDMTQuODc5MTQzMSw2LjIyMTg4OTI1IDE1LjA2ODQ4MzksNi40NzU2MTA2NyAxNS4wMjg3NzUxLDYuNzQ4ODgzMSBDMTUuMDEyOTYyOCw2Ljg1NzcwMTYyIDE0Ljk2MTcxOTIsNi45NTgyNzI4MiAxNC44ODI5Nzc0LDcuMDM1MDI3MTMgTDExLjgwNDIyNjEsMTAuMDM2MDY4IEwxMS44MDQyMjYxLDEwLjAzNjA2OCBMMTIuNTMxMDIwNywxNC4yNzM2MDU3IEMxMi41Nzc3MDEyLDE0LjU0NTc3MzkgMTIuMzk0OTA3MywxNC44MDQyNTE4IDEyLjEyMjczOSwxNC44NTA5MzI0IEMxMi4wMTQzNjAyLDE0Ljg2OTUyMDggMTEuOTAyODc2MiwxNC44NTE4NjM0IDExLjgwNTU0NTksMTQuODAwNjkzOSBMOCwxMi44IEw4LDEyLjggTDQuMTk0NDU0MDYsMTQuODAwNjkzOSBDMy45NTAwMzE3NywxNC45MjkxOTQzIDMuNjQ3NzE4MTksMTQuODM1MjIxIDMuNTE5MjE3NzgsMTQuNTkwNzk4OCBDMy40NjgwNDgyNSwxNC40OTM0Njg1IDMuNDUwMzkwOTEsMTQuMzgxOTg0NSAzLjQ2ODk3OTMzLDE0LjI3MzYwNTcgTDQuMTk1NzczOTMsMTAuMDM2MDY4IEw0LjE5NTc3MzkzLDEwLjAzNjA2OCBMMS4xMTcwMjI2LDcuMDM1MDI3MTMgQzAuOTE5MjgwODA2LDYuODQyMjc2NTIgMC45MTUyMzQ2NTMsNi41MjU3MTk4OSAxLjEwNzk4NTI2LDYuMzI3OTc4MSBDMS4xODQ3Mzk1Niw2LjI0OTIzNjI4IDEuMjg1MzEwNzcsNi4xOTc5OTI2OSAxLjM5NDEyOTI4LDYuMTgyMTgwNDQgTDUuNjQ4ODU4OTksNS41NjM5MzIwMiBMNS42NDg4NTg5OSw1LjU2MzkzMjAyIEw3LjU1MTYzMTk2LDEuNzA4NDkyODggQzcuNjczODQzMTEsMS40NjA4NjYwNSA3Ljk3MzY1NjAzLDEuMzU5MTk2NTUgOC4yMjEyODI4NiwxLjQ4MTQwNzY5IEM4LjMxOTg4OTE2LDEuNTMwMDcyODEgOC4zOTk3MDI5MiwxLjYwOTg4NjU3IDguNDQ4MzY4MDQsMS43MDg0OTI4OCBaIiBpZD0i5pif5b2iIiBmaWxsPSIjQTJBQ0JEIiBmaWxsLXJ1bGU9Im5vbnplcm8iPjwvcGF0aD4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPg==);
 }
 
-/*# sourceURL=webpack://./src/web/components/flow/modules/control/ControlMobile.css */
-/*# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack://./src/web/components/flow/modules/control/ControlMobile.css"],"names":[],"mappings":"AAAA;EACE,gBAAgB;EAChB,qBAAqB;EACrB,kBAAkB;EAClB,WAAW;AACb;AACA;EACE,WAAW;EACX,UAAU;EACV,sBAAsB;EACtB,eAAe;EACf,gBAAgB;AAClB;AACA;EACE;IACE,SAAS;EACX;AACF;AACA;EACE,aAAa;EACb,uBAAuB;EACvB,sBAAsB;AACxB;AACA;EACE,kBAAkB;EAClB,aAAa;EACb,cAAc;EACd,8BAA8B;EAC9B,mBAAmB;EACnB,qBAAqB;EACrB,gBAAgB;EAChB,qBAAqB;EACrB,uCAAuC;AACzC;AACA;EACE,WAAW;AACb;AACA;EACE,eAAe;EACf,WAAW;AACb;AACA;EACE,cAAc;AAChB;AACA;EACE,aAAa;EACb,mBAAmB;AACrB;AACA;EACE,OAAO;EACP,mBAAmB;EACnB,gBAAgB;EAChB,uBAAuB;AACzB;AACA;EACE,iBAAiB;EACjB,kBAAkB;EAClB,qBAAqB;EACrB,sBAAsB;EACtB,4BAA4B;EAC5B,4BAA4B;EAC5B,YAAY;AACd;AACA;EACE,qoEAAqoE;AACvoE;AACA;EACE,qoEAAqoE;AACvoE","sourcesContent":[".mf-progress-mb--footer {\n  background: #fff;\n  padding: 1.42857rem 0;\n  text-align: center;\n  width: 100%;\n}\n.approval-progress__more--dialog .wedatea2td-dialog__inner {\n  width: 100%;\n  padding: 0;\n  vertical-align: bottom;\n  min-width: 100%;\n  border-radius: 0;\n}\n@media (max-width: 1024px) {\n  .approval-progress__more--dialog .wedatea2td-dialog__inner {\n    margin: 0;\n  }\n}\n.flow-popup {\n  display: flex;\n  max-height: 28.57143rem;\n  flex-direction: column;\n}\n.flow-popup-title {\n  height: 2.85714rem;\n  display: flex;\n  flex-shrink: 0;\n  justify-content: space-between;\n  align-items: center;\n  font-size: 1.14286rem;\n  font-weight: 400;\n  padding: 0 1.42857rem;\n  border-bottom: 0.07143rem solid #dcdee6;\n}\n.flow-popup-title .left {\n  color: #666;\n}\n.flow-popup-title .center {\n  font-size: 1rem;\n  color: #666;\n}\n.flow-popup-title .right {\n  color: #006eff;\n}\n.flow-popup_mb-group-list {\n  display: flex;\n  align-items: center;\n}\n.flow-popup_mb-group-list span {\n  flex: 1;\n  white-space: nowrap;\n  overflow: hidden;\n  text-overflow: ellipsis;\n}\n.flow-popup_mb-group-list .apa-icon {\n  width: 1.14286rem;\n  height: 1.14286rem;\n  display: inline-block;\n  vertical-align: middle;\n  background-repeat: no-repeat;\n  background-position: inherit;\n  font-size: 0;\n}\n.flow-popup_mb-group-list .apa-icon-star-fill-active {\n  background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTZweCIgaGVpZ2h0PSIxNnB4IiB2aWV3Qm94PSIwIDAgMTYgMTYiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDU4ICg4NDY2MykgLSBodHRwczovL3NrZXRjaC5jb20gLS0+CiAgICA8dGl0bGU+55S75p2/PC90aXRsZT4KICAgIDxkZXNjPkNyZWF0ZWQgd2l0aCBTa2V0Y2guPC9kZXNjPgogICAgPGcgaWQ9IueUu+advyIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPGcgaWQ9Iue8lue7hCI+CiAgICAgICAgICAgIDxyZWN0IGlkPSLnn6nlvaIiIHg9IjAiIHk9IjAiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PC9yZWN0PgogICAgICAgICAgICA8cGF0aCBkPSJNOC40NDgzNjgwNCwxLjcwODQ5Mjg4IEwxMC4zNTExNDEsNS41NjM5MzIwMiBMMTAuMzUxMTQxLDUuNTYzOTMyMDIgTDE0LjYwNTg3MDcsNi4xODIxODA0NCBDMTQuODc5MTQzMSw2LjIyMTg4OTI1IDE1LjA2ODQ4MzksNi40NzU2MTA2NyAxNS4wMjg3NzUxLDYuNzQ4ODgzMSBDMTUuMDEyOTYyOCw2Ljg1NzcwMTYyIDE0Ljk2MTcxOTIsNi45NTgyNzI4MiAxNC44ODI5Nzc0LDcuMDM1MDI3MTMgTDExLjgwNDIyNjEsMTAuMDM2MDY4IEwxMS44MDQyMjYxLDEwLjAzNjA2OCBMMTIuNTMxMDIwNywxNC4yNzM2MDU3IEMxMi41Nzc3MDEyLDE0LjU0NTc3MzkgMTIuMzk0OTA3MywxNC44MDQyNTE4IDEyLjEyMjczOSwxNC44NTA5MzI0IEMxMi4wMTQzNjAyLDE0Ljg2OTUyMDggMTEuOTAyODc2MiwxNC44NTE4NjM0IDExLjgwNTU0NTksMTQuODAwNjkzOSBMOCwxMi44IEw4LDEyLjggTDQuMTk0NDU0MDYsMTQuODAwNjkzOSBDMy45NTAwMzE3NywxNC45MjkxOTQzIDMuNjQ3NzE4MTksMTQuODM1MjIxIDMuNTE5MjE3NzgsMTQuNTkwNzk4OCBDMy40NjgwNDgyNSwxNC40OTM0Njg1IDMuNDUwMzkwOTEsMTQuMzgxOTg0NSAzLjQ2ODk3OTMzLDE0LjI3MzYwNTcgTDQuMTk1NzczOTMsMTAuMDM2MDY4IEw0LjE5NTc3MzkzLDEwLjAzNjA2OCBMMS4xMTcwMjI2LDcuMDM1MDI3MTMgQzAuOTE5MjgwODA2LDYuODQyMjc2NTIgMC45MTUyMzQ2NTMsNi41MjU3MTk4OSAxLjEwNzk4NTI2LDYuMzI3OTc4MSBDMS4xODQ3Mzk1Niw2LjI0OTIzNjI4IDEuMjg1MzEwNzcsNi4xOTc5OTI2OSAxLjM5NDEyOTI4LDYuMTgyMTgwNDQgTDUuNjQ4ODU4OTksNS41NjM5MzIwMiBMNS42NDg4NTg5OSw1LjU2MzkzMjAyIEw3LjU1MTYzMTk2LDEuNzA4NDkyODggQzcuNjczODQzMTEsMS40NjA4NjYwNSA3Ljk3MzY1NjAzLDEuMzU5MTk2NTUgOC4yMjEyODI4NiwxLjQ4MTQwNzY5IEM4LjMxOTg4OTE2LDEuNTMwMDcyODEgOC4zOTk3MDI5MiwxLjYwOTg4NjU3IDguNDQ4MzY4MDQsMS43MDg0OTI4OCBaIiBpZD0i5pif5b2iIiBmaWxsPSIjRjRDMDBDIiBmaWxsLXJ1bGU9Im5vbnplcm8iPjwvcGF0aD4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPg==);\n}\n.flow-popup_mb-group-list .apa-icon-star-fill {\n  background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTZweCIgaGVpZ2h0PSIxNnB4IiB2aWV3Qm94PSIwIDAgMTYgMTYiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDU4ICg4NDY2MykgLSBodHRwczovL3NrZXRjaC5jb20gLS0+CiAgICA8dGl0bGU+55S75p2/PC90aXRsZT4KICAgIDxkZXNjPkNyZWF0ZWQgd2l0aCBTa2V0Y2guPC9kZXNjPgogICAgPGcgaWQ9IueUu+advyIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPGcgaWQ9Iue8lue7hCI+CiAgICAgICAgICAgIDxyZWN0IGlkPSLnn6nlvaIiIHg9IjAiIHk9IjAiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PC9yZWN0PgogICAgICAgICAgICA8cGF0aCBkPSJNOC40NDgzNjgwNCwxLjcwODQ5Mjg4IEwxMC4zNTExNDEsNS41NjM5MzIwMiBMMTAuMzUxMTQxLDUuNTYzOTMyMDIgTDE0LjYwNTg3MDcsNi4xODIxODA0NCBDMTQuODc5MTQzMSw2LjIyMTg4OTI1IDE1LjA2ODQ4MzksNi40NzU2MTA2NyAxNS4wMjg3NzUxLDYuNzQ4ODgzMSBDMTUuMDEyOTYyOCw2Ljg1NzcwMTYyIDE0Ljk2MTcxOTIsNi45NTgyNzI4MiAxNC44ODI5Nzc0LDcuMDM1MDI3MTMgTDExLjgwNDIyNjEsMTAuMDM2MDY4IEwxMS44MDQyMjYxLDEwLjAzNjA2OCBMMTIuNTMxMDIwNywxNC4yNzM2MDU3IEMxMi41Nzc3MDEyLDE0LjU0NTc3MzkgMTIuMzk0OTA3MywxNC44MDQyNTE4IDEyLjEyMjczOSwxNC44NTA5MzI0IEMxMi4wMTQzNjAyLDE0Ljg2OTUyMDggMTEuOTAyODc2MiwxNC44NTE4NjM0IDExLjgwNTU0NTksMTQuODAwNjkzOSBMOCwxMi44IEw4LDEyLjggTDQuMTk0NDU0MDYsMTQuODAwNjkzOSBDMy45NTAwMzE3NywxNC45MjkxOTQzIDMuNjQ3NzE4MTksMTQuODM1MjIxIDMuNTE5MjE3NzgsMTQuNTkwNzk4OCBDMy40NjgwNDgyNSwxNC40OTM0Njg1IDMuNDUwMzkwOTEsMTQuMzgxOTg0NSAzLjQ2ODk3OTMzLDE0LjI3MzYwNTcgTDQuMTk1NzczOTMsMTAuMDM2MDY4IEw0LjE5NTc3MzkzLDEwLjAzNjA2OCBMMS4xMTcwMjI2LDcuMDM1MDI3MTMgQzAuOTE5MjgwODA2LDYuODQyMjc2NTIgMC45MTUyMzQ2NTMsNi41MjU3MTk4OSAxLjEwNzk4NTI2LDYuMzI3OTc4MSBDMS4xODQ3Mzk1Niw2LjI0OTIzNjI4IDEuMjg1MzEwNzcsNi4xOTc5OTI2OSAxLjM5NDEyOTI4LDYuMTgyMTgwNDQgTDUuNjQ4ODU4OTksNS41NjM5MzIwMiBMNS42NDg4NTg5OSw1LjU2MzkzMjAyIEw3LjU1MTYzMTk2LDEuNzA4NDkyODggQzcuNjczODQzMTEsMS40NjA4NjYwNSA3Ljk3MzY1NjAzLDEuMzU5MTk2NTUgOC4yMjEyODI4NiwxLjQ4MTQwNzY5IEM4LjMxOTg4OTE2LDEuNTMwMDcyODEgOC4zOTk3MDI5MiwxLjYwOTg4NjU3IDguNDQ4MzY4MDQsMS43MDg0OTI4OCBaIiBpZD0i5pif5b2iIiBmaWxsPSIjQTJBQ0JEIiBmaWxsLXJ1bGU9Im5vbnplcm8iPjwvcGF0aD4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPg==);\n}\n"],"sourceRoot":""} */
+.list-content {
+  flex: 1;
+  padding: 0 20px 20px;
+  font-size: 14px;
+  overflow-y: auto;
+}
+.list-content li {
+  height: 40px;
+  line-height: 40px;
+  border-bottom: 1px solid #dcdee6;
+}
+.list-content .list-checked {
+  color: #2473f2;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.list-checked::after {
+  content: '\2713';
+  width: 16px;
+  height: 40px;
+}
+
+.list-content li span {
+  display: inline-block;
+  max-width: 90%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}

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.css

@@ -1,6 +1,3 @@
 .flow_center_next_approve-form_item > .tea-form__controls {
   width: 100% !important;
 }
-
-/*# sourceURL=webpack://./src/web/components/flow/modules/control/FlowTaskInfoModal.css */
-/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8uL3NyYy93ZWIvY29tcG9uZW50cy9mbG93L21vZHVsZXMvY29udHJvbC9GbG93VGFza0luZm9Nb2RhbC5jc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7RUFDRSxzQkFBc0I7QUFDeEIiLCJzb3VyY2VzQ29udGVudCI6WyIuZmxvd19jZW50ZXJfbmV4dF9hcHByb3ZlLWZvcm1faXRlbSA+IC50ZWEtZm9ybV9fY29udHJvbHMge1xuICB3aWR0aDogMTAwJSAhaW1wb3J0YW50O1xufVxuIl0sInNvdXJjZVJvb3QiOiIifQ== */

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

@@ -4,7 +4,7 @@ import { postApprovalFlow, postApprovalSign, postFlowTaskList, } from '../../../
 import { ACTION_TYPE, ACTION_TYPE_MAP, ACTION_FINISH_MAP } from '../constants';
 import { ControlModelUtils } from '../utils';
 export const useControlModel = (params) => {
-    const { commonFlowData, flowLocalProps, ide, reload } = params;
+    const { commonFlowData, flowLocalProps, ide, reload, setFormType } = params;
     const { flowDetail, pageInfo, ccUserMaps } = commonFlowData;
     const { isWedaIde, callWedaApi } = flowLocalProps;
     const { events } = ide || {};
@@ -20,6 +20,8 @@ export const useControlModel = (params) => {
     const [flowTaskIds, setFlowTaskIds] = useState([]);
     const [ccUserModelVisible, setCcUserModelVisible] = useState(false);
     const [ccUsers, setCcUsers] = useState([]);
+    /** 流程是否回退 */
+    const [hasGoBack, setHasGoBack] = useState(false);
     useEffect(() => {
         var _a;
         const ccUsers = (_a = Object.entries(ccUserMaps || {})) === null || _a === void 0 ? void 0 : _a.map(([value, text]) => ({
@@ -55,8 +57,11 @@ export const useControlModel = (params) => {
         }
         handleTypeRef.current = type;
         (_a = events === null || events === void 0 ? void 0 : events.tap) === null || _a === void 0 ? void 0 : _a.call(events, {
-            onGetFormData: (value) => {
-                pageFormData.current = { ...pageFormData.current, ...value };
+            onGetFormData: (formDataMap) => {
+                if (Object.values(formDataMap).some((item) => item === undefined)) {
+                    return;
+                }
+                pageFormData.current = { ...pageFormData.current, ...formDataMap };
                 if (type === ACTION_TYPE.SUBMIT) {
                     onTriggerFlowEvent({ buttonAction: ACTION_TYPE_MAP.submit });
                 }
@@ -85,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,
@@ -121,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,
@@ -206,8 +207,15 @@ export const useControlModel = (params) => {
                 }
                 ControlModelUtils.updateUrlSearch({ pageType: newPageType });
             }
-            // 重新加载数据
-            reload();
+            // 操作类型不是回退的情况才reload数据 回退之后当前流程被销毁 故回退之后不刷新数据
+            if (currentHandleType === ACTION_TYPE.GO_BACK) {
+                setHasGoBack(true);
+                setFormType('read');
+            }
+            else {
+                // 重新加载数据
+                reload();
+            }
             // 执行自定义事件
             customizeFinishAction === null || customizeFinishAction === void 0 ? void 0 : customizeFinishAction();
         }
@@ -225,6 +233,7 @@ export const useControlModel = (params) => {
         ccUserModelVisible,
         ccUsers,
         ifSubmitAndCc,
+        hasGoBack,
         setUserModalVisible,
         setCcUsers,
         setCcUserModelVisible,

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/flow/modules/layout/index.css

@@ -4,6 +4,3 @@
 .model-flow-layout .wedatea2td-layout__content {
   background-color: #fff;
 }
-
-/*# sourceURL=webpack://./src/web/components/flow/modules/layout/index.css */
-/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8uL3NyYy93ZWIvY29tcG9uZW50cy9mbG93L21vZHVsZXMvbGF5b3V0L2luZGV4LmNzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtFQUNFLHVCQUF1QjtBQUN6QjtBQUNBO0VBQ0Usc0JBQXNCO0FBQ3hCIiwic291cmNlc0NvbnRlbnQiOlsiLm1vZGVsLWZsb3ctbGF5b3V0IHtcbiAgaGVpZ2h0OiBhdXRvICFpbXBvcnRhbnQ7XG59XG4ubW9kZWwtZmxvdy1sYXlvdXQgLndlZGF0ZWEydGQtbGF5b3V0X19jb250ZW50IHtcbiAgYmFja2dyb3VuZC1jb2xvcjogI2ZmZjtcbn1cbiJdLCJzb3VyY2VSb290IjoiIn0= */

package/dist/web/components/flow/modules/process/Process.js

@@ -47,7 +47,7 @@ const ApproveProcess = (props) => {
                                 (details === null || details === void 0 ? void 0 : details.operation)
                                     ? (_d = safeJsonParse(details === null || details === void 0 ? void 0 : details.operation)[1]) === null || _d === void 0 ? void 0 : _d.name
                                     : '')),
-                            !!details.operationComment && (React.createElement(Text, { theme: "weak" },
+                            !!details.operationComment && (React.createElement(Text, { theme: "weak", className: "approval-progress__comment" },
                                 "\u5BA1\u6279\u610F\u89C1\uFF1A",
                                 React.createElement(HighLightComment, { details: details })))),
                         React.createElement("div", { className: "approval-progress__row", style: {

package/dist/web/components/flow/modules/process/ProcessMobile.js

@@ -54,7 +54,7 @@ const ApproveProcessMobile = (props) => {
                                         ? (_d = safeJsonParse(details === null || details === void 0 ? void 0 : details.operation)[1]) === null || _d === void 0 ? void 0 : _d.name
                                         : ''))),
                             !!details.operationComment && (React.createElement("div", { className: "approval-progress__row  approval-progress__row--start tea-mb-1n" },
-                                React.createElement(Text, { theme: "weak" },
+                                React.createElement(Text, { theme: "weak", className: "approval-progress__comment-mb" },
                                     "\u5BA1\u6279\u610F\u89C1\uFF1A",
                                     React.createElement(HighLightComment, { details: details })))),
                             React.createElement("div", { className: "approval-progress__row", style: {