@cloudbase/weda-ui 3.4.7 → 3.4.9-alpha.1024

package/dist/web/components/flow/modules/operations/config/approval-form-config.js

@@ -1,20 +1,19 @@
 /** 审批类型操作的表单配置(同意、拒绝、处理、转办) */
 export function getApprovalFormConfig(flowProps) {
     var _a, _b;
-    const { flowDetail, pageInfo } = (flowProps === null || flowProps === void 0 ? void 0 : flowProps.commonFlowData) || {};
-    const { isH5 } = (flowProps === null || flowProps === void 0 ? void 0 : flowProps.flowLocalProps) || {};
-    const actionTypeName = (flowDetail === null || flowDetail === void 0 ? void 0 : flowDetail.userTaskType) === 2 ? '处理' : '审批';
+    const { isH5, approvalPageDetail, processInstance } = flowProps;
+    const actionTypeName = (processInstance === null || processInstance === void 0 ? void 0 : processInstance.userTaskType) === 2 ? '处理' : '审批';
     /** 当前节点名称 只读表单项配置 */
     const currentNodeNameConfig = {
         label: '当前节点',
-        content: flowDetail === null || flowDetail === void 0 ? void 0 : flowDetail.currentNodeName,
+        content: processInstance === null || processInstance === void 0 ? void 0 : processInstance.currentNodeName,
         readonly: true,
         field: 'currentNodeName',
     };
     /** 当前审批/处理人 只读表单项配置 */
     const currentApproverNameConfig = {
         label: `${actionTypeName}人`,
-        content: (flowDetail === null || flowDetail === void 0 ? void 0 : flowDetail.currentApproverName) || '-',
+        content: (processInstance === null || processInstance === void 0 ? void 0 : processInstance.currentApproverName) || '-',
         readonly: true,
         field: 'currentApproverName',
     };
@@ -52,7 +51,7 @@ export function getApprovalFormConfig(flowProps) {
     const userSelectConfig = {
         label: '抄送',
         field: 'ccUserIds',
-        hidden: !(pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showCarbonCopy),
+        hidden: !(approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.showCarbonCopy),
         component: 'FlowUserSelect',
         props: {
             label: '抄送',
@@ -69,7 +68,7 @@ export function getApprovalFormConfig(flowProps) {
     /** 表单配置 */
     return {
         agree: {
-            formTitle: `审批意见 - ${((_a = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.buttons) === null || _a === void 0 ? void 0 : _a[1]) || '同意'}`,
+            formTitle: `审批意见 - ${((_a = approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.buttons) === null || _a === void 0 ? void 0 : _a[1]) || '同意'}`,
             formItems: [
                 currentNodeNameConfig,
                 currentApproverNameConfig,
@@ -78,7 +77,7 @@ export function getApprovalFormConfig(flowProps) {
             ],
         },
         reject: {
-            formTitle: `审批意见 - ${((_b = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.buttons) === null || _b === void 0 ? void 0 : _b[2]) || '拒绝'}`,
+            formTitle: `审批意见 - ${((_b = approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.buttons) === null || _b === void 0 ? void 0 : _b[2]) || '拒绝'}`,
             formItems: [
                 currentNodeNameConfig,
                 currentApproverNameConfig,
@@ -97,7 +96,7 @@ export function getApprovalFormConfig(flowProps) {
             ],
         },
         handle: {
-            formTitle: `${(flowDetail === null || flowDetail === void 0 ? void 0 : flowDetail.operationName) || '处理'}意见`,
+            formTitle: `${(processInstance === null || processInstance === void 0 ? void 0 : processInstance.operationName) || '处理'}意见`,
             formItems: [
                 currentNodeNameConfig,
                 currentApproverNameConfig,

package/dist/web/components/flow/modules/operations/config/control-config.js

@@ -2,9 +2,7 @@ import { getApprovalFormConfig } from './approval-form-config';
 /** 流程操作配置 */
 export function getControlConfig(flowProps) {
     var _a, _b, _c;
-    const { commonFlowData, flowLocalProps } = flowProps || {};
-    const { flowDetail, pageInfo } = commonFlowData || {};
-    const { currentPageType, isH5 } = flowLocalProps || {};
+    const { isH5, currentPageType, approvalPageDetail, processInstance } = flowProps || {};
     const approvalFormConfig = getApprovalFormConfig(flowProps);
     const config = [
         {
@@ -16,8 +14,8 @@ export function getControlConfig(flowProps) {
                 buttonProps: { type: isH5 ? 'link' : 'weak' },
             },
             visible: currentPageType === 'TODO' &&
-                !(pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showSubmitApp) &&
-                (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showRollBack),
+                !(approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.showSubmitApp) &&
+                (approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.showRollBack),
         },
         {
             actionKey: FLOW_CONTROL_ACTION_KEY.ADD_ASSIGNEE,
@@ -28,8 +26,8 @@ export function getControlConfig(flowProps) {
                 buttonProps: { type: isH5 ? 'link' : 'weak' },
             },
             visible: currentPageType === 'TODO' &&
-                !(pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showSubmitApp) &&
-                (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showAddAssignee),
+                !(approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.showSubmitApp) &&
+                (approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.showAddAssignee),
         },
         {
             actionKey: FLOW_CONTROL_ACTION_KEY.TURN_TO_PERSON,
@@ -42,14 +40,14 @@ export function getControlConfig(flowProps) {
                 buttonProps: { type: isH5 ? 'link' : 'weak' },
             },
             visible: currentPageType === 'TODO' &&
-                !(pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showSubmitApp) &&
-                (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showTurnToPerson),
+                !(approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.showSubmitApp) &&
+                (approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.showTurnToPerson),
         },
         {
             actionKey: FLOW_CONTROL_ACTION_KEY.REJECT,
             component: 'ApprovalDrawer',
             props: {
-                label: ((_a = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.buttons) === null || _a === void 0 ? void 0 : _a[2]) || '拒绝',
+                label: ((_a = approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.buttons) === null || _a === void 0 ? void 0 : _a[2]) || '拒绝',
                 buttonAction: 3,
                 afterAction: 'afterReject',
                 approvalFormInfo: approvalFormConfig.reject,
@@ -60,14 +58,14 @@ export function getControlConfig(flowProps) {
                 buttonIcon: isH5 ? 'close-circle' : '',
             },
             visible: currentPageType === 'TODO' &&
-                !(pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showSubmitApp) &&
-                (flowDetail === null || flowDetail === void 0 ? void 0 : flowDetail.userTaskType) !== 2,
+                !(approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.showSubmitApp) &&
+                (processInstance === null || processInstance === void 0 ? void 0 : processInstance.userTaskType) !== 2,
         },
         {
             actionKey: FLOW_CONTROL_ACTION_KEY.AGREE,
             component: 'ApprovalDrawer',
             props: {
-                label: ((_b = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.buttons) === null || _b === void 0 ? void 0 : _b[1]) || '同意',
+                label: ((_b = approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.buttons) === null || _b === void 0 ? void 0 : _b[1]) || '同意',
                 buttonAction: 2,
                 afterAction: 'afterAgree',
                 approvalFormInfo: approvalFormConfig.agree,
@@ -79,14 +77,14 @@ export function getControlConfig(flowProps) {
             },
             hideDivider: true,
             visible: currentPageType === 'TODO' &&
-                !(pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showSubmitApp) &&
-                (flowDetail === null || flowDetail === void 0 ? void 0 : flowDetail.userTaskType) !== 2,
+                !(approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.showSubmitApp) &&
+                (processInstance === null || processInstance === void 0 ? void 0 : processInstance.userTaskType) !== 2,
         },
         {
             actionKey: FLOW_CONTROL_ACTION_KEY.HANDLE,
             component: 'ApprovalDrawer',
             props: {
-                label: (flowDetail === null || flowDetail === void 0 ? void 0 : flowDetail.operationName) || '处理',
+                label: (processInstance === null || processInstance === void 0 ? void 0 : processInstance.operationName) || '处理',
                 buttonAction: 2,
                 afterAction: 'afterHandle',
                 approvalFormInfo: approvalFormConfig.handle,
@@ -98,8 +96,8 @@ export function getControlConfig(flowProps) {
             },
             hideDivider: true,
             visible: currentPageType === 'TODO' &&
-                !(pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showSubmitApp) &&
-                (flowDetail === null || flowDetail === void 0 ? void 0 : flowDetail.userTaskType) === 2,
+                !(approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.showSubmitApp) &&
+                (processInstance === null || processInstance === void 0 ? void 0 : processInstance.userTaskType) === 2,
         },
         {
             actionKey: FLOW_CONTROL_ACTION_KEY.REVOKE,
@@ -114,7 +112,8 @@ export function getControlConfig(flowProps) {
                 buttonIcon: isH5 ? 'minus-circle' : '',
             },
             hideDivider: true,
-            visible: ['CREATE', 'DONE'].includes(currentPageType) && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showRevoke),
+            visible: ['CREATE', 'DONE'].includes(currentPageType) &&
+                (approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.showRevoke),
         },
         {
             actionKey: FLOW_CONTROL_ACTION_KEY.CC,
@@ -124,9 +123,9 @@ export function getControlConfig(flowProps) {
                 buttonProps: { type: isH5 ? 'link' : 'weak' },
             },
             visible: ['DRAFT', 'CREATEFLOW', 'TODO'].includes(currentPageType) &&
-                (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.show) &&
-                (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showSubmitApp) &&
-                (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showCarbonCopy),
+                (approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.show) &&
+                (approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.showSubmitApp) &&
+                (approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.showCarbonCopy),
         },
         {
             actionKey: FLOW_CONTROL_ACTION_KEY.SAVE_DRAFT,
@@ -138,9 +137,9 @@ export function getControlConfig(flowProps) {
                 buttonProps: { type: isH5 ? 'link' : 'weak' },
             },
             visible: ['DRAFT', 'CREATEFLOW'].includes(currentPageType) &&
-                (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.show) &&
-                (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showSubmitApp) &&
-                (flowDetail === null || flowDetail === void 0 ? void 0 : flowDetail.canDelete),
+                (approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.show) &&
+                (approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.showSubmitApp) &&
+                (processInstance === null || processInstance === void 0 ? void 0 : processInstance.canDelete),
         },
         {
             actionKey: FLOW_CONTROL_ACTION_KEY.CANCEL_SUBMIT,
@@ -154,15 +153,15 @@ export function getControlConfig(flowProps) {
                 buttonIcon: isH5 ? 'close-circle' : '',
             },
             visible: ['DRAFT', 'CREATEFLOW'].includes(currentPageType) &&
-                (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.show) &&
-                (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showSubmitApp) &&
-                (flowDetail === null || flowDetail === void 0 ? void 0 : flowDetail.canDelete),
+                (approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.show) &&
+                (approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.showSubmitApp) &&
+                (processInstance === null || processInstance === void 0 ? void 0 : processInstance.canDelete),
         },
         {
             actionKey: FLOW_CONTROL_ACTION_KEY.SUBMIT,
             component: 'InitiationBtn',
             props: {
-                label: ((_c = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.buttons) === null || _c === void 0 ? void 0 : _c[3]) || '提交申请',
+                label: ((_c = approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.buttons) === null || _c === void 0 ? void 0 : _c[3]) || '提交申请',
                 buttonAction: 1,
                 afterAction: 'afterSubmit',
                 buttonIcon: isH5 ? 'upload' : '',
@@ -173,8 +172,8 @@ export function getControlConfig(flowProps) {
             },
             hideDivider: true,
             visible: ['DRAFT', 'CREATEFLOW', 'TODO'].includes(currentPageType) &&
-                (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.show) &&
-                (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.showSubmitApp),
+                (approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.show) &&
+                (approvalPageDetail === null || approvalPageDetail === void 0 ? void 0 : approvalPageDetail.showSubmitApp),
         },
         {
             actionKey: FLOW_CONTROL_ACTION_KEY.NEXT_APPROVER,
@@ -188,11 +187,17 @@ export function getControlConfig(flowProps) {
         },
     ];
     config.forEach((config) => {
-        // 统一设置id和流程公共属性
         config.props = {
             ...config.props,
+            // 统一设置id
             id: setConfigElementId(config.actionKey),
-            flowFrameCommonProps: flowProps,
+            // 统一设置流程公共属性
+            flowModulesProps: flowProps,
+            // 统一设置每个按钮的禁用状态
+            buttonProps: {
+                ...(config.props.buttonProps || {}),
+                disabled: flowProps.commonFlowLoading,
+            },
         };
     });
     return config;

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

@@ -1,26 +1,32 @@
-import React from 'react';
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { createElement as _createElement } from "react";
 import { Button } from 'tea-component';
 import { WdDivider } from '../../../wd-divider';
-import { createModuleFrame } from '../../frame';
+import { useFlowConfig, WedaFlowContainer, } from '../../common';
 import { getControlConfig } from './config';
 import { useFlowControlModel } from './view-model';
 import { CONTROL_COMPONENT } from './controls-items';
 import './style.css';
 /** 流程控制组件 */
-const FlowControl = (props) => {
-    const controlModel = useFlowControlModel(props);
-    const configs = getControlConfig(props);
+export const ModelFlowControl = (props) => {
+    const flowConfig = useFlowConfig({
+        moduleName: 'flow-control',
+        wedaPlatformProps: props,
+    });
+    const flowModuleProps = {
+        ...flowConfig,
+        wedaPlatformProps: props,
+    };
+    const controlModel = useFlowControlModel(flowModuleProps);
+    const configs = getControlConfig(flowModuleProps);
     /** 已回退之后不显示任何操作按钮 */
     if (controlModel.hasGoBack)
         return null;
-    return (React.createElement("div", { className: `weda-flow-control ${props.flowLocalProps.isH5 ? 'weda-flow-h5-control' : ''}` }, configs.map((config) => {
-        const { component, props, visible, actionKey } = config;
-        const Component = CONTROL_COMPONENT[component] || Button;
-        if (!visible)
-            return null;
-        return (React.createElement(React.Fragment, null,
-            React.createElement(Component, { ...props, key: config.actionKey, actionKey: actionKey, flowControlModel: controlModel }),
-            !(config === null || config === void 0 ? void 0 : config.hideDivider) && (React.createElement(WdDivider, { type: "solid", className: "weda-flow-control-divider" }))));
-    })));
+    return (_jsx(WedaFlowContainer, { wedaPlatformProps: props, ref: flowConfig.elementRef, children: _jsx("div", { className: `weda-flow-control ${flowConfig.isH5 ? 'weda-flow-h5-control' : ''}`, children: configs.map((config) => {
+                const { component, props, visible, actionKey } = config;
+                const Component = CONTROL_COMPONENT[component] || Button;
+                if (!visible)
+                    return null;
+                return (_jsxs(_Fragment, { children: [_createElement(Component, { ...props, key: config.actionKey, actionKey: actionKey, flowControlModel: controlModel }), !(config === null || config === void 0 ? void 0 : config.hideDivider) && (_jsx(WdDivider, { type: "solid", className: "weda-flow-control-divider" }))] }));
+            }) }) }));
 };
-export const ModelFlowControl = createModuleFrame(FlowControl, 'flow-control');

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

@@ -1,13 +1,13 @@
-import React from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
 import { message } from 'tea-component';
+import { flowRequest } from '../../../common';
 import { FlowUserSelectBtn } from '../components';
 /**
  * 提交申请抄送按钮
  */
 export function AddAssigneeBtn(props) {
-    const { flowControlModel, flowFrameCommonProps } = props;
-    const { flowRequest } = flowFrameCommonProps.flowLocalProps;
-    const { flowDetail } = flowFrameCommonProps.commonFlowData;
+    const { flowControlModel, flowModulesProps } = props;
+    const { processInstance, isH5 } = flowModulesProps;
     const onUserChange = (user) => {
         addCounterSignAssignee(user.userIds);
     };
@@ -16,9 +16,9 @@ export function AddAssigneeBtn(props) {
         const result = await flowRequest({
             action: 'AddCounterSignAssignee',
             data: {
-                instanceId: flowDetail.instanceId,
-                nodeId: flowDetail.currentNodeId,
-                taskId: flowDetail.taskId,
+                instanceId: processInstance.instanceId,
+                nodeId: processInstance.currentNodeId,
+                taskId: processInstance.taskId,
                 assigneeIds,
             },
         });
@@ -29,5 +29,5 @@ export function AddAssigneeBtn(props) {
             flowControlModel.onAfterFinishFlowAction(props.actionKey, props.afterAction);
         }
     };
-    return (React.createElement(FlowUserSelectBtn, { buttonProps: { ...props.buttonProps, id: props.id }, buttonText: props.label, onChange: onUserChange, isH5: props.flowFrameCommonProps.flowLocalProps.isH5, multiple: true }));
+    return (_jsx(FlowUserSelectBtn, { buttonProps: { ...props.buttonProps, id: props.id }, buttonText: props.label, onChange: onUserChange, isH5: isH5, multiple: true }));
 }

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
 import { FlowUserSelectBtn } from '../components';
 /**
  * 提交申请抄送按钮
@@ -8,5 +8,5 @@ export function ApplyCcBtn(props) {
     const onUserChange = (user) => {
         props.flowControlModel.setApplyCcUser(user.userIds);
     };
-    return (React.createElement(FlowUserSelectBtn, { buttonProps: { ...props.buttonProps, id: props.id }, buttonText: `${props.label}(${(_b = (_a = props.flowControlModel.applyCcUser) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0})`, onChange: onUserChange, isH5: props.flowFrameCommonProps.flowLocalProps.isH5, multiple: true }));
+    return (_jsx(FlowUserSelectBtn, { buttonProps: { ...props.buttonProps, id: props.id }, buttonText: `${props.label}(${(_b = (_a = props.flowControlModel.applyCcUser) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0})`, onChange: onUserChange, isH5: props.flowModulesProps.isH5, multiple: true }));
 }

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

@@ -1,4 +1,5 @@
-import React, { useState, useRef } from 'react';
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useState, useRef } from 'react';
 // eslint-disable-next-line import/no-named-as-default
 import HighlightWithinTextarea from 'react-highlight-within-textarea';
 import { Button } from 'tea-component';
@@ -80,11 +81,7 @@ export function FlowComment(props) {
         (_b = props === null || props === void 0 ? void 0 : props.onChange) === null || _b === void 0 ? void 0 : _b.call(props, newValues);
         setHighlightPositions(highlightPositions);
     };
-    return (React.createElement(React.Fragment, null,
-        React.createElement("div", { className: `weda-flow-comment ${bordered ? 'bordered' : ''}`, onKeyUp: keyboardModel.onKeyUp },
-            React.createElement(HighlightWithinTextarea, { value: commentValue, onChange: onCommentChange, highlight: highlightPositions, placeholder: placeholder, ref: textAreaRef, onFocus: () => rangeModel.getRange(!isH5), onBlur: () => rangeModel.getRange(!isH5) }),
-            React.createElement(FlowUserSelect, { visible: userModalVisible, multiple: true, onChange: onUserChange, onClose: () => setUserModalVisible(false), defaultValue: [], isH5: props.isH5 })),
-        isH5 ? (React.createElement(Button, { type: "link", onClick: onPressAtSingle, style: props.atButtonStyle }, "@\u67D0\u4EBA")) : null));
+    return (_jsxs(_Fragment, { children: [_jsxs("div", { className: `weda-flow-comment ${bordered ? 'bordered' : ''}`, onKeyUp: keyboardModel.onKeyUp, children: [_jsx(HighlightWithinTextarea, { value: commentValue, onChange: onCommentChange, highlight: highlightPositions, placeholder: placeholder, ref: textAreaRef, onFocus: () => rangeModel.getRange(!isH5), onBlur: () => rangeModel.getRange(!isH5) }), _jsx(FlowUserSelect, { visible: userModalVisible, multiple: true, onChange: onUserChange, onClose: () => setUserModalVisible(false), defaultValue: [], isH5: props.isH5 })] }), isH5 ? (_jsx(Button, { type: "link", onClick: onPressAtSingle, style: props.atButtonStyle, children: "@\u67D0\u4EBA" })) : null] }));
 }
 /** 处理评论框光标hook */
 function useRangeModel() {

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { Drawer, Button, Form } from 'tea-component';
 import { FlowPopup, FlowUserSelect } from '../../../components';
 import { FlowField } from '../field';
@@ -20,45 +20,38 @@ export const DrawerForm = (props) => {
         onClose: props.onClose,
     };
     if (props.isH5) {
-        return React.createElement(DrawerFormH5View, { ...commonProps });
+        return _jsx(DrawerFormH5View, { ...commonProps });
     }
-    return React.createElement(DrawerFormPCView, { ...commonProps });
+    return _jsx(DrawerFormPCView, { ...commonProps });
 };
 DrawerForm.displayName = 'DrawerForm';
 /** 抽屉表单PC视图 */
 function DrawerFormPCView(props) {
     const { drawerFormModel, formInfo, visible, onClose } = props;
-    return (React.createElement(Drawer, { showMask: true, destroyOnClose: true, size: "l", outerClickClosable: false, visible: visible, onClose: onClose, title: formInfo.formTitle, className: "weda-flow-approval-drawer", footer: React.createElement(React.Fragment, null,
-            React.createElement(Button, { type: "primary", onClick: drawerFormModel.onSubmitForm, loading: props.submitLoading }, "\u63D0\u4EA4"),
-            React.createElement(Button, { onClick: onClose }, "\u53D6\u6D88")) },
-        React.createElement(Form, null, formInfo.formItems.map((formItem) => {
-            var _a, _b;
-            if (formItem.hidden)
-                return;
-            if (formItem.readonly) {
-                return (React.createElement(Form.Item, { key: formItem.field, label: formItem.label },
-                    React.createElement(Form.Text, null, formItem.content)));
-            }
-            const Component = FormComponents[formItem.component];
-            return (React.createElement(Form.Item, { label: formItem.label, key: formItem.field, required: formItem.required, showStatusIcon: false, message: ((_a = drawerFormModel.errorMap) === null || _a === void 0 ? void 0 : _a[formItem.field]) ||
-                    formItem.help ||
-                    '', status: ((_b = drawerFormModel.errorMap) === null || _b === void 0 ? void 0 : _b[formItem.field]) ? 'error' : 'success' },
-                React.createElement(Component, { ...formItem.props, onChange: (value) => drawerFormModel.onFormItemChange(value, formItem) })));
-        }))));
+    return (_jsx(Drawer, { showMask: true, destroyOnClose: true, size: "l", outerClickClosable: false, visible: visible, onClose: onClose, title: formInfo.formTitle, className: "weda-flow-approval-drawer", footer: _jsxs(_Fragment, { children: [_jsx(Button, { type: "primary", onClick: drawerFormModel.onSubmitForm, loading: props.submitLoading, children: "\u63D0\u4EA4" }), _jsx(Button, { onClick: onClose, children: "\u53D6\u6D88" })] }), children: _jsx(Form, { children: formInfo.formItems.map((formItem) => {
+                var _a, _b;
+                if (formItem.hidden)
+                    return;
+                if (formItem.readonly) {
+                    return (_jsx(Form.Item, { label: formItem.label, children: _jsx(Form.Text, { children: formItem.content }) }, formItem.field));
+                }
+                const Component = FormComponents[formItem.component];
+                return (_jsx(Form.Item, { label: formItem.label, required: formItem.required, showStatusIcon: false, message: ((_a = drawerFormModel.errorMap) === null || _a === void 0 ? void 0 : _a[formItem.field]) ||
+                        formItem.help ||
+                        '', status: ((_b = drawerFormModel.errorMap) === null || _b === void 0 ? void 0 : _b[formItem.field]) ? 'error' : 'success', children: _jsx(Component, { ...formItem.props, onChange: (value) => drawerFormModel.onFormItemChange(value, formItem) }) }, formItem.field));
+            }) }) }));
 }
 /** 抽屉表单H5视图 */
 function DrawerFormH5View(props) {
     const { drawerFormModel, formInfo, visible, onClose } = props;
-    return (React.createElement(FlowPopup, { destroyOnClose: true, closeable: true, position: "bottom", className: "weda-flow-approval-drawer-mobile", overlayStyle: { zIndex: 998 }, height: 550, visible: visible, onClose: onClose, title: formInfo.formTitle },
-        formInfo.formItems.map((formItem, index) => {
-            var _a, _b;
-            if (formItem.hidden)
-                return;
-            if (formItem.readonly) {
-                return (React.createElement(FlowField, { key: formItem.field, content: formItem.content, label: formItem.label, bordered: index !== formInfo.formItems.length - 1 }));
-            }
-            const Component = FormComponents[formItem.component];
-            return (React.createElement(FlowField, { key: formItem.field, label: formItem.label, required: formItem.required, errorMessage: ((_a = drawerFormModel.errorMap) === null || _a === void 0 ? void 0 : _a[formItem.field]) || '', bordered: index !== formInfo.formItems.length - 1, layout: ((_b = formItem === null || formItem === void 0 ? void 0 : formItem.extra) === null || _b === void 0 ? void 0 : _b.isH5Vertical) ? 'vertical' : 'horizontal', content: React.createElement(Component, { ...formItem.props, onChange: (value) => drawerFormModel.onFormItemChange(value, formItem) }) }));
-        }),
-        React.createElement(Button, { type: "primary", onClick: drawerFormModel.onSubmitForm, className: "submit", loading: props.submitLoading }, "\u63D0\u4EA4")));
+    return (_jsxs(FlowPopup, { destroyOnClose: true, closeable: true, position: "bottom", className: "weda-flow-approval-drawer-mobile", overlayStyle: { zIndex: 998 }, height: 550, visible: visible, onClose: onClose, title: formInfo.formTitle, children: [formInfo.formItems.map((formItem, index) => {
+                var _a, _b;
+                if (formItem.hidden)
+                    return;
+                if (formItem.readonly) {
+                    return (_jsx(FlowField, { content: formItem.content, label: formItem.label, bordered: index !== formInfo.formItems.length - 1 }, formItem.field));
+                }
+                const Component = FormComponents[formItem.component];
+                return (_jsx(FlowField, { label: formItem.label, required: formItem.required, errorMessage: ((_a = drawerFormModel.errorMap) === null || _a === void 0 ? void 0 : _a[formItem.field]) || '', bordered: index !== formInfo.formItems.length - 1, layout: ((_b = formItem === null || formItem === void 0 ? void 0 : formItem.extra) === null || _b === void 0 ? void 0 : _b.isH5Vertical) ? 'vertical' : 'horizontal', content: _jsx(Component, { ...formItem.props, onChange: (value) => drawerFormModel.onFormItemChange(value, formItem) }) }, formItem.field));
+            }), _jsx(Button, { type: "primary", onClick: drawerFormModel.onSubmitForm, className: "submit", loading: props.submitLoading, children: "\u63D0\u4EA4" })] }));
 }

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from '../../../../../../../utils/classnames';
 import './style.css';
 export function FlowField(props) {
@@ -8,9 +8,5 @@ export function FlowField(props) {
         ['vertical']: layout === 'vertical',
         ['horizontal']: layout === 'horizontal',
     });
-    return (React.createElement("div", { className: outerClassNames },
-        React.createElement("div", { className: `weda-flow-field-label ${required ? 'required' : ''}` }, label),
-        React.createElement("div", { className: "weda-flow-field-content" },
-            content,
-            errorMessage ? (React.createElement("div", { className: "weda-flow-field-error" }, errorMessage)) : null)));
+    return (_jsxs("div", { className: outerClassNames, children: [_jsx("div", { className: `weda-flow-field-label ${required ? 'required' : ''}`, children: label }), _jsxs("div", { className: "weda-flow-field-content", children: [content, errorMessage ? (_jsx("div", { className: "weda-flow-field-error", children: errorMessage })) : null] })] }));
 }

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()] });
+};