openxiangda 2.48.2 → 2.55.1

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

@@ -3,6 +3,7 @@ import { applicationCode } from '../../runtime-meta';
 import { readPendingWorkflowSubmission, writePendingWorkflowSubmission, clearPendingWorkflowSubmission, workflowSubmissionScope, submissionLocatorStorage, standardProcessWasRejected } from '../../workflow-submission-recovery';
 import { readPendingWorkflowTaskCommand, writePendingWorkflowTaskCommand, clearPendingWorkflowTaskCommand, workflowTaskCommandScope, workflowCommandTokenDigest, workflowTaskCommandWasRejected } from '../../workflow-task-command-recovery';
 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';
@@ -28,6 +29,7 @@ import { PlatformAvatar } from '../PlatformAvatar';
 import { SubtableField } from '../platform-fields/SubtableField';
 import { standardProcessFormValues } from './standard-process-values';
 import { fieldWritable } from '../resource/resource-page-helpers';
+import { workflowSubmissionFormProjection, workflowSubmissionPrefill } from './workflow-submission-form';
 /**
  * An advanced task command has completed the current task and may have
  * created a new task. Reading the old task Surface in that case is expected
@@ -87,6 +89,7 @@ function workflowStatus(status) {
         running: { label: '审批中', color: 'processing' },
         returned: { label: '已退回', color: 'orange' },
         completed: { label: '已完成', color: 'success' },
+        skipped: { label: '已跳过', color: 'default' },
         approved: { label: '已同意', color: 'success' },
         rejected: { label: '已拒绝', color: 'error' },
         withdrawn: { label: '已撤回', color: 'default' },
@@ -132,25 +135,6 @@ function workflowSurfaceMatchesInstance(surface, instanceId) {
 function surfaceBusinessDetail(surface) {
     return normalizeWorkflowBusinessDetail(surface.presentation.businessDetail);
 }
-function workflowOperationSignature(operation) {
-    return JSON.stringify({
-        key: operation.key,
-        kind: operation.kind,
-        label: operation.label,
-        placement: operation.placement,
-        group: operation.group,
-        audience: operation.audience,
-        emphasis: operation.emphasis,
-        tone: operation.tone,
-        visible: operation.visible,
-        enabled: operation.enabled,
-        disabledReason: operation.disabledReason,
-        inputSchema: operation.inputSchema,
-        uiSchema: operation.uiSchema,
-        execute: operation.execute,
-        refresh: operation.refresh,
-    });
-}
 const WORKFLOW_APP_ACTION_DISABLED_REASON = '应用动作由应用页面负责';
 function standardWorkflowOperations(surface) {
     return surface.operations
@@ -320,7 +304,7 @@ export function WorkflowTimelineSection({ timeline, }) {
                 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 })] }), 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));
+                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 })) }));
 }
 function WorkflowMemberPicker({ id, placeholder, value, onChange, multiple = false, variant }) {
@@ -347,6 +331,11 @@ function OperationFields({ operation, variant, }) {
     return (_jsx(_Fragment, { children: schemaProperties(operation).map(({ key, property, required, ui }) => {
             const rules = [
                 ...(required ? [{ required: true, message: `请填写${property.title || key}` }] : []),
+                ...(property.type === 'string' ? [{ validator: async (_rule, value) => {
+                            const error = workflowOperationStringError(property, value, required, property.title || key);
+                            if (error)
+                                throw new Error(error);
+                        } }] : []),
                 ...(property.type === 'array' ? [{ validator: async (_rule, value) => {
                             if (value == null && !required)
                                 return;
@@ -370,7 +359,7 @@ function OperationFields({ operation, variant, }) {
             else if (property.format === 'date-time') {
                 control = _jsx(Input, { type: "datetime-local" });
             }
-            return (_jsx(Form.Item, { initialValue: property.default, label: property.title || key, name: key, rules: rules, children: control }, key));
+            return (_jsx(Form.Item, { initialValue: property.default, label: property.title || key, name: key, rules: rules, validateFirst: true, children: control }, key));
         }) }));
 }
 function OperationDialog({ error, operation, submitting, variant, onCancel, onSubmit, }) {
@@ -392,6 +381,7 @@ function WorkflowOperations({ surface, variant, onRefresh, onCommandSuccess, pen
     const [selectedState, setSelectedState] = useState(null);
     const [moreOpen, setMoreOpen] = useState(false);
     const [operationError, setOperationError] = useState('');
+    const [retainRefusedInput, setRetainRefusedInput] = useState(false);
     const [submitting, setSubmitting] = useState(false);
     const [draftLocked, setDraftLocked] = useState(false);
     const [fileLocked, setFileLocked] = useState(false);
@@ -429,16 +419,14 @@ function WorkflowOperations({ surface, variant, onRefresh, onCommandSuccess, pen
         timer = setTimeout(tick, Math.min(commandExpiresAt - Date.now(), 2_147_483_647));
         return () => clearTimeout(timer);
     }, [surface.commandToken, commandExpiresAt]);
-    const selected = !commandNeedsRefresh && selectedState?.surface === surface
-        ? operations.find((operation) => operation.key === selectedState.operation.key &&
-            workflowOperationSignature(operation) ===
-                selectedState.operationSignature) || null
-        : null;
+    const selected = commandNeedsRefresh ? null
+        : retainedWorkflowOperation(selectedState, surface, operations, retainRefusedInput);
     useEffect(() => {
         if (selectedState && !selected && !submitting && !unknown)
             setSelectedState(null);
     }, [selected, selectedState, submitting, unknown]);
     const selectOperation = (operation) => {
+        setRetainRefusedInput(false);
         setOperationError('');
         setSelectedState({
             operation,
@@ -519,13 +507,13 @@ function WorkflowOperations({ surface, variant, onRefresh, onCommandSuccess, pen
             if (rejected) {
                 clearLocator(wire.key);
                 request.current = null;
-                setSelectedState(null);
+                setRetainRefusedInput(true);
             }
             else {
                 setUnknown(true);
                 setSelectedState(null);
             }
-            const failure = errorMessage(error, '任务操作尚未完成');
+            const failure = workflowOperationInputFailure(error) || errorMessage(error, '任务操作尚未完成');
             setOperationError(failure);
             if (rejected) {
                 message.error(failure);
@@ -607,12 +595,12 @@ function WorkflowOperations({ surface, variant, onRefresh, onCommandSuccess, pen
         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, 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 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, 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'
                     ? '任务操作已成功，但资料刷新失败' : '本次未提交，最新资料读取失败', 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: () => setSelectedState(null), onSubmit: (values) => void submit(values), operation: selected, submitting: submitting, variant: variant })] }));
+                            }, 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 })] }));
     return renderLayout({ content, actions });
 }
 /**
@@ -950,7 +938,8 @@ function StandardWorkflowDetailRenderer({ surface, timeline, warning, operations
     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 people = activeNode?.people.map(person => person.displayName).filter(Boolean).join('、');
+    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 edit = workflowHasEnded(instance) ? onEdit : undefined;
@@ -1254,7 +1243,7 @@ async function workflowContextPrefillValue(field, rawValue, resources) {
     }
     return workflowContextScalarValue(field, value);
 }
-export function WorkflowSubmissionPage({ instancePath, workflowCode: declaredWorkflowCode, variant = 'desktop', onDismiss, onCompleted, } = {}) {
+export function WorkflowSubmissionPage({ instancePath, workflowCode: declaredWorkflowCode, variant = 'desktop', onDismiss, onCompleted, formOptions, } = {}) {
     const { workflowCode: routeWorkflowCode = '' } = useParams();
     const workflowCode = declaredWorkflowCode || routeWorkflowCode;
     const definition = useWorkflowDefinition(workflowCode);
@@ -1265,6 +1254,9 @@ export function WorkflowSubmissionPage({ instancePath, workflowCode: declaredWor
     const { message } = App.useApp();
     const [subjectForm] = Form.useForm();
     const [requirementForm] = Form.useForm();
+    const watchedFormValues = Form.useWatch([], { form: subjectForm, preserve: true });
+    const [prefillError, setPrefillError] = useState(false);
+    const prefill = useRef({ context: '', applied: new Set() });
     const [loading, setLoading] = useState(false);
     const [launchSurface, setLaunchSurface] = useState(null);
     const [launchError, setLaunchError] = useState(null);
@@ -1357,6 +1349,41 @@ export function WorkflowSubmissionPage({ instancePath, workflowCode: declaredWor
         namedIntent,
         subjectDefinition,
     ]);
+    const formProjection = useMemo(() => {
+        try {
+            const values = subjectDefinition ? normalizeFormValues(watchedFormValues || {}, subjectDefinition.surface) : {};
+            return { ...workflowSubmissionFormProjection(fields, values, formOptions?.fieldState?.(values)), error: false };
+        }
+        catch {
+            return { fields, values: {}, hiddenValues: {}, error: true };
+        }
+    }, [fields, formOptions?.fieldState, subjectDefinition, watchedFormValues]);
+    const prefillContext = JSON.stringify([recoveryScope, identity.environment.activeAppVersionId, submissionMode, subjectId]);
+    useEffect(() => {
+        if (!launchSurface || commandId || pendingSubmission || formOptions?.preparation || mutationMode !== 'create' || !subjectDefinition ||
+            launchSurface.environmentId !== identity.environment.id || (generatedNamedSubmission && !namedIntent))
+            return;
+        if (prefill.current.context !== prefillContext)
+            prefill.current = { context: prefillContext, applied: new Set() };
+        try {
+            const values = workflowSubmissionPrefill(fields, formOptions?.initialValues || {}, prefill.current.applied, key => subjectForm.isFieldTouched(key));
+            const normalized = normalizeRecordForForm(values, subjectDefinition.surface);
+            subjectForm.setFields(Object.entries(normalized).map(([name, value]) => ({ name, value, touched: false })));
+            setPrefillError(false);
+        }
+        catch {
+            setPrefillError(true);
+        }
+    }, [commandId, fields, formOptions?.initialValues, formOptions?.preparation, generatedNamedSubmission, identity.environment.id,
+        launchSurface, mutationMode, namedIntent, pendingSubmission, prefillContext, subjectDefinition, subjectForm]);
+    useEffect(() => {
+        if (loading || commandId || pendingSubmission || !launchSurface || formProjection.error || !subjectDefinition)
+            return;
+        const values = normalizeRecordForForm(formProjection.hiddenValues, subjectDefinition.surface);
+        const changes = Object.entries(values).filter(([key, value]) => JSON.stringify(subjectForm.getFieldValue(key)) !== JSON.stringify(value));
+        if (changes.length)
+            subjectForm.setFields(changes.map(([name, value]) => ({ name, value, errors: [] })));
+    }, [commandId, formProjection, launchSurface, loading, pendingSubmission, subjectDefinition, subjectForm]);
     useEffect(() => {
         let active = true;
         setLaunchSurface(null);
@@ -1691,6 +1718,8 @@ export function WorkflowSubmissionPage({ instancePath, workflowCode: declaredWor
                 : '当前部署版本未声明 launch 配置；请升级工具链后为 workflows.definitions[].launch 显式声明 mode' }));
     if (!subjectDefinition)
         return frame(_jsx(Result, { status: "500", title: "\u6807\u51C6\u6D41\u7A0B\u5408\u540C\u4E0D\u5B8C\u6574" }));
+    if (!commandId && formOptions?.preparation)
+        return frame(formOptions.preparation);
     if (launchError && !commandId)
         return frame(_jsx(Result, { status: "error", title: "\u53D1\u8D77\u9875\u9762\u5F53\u524D\u4E0D\u53EF\u7528", subTitle: launchError }));
     if (!launchSurface && !commandId)
@@ -1710,7 +1739,7 @@ export function WorkflowSubmissionPage({ instancePath, workflowCode: declaredWor
         return frame(_jsx(Result, { status: "error", title: "\u6807\u51C6\u6D41\u7A0B\u4E0D\u652F\u6301\u5305\u542B\u53EF\u5199\u5B50\u8868\u7684\u4E3B\u4F53\u8868\u5355", subTitle: "\u5F53\u524D\u6807\u51C6\u63D0\u4EA4 Surface \u5C1A\u672A\u58F0\u660E\u53EF\u5199\u5B50\u8868\u6E32\u67D3\u5668\u3002" }));
     }
     const submit = async (values) => {
-        if (submitInFlight.current || commandId || completion || !launchSurface)
+        if (submitInFlight.current || commandId || completion || !launchSurface || formOptions?.preparation || prefillError || formProjection.error)
             return;
         const unresolved = readPendingWorkflowSubmission(submissionLocatorStorage(), recoveryScope);
         if (pendingSubmission || unresolved) {
@@ -1732,7 +1761,7 @@ export function WorkflowSubmissionPage({ instancePath, workflowCode: declaredWor
         try {
             const encoded = namedIntent ? normalizeFormValues(values, subjectDefinition.surface)
                 : standardProcessFormValues(values, subjectDefinition.surface, resources, (field, mode) => fieldWritable(field, mode === 'create' ? 'create' : 'edit', hasCapability, identity.isAppSuperAdmin));
-            const data = Object.fromEntries(fields.filter(field => Object.hasOwn(encoded, field.key)).map(field => [field.key, encoded[field.key]]));
+            const data = workflowSubmissionFormProjection(fields, encoded, formOptions?.fieldState?.(encoded)).values;
             const signature = JSON.stringify({ workflowCode, subjectId, environmentKey: identity.environment.key, submissionMode, data });
             if (submissionAttempt.current?.signature !== signature) {
                 submissionAttempt.current = { signature, idempotencyKey: randomId(`process:${workflowCode}`), requestedAt: new Date().toISOString() };
@@ -1945,7 +1974,7 @@ export function WorkflowSubmissionPage({ instancePath, workflowCode: declaredWor
             (namedIntent
                 ? '业务操作将在服务端完成校验、幂等提交，并按规则决定是否进入审批'
                 : '业务数据和流程发起意图将原子提交'),
-        fields,
+        fields: formProjection.fields,
         subjectDefinition,
         subjectForm,
         requirementForm,
@@ -1959,7 +1988,10 @@ export function WorkflowSubmissionPage({ instancePath, workflowCode: declaredWor
         completion,
         embedded: Boolean(onDismiss),
         fieldRenderers,
+        formIntro: formOptions?.intro,
+        formError: prefillError || formProjection.error ? '表单规则暂不可用，请联系管理员。' : undefined,
         recordId: mutationMode === 'update' ? subjectId : undefined,
+        expectedRevision: mutationMode === 'update' ? loadedSubjectRevision : undefined,
         onBack: onDismiss ? dismissDrawer : () => navigate(-1),
         onSubmit: submit,
         onAnswer: answer,
@@ -1988,7 +2020,7 @@ function StandardProcessSubmissionRenderer(props) {
         }, new Map())].map(([section, fields]) => ({ section, fields }));
     if (props.completion)
         return _jsx(Result, { status: "success", title: "\u63D0\u4EA4\u6210\u529F", extra: _jsx(Button, { onClick: props.onBack, children: "\u8FD4\u56DE" }) });
-    return _jsxs("div", { className: props.variant === 'mobile' ? 'oxa-mobile-page oxa-mobile-entry oxa-workflow-submission-mobile' : 'oxa-workflow-entry', children: [!props.embedded && _jsxs("header", { className: props.variant === 'mobile' ? 'oxa-mobile-header' : 'oxa-workflow-entry-header', children: [_jsx(Button, { type: "text", "aria-label": "\u8FD4\u56DE", icon: _jsx(ArrowLeftOutlined, {}), disabled: props.processing, onClick: props.onBack }), _jsx("h3", { children: props.title }), _jsx("span", {})] }), _jsx(ResourceFormContent, { variant: props.variant, mode: props.mutationMode === 'update' ? 'edit' : 'create', resourceCode: props.subjectDefinition.code, recordId: props.recordId, groups: groups, form: props.subjectForm, busy: props.loading || props.submitted, pending: props.loading || props.processing, submitDisabled: props.submitted, submitLabel: "\u63D0\u4EA4\u5BA1\u6279", canWriteField: () => true, renderers: props.fieldRenderers, feedback: _jsxs(_Fragment, { children: [props.launchControls, props.processing && _jsx(Alert, { type: "info", showIcon: true, title: "\u6B63\u5728\u63D0\u4EA4\u7533\u8BF7\uFF0C\u8BF7\u7A0D\u5019\u2026" })] }), onSubmit: values => void props.onSubmit(values) }), _jsx(ProcessCommandPanel, { error: props.processError, form: props.requirementForm, loading: props.loading, onAnswer: props.onAnswer, onRetry: props.onRetry, onRefresh: props.onRefresh, surface: props.processSurface })] });
+    return _jsxs("div", { className: props.variant === 'mobile' ? 'oxa-mobile-page oxa-mobile-entry oxa-workflow-submission-mobile' : 'oxa-workflow-entry', children: [!props.embedded && _jsxs("header", { className: props.variant === 'mobile' ? 'oxa-mobile-header' : 'oxa-workflow-entry-header', children: [_jsx(Button, { type: "text", "aria-label": "\u8FD4\u56DE", icon: _jsx(ArrowLeftOutlined, {}), disabled: props.processing, onClick: props.onBack }), _jsx("h3", { children: props.title }), _jsx("span", {})] }), _jsx(ResourceFormContent, { variant: props.variant, mode: props.mutationMode === 'update' ? 'edit' : 'create', resourceCode: props.subjectDefinition.code, recordId: props.recordId, groups: groups, expectedRevision: props.expectedRevision, initialValues: props.mutationMode === 'update' ? undefined : Object.fromEntries(props.fields.filter(field => field.type === 'user.multiple').map(field => [field.key, []])), form: props.subjectForm, busy: props.loading || props.submitted, pending: props.loading || props.processing, submitDisabled: props.submitted || Boolean(props.formError), submitLabel: "\u63D0\u4EA4\u5BA1\u6279", canWriteField: () => true, renderers: props.fieldRenderers, feedback: _jsxs(_Fragment, { children: [props.formIntro, props.launchControls, props.formError && _jsx(Alert, { type: "error", showIcon: true, title: props.formError }), props.processing && _jsx(Alert, { type: "info", showIcon: true, title: "\u6B63\u5728\u63D0\u4EA4\u7533\u8BF7\uFF0C\u8BF7\u7A0D\u5019\u2026" })] }), onSubmit: values => void props.onSubmit(values) }), _jsx(ProcessCommandPanel, { error: props.processError, form: props.requirementForm, loading: props.loading, onAnswer: props.onAnswer, onRetry: props.onRetry, onRefresh: props.onRefresh, surface: props.processSurface })] });
 }
 function DesktopProcessSubmissionRenderer(props) { return _jsx(StandardProcessSubmissionRenderer, { ...props, variant: "desktop" }); }
 function MobileProcessSubmissionRenderer(props) { return _jsx(StandardProcessSubmissionRenderer, { ...props, variant: "mobile" }); }