openxiangda 2.62.0 → 2.63.1

package/dist/browser/components/workflow/StandardWorkflowPages.js

@@ -7,8 +7,8 @@ import { WorkflowTaskForm, useWorkflowTaskForm } from './WorkflowTaskForm';
 import { retainedWorkflowOperation, workflowOperationSignature, workflowOperationStringError, workflowOperationInputFailure } from '../../workflow-operation-input';
 import { WorkflowPendingCommandGuard, WorkflowTaskCommandReceipt } from './WorkflowTaskCommandReceipt';
 import { PresentationTime, usePresentationTimeZone } from '../../presentation-time';
-import { ArrowLeftOutlined, ClockCircleOutlined, EllipsisOutlined, ReloadOutlined, CloseOutlined, ExpandOutlined, CompressOutlined, ExportOutlined, } from '@ant-design/icons';
-import { Alert, App, Button, Card, Drawer, Empty, Form, Input, Modal, Result, Segmented, Select, Space, Spin, Table, Tabs, Tag, Tooltip, Typography, } from 'antd';
+import { ArrowLeftOutlined, EllipsisOutlined, RightOutlined, EditOutlined, StopOutlined, SwapOutlined, UserAddOutlined, SaveOutlined, ReloadOutlined, CloseOutlined, ExpandOutlined, CompressOutlined, ExportOutlined, } from '@ant-design/icons';
+import { Alert, App, Button, Card, Dropdown, Drawer, Empty, Form, Input, Modal, Result, Segmented, Select, Space, Spin, Table, Tabs, Tag, Tooltip, Typography, } from 'antd';
 import { normalizeWorkflowBusinessDetail, } from 'openxiangda-contracts/browser';
 import { useCallback, useEffect, useMemo, useRef, useState, } from 'react';
 import { Link, Navigate, useHref, useNavigate, useParams, useSearchParams, } from 'react-router-dom';
@@ -23,10 +23,12 @@ import { useRuntime, useOptionalRuntime } from '../../runtime';
 import { SurfaceFieldValue, } from '../resource/SurfaceFields';
 import { workflowContextScalarValue, processStatusReadRetryDelay, buildWorkflowNamedOperationInput, parseWorkflowNamedOperationResult, workflowLaunchContractJsonEqual, } from '../../workflow-launch';
 import { normalizeFormValues, normalizeRecordForForm, } from '../platform-fields/field-form-codec';
-import { RecordDetailFrame, RecordDetailSections, detailTime } from '../resource/RecordDetailFrame';
+import { RecordDetailFrame, detailTime } from '../resource/RecordDetailFrame';
 import { RecordChangeHistory } from '../resource/RecordChangeHistory';
 import { ResourceFormContent } from '../resource/ResourceFormFrame';
 import { WorkflowRecordEditor } from './WorkflowRecordEditor';
+import { workflowOperationGroups } from './workflow-operation-layout';
+import { workflowApprovalProgress, WorkflowApprovalParticipants } from './workflow-approval-presentation';
 import { PlatformAvatar } from '../PlatformAvatar';
 import { SubtableField } from '../platform-fields/SubtableField';
 import { assertNamedSubtableReadonlyFields, namedProcessFormValues, standardProcessFormValues } from './standard-process-values';
@@ -79,7 +81,7 @@ function errorMessage(error, fallback) {
         WORKFLOW_TASK_FORM_REVISION_CONFLICT: '业务资料已被其他处理人更新。请刷新并核对，当前输入会保留。',
         WORKFLOW_TASK_FORM_RECOMPUTATION_REQUIRED: '这些资料会影响已完成的计算，请退回到计算前的节点重新办理。',
         WORKFLOW_TASK_FORM_FIELD_NOT_EDITABLE: '页面规则已变化，请刷新资料后重新确认。',
-        WORKFLOW_TASK_FORM_COMMAND_FORBIDDEN: '此操作不提交补填资料，请使用保存补填、同意或重新提交。',
+        WORKFLOW_TASK_FORM_COMMAND_FORBIDDEN: '此操作不提交补填资料，请使用保存、同意或重新提交。',
     };
     if (code && taskPageMessages[code])
         return taskPageMessages[code];
@@ -222,9 +224,18 @@ export function WorkflowBusinessDetailSections({ surface, variant, }) {
     if (detail.status === 'unavailable' || !detail.surface) {
         return _jsx(Result, { status: "warning", title: "\u4E1A\u52A1\u8BE6\u60C5\u6682\u65F6\u4E0D\u53EF\u7528" });
     }
-    return _jsx(RecordDetailSections, { groups: groups, renderValue: field => field.type === 'subtable'
-            ? _jsx(WorkflowSubtableValue, { detail: detail, field: field, instanceId: instance.id, variant: variant })
-            : _jsx(SurfaceFieldValue, { field: field, presentation: "workflow-detail", mobile: variant === 'mobile', resourceCode: detail.resourceCode || undefined, value: detail.record[field.key], workflowFileBinding: { instanceId: instance.id, resourceCode: String(detail.resourceCode), recordId: String(detail.recordId), fieldCode: field.key } }) });
+    const renderValue = (field) => _jsx(SurfaceFieldValue, { field: field, presentation: "workflow-detail", mobile: variant === 'mobile', resourceCode: detail.resourceCode || undefined, value: detail.record[field.key], workflowFileBinding: { instanceId: instance.id, resourceCode: String(detail.resourceCode), recordId: String(detail.recordId), fieldCode: field.key } });
+    const attachmentFields = groups.flatMap(group => group.fields).filter(field => field.type === 'file');
+    const contentGroups = groups.map(group => ({ ...group, fields: group.fields.filter(field => field.type !== 'file') })).filter(group => group.fields.length);
+    return _jsxs("div", { className: "oxa-record-detail-sections oxa-workflow-business-sections", children: [contentGroups.map(group => _jsxs("section", { className: "oxa-workflow-business-section", children: [_jsx("h2", { children: ['default', '申请信息', '基本信息'].includes(group.section) ? '申请内容' : group.section }), _jsx("div", { className: "oxa-record-detail-card", children: _jsx("div", { className: "oxa-record-detail-fields", children: group.fields.map(field => field.type === 'subtable'
+                                ? _jsxs("details", { className: "is-wide oxa-workflow-subtable-disclosure", children: [_jsxs("summary", { children: [_jsx("span", { children: field.label }), _jsxs("span", { children: [detail.subtables[field.key]?.total ?? 0, " \u9879", _jsx(RightOutlined, {})] })] }), _jsx(WorkflowSubtableValue, { detail: detail, field: field, instanceId: instance.id, variant: variant })] }, field.key)
+                                : _jsxs("div", { className: ['textarea', 'image', 'rich-text', 'address', 'location', 'signature', 'json'].includes(field.widget) ? 'is-wide' : undefined, children: [_jsx("div", { className: "oxa-record-detail-label", children: field.label }), _jsx("div", { className: `oxa-record-detail-value${field.widget === 'money' ? ' is-amount' : ''}`, children: field.type === 'text.long' && typeof detail.record[field.key] === 'string'
+                                                ? _jsx(Typography.Paragraph, { ellipsis: { rows: 2, expandable: 'collapsible', symbol: expanded => expanded ? '收起' : '展开' }, children: String(detail.record[field.key]) })
+                                                : renderValue(field) })] }, field.key)) }) })] }, group.section)), attachmentFields.map(field => {
+                const value = detail.record[field.key];
+                const count = Array.isArray(value) ? value.length : value ? 1 : 0;
+                return _jsxs("section", { className: "oxa-workflow-business-section oxa-workflow-attachment-section", "aria-label": field.label, children: [_jsxs("h2", { children: [field.label, "\uFF08", count, "\uFF09"] }), _jsx("div", { className: "oxa-record-detail-card", children: renderValue(field) })] }, field.key);
+            })] });
 }
 function timelineTone(status) {
     return `is-${status}`;
@@ -298,14 +309,30 @@ export function WorkflowStatusIcon({ status, }) {
     }
     return (_jsx("svg", { "aria-hidden": "true", className: `oxa-workflow-status-icon is-${status}`, viewBox: "0 0 24 24", children: glyph }));
 }
-export function WorkflowTimelineSection({ timeline, }) {
-    const entries = workflowTimelineEntries(timeline);
-    return (_jsx(Card, { className: "oxa-workflow-timeline-card", title: "\u5BA1\u6279\u6D41\u7A0B", children: entries.length ? (_jsx("div", { className: "oxa-workflow-timeline", children: entries.map((item) => {
-                const operations = item.operations || [];
-                const visiblePeople = visibleWorkflowTimelinePeople(item, operations);
-                const businessStep = item.nodeKind === 'action' ? item.result.businessStep : undefined;
-                return (_jsxs("div", { className: timelineTone(item.status), children: [_jsx("span", { className: "oxa-workflow-timeline-dot", children: _jsx(WorkflowStatusIcon, { status: item.status }) }), _jsxs("div", { children: [_jsxs("div", { className: "oxa-workflow-timeline-title", children: [_jsx("strong", { children: item.title }), businessStep?.status === 'waiting' ? _jsx(Tag, { color: "processing", children: "\u7B49\u5F85\u4E1A\u52A1\u7ED3\u679C" }) : businessStep?.status === 'result_ready' ? _jsx(Tag, { color: "warning", children: "\u63A8\u8FDB\u53D7\u963B" }) : _jsx(StatusTag, { status: item.status })] }), item.status === 'skipped' && _jsx(Typography.Text, { type: "secondary", children: "\u65E0\u5BA1\u6279\u4EBA\uFF0C\u6309\u6B64\u8282\u70B9\u7684\u89C4\u5219\u81EA\u52A8\u7EE7\u7EED\u3002" }), businessStep?.status === 'result_ready' && _jsx(Typography.Text, { type: "secondary", children: "\u8BA1\u7B97\u7ED3\u679C\u5DF2\u6536\u5230\uFF0C\u540E\u7EED\u6D41\u8F6C\u7B49\u5F85\u4FEE\u590D\u3002" }), visiblePeople.length > 0 && (_jsx("div", { className: "oxa-workflow-timeline-assignees", children: visiblePeople.map((person, index) => (_jsxs("div", { children: [_jsx(PlatformAvatar, { avatarUrl: person.avatarUrl, size: 20 }), _jsxs("span", { children: [_jsx(Typography.Text, { children: person.displayName }), person.departmentDisplayName && (_jsx("small", { children: person.departmentDisplayName }))] })] }, `${person.userId || person.displayName}:${index}`))) })), operations.length > 0 && (_jsx("div", { className: "oxa-workflow-timeline-operations", children: operations.map((operation) => (_jsxs("div", { children: [_jsx(PlatformAvatar, { avatarUrl: operation.actor.avatarUrl, size: 20 }), _jsxs("span", { className: "oxa-workflow-operation-content", children: [_jsxs("span", { children: [_jsx(Typography.Text, { children: operation.actor.displayName }), _jsx("strong", { children: operation.operationLabel })] }), operation.reason && (_jsxs("span", { className: "oxa-workflow-operation-opinion", children: [_jsx(Typography.Text, { type: "secondary", children: "\u610F\u89C1" }), _jsx(Typography.Text, { children: operation.reason })] }))] })] }, operation.id))) })), item.terminalReason && !operations.some(operation => operation.reason) && (_jsxs(Typography.Text, { type: "secondary", children: ["\u539F\u56E0\uFF1A", item.terminalReason] })), item.primaryDisplayTime && (_jsx("time", { className: "oxa-workflow-primary-time", children: formatTime(item.primaryDisplayTime) }))] })] }, item.key));
-            }) })) : (_jsx(Empty, { description: "\u6682\u65E0\u6D41\u7A0B\u8F68\u8FF9", image: Empty.PRESENTED_IMAGE_SIMPLE })) }));
+export function WorkflowTimelineSection({ timeline, compact = false, task, footer, }) {
+    const [expanded, setExpanded] = useState(false);
+    const runtime = useOptionalRuntime();
+    const allEntries = workflowTimelineEntries(timeline);
+    const activeIndex = allEntries.findIndex(entry => entry.status === 'active' || entry.status === 'waiting');
+    const start = Math.max(0, Math.min(activeIndex < 0 ? allEntries.length - 3 : activeIndex - 1, allEntries.length - 3));
+    const entries = compact ? allEntries.slice(start, start + 3) : allEntries;
+    const time = (value) => _jsx("time", { className: "oxa-workflow-primary-time", dateTime: value, children: _jsx(PresentationTime, { value: value, options: { month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' } }) });
+    return (_jsxs(Card, { className: `oxa-workflow-timeline-card${compact ? ' oxa-workflow-timeline-compact' : ''}`, title: "\u5BA1\u6279\u8FDB\u5EA6", extra: compact && entries.length > 0 ? _jsxs(Button, { type: "link", onClick: () => setExpanded(true), children: ["\u67E5\u770B\u5168\u90E8", _jsx(RightOutlined, {})] }) : undefined, children: [entries.length ? _jsx("div", { className: "oxa-workflow-timeline", children: entries.map(item => {
+                    const operations = item.operations || [];
+                    const visiblePeople = visibleWorkflowTimelinePeople(item, operations);
+                    const flow = timeline?.flow.find(visit => visit.key === item.key);
+                    const progress = item.status === 'active' && task?.nodeId === item.nodeId ? workflowApprovalProgress(task) : null;
+                    const businessStep = item.nodeKind === 'action' ? item.result.businessStep : undefined;
+                    return _jsxs("div", { className: `${timelineTone(item.status)}${item.kind === 'planned_node' ? ' is-planned' : ''}`, children: [_jsx("span", { className: "oxa-workflow-timeline-dot", children: _jsx(WorkflowStatusIcon, { status: item.status }) }), _jsxs("div", { children: [_jsxs("div", { className: "oxa-workflow-timeline-title", children: [_jsx("strong", { children: item.title }), item.kind === 'planned_node' ? _jsx(Tag, { children: "\u9884\u8BA1" }) : progress
+                                                ? _jsxs(Tag, { color: "processing", children: [progress.label, progress.total > 0 ? ` ${progress.approved}/${progress.total}` : ''] })
+                                                : businessStep?.status === 'waiting' ? _jsx(Tag, { color: "processing", children: "\u7B49\u5F85\u4E1A\u52A1\u7ED3\u679C" })
+                                                    : businessStep?.status === 'result_ready' ? _jsx(Tag, { color: "warning", children: "\u63A8\u8FDB\u53D7\u963B" })
+                                                        : !['completed', 'active', 'waiting'].includes(item.status) ? _jsx(StatusTag, { status: item.status }) : null, item.primaryDisplayTime && item.status !== 'active' && !compact && time(item.primaryDisplayTime)] }), !compact && progress && progress.total > 0 && _jsxs("div", { className: "oxa-workflow-quorum", "aria-label": `${progress.label}：${progress.approved}/${progress.total} 人${progress.verb}`, children: [_jsx("span", { children: _jsx("span", { style: { width: `${progress.approved / progress.total * 100}%` } }) }), _jsxs("small", { children: [progress.approved, "/", progress.total] })] }), item.status === 'skipped' && _jsx(Typography.Text, { type: "secondary", children: item.result.skipReason === 'return_resume' ? '重新提交后直接返回当前节点，已处理的阶段无需重复办理。' : '无审批人，按此节点的规则自动继续。' }), businessStep?.status === 'result_ready' && _jsx(Typography.Text, { type: "secondary", children: "\u8BA1\u7B97\u7ED3\u679C\u5DF2\u6536\u5230\uFF0C\u540E\u7EED\u6D41\u8F6C\u7B49\u5F85\u4FEE\u590D\u3002" }), operations.length > 0 && _jsx("div", { className: "oxa-workflow-timeline-operations", children: operations.map(operation => _jsxs("div", { children: [_jsxs("div", { className: "oxa-workflow-person-line", children: [_jsx(PlatformAvatar, { avatarUrl: operation.actor.avatarUrl, size: 24 }), _jsxs("span", { children: [operation.actor.displayName, operation.actor.userId === runtime?.identity.userId ? '（你）' : ''] }), _jsx(Tag, { color: operation.operation === 'approve' ? 'success' : operation.operation === 'reject' ? 'error' : 'default', children: operation.operationLabel }), operation.occurredAt && (compact || item.status === 'active' || operation.occurredAt !== item.primaryDisplayTime) && time(operation.occurredAt)] }), operation.reason && _jsxs("div", { className: "oxa-workflow-operation-opinion", children: ["\u201C", operation.reason, "\u201D"] })] }, operation.id)) }), visiblePeople.length > 0 && _jsx("div", { className: "oxa-workflow-timeline-assignees", children: visiblePeople.map((person, index) => {
+                                            const participant = flow?.assignees.find(assignee => assignee.userId === person.userId);
+                                            return _jsxs("div", { className: "oxa-workflow-person-line", children: [_jsx(PlatformAvatar, { avatarUrl: person.avatarUrl, size: 24 }), _jsxs("span", { children: [person.displayName, person.userId === runtime?.identity.userId ? '（你）' : ''] }), item.status === 'active' && participant?.status === 'active' ? _jsx(Tag, { color: "warning", children: "\u5F85\u5904\u7406" })
+                                                        : person.departmentDisplayName && _jsx("small", { children: person.departmentDisplayName })] }, `${person.userId || person.displayName}:${index}`);
+                                        }) }), item.terminalReason && !operations.some(operation => operation.reason) && _jsxs(Typography.Text, { type: "secondary", children: ["\u539F\u56E0\uFF1A", item.terminalReason] }), compact && !operations.length && item.primaryDisplayTime && time(item.primaryDisplayTime)] })] }, item.key);
+                }) }) : _jsx(Empty, { description: "\u6682\u65E0\u6D41\u7A0B\u8F68\u8FF9", image: Empty.PRESENTED_IMAGE_SIMPLE }), footer, compact && _jsx(Drawer, { open: expanded, onClose: () => setExpanded(false), title: "\u5168\u90E8\u5BA1\u6279\u8FDB\u5EA6", placement: "bottom", size: "85dvh", rootClassName: "oxa-workflow-progress-drawer", destroyOnHidden: true, children: _jsx(WorkflowTimelineSection, { timeline: timeline, task: task }) })] }));
 }
 function WorkflowMemberPicker({ id, placeholder, value, onChange, multiple = false, variant }) {
     const [snapshots, setSnapshots] = useState([]);
@@ -328,6 +355,16 @@ function schemaProperties(operation) {
     }));
 }
 function OperationFields({ operation, variant, }) {
+    const form = Form.useFormInstance();
+    const targetNodeId = Form.useWatch('targetNodeId', form);
+    const returnRoutes = operation.uiSchema.returnRoutes;
+    const previousTarget = useRef(undefined);
+    useEffect(() => {
+        const policy = targetNodeId ? returnRoutes?.[targetNodeId] : undefined;
+        if (policy && (previousTarget.current !== targetNodeId || !policy.routes.includes(String(form.getFieldValue('resubmitMode')))))
+            form.setFieldsValue({ resubmitMode: policy.defaultRoute });
+        previousTarget.current = targetNodeId;
+    }, [form, targetNodeId, returnRoutes]);
     return (_jsx(_Fragment, { children: schemaProperties(operation).map(({ key, property, required, ui }) => {
             const rules = [
                 ...(required ? [{ required: true, message: `请填写${property.title || key}` }] : []),
@@ -348,10 +385,10 @@ function OperationFields({ operation, variant, }) {
             if (ui.component === 'user_select')
                 control = _jsx(WorkflowMemberPicker, { variant: variant, multiple: property.type === 'array' || ui.mode === 'multiple', placeholder: ui.placeholder || `请选择${property.title || '成员'}` });
             else if (property.enum) {
-                control = (_jsx(Select, { options: property.enum.map((value, index) => ({
-                        label: property.enumNames?.[index] || value,
-                        value,
-                    })) }));
+                control = (_jsx(Select, { options: property.enum.flatMap((value, index) => key === 'resubmitMode' && targetNodeId && returnRoutes?.[targetNodeId] && !returnRoutes[targetNodeId].routes.includes(value) ? [] : [{
+                            label: property.enumNames?.[index] || value,
+                            value,
+                        }]) }));
             }
             else if (property.format === 'textarea') {
                 control = (_jsx(Input.TextArea, { autoSize: { minRows: 4, maxRows: 8 }, maxLength: property.maxLength, showCount: true }));
@@ -370,11 +407,11 @@ function OperationDialog({ error, operation, submitting, variant, onCancel, onSu
     if (!operation)
         return null;
     const ui = operation.uiSchema;
-    const formNode = (_jsxs(Form, { form: form, layout: "vertical", onFinish: onSubmit, disabled: submitting, children: [error && _jsx(Alert, { role: "alert", title: "\u5BA1\u6279\u5C1A\u672A\u5B8C\u6210", description: error, showIcon: true, type: "error" }), ui.confirmation?.description && (_jsx(Alert, { className: "oxa-workflow-operation-alert", description: ui.confirmation.description, showIcon: true, type: operation.emphasis === 'danger' ? 'warning' : 'info' })), _jsx(OperationFields, { operation: operation, variant: variant })] }));
+    const formNode = (_jsxs(Form, { form: form, layout: "vertical", onFinish: onSubmit, disabled: submitting, children: [error && _jsx(Alert, { role: "alert", title: "\u5BA1\u6279\u5C1A\u672A\u5B8C\u6210", description: error, showIcon: true, type: "error" }), (operation.consequence || ui.confirmation?.description) && (_jsx(Alert, { className: "oxa-workflow-operation-alert", description: operation.consequence || ui.confirmation?.description, showIcon: true, type: operation.emphasis === 'danger' ? 'warning' : 'info' })), _jsx(OperationFields, { operation: operation, variant: variant })] }));
     if (variant === 'mobile') {
-        return (_jsx(Drawer, { extra: _jsx(Button, { loading: submitting, onClick: () => form.submit(), type: "primary", children: ui.confirmText || `确认${operation.label}` }), rootClassName: "oxa-workflow-operation-drawer", styles: { body: { overflowY: 'auto', minHeight: 0 } }, keyboard: !submitting, mask: { closable: !submitting }, closable: !submitting, onClose: submitting ? undefined : onCancel, open: true, placement: "bottom", size: "min(640px, 92dvh)", title: operation.label, children: formNode }));
+        return (_jsx(Drawer, { extra: _jsx(Button, { danger: operation.emphasis === 'danger', loading: submitting, onClick: () => form.submit(), type: "primary", children: ui.confirmText || `确认${operation.label}` }), rootClassName: "oxa-workflow-operation-drawer", styles: { body: { overflowY: 'auto', minHeight: 0 } }, keyboard: !submitting, mask: { closable: !submitting }, closable: !submitting, onClose: submitting ? undefined : onCancel, open: true, placement: "bottom", size: "min(640px, 92dvh)", title: operation.label, children: formNode }));
     }
-    return (_jsx(Modal, { cancelText: "\u53D6\u6D88", confirmLoading: submitting, cancelButtonProps: { disabled: submitting }, okText: ui.confirmText || `确认${operation.label}`, onCancel: onCancel, onOk: () => form.submit(), open: true, title: operation.label, keyboard: !submitting, mask: { closable: !submitting }, closable: !submitting, children: formNode }));
+    return (_jsx(Modal, { cancelText: "\u53D6\u6D88", confirmLoading: submitting, cancelButtonProps: { disabled: submitting }, okButtonProps: { danger: operation.emphasis === 'danger' }, okText: ui.confirmText || `确认${operation.label}`, onCancel: onCancel, onOk: () => form.submit(), open: true, title: operation.label, keyboard: !submitting, mask: { closable: !submitting }, closable: !submitting, children: formNode }));
 }
 function WorkflowOperations({ surface, variant, onRefresh, onCommandSuccess, pendingLocator, persistLocator, clearLocator, onBusyChange, settlement, confirmedReadPending, renderLayout, }) {
     const { message } = App.useApp();
@@ -383,7 +420,6 @@ function WorkflowOperations({ surface, variant, onRefresh, onCommandSuccess, pen
     const [operationError, setOperationError] = useState('');
     const [retainRefusedInput, setRetainRefusedInput] = useState(false);
     const [submitting, setSubmitting] = useState(false);
-    const [draftLocked, setDraftLocked] = useState(false);
     const [fileLocked, setFileLocked] = useState(false);
     const [refreshFailure, setRefreshFailure] = useState(null);
     const [unknown, setUnknown] = useState(false);
@@ -435,15 +471,15 @@ function WorkflowOperations({ surface, variant, onRefresh, onCommandSuccess, pen
             surface,
         });
     };
-    const submit = async (values) => {
-        if (!selected || busyRef.current || draftLocked || fileLocked || taskForm.draftNeedsSave || pendingLocator || unknown || refreshFailure || confirmedReadPending)
+    const submit = async (values, operation = selected) => {
+        if (!operation || busyRef.current || fileLocked || taskForm.draftNeedsSave || pendingLocator || unknown || refreshFailure || confirmedReadPending)
             return;
         setOperationError('');
         setSubmitting(true);
         busyRef.current = true;
         onBusyChange(true);
         try {
-            if (selected.kind !== 'workflow_command') {
+            if (operation.kind !== 'workflow_command') {
                 throw new Error('WORKFLOW_APP_ACTION_NOT_EXECUTABLE_IN_STANDARD_PANEL');
             }
             const commandToken = surface.commandToken;
@@ -456,16 +492,16 @@ function WorkflowOperations({ surface, variant, onRefresh, onCommandSuccess, pen
                 throw new Error('操作已刷新，请保留当前输入并重新确认。');
             }
             const input = { ...values };
-            if (surface.taskForm && ['save_form', 'approve', 'resubmit'].includes(selected.key)) {
+            if (surface.taskForm && ['save_form', 'complete', 'approve', 'resubmit'].includes(operation.key)) {
                 if (taskForm.stale)
                     throw new Error('业务资料已更新，请先核对最新资料');
-                input.form = await taskForm.build(selected.key !== 'save_form');
+                input.form = await taskForm.build(operation.key !== 'save_form');
             }
-            const key = randomId(`workflow:${selected.key}`);
+            const key = randomId(`workflow:${operation.key}`);
             if (surface.task?.id)
-                persistLocator({ taskId: String(surface.task.id), command: selected.key,
+                persistLocator({ taskId: String(surface.task.id), command: operation.key,
                     idempotencyKey: key, requestedAt: new Date().toISOString(), tokenDigest: await workflowCommandTokenDigest(commandToken) });
-            request.current = { surface, operation: selected, input: JSON.parse(JSON.stringify(input)), key };
+            request.current = { surface, operation, input: JSON.parse(JSON.stringify(input)), key };
         }
         catch (error) {
             const hasFreshSurface = Boolean(error?.data?.freshSurface);
@@ -477,7 +513,7 @@ function WorkflowOperations({ surface, variant, onRefresh, onCommandSuccess, pen
             else {
                 const failure = error?.status === 403
                     ? '当前审批资料或操作权限已变化，请刷新资料后重新确认。'
-                    : errorMessage(error, `${selected.label}失败`);
+                    : errorMessage(error, `${operation.label}失败`);
                 setOperationError(failure);
                 message.error(failure);
             }
@@ -543,7 +579,10 @@ function WorkflowOperations({ surface, variant, onRefresh, onCommandSuccess, pen
         setSelectedState(null);
         taskForm.committed(wire.input.form, Number(result.dataRevision) || undefined);
         onBusyChange(false);
-        message.success(`${wire.operation.label}已提交`);
+        message.success(`${wire.operation.label}成功`);
+        const resume = result.returnResume;
+        if (resume?.reason)
+            message.info(resume.reason);
         // The write has succeeded. A callback or read failure can only affect refresh.
         try {
             await onCommandSuccess(result);
@@ -584,24 +623,30 @@ function WorkflowOperations({ surface, variant, onRefresh, onCommandSuccess, pen
         }
     };
     const commandLocked = submitting || unknown || Boolean(pendingLocator) || Boolean(refreshFailure) || confirmedReadPending;
-    const locked = commandLocked || draftLocked || fileLocked;
+    const locked = commandLocked || fileLocked;
     if (!operations.length && !surface.taskForm && !unknown && !refreshFailure)
         return renderLayout({ content: null, actions: null });
-    const primary = operations
-        .filter((operation) => operation.placement === 'primary')
-        .sort((left, right) => {
-        if (variant !== 'mobile')
-            return 0;
-        const order = { reject: 0, approve: 1, resubmit: 1 };
-        return (order[left.key] ?? 10) - (order[right.key] ?? 10);
-    });
-    const secondary = operations.filter((operation) => operation.placement !== 'primary');
-    const content = surface.taskForm || commandNeedsRefresh || ((submitting || unknown) && !pendingLocator) || unknown || refreshFailure ? (_jsxs(_Fragment, { children: [commandNeedsRefresh && !unknown && !pendingLocator && !refreshFailure && _jsx(Alert, { type: "info", showIcon: true, title: "\u8BF7\u5237\u65B0\u64CD\u4F5C\u540E\u7EE7\u7EED\u529E\u7406", description: "\u9875\u9762\u505C\u7559\u8F83\u4E45\uFF0C\u9700\u91CD\u65B0\u786E\u8BA4\u5F53\u524D\u529E\u7406\u6743\u9650\u3002\u5237\u65B0\u4F1A\u4FDD\u7559\u5C1A\u672A\u4FDD\u5B58\u7684\u8F93\u5165\u3002", action: _jsx(Button, { disabled: locked, loading: submitting, onClick: () => void refreshConfirmed(), children: "\u5237\u65B0\u64CD\u4F5C" }) }), surface.taskForm && _jsx(WorkflowTaskForm, { controller: taskForm, disabled: locked, variant: variant, valueLinkage: taskFormBehavior?.valueLinkage, linkageContext: { workflowCode: String(surface.instance.workflowCode || ''), nodeId: String(surface.task?.nodeId || ''), pageCode: surface.taskForm.pageCode }, operationPending: submitting || unknown || Boolean(pendingLocator) || draftLocked || fileLocked, taskVersion: surface.task?.version ? Number(surface.task.version) : undefined, taskId: surface.task?.id ? String(surface.task.id) : undefined, draftDisabled: commandLocked, onRefresh: onRefresh, onDraftBusyChange: busy => { setDraftLocked(busy); onBusyChange(busy || fileLocked || busyRef.current); }, onFileBusyChange: busy => { setFileLocked(busy); onBusyChange(busy || draftLocked || busyRef.current); }, resourceCode: surface.presentation.businessDetail.resourceCode || undefined, recordId: surface.presentation.businessDetail.recordId || undefined }), (submitting || unknown) && !pendingLocator && _jsx(WorkflowPendingCommandGuard, {}), unknown && _jsx(Alert, { type: "warning", showIcon: true, title: "\u4FDD\u7559\u4E86\u539F\u63D0\u4EA4\u8BF7\u6C42", description: operationError || '提交结果待确认，请重试原请求或查询原结果。', action: _jsx(Button, { disabled: submitting, loading: submitting, onClick: () => void sendRequest(true), children: "\u91CD\u8BD5\u539F\u8BF7\u6C42" }) }), refreshFailure && _jsx(Alert, { type: "warning", showIcon: true, title: refreshFailure.outcome === 'succeeded'
+    const { primary, secondary } = workflowOperationGroups(operations, variant);
+    const actionsDisabled = locked || commandNeedsRefresh || taskForm.stale || taskForm.draftNeedsSave;
+    const choose = (operation) => {
+        if (actionsDisabled || !operation.visible || !operation.enabled)
+            return;
+        setMoreOpen(false);
+        if (operation.uiSchema.presentation === 'direct') {
+            setRetainRefusedInput(false);
+            setSelectedState(null);
+            void submit({}, operation);
+        }
+        else
+            selectOperation(operation);
+    };
+    const content = surface.taskForm || commandNeedsRefresh || ((submitting || unknown) && !pendingLocator) || unknown || refreshFailure ? (_jsxs(_Fragment, { children: [commandNeedsRefresh && !unknown && !pendingLocator && !refreshFailure && _jsx(Alert, { type: "info", showIcon: true, title: "\u8BF7\u5237\u65B0\u64CD\u4F5C\u540E\u7EE7\u7EED\u529E\u7406", description: "\u9875\u9762\u505C\u7559\u8F83\u4E45\uFF0C\u9700\u91CD\u65B0\u786E\u8BA4\u5F53\u524D\u529E\u7406\u6743\u9650\u3002\u5237\u65B0\u4F1A\u4FDD\u7559\u5C1A\u672A\u4FDD\u5B58\u7684\u8F93\u5165\u3002", action: _jsx(Button, { disabled: locked, loading: submitting, onClick: () => void refreshConfirmed(), children: "\u5237\u65B0\u64CD\u4F5C" }) }), surface.taskForm && _jsx(WorkflowTaskForm, { controller: taskForm, disabled: locked, variant: variant, valueLinkage: taskFormBehavior?.valueLinkage, linkageContext: { workflowCode: String(surface.instance.workflowCode || ''), nodeId: String(surface.task?.nodeId || ''), pageCode: surface.taskForm.pageCode }, operationPending: submitting || unknown || Boolean(pendingLocator) || fileLocked, taskVersion: surface.task?.version ? Number(surface.task.version) : undefined, taskId: surface.task?.id ? String(surface.task.id) : undefined, onFileBusyChange: busy => { setFileLocked(busy); onBusyChange(busy || busyRef.current); }, resourceCode: surface.presentation.businessDetail.resourceCode || undefined, recordId: surface.presentation.businessDetail.recordId || undefined }), (submitting || unknown) && !pendingLocator && _jsx(WorkflowPendingCommandGuard, {}), unknown && _jsx(Alert, { type: "warning", showIcon: true, title: "\u4FDD\u7559\u4E86\u539F\u63D0\u4EA4\u8BF7\u6C42", description: operationError || '提交结果待确认，请重试原请求或查询原结果。', action: _jsx(Button, { disabled: submitting, loading: submitting, onClick: () => void sendRequest(true), children: "\u91CD\u8BD5\u539F\u8BF7\u6C42" }) }), refreshFailure && _jsx(Alert, { type: "warning", showIcon: true, title: refreshFailure.outcome === 'succeeded'
                     ? '任务操作已成功，但资料刷新失败' : '本次未提交，最新资料读取失败', description: refreshFailure.message, action: _jsx(Button, { disabled: submitting, onClick: () => void refreshConfirmed(), children: "\u5237\u65B0\u8D44\u6599" }) })] })) : null;
-    const actions = (_jsxs(_Fragment, { children: [_jsxs("div", { className: `oxa-workflow-actions oxa-workflow-actions-${variant}`, children: [primary.map((operation) => (_jsx(Button, { danger: operation.emphasis === 'danger', disabled: locked || commandNeedsRefresh || taskForm.stale || taskForm.draftNeedsSave || !operation.enabled, onClick: () => selectOperation(operation), title: operation.disabledReason, type: operation.emphasis === 'primary' ? 'primary' : 'default', children: operation.label }, operation.key))), secondary.length > 0 && (_jsx(Button, { className: "oxa-workflow-more-trigger", disabled: locked || commandNeedsRefresh || taskForm.stale || taskForm.draftNeedsSave, icon: _jsx(EllipsisOutlined, {}), onClick: () => setMoreOpen((value) => !value), children: "\u66F4\u591A\u64CD\u4F5C" })), secondary.length > 0 && moreOpen && (_jsx("div", { className: "oxa-workflow-more-actions", children: secondary.map((operation) => (_jsx(Button, { disabled: locked || commandNeedsRefresh || taskForm.stale || taskForm.draftNeedsSave || !operation.enabled, onClick: () => {
-                                setMoreOpen(false);
-                                selectOperation(operation);
-                            }, type: "text", title: operation.disabledReason, children: operation.label }, operation.key))) }))] }), _jsx(OperationDialog, { error: operationError, onCancel: () => { setRetainRefusedInput(false); setSelectedState(null); }, onSubmit: (values) => void submit(values), operation: selected, submitting: submitting, variant: variant })] }));
+    const moreTrigger = _jsx(Button, { className: "oxa-workflow-more-trigger", disabled: actionsDisabled, icon: _jsx(EllipsisOutlined, {}), "aria-label": "\u66F4\u591A", "aria-expanded": moreOpen && !actionsDisabled, onClick: variant === 'mobile' ? () => setMoreOpen(true) : undefined, children: "\u66F4\u591A" });
+    const actions = operations.length ? (_jsxs(_Fragment, { children: [_jsxs("div", { className: `oxa-workflow-actions oxa-workflow-actions-${variant}`, role: "group", "aria-label": "\u5BA1\u6279\u64CD\u4F5C", children: [secondary.length > 0 && (variant === 'mobile' ? moreTrigger : _jsx(Dropdown, { open: moreOpen && !actionsDisabled, onOpenChange: setMoreOpen, trigger: ['click'], placement: "topLeft", menu: { items: secondary.map(operation => ({ key: operation.key, danger: operation.emphasis === 'danger',
+                                disabled: actionsDisabled || !operation.enabled,
+                                label: _jsxs("span", { className: "oxa-workflow-more-label", children: [_jsx("strong", { children: operation.label }), _jsx("small", { children: operation.disabledReason || operation.consequence })] }),
+                                onClick: () => choose(operation), })) }, children: moreTrigger })), primary.map(operation => _jsx(Button, { className: operation.emphasis === 'primary' ? 'oxa-workflow-approve-primary' : undefined, danger: operation.emphasis === 'danger', disabled: actionsDisabled || !operation.enabled, onClick: () => choose(operation), title: operation.disabledReason, type: operation.emphasis === 'primary' ? 'primary' : variant === 'desktop' && operation.emphasis === 'danger' ? 'text' : 'default', children: operation.label }, operation.key))] }), variant === 'mobile' && _jsx(Drawer, { title: "\u66F4\u591A\u64CD\u4F5C", open: moreOpen && !actionsDisabled && secondary.length > 0, onClose: () => setMoreOpen(false), closable: false, placement: "bottom", size: "auto", rootClassName: "oxa-workflow-more-drawer", destroyOnHidden: true, footer: _jsx(Button, { type: "text", block: true, onClick: () => setMoreOpen(false), children: "\u53D6\u6D88" }), children: _jsx("div", { className: "oxa-workflow-more-list", children: secondary.map(operation => _jsxs(Button, { type: "text", danger: operation.emphasis === 'danger', disabled: actionsDisabled || !operation.enabled, onClick: () => choose(operation), children: [_jsx("span", { className: "oxa-workflow-more-icon", "aria-hidden": "true", children: operation.emphasis === 'danger' ? _jsx(StopOutlined, {}) : operation.key === 'transfer' ? _jsx(SwapOutlined, {}) : operation.key === 'add_assignee' ? _jsx(UserAddOutlined, {}) : operation.key === 'save_form' ? _jsx(SaveOutlined, {}) : _jsx(EditOutlined, {}) }), _jsxs("span", { className: "oxa-workflow-more-label", children: [_jsx("strong", { children: operation.label }), _jsx("small", { children: operation.disabledReason || operation.consequence })] })] }, operation.key)) }) }), _jsx(OperationDialog, { error: operationError, onCancel: () => { setRetainRefusedInput(false); setSelectedState(null); }, onSubmit: values => void submit(values), operation: selected, submitting: submitting, variant: variant })] })) : null;
     return renderLayout({ content, actions });
 }
 /**
@@ -942,30 +987,28 @@ export function WorkflowSummarySection({ surface }) {
 function StandardWorkflowDetailRenderer({ surface, timeline, warning, operations, taskContent, variant, onClose, onEdit, drawer, drawerState, newPageHref, editing, busy, }) {
     const navigate = useNavigate();
     const timeZone = usePresentationTimeZone();
-    const [tab, setTab] = useState('application');
+    const [auditInstance, setAuditInstance] = useState(null);
     const instance = surfaceInstance(surface);
-    const deadline = surfaceTask(surface)?.completionDeadline;
+    const task = surfaceTask(surface);
+    const definition = useWorkflowDefinition(instance.workflowCode);
+    const deadline = task?.completionDeadline;
     const business = surfaceBusinessDetail(surface);
     const summary = surface.presentation.summary;
-    const titleField = workflowDetailGroups(business).flatMap(group => group.fields).find(field => field.type === 'text.short');
-    const title = titleField && business.record[titleField.key] ? String(business.record[titleField.key]) : summary.title;
-    const activeNode = timeline?.display?.entries.find(entry => entry.status === 'active');
+    const title = summary.title;
+    const pageTitle = business.resourceName || definition?.title || '申请详情';
+    const activeNode = workflowTimelineEntries(timeline).find(entry => entry.status === 'active');
     const activeFlow = activeNode && timeline?.flow.find(entry => entry.key === activeNode.key && entry.status === 'active');
     const people = activeFlow?.assignees.filter(person => person.status === 'active').map(person => person.displayName).filter(Boolean).join('、');
-    const statusTone = workflowStatus(instance.status).color;
-    const bannerTone = statusTone === 'error' ? 'error' : 'active';
+    const progress = activeNode?.nodeId === task?.nodeId ? workflowApprovalProgress(task) : null;
     const edit = workflowHasEnded(instance) ? onEdit : undefined;
-    const hasActions = standardWorkflowOperations(surface).length > 0;
+    const visibleOperations = standardWorkflowOperations(surface);
+    const needsYou = visibleOperations.some(operation => operation.enabled && operation.audience === 'participant' && operation.group === 'decision');
     const loadAudit = useCallback(() => loadWorkflowDataAudit(instance.id), [instance.id]);
     const back = onClose || (() => navigate(variant === 'mobile' ? '/m/work-center' : '/work-center'));
-    return _jsxs(RecordDetailFrame, { variant: variant, title: "\u7533\u8BF7\u8BE6\u60C5", heading: title, status: _jsx(StatusTag, { status: instance.status }), metadata: [summary.initiator?.displayName || summary.initiatorDisplayName, summary.initiator?.departmentDisplayName || summary.departmentDisplayName,
-            summary.submittedAt ? `${detailTime(summary.submittedAt, timeZone)} 创建` : ''].filter(Boolean).join(' · '), updatedAt: business.record.updated_at || instance.completedAt || instance.startedAt, onClose: back, onEdit: edit, editing: editing, busy: busy, drawer: drawer, drawerState: drawerState, newPageHref: newPageHref, footer: operations || hasActions || edit ? _jsxs(_Fragment, { children: [operations, edit && _jsx(Button, { onClick: edit, children: "\u7F16\u8F91" })] }) : null, children: [warning && _jsx(Alert, { description: warning, showIcon: true, type: "warning" }), !workflowHasEnded(instance) && activeNode && _jsxs("div", { className: `oxa-workflow-current-node is-${bannerTone}`, role: "status", children: [_jsxs("span", { children: [_jsx(ClockCircleOutlined, {}), "\u5F53\u524D\u8282\u70B9\uFF1A", activeNode.title] }), people && _jsxs("span", { children: ["\u7B49\u5F85", people, "\u5904\u7406"] })] }), deadline && !workflowHasEnded(instance) && ['pending', 'failed'].includes(deadline.status) && _jsx(Alert, { showIcon: true, type: deadline.status === 'failed' ? 'warning' : 'info', title: deadline.status === 'failed' ? '到期自动处理未成功' : `未提前完成时，将于 ${detailTime(deadline.deadlineAt, timeZone)} 自动同意`, description: deadline.status === 'failed' ? '流程仍可人工办理。自动处理已停止，请联系流程管理员查看执行记录。' : '可以在此之前填写可选内容并手动提交；自动处理不会代替任何人记录审批意见。' }), _jsx(Tabs, { activeKey: tab, onChange: setTab, items: [
-                    { key: 'application', label: '申请内容', children: _jsx(WorkflowBusinessDetailSections, { surface: surface, variant: variant }) },
-                    { key: 'history', label: '审批历史', children: _jsx(WorkflowTimelineSection, { timeline: timeline }) },
-                    { key: 'changes', label: '变更记录', children: tab === 'changes' && business.surface && business.resourceCode && business.recordId
-                            ? _jsx(RecordChangeHistory, { resourceCode: business.resourceCode, recordId: business.recordId, surface: business.surface, readable: () => true, loadPage: loadAudit })
-                            : _jsx(Empty, { description: "\u6682\u65E0\u53D8\u66F4\u8BB0\u5F55" }) },
-                ] }), taskContent && _jsx("div", { className: "oxa-workflow-task-content", children: taskContent })] });
+    const audit = ['ready', 'stale'].includes(business.status) && business.surface && business.resourceCode && business.recordId &&
+        _jsxs("details", { className: "oxa-workflow-audit-section", open: auditInstance === instance.id, onToggle: event => setAuditInstance(event.currentTarget.open ? instance.id : null), children: [_jsxs("summary", { children: [_jsx(EditOutlined, {}), _jsx("span", { children: "\u8D44\u6599\u53D8\u66F4" }), _jsx(RightOutlined, {})] }), auditInstance === instance.id && _jsx(RecordChangeHistory, { resourceCode: business.resourceCode, recordId: business.recordId, surface: business.surface, readable: () => true, loadPage: loadAudit })] });
+    return _jsxs(RecordDetailFrame, { className: "oxa-workflow-approval-detail", variant: variant, summaryHeader: true, backLabel: "\u8FD4\u56DE\u5F85\u529E", title: pageTitle, heading: variant === 'desktop' && title !== pageTitle ? `${pageTitle} · ${title}` : title, status: _jsx(StatusTag, { status: instance.status }), metadata: [summary.initiator?.displayName || summary.initiatorDisplayName, summary.initiator?.departmentDisplayName || summary.departmentDisplayName,
+            summary.submittedAt ? `${detailTime(summary.submittedAt, timeZone)}${variant === 'desktop' ? ' 提交' : ''}` : '', variant === 'desktop' ? summary.businessNumber : ''].filter(Boolean).join(' · '), onClose: back, onEdit: edit, editing: editing, busy: busy, drawer: drawer, drawerState: drawerState, newPageHref: newPageHref, footer: operations || visibleOperations.length || edit ? _jsxs(_Fragment, { children: [operations, edit && _jsx(Button, { onClick: edit, children: "\u7F16\u8F91" })] }) : null, children: [warning && _jsx(Alert, { description: warning, showIcon: true, type: "warning" }), _jsxs("div", { className: `oxa-workflow-detail-sections oxa-workflow-detail-sections-${variant}`, children: [_jsxs("div", { className: "oxa-workflow-main-column", children: [!workflowHasEnded(instance) && activeNode && _jsx("div", { className: "oxa-workflow-current-section", children: _jsxs("div", { className: "oxa-workflow-current-node is-active", role: "status", children: [_jsxs("strong", { children: [_jsx("span", { className: "oxa-workflow-current-dot" }), `${needsYou ? '需要你处理' : '当前节点'}：${activeNode.title}`] }), (progress || people) && _jsx("span", { children: progress ? `${progress.label}${progress.total > 0 ? ` · 已有 ${progress.approved}/${progress.total} 人${progress.verb}` : ''}` : `等待${people}处理` })] }) }), deadline && !workflowHasEnded(instance) && ['pending', 'failed'].includes(deadline.status) && _jsx(Alert, { showIcon: true, type: deadline.status === 'failed' ? 'warning' : 'info', title: deadline.status === 'failed' ? '到期自动处理未成功' : `未提前完成时，将于 ${detailTime(deadline.deadlineAt, timeZone)} 自动同意`, description: deadline.status === 'failed' ? '流程仍可人工办理。自动处理已停止，请联系流程管理员查看执行记录。' : '可以在此之前填写可选内容并手动提交；自动处理不会代替任何人记录审批意见。' }), _jsx("section", { "aria-label": "\u7533\u8BF7\u5185\u5BB9", className: "oxa-workflow-detail-section oxa-workflow-application-section", children: _jsx(WorkflowBusinessDetailSections, { surface: surface, variant: variant }) }), taskContent && _jsx("section", { "aria-label": "\u672C\u8282\u70B9\u9700\u586B\u5199", className: "oxa-workflow-task-content", children: taskContent })] }), _jsxs("aside", { className: "oxa-workflow-progress-rail", children: [_jsx("section", { "aria-label": "\u5BA1\u6279\u8FDB\u5EA6", className: "oxa-workflow-detail-section oxa-workflow-history-section", children: _jsx(WorkflowTimelineSection, { timeline: timeline, task: task, compact: variant === 'mobile', footer: audit }) }), variant === 'desktop' && _jsx(WorkflowApprovalParticipants, { surface: surface, timeline: timeline })] })] })] });
 }
 export function DesktopWorkflowDetailRenderer(props) {
     return _jsx(StandardWorkflowDetailRenderer, { ...props, variant: "desktop" });