sy-form-components 0.2.13 → 0.2.14

package/dist/index.mjs

@@ -6563,12 +6563,13 @@ var normalizeProcessBasic = (value) => {
     processStatus: raw.processStatus ?? raw.status ?? instance.processStatus ?? instance.status,
     formUuid: raw.formUuid ?? instance.formUuid ?? instance.definition?.formUuid,
     appType: raw.appType ?? instance.appType ?? instance.definition?.appType,
-    title: raw.title ?? instance.title,
+    title: raw.title ?? instance.title ?? instance.instanceTitle,
     originatorId: raw.originatorId ?? instance.originatorId ?? instance.startedBy,
     originatorName: raw.originatorName ?? instance.originatorName ?? instance.startedByName,
     originatorDepartment: raw.originatorDepartment ?? instance.originatorDepartment ?? instance.startedDepartmentName,
     createdAt: raw.createdAt ?? instance.createdAt ?? instance.startedAt,
-    currentTask
+    currentTask,
+    isExecuting: raw.isExecuting ?? instance.isExecuting
   };
 };
 var normalizeApprovalPermission = (value) => {
@@ -6592,6 +6593,13 @@ var normalizeReturnableNodes = (value) => {
     nodeName: node?.nodeName || node?.name || node?.title || node?.id || ""
   }));
 };
+var normalizeReturnableNodeResult = (value) => {
+  const raw = value?.data || value || {};
+  return {
+    nodes: normalizeReturnableNodes(raw),
+    policy: raw?.policy || null
+  };
+};
 var normalizeProcessDefinition = (value) => {
   const raw = value?.definitionJson || value?.viewJson || value || {};
   const nodes = Array.isArray(raw.nodes) ? raw.nodes : [];
@@ -6678,11 +6686,15 @@ async function saveTask(request, params) {
   return response.data || response.result;
 }
 async function getReturnableNodes(request, taskId) {
+  const result = await getReturnableNodeResult(request, taskId);
+  return result.nodes;
+}
+async function getReturnableNodeResult(request, taskId) {
   const response = await request({
     url: `/workflow/task/${taskId}/returnable-nodes`,
     method: "get"
   });
-  return normalizeReturnableNodes(response.data || response.result);
+  return normalizeReturnableNodeResult(response.data || response.result);
 }
 async function previewProcess(request, params) {
   const response = await request({
@@ -7860,6 +7872,13 @@ var DEFAULT_APPROVAL_ACTIONS = [
   { action: "rejected", name: { zh_CN: "\u62D2\u7EDD" } }
 ];
 var WITHDRAW_ACTION = { action: "withdraw", name: { zh_CN: "\u64A4\u9500" } };
+var FINAL_PROCESS_STATUSES = /* @__PURE__ */ new Set([
+  "completed",
+  "terminated",
+  "withdrawn",
+  "cancelled"
+]);
+var EDITABLE_COMPLETED_STATUSES = /* @__PURE__ */ new Set(["completed", "terminated"]);
 function mergeCurrentTask(processTask, approvalTask) {
   if (!approvalTask) return processTask ?? null;
   if (!processTask) return approvalTask;
@@ -7881,11 +7900,14 @@ function useProcessDetail(options) {
   const [progressList, setProgressList] = useState25([]);
   const [formData, setFormData] = useState25(null);
   const [instanceInfo, setInstanceInfo] = useState25(null);
+  const [accessDenied, setAccessDenied] = useState25(false);
+  const [loadError, setLoadError] = useState25(null);
   const [isApprover, setIsApprover] = useState25(false);
   const [canWithdraw, setCanWithdraw] = useState25(false);
   const [approvalTasks, setApprovalTasks] = useState25([]);
   const [permissions, setPermissions] = useState25(null);
   const [processDefinition, setProcessDefinition] = useState25(null);
+  const [dataVersion, setDataVersion] = useState25(0);
   const mountedRef = useRef10(true);
   const fieldIdsKey = fieldIds?.join("
") ?? "";
   useEffect30(() => {
@@ -7899,26 +7921,34 @@ function useProcessDetail(options) {
     [processInfo?.currentTask, approvalTasks]
   );
   const processStatus = processInfo?.processStatus ?? null;
-  const isOriginatorReturn = currentTask?.nodeType === "originator_return";
-  const isProcessCompleted = processStatus === "completed" || processStatus === "terminated";
+  const isProcessFinal = processStatus ? FINAL_PROCESS_STATUSES.has(processStatus) : false;
+  const isOriginatorReturn = !isProcessFinal && currentTask?.nodeType === "originator_return";
+  const isProcessCompleted = processStatus ? EDITABLE_COMPLETED_STATUSES.has(processStatus) : false;
+  const canEdit = hasViewOperation(permissions?.operations, "edit");
+  const canDelete = hasViewOperation(permissions?.operations, "delete");
+  const canViewWorkflow = hasViewOperation(permissions?.operations, "workflow");
+  const canViewChangeRecords = hasViewOperation(permissions?.operations, "change_records");
+  const fieldPermissionTask = isProcessFinal ? void 0 : currentTask ?? void 0;
   const { fieldBehaviors } = useFieldPermission({
     viewPermissions: permissions ?? void 0,
     processDefinition: processDefinition ?? void 0,
-    currentTask: currentTask ?? void 0,
-    isApprover,
+    currentTask: fieldPermissionTask,
+    isApprover: isProcessFinal ? false : isApprover,
     mode
   });
   const activeActions = useMemo13(() => {
-    if (!isApprover) return [];
+    if (!isApprover || isProcessFinal) return [];
     const actions = currentTask?.actions && currentTask.actions.length > 0 ? [...currentTask.actions] : [...DEFAULT_APPROVAL_ACTIONS];
     if (canWithdraw && !actions.some((action) => action.action === "withdraw")) {
       actions.push(WITHDRAW_ACTION);
     }
     return actions;
-  }, [isApprover, currentTask?.actions, canWithdraw]);
+  }, [isApprover, isProcessFinal, currentTask?.actions, canWithdraw]);
   const loadData = useCallback12(async () => {
     if (!mountedRef.current) return;
     setLoading(true);
+    setAccessDenied(false);
+    setLoadError(null);
     try {
       const [basicResult, approvalResult, permResult, formResult] = await Promise.all([
         getProcessBasic(request, formInstanceId),
@@ -7927,16 +7957,35 @@ function useProcessDetail(options) {
         getFormData(request, { formInstanceId, appType, formUuid })
       ]);
       if (!mountedRef.current) return;
+      if (!hasViewPermission(permResult)) {
+        setAccessDenied(true);
+        setProcessInfo(null);
+        setIsApprover(false);
+        setCanWithdraw(false);
+        setApprovalTasks([]);
+        setPermissions(permResult);
+        setInstanceInfo(null);
+        setFormData(null);
+        setProgressList([]);
+        setProcessDefinition(null);
+        return;
+      }
       setProcessInfo(basicResult);
-      setIsApprover(approvalResult?.isApprover ?? false);
-      setCanWithdraw(approvalResult?.canUndo ?? false);
-      setApprovalTasks(approvalResult?.currentTasks ?? []);
+      const nextProcessStatus = basicResult?.processStatus ?? null;
+      const nextIsProcessFinal = nextProcessStatus ? FINAL_PROCESS_STATUSES.has(nextProcessStatus) : false;
+      const nextCanWithdraw = Boolean(
+        approvalResult?.canUndo && nextProcessStatus === "running" && basicResult?.isExecuting !== true
+      );
+      setIsApprover(nextIsProcessFinal ? false : approvalResult?.isApprover ?? false);
+      setCanWithdraw(nextCanWithdraw);
+      setApprovalTasks(nextIsProcessFinal ? [] : approvalResult?.currentTasks ?? []);
       setPermissions(permResult);
       setInstanceInfo(formResult);
       setFormData(
         extractFormValues(formResult, fieldIdsKey ? fieldIdsKey.split("
") : void 0)
       );
-      if (permResult?.operations?.includes("VIEW_PROCESS") || permResult?.operations?.length > 0) {
+      setDataVersion((version) => version + 1);
+      if (hasViewOperation(permResult?.operations, "workflow")) {
         try {
           const progress = await getProcessProgress(request, formInstanceId);
           if (mountedRef.current) {
@@ -7946,8 +7995,8 @@ function useProcessDetail(options) {
           console.error("[useProcessDetail] Failed to load progress:", error);
         }
       }
-      const task = basicResult?.currentTask;
-      if (approvalResult?.isApprover && task && (task.nodeType === "originator_return" || task.nodeType === "approval")) {
+      const task = mergeCurrentTask(basicResult?.currentTask, approvalResult?.currentTasks?.[0]);
+      if (!nextIsProcessFinal && approvalResult?.isApprover && task && (task.nodeType === "originator_return" || task.nodeType === "approval")) {
         try {
           const definition = await getProcessDefinition(request, formUuid);
           if (mountedRef.current) {
@@ -7956,14 +8005,20 @@ function useProcessDetail(options) {
         } catch (error) {
           console.error("[useProcessDetail] Failed to load process definition:", error);
         }
+      } else if (mountedRef.current) {
+        setProcessDefinition(null);
       }
     } catch (error) {
       console.error("[useProcessDetail] Failed to load data:", error);
       if (mountedRef.current) {
+        setLoadError(error instanceof Error ? error.message : "\u9875\u9762\u52A0\u8F7D\u5931\u8D25");
+        setAccessDenied(false);
         setProcessInfo(null);
         setFormData(null);
         setInstanceInfo(null);
         setApprovalTasks([]);
+        setProgressList([]);
+        setProcessDefinition(null);
       }
     } finally {
       if (mountedRef.current) {
@@ -7976,24 +8031,46 @@ function useProcessDetail(options) {
   }, [loadData]);
   const switchToEdit = useCallback12(() => {
     setMode("edit");
-  }, []);
+    void loadData();
+  }, [loadData]);
   const switchToReadonly = useCallback12(() => {
     setMode("readonly");
   }, []);
+  const refreshDetail = useCallback12(async () => {
+    setMode("readonly");
+    await loadData();
+  }, [loadData]);
   const refreshProgress = useCallback12(async () => {
-    try {
-      const [progress, basicResult] = await Promise.all([
-        getProcessProgress(request, formInstanceId),
-        getProcessBasic(request, formInstanceId)
-      ]);
-      if (mountedRef.current) {
-        setProgressList(progress);
-        setProcessInfo(basicResult);
+    await refreshDetail();
+  }, [refreshDetail]);
+  const saveChanges = useCallback12(
+    async (values) => {
+      try {
+        await api.updateFormData({
+          formInstanceId,
+          formUuid,
+          appType,
+          updateFormDataJson: JSON.stringify(values)
+        });
+        setMode("readonly");
+        await loadData();
+        return true;
+      } catch (error) {
+        console.error("[useProcessDetail] Failed to save changes:", error);
+        return false;
       }
+    },
+    [api, formInstanceId, formUuid, appType, loadData]
+  );
+  const deleteInstance = useCallback12(async () => {
+    try {
+      await deleteFormData(request, { formInstanceId, appType, formUuid });
+      return true;
     } catch (error) {
-      console.error("[useProcessDetail] Failed to refresh progress:", error);
+      console.error("[useProcessDetail] Failed to delete instance:", error);
+      return false;
     }
-  }, [request, formInstanceId]);
+  }, [request, formInstanceId, appType, formUuid]);
   return {
     loading,
     processInfo,
@@ -8002,6 +8079,8 @@ function useProcessDetail(options) {
     progressList,
     formData,
     instanceInfo,
+    accessDenied,
+    loadError,
     isApprover,
     activeActions,
     fieldBehaviors,
@@ -8009,8 +8088,16 @@ function useProcessDetail(options) {
     isOriginatorReturn,
     isProcessCompleted,
     canWithdraw,
+    canEdit,
+    canDelete,
+    canViewWorkflow,
+    canViewChangeRecords,
+    dataVersion,
     switchToEdit,
     switchToReadonly,
+    saveChanges,
+    deleteInstance,
+    refreshDetail,
     refreshProgress
   };
 }
@@ -8024,6 +8111,7 @@ function useApprovalActions(options) {
   const [isLoading, setIsLoading] = useState26(false);
   const [currentAction, setCurrentAction] = useState26(null);
   const [returnableNodes, setReturnableNodes] = useState26([]);
+  const [returnPolicy, setReturnPolicy] = useState26(null);
   const mountedRef = useRef11(true);
   useEffect31(() => {
     mountedRef.current = true;
@@ -8051,8 +8139,8 @@ function useApprovalActions(options) {
           formUuid,
           updateFormDataJson: formValues ? JSON.stringify(formValues) : void 0
         });
+        await onActionComplete?.("approve");
         resetLoading();
-        onActionComplete?.("approve");
         return true;
       } catch (error) {
         console.error("[useApprovalActions] approve failed:", error);
@@ -8067,17 +8155,13 @@ function useApprovalActions(options) {
       setIsLoading(true);
       setCurrentAction("reject");
       try {
-        const formValues = getFormValues?.();
         await handleApproval(request, {
           instanceId: formInstanceId,
           action: "rejected",
-          comments,
-          appType,
-          formUuid,
-          updateFormDataJson: formValues ? JSON.stringify(formValues) : void 0
+          comments
         });
+        await onActionComplete?.("reject");
         resetLoading();
-        onActionComplete?.("reject");
         return true;
       } catch (error) {
         console.error("[useApprovalActions] reject failed:", error);
@@ -8085,7 +8169,7 @@ function useApprovalActions(options) {
         return false;
       }
     },
-    [request, formInstanceId, appType, formUuid, getFormValues, onActionComplete, resetLoading]
+    [request, formInstanceId, onActionComplete, resetLoading]
   );
   const transfer = useCallback13(
     async (userId, reason) => {
@@ -8101,8 +8185,8 @@ function useApprovalActions(options) {
           newAssignee: userId,
           reason
         });
+        await onActionComplete?.("transfer");
         resetLoading();
-        onActionComplete?.("transfer");
         return true;
       } catch (error) {
         console.error("[useApprovalActions] transfer failed:", error);
@@ -8126,8 +8210,8 @@ function useApprovalActions(options) {
           targetNodeId: nodeId,
           reason
         });
+        await onActionComplete?.("return");
         resetLoading();
-        onActionComplete?.("return");
         return true;
       } catch (error) {
         console.error("[useApprovalActions] returnTo failed:", error);
@@ -8146,8 +8230,8 @@ function useApprovalActions(options) {
           instanceId: formInstanceId,
           reason
         });
+        await onActionComplete?.("withdraw");
         resetLoading();
-        onActionComplete?.("withdraw");
         return true;
       } catch (error) {
         console.error("[useApprovalActions] withdraw failed:", error);
@@ -8168,8 +8252,8 @@ function useApprovalActions(options) {
         appType,
         updateFormDataJson: JSON.stringify(formValues)
       });
+      await onActionComplete?.("save");
       resetLoading();
-      onActionComplete?.("save");
       return true;
     } catch (error) {
       console.error("[useApprovalActions] save failed:", error);
@@ -8194,8 +8278,8 @@ function useApprovalActions(options) {
           updateFormDataJson: JSON.stringify(formValues),
           comments
         });
+        await onActionComplete?.("resubmit");
         resetLoading();
-        onActionComplete?.("resubmit");
         return true;
       } catch (error) {
         console.error("[useApprovalActions] resubmit failed:", error);
@@ -8218,8 +8302,8 @@ function useApprovalActions(options) {
           taskId: currentTaskId,
           payload
         });
+        await onActionComplete?.("callback");
         resetLoading();
-        onActionComplete?.("callback");
         return true;
       } catch (error) {
         console.error("[useApprovalActions] callbackTask failed:", error);
@@ -8230,14 +8314,21 @@ function useApprovalActions(options) {
     [request, currentTaskId, onActionComplete, resetLoading]
   );
   const loadReturnableNodes = useCallback13(async () => {
-    if (!currentTaskId) return;
+    if (!currentTaskId) return [];
     try {
-      const nodes = await getReturnableNodes(request, currentTaskId);
+      const result = await getReturnableNodeResult(request, currentTaskId);
       if (mountedRef.current) {
-        setReturnableNodes(nodes);
+        setReturnableNodes(result.nodes);
+        setReturnPolicy(result.policy || null);
       }
+      return result.nodes;
     } catch (error) {
       console.error("[useApprovalActions] loadReturnableNodes failed:", error);
+      if (mountedRef.current) {
+        setReturnableNodes([]);
+        setReturnPolicy(null);
+      }
+      return [];
     }
   }, [request, currentTaskId]);
   return {
@@ -8252,6 +8343,7 @@ function useApprovalActions(options) {
     isLoading,
     currentAction,
     returnableNodes,
+    returnPolicy,
     loadReturnableNodes
   };
 }
@@ -9110,7 +9202,7 @@ var ApprovalTimeline = ({
 };
 
 // src/modules/ApprovalActionBar.tsx
-import { useMemo as useMemo16, useState as useState32 } from "react";
+import React43, { useMemo as useMemo16, useState as useState32 } from "react";
 import { Form, Input as Input10, Modal as Modal5, Select as Select5 } from "antd";
 import {
   CheckOutlined,
@@ -9147,7 +9239,6 @@ var getActionPriority = (action) => {
   if (action.type === "danger") return 90;
   return 50;
 };
-var getPlacement = (action) => action.placement;
 var StickyActionBar = ({
   actions,
   className = "",
@@ -9171,8 +9262,6 @@ var StickyActionBar = ({
   const maxWidthStyle = typeof maxWidth === "number" ? `${maxWidth}px` : maxWidth;
   const primaryMobile = visibleActions.slice(0, maxMobileButtons);
   const moreMobile = visibleActions.slice(maxMobileButtons);
-  const leftActions = visibleActions.filter((action) => getPlacement(action) === "left");
-  const rightActions = visibleActions.filter((action) => getPlacement(action) !== "left");
   const positionClass = position === "fixed" ? "fixed bottom-0 left-0 right-0" : position === "inline" ? "relative" : "sticky bottom-0";
   const runAction = (action) => {
     if (action.confirm) {
@@ -9202,7 +9291,7 @@ var StickyActionBar = ({
       children: /* @__PURE__ */ jsx81(
         "div",
         {
-          className: `mx-auto flex w-full items-center gap-3 ${layoutMode === "approval" && !isMobile ? "justify-between" : "justify-end"}`,
+          className: `mx-auto flex w-full items-center gap-3 ${layoutMode === "approval" && !isMobile ? "justify-center" : "justify-end"}`,
           style: { maxWidth: maxWidthStyle },
           children: isMobile ? /* @__PURE__ */ jsxs33(Fragment2, { children: [
             /* @__PURE__ */ jsx81("div", { className: "flex flex-1 gap-2", children: primaryMobile.map((action) => renderButton(action, true)) }),
@@ -9224,10 +9313,7 @@ var StickyActionBar = ({
                 children: /* @__PURE__ */ jsx81(Button10, { icon: /* @__PURE__ */ jsx81(MoreOutlined, {}), className: "rounded-md", children: "\u66F4\u591A" })
               }
             )
-          ] }) : layoutMode === "approval" && leftActions.length > 0 ? /* @__PURE__ */ jsxs33(Fragment2, { children: [
-            /* @__PURE__ */ jsx81("div", { className: "flex flex-wrap items-center gap-3", children: leftActions.map((action) => renderButton(action)) }),
-            /* @__PURE__ */ jsx81("div", { className: "flex flex-wrap items-center justify-end gap-3", children: rightActions.map((action) => renderButton(action)) })
-          ] }) : /* @__PURE__ */ jsx81("div", { className: "flex flex-wrap items-center justify-end gap-3", children: visibleActions.map((action) => renderButton(action)) })
+          ] }) : layoutMode === "approval" ? /* @__PURE__ */ jsx81("div", { className: "flex flex-wrap items-center justify-center gap-3", children: visibleActions.map((action) => renderButton(action)) }) : /* @__PURE__ */ jsx81("div", { className: "flex flex-wrap items-center justify-end gap-3", children: visibleActions.map((action) => renderButton(action)) })
         }
       )
     }
@@ -9277,6 +9363,50 @@ function getModalTitle(action) {
       return "\u786E\u8BA4\u64CD\u4F5C";
   }
 }
+function formatReturnPolicy(policy) {
+  if (!policy?.resubmitMode) return null;
+  return policy.resubmitMode === "resume_current" ? "\u4ECE\u5F53\u524D\u8282\u70B9\u5BA1\u6279" : "\u91CD\u65B0\u4F9D\u6B21\u5BA1\u6279";
+}
+function DefaultTransferSelector({
+  value,
+  onChange
+}) {
+  const formContext = React43.useContext(FormContext);
+  const [open, setOpen] = useState32(false);
+  const [selectedUsers, setSelectedUsers] = useState32([]);
+  if (!formContext) {
+    return /* @__PURE__ */ jsx82(Input10, { value, onChange: (event) => onChange(event.target.value) });
+  }
+  const selectedLabel = selectedUsers[0] ? getUserName(selectedUsers[0]) : value;
+  return /* @__PURE__ */ jsxs34(Fragment3, { children: [
+    /* @__PURE__ */ jsx82(
+      Input10,
+      {
+        readOnly: true,
+        value: selectedLabel,
+        placeholder: "\u8BF7\u9009\u62E9\u8F6C\u4EA4\u7528\u6237",
+        addonAfter: /* @__PURE__ */ jsx82("span", { className: "cursor-pointer text-blue-600", onClick: () => setOpen(true), children: "\u9009\u62E9" })
+      }
+    ),
+    /* @__PURE__ */ jsx82(
+      UserPicker,
+      {
+        api: formContext.api,
+        open,
+        onOpenChange: setOpen,
+        multiple: false,
+        value: selectedUsers,
+        onCancel: () => setOpen(false),
+        onConfirm: (items) => {
+          const next = items.slice(0, 1);
+          setSelectedUsers(next);
+          const userId = next[0] ? getUserId(next[0]) : "";
+          onChange(userId);
+        }
+      }
+    )
+  ] });
+}
 var ApprovalActionBar = ({
   actions,
   onApprove,
@@ -9288,6 +9418,7 @@ var ApprovalActionBar = ({
   onResubmit,
   onCallback,
   returnableNodes = [],
+  returnPolicy,
   onLoadReturnableNodes,
   renderTransferSelector,
   renderReturnNodeLabel,
@@ -9313,7 +9444,12 @@ var ApprovalActionBar = ({
       userId: void 0,
       nodeId: void 0
     });
-    if (target === "return") await onLoadReturnableNodes?.();
+    if (target === "return") {
+      const loadedNodes = await onLoadReturnableNodes?.() || returnableNodes;
+      if (loadedNodes.length === 1) {
+        form.setFieldsValue({ nodeId: loadedNodes[0].nodeId || loadedNodes[0].id || "" });
+      }
+    }
     setModalAction(target);
   };
   const executeDirect = async (action) => {
@@ -9328,6 +9464,14 @@ var ApprovalActionBar = ({
     }
     if (normalized === "agree") {
       await onApprove?.();
+      return;
+    }
+    if (normalized === "rejected") {
+      await onReject?.();
+      return;
+    }
+    if (normalized === "resubmit") {
+      await onResubmit?.();
     }
   };
   const handleActionClick = async (action) => {
@@ -9336,6 +9480,10 @@ var ApprovalActionBar = ({
       await executeDirect(action);
       return;
     }
+    if ((normalized === "agree" || normalized === "rejected" || normalized === "resubmit") && !action.remark?.popUp) {
+      await executeDirect(action);
+      return;
+    }
     await openModal(action, normalized);
   };
   const handleOk = async () => {
@@ -9397,7 +9545,7 @@ var ApprovalActionBar = ({
           setActiveAction(null);
           form.resetFields();
         },
-        destroyOnClose: true,
+        destroyOnHidden: true,
         children: /* @__PURE__ */ jsxs34(Form, { form, layout: "vertical", children: [
           modalAction === "transfer" && /* @__PURE__ */ jsx82(
             Form.Item,
@@ -9408,28 +9556,40 @@ var ApprovalActionBar = ({
               children: renderTransferSelector ? renderTransferSelector({
                 value: form.getFieldValue("userId"),
                 onChange: (userId) => form.setFieldsValue({ userId })
-              }) : /* @__PURE__ */ jsx82(Input10, { placeholder: "\u8BF7\u8F93\u5165\u7528\u6237 ID" })
-            }
-          ),
-          modalAction === "return" && /* @__PURE__ */ jsx82(
-            Form.Item,
-            {
-              name: "nodeId",
-              label: "\u9000\u56DE\u5230\u8282\u70B9",
-              rules: [{ required: true, message: "\u8BF7\u9009\u62E9\u9000\u56DE\u8282\u70B9" }],
-              children: /* @__PURE__ */ jsx82(
-                Select5,
+              }) : /* @__PURE__ */ jsx82(
+                DefaultTransferSelector,
                 {
-                  placeholder: "\u8BF7\u9009\u62E9\u9000\u56DE\u8282\u70B9",
-                  getPopupContainer: (triggerNode) => triggerNode.parentElement || document.body,
-                  options: returnableNodes.map((node) => ({
-                    value: node.nodeId || node.id || "",
-                    label: renderReturnNodeLabel ? renderReturnNodeLabel(node) : node.nodeName || node.name || node.nodeId || node.id
-                  }))
+                  value: form.getFieldValue("userId"),
+                  onChange: (userId) => form.setFieldsValue({ userId })
                 }
               )
             }
           ),
+          modalAction === "return" && /* @__PURE__ */ jsxs34(Fragment3, { children: [
+            formatReturnPolicy(returnPolicy) && /* @__PURE__ */ jsxs34("div", { className: "mb-3 text-sm text-gray-500", children: [
+              "\u9000\u56DE\u540E\u5BA1\u6279\u903B\u8F91\uFF1A",
+              formatReturnPolicy(returnPolicy)
+            ] }),
+            /* @__PURE__ */ jsx82(
+              Form.Item,
+              {
+                name: "nodeId",
+                label: "\u9000\u56DE\u5230\u8282\u70B9",
+                rules: [{ required: true, message: "\u8BF7\u9009\u62E9\u9000\u56DE\u8282\u70B9" }],
+                children: /* @__PURE__ */ jsx82(
+                  Select5,
+                  {
+                    placeholder: "\u8BF7\u9009\u62E9\u9000\u56DE\u8282\u70B9",
+                    getPopupContainer: (triggerNode) => triggerNode.parentElement || document.body,
+                    options: returnableNodes.map((node) => ({
+                      value: node.nodeId || node.id || "",
+                      label: renderReturnNodeLabel ? renderReturnNodeLabel(node) : node.nodeName || node.name || node.nodeId || node.id
+                    }))
+                  }
+                )
+              }
+            )
+          ] }),
           /* @__PURE__ */ jsx82(
             Form.Item,
             {
@@ -9479,6 +9639,7 @@ var ApprovalActions = ({
   const [activeAction, setActiveAction] = useState33(null);
   const [loading, setLoading] = useState33(false);
   const [saveLoading, setSaveLoading] = useState33(false);
+  const [directLoading, setDirectLoading] = useState33(null);
   const renderableActions = useMemo17(
     () => actions.filter((action) => !action.hidden).sort((a, b) => (priority[a.action] ?? 50) - (priority[b.action] ?? 50)),
     [actions]
@@ -9496,6 +9657,14 @@ var ApprovalActions = ({
       setSaveLoading(false);
     }
   };
+  const executeDirect = async (action, fn) => {
+    setDirectLoading(action.action);
+    try {
+      await fn?.();
+    } finally {
+      setDirectLoading(null);
+    }
+  };
   const handleAction = (action) => {
     if (action.action === "transfer") {
       onTransfer?.();
@@ -9514,9 +9683,17 @@ var ApprovalActions = ({
       return;
     }
     if (action.action === "rejected" || action.action === "reject") {
+      if (!action.remark?.popUp) {
+        void executeDirect(action, onReject);
+        return;
+      }
       openModal("reject", action);
       return;
     }
+    if (!action.remark?.popUp) {
+      void executeDirect(action, onApprove);
+      return;
+    }
     openModal("approve", action);
   };
   const handleConfirm = async () => {
@@ -9542,7 +9719,7 @@ var ApprovalActions = ({
       type: action.action === "agree" || action.action === "approved" ? "primary" : "default",
       danger: action.action === "rejected" || action.action === "reject" || action.action === "withdraw",
       onClick: () => handleAction(action),
-      loading: action.action === "save" && saveLoading,
+      loading: action.action === "save" && saveLoading || directLoading === action.action,
       children: getLabel(action)
     },
     action.action
@@ -9551,7 +9728,7 @@ var ApprovalActions = ({
     /* @__PURE__ */ jsxs35(
       "div",
       {
-        className: `${layout === "horizontal" ? "flex items-center gap-3" : "flex flex-col gap-2"} ${className}`,
+        className: `${layout === "horizontal" ? "flex items-center justify-center gap-3" : "flex flex-col items-center gap-2"} ${className}`,
         children: [
           visibleButtons.map(button),
           moreButtons.length > 0 && /* @__PURE__ */ jsx83(
@@ -9588,7 +9765,7 @@ var ApprovalActions = ({
           setActiveAction(null);
           form.resetFields();
         },
-        destroyOnClose: true,
+        destroyOnHidden: true,
         children: /* @__PURE__ */ jsx83(Form2, { form, layout: "vertical", children: /* @__PURE__ */ jsx83(
           Form2.Item,
           {
@@ -11918,13 +12095,16 @@ var FormDetailTemplate = (props) => {
 };
 
 // src/templates/ProcessDetailTemplate.tsx
-import { useCallback as useCallback20, useMemo as useMemo20, useRef as useRef16 } from "react";
+import { useCallback as useCallback20, useMemo as useMemo20, useRef as useRef16, useState as useState38 } from "react";
+import { Form as AntForm, Input as Input13, Modal as Modal9 } from "antd";
 import { jsx as jsx93, jsxs as jsxs45 } from "react/jsx-runtime";
 function FormDataBridge2({
-  formDataRef
+  formDataRef,
+  validateRef
 }) {
-  const { getFormData: getFormData2 } = useFormContext();
+  const { getFormData: getFormData2, validateAll } = useFormContext();
   formDataRef.current = getFormData2;
+  validateRef.current = validateAll;
   return null;
 }
 var InnerProcessContent = ({
@@ -11932,18 +12112,31 @@ var InnerProcessContent = ({
   formUuid,
   appType,
   formInstanceId,
+  enableEdit = true,
+  enableDelete = true,
+  enableChangeRecords = true,
+  showApproverInfo = true,
   header,
   renderTimeline,
   renderActions,
+  renderFooterActions,
   renderTransferSelector,
   renderReturnNodeLabel,
   renderActionModalExtra,
   beforeForm,
   afterForm,
   onActionComplete,
+  onSave,
+  onDelete,
   inDrawer = false
 }) => {
   const formDataRef = useRef16(void 0);
+  const validateRef = useRef16(void 0);
+  const [withdrawForm] = AntForm.useForm();
+  const [withdrawOpen, setWithdrawOpen] = useState38(false);
+  const [withdrawLoading, setWithdrawLoading] = useState38(false);
+  const [saveLoading, setSaveLoading] = useState38(false);
+  const [deleteLoading, setDeleteLoading] = useState38(false);
   const fieldIds = useMemo20(() => schema.fields.map((field) => field.fieldId), [schema.fields]);
   const {
     loading,
@@ -11953,15 +12146,25 @@ var InnerProcessContent = ({
     progressList,
     formData,
     instanceInfo,
+    accessDenied,
+    loadError,
     isApprover,
     activeActions,
     fieldBehaviors,
     mode,
     isOriginatorReturn,
+    isProcessCompleted,
     canWithdraw,
+    canEdit,
+    canDelete,
+    canViewWorkflow,
+    canViewChangeRecords,
+    dataVersion,
     switchToEdit,
     switchToReadonly,
-    refreshProgress
+    saveChanges,
+    deleteInstance,
+    refreshDetail
   } = useProcessDetail({ formUuid, appType, formInstanceId, fieldIds });
   const {
     approve,
@@ -11973,6 +12176,7 @@ var InnerProcessContent = ({
     resubmit,
     callbackTask,
     returnableNodes,
+    returnPolicy,
     loadReturnableNodes
   } = useApprovalActions({
     formInstanceId,
@@ -11980,16 +12184,34 @@ var InnerProcessContent = ({
     appType,
     currentTaskId: currentTask?.taskId ?? currentTask?.id,
     onActionComplete: async (action) => {
-      onActionComplete?.(action);
-      await refreshProgress();
+      await onActionComplete?.(action);
+      await refreshDetail();
     },
     getFormValues: () => formDataRef.current?.() ?? formData ?? {}
   });
+  const {
+    records,
+    loading: recordsLoading,
+    total: recordsTotal,
+    page: recordsPage,
+    hasMore,
+    loadMore,
+    refresh: refreshRecords
+  } = useChangeRecords({
+    formUuid,
+    appType,
+    formInstanceId,
+    autoLoad: enableChangeRecords && canViewChangeRecords
+  });
+  const validateForm = useCallback20(async () => {
+    return validateRef.current ? validateRef.current() : true;
+  }, []);
   const handleApprove = useCallback20(
     async (comments) => {
+      if (!await validateForm()) return;
       await approve(comments);
     },
-    [approve]
+    [approve, validateForm]
   );
   const handleReject = useCallback20(
     async (comments) => {
@@ -12016,22 +12238,104 @@ var InnerProcessContent = ({
     [withdraw]
   );
   const handleSave = useCallback20(async () => {
+    if (!await validateForm()) return;
     await save();
-  }, [save]);
+  }, [save, validateForm]);
   const handleResubmit = useCallback20(
     async (comments) => {
+      if (!await validateForm()) return;
       await resubmit(comments);
     },
-    [resubmit]
+    [resubmit, validateForm]
   );
   const handleCallback = useCallback20(async () => {
     await callbackTask();
   }, [callbackTask]);
+  const handleCompletedSave = useCallback20(async () => {
+    if (!await validateForm()) return;
+    const values = formDataRef.current?.() ?? formData;
+    if (!values) return;
+    setSaveLoading(true);
+    try {
+      const success = await saveChanges(values);
+      if (success) {
+        await onSave?.(values);
+      }
+    } finally {
+      setSaveLoading(false);
+    }
+  }, [formData, onSave, saveChanges, validateForm]);
+  const handleCompletedDelete = useCallback20(async () => {
+    setDeleteLoading(true);
+    try {
+      const success = await deleteInstance();
+      if (success) {
+        await onDelete?.();
+      }
+    } finally {
+      setDeleteLoading(false);
+    }
+  }, [deleteInstance, onDelete]);
+  const handleFooterWithdraw = useCallback20(async () => {
+    const values = await withdrawForm.validateFields();
+    setWithdrawLoading(true);
+    try {
+      await handleWithdraw(values.reason || void 0);
+      setWithdrawOpen(false);
+      withdrawForm.resetFields();
+    } finally {
+      setWithdrawLoading(false);
+    }
+  }, [handleWithdraw, withdrawForm]);
+  const handleFooterWithdrawCancel = useCallback20(() => {
+    setWithdrawOpen(false);
+    withdrawForm.resetFields();
+  }, [withdrawForm]);
   const bottomActions = useMemo20(() => {
-    if (isApprover && activeActions.length > 0) return [];
+    if (isApprover && !isOriginatorReturn && activeActions.length > 0) return [];
+    if (isProcessCompleted) {
+      if (mode === "readonly") {
+        const actions = [];
+        if (enableEdit && canEdit) {
+          actions.push({
+            key: "edit",
+            label: "\u7F16\u8F91",
+            type: "primary",
+            onClick: switchToEdit
+          });
+        }
+        if (enableDelete && canDelete) {
+          actions.push({
+            key: "delete",
+            label: "\u5220\u9664",
+            type: "danger",
+            loading: deleteLoading,
+            onClick: handleCompletedDelete,
+            confirm: { title: "\u786E\u8BA4\u5220\u9664", content: "\u5220\u9664\u540E\u5C06\u65E0\u6CD5\u6062\u590D\uFF0C\u786E\u8BA4\u8981\u5220\u9664\u5417\uFF1F" }
+          });
+        }
+        return actions;
+      }
+      return [
+        {
+          key: "cancel",
+          label: "\u53D6\u6D88",
+          type: "default",
+          onClick: switchToReadonly,
+          placement: "left"
+        },
+        {
+          key: "save",
+          label: "\u4FDD\u5B58",
+          type: "primary",
+          loading: saveLoading,
+          onClick: handleCompletedSave
+        }
+      ];
+    }
     if (isOriginatorReturn) {
       if (mode === "readonly") {
-        return [
+        const actions2 = [
           {
             key: "edit",
             label: "\u7F16\u8F91",
@@ -12039,8 +12343,23 @@ var InnerProcessContent = ({
             onClick: switchToEdit
           }
         ];
+        actions2.push({
+          key: "resubmit",
+          label: "\u91CD\u65B0\u63D0\u4EA4",
+          type: "default",
+          onClick: () => handleResubmit()
+        });
+        if (canWithdraw) {
+          actions2.push({
+            key: "withdraw",
+            label: "\u64A4\u9500",
+            type: "danger",
+            onClick: () => setWithdrawOpen(true)
+          });
+        }
+        return actions2;
       }
-      return [
+      const actions = [
         {
           key: "cancel",
           label: "\u53D6\u6D88",
@@ -12055,6 +12374,15 @@ var InnerProcessContent = ({
           onClick: () => handleResubmit()
         }
       ];
+      if (canWithdraw) {
+        actions.push({
+          key: "withdraw",
+          label: "\u64A4\u9500",
+          type: "danger",
+          onClick: () => setWithdrawOpen(true)
+        });
+      }
+      return actions;
     }
     if (canWithdraw) {
       return [
@@ -12062,22 +12390,31 @@ var InnerProcessContent = ({
           key: "withdraw",
           label: "\u64A4\u9500",
           type: "danger",
-          onClick: () => handleWithdraw(),
-          confirm: { title: "\u786E\u8BA4\u64A4\u9500", content: "\u64A4\u9500\u540E\u6D41\u7A0B\u5C06\u7EC8\u6B62\uFF0C\u786E\u8BA4\u7EE7\u7EED\u5417\uFF1F" }
+          loading: withdrawLoading,
+          onClick: () => setWithdrawOpen(true)
         }
       ];
     }
     return [];
   }, [
     activeActions.length,
+    canDelete,
+    canEdit,
     canWithdraw,
+    deleteLoading,
+    enableDelete,
+    enableEdit,
+    handleCompletedDelete,
+    handleCompletedSave,
     handleResubmit,
-    handleWithdraw,
     isApprover,
     isOriginatorReturn,
+    isProcessCompleted,
     mode,
+    saveLoading,
     switchToEdit,
-    switchToReadonly
+    switchToReadonly,
+    withdrawLoading
   ]);
   const formConfig = {
     mode: mode === "edit" ? "edit" : "readonly",
@@ -12092,7 +12429,10 @@ var InnerProcessContent = ({
   if (loading) {
     return /* @__PURE__ */ jsx93("div", { className: "min-h-screen bg-ant-bg-layout", children: /* @__PURE__ */ jsx93("div", { className: "mx-auto max-w-4xl px-6 py-8 pb-24", children: /* @__PURE__ */ jsx93(PageSkeleton, { type: "process" }) }) });
   }
-  const showApprovalActions = isApprover && activeActions.length > 0;
+  if (accessDenied || loadError) {
+    return /* @__PURE__ */ jsx93(RuntimePageShell, { accessDenied, error: loadError, inDrawer, children: /* @__PURE__ */ jsx93("div", {}) });
+  }
+  const showApprovalActions = isApprover && !isOriginatorReturn && activeActions.length > 0;
   const actionsNode = showApprovalActions ? renderActions ? renderActions(activeActions) : /* @__PURE__ */ jsx93(
     ApprovalActionBar,
     {
@@ -12106,52 +12446,108 @@ var InnerProcessContent = ({
       onResubmit: handleResubmit,
       onCallback: handleCallback,
       returnableNodes,
+      returnPolicy,
       onLoadReturnableNodes: loadReturnableNodes,
       renderTransferSelector,
       renderReturnNodeLabel,
       renderActionModalExtra,
       inDrawer
     }
-  ) : bottomActions.length > 0 ? /* @__PURE__ */ jsx93(StickyActionBar, { actions: bottomActions, inDrawer }) : null;
+  ) : bottomActions.length > 0 ? renderFooterActions ? renderFooterActions(bottomActions) : /* @__PURE__ */ jsx93(StickyActionBar, { actions: bottomActions, inDrawer }) : null;
   const statusMeta = processStatus ? PROCESS_STATUS_META[processStatus] : void 0;
-  return /* @__PURE__ */ jsx93(RuntimePageShell, { actions: actionsNode, inDrawer, children: /* @__PURE__ */ jsxs45("div", { className: "space-y-6", children: [
-    header,
+  return /* @__PURE__ */ jsxs45(RuntimePageShell, { actions: actionsNode, inDrawer, children: [
+    /* @__PURE__ */ jsxs45("div", { className: "space-y-6", children: [
+      header,
+      /* @__PURE__ */ jsx93(
+        SummaryPanel,
+        {
+          title: processInfo?.title || instanceInfo?.title || schema.formMeta.title,
+          eyebrow: `\u6D41\u7A0B\u5B9E\u4F8B ${formInstanceId?.slice(0, 8) || "-"}`,
+          creator: processInfo?.originatorName ? {
+            name: processInfo.originatorName,
+            department: processInfo.originatorDepartment
+          } : void 0,
+          createdAt: processInfo?.createdAt,
+          status: statusMeta,
+          metaItems: [
+            { key: "currentTask", label: "\u5F53\u524D\u8282\u70B9", value: currentTask?.nodeName || "\u65E0" },
+            {
+              key: "processStatus",
+              label: "\u5B9E\u4F8B\u72B6\u6001",
+              value: statusMeta?.label || processStatus || "-"
+            }
+          ]
+        }
+      ),
+      beforeForm,
+      mode === "edit" && /* @__PURE__ */ jsx93("div", { className: "rounded-lg border border-blue-200 bg-blue-50 px-4 py-3 text-sm text-blue-700 transition-all duration-150", children: isProcessCompleted ? "\u6B63\u5728\u7F16\u8F91\uFF0C\u4FEE\u6539\u540E\u8BF7\u4FDD\u5B58" : "\u6B63\u5728\u7F16\u8F91\u8868\u5355\uFF0C\u4FEE\u6539\u540E\u8BF7\u91CD\u65B0\u63D0\u4EA4" }),
+      /* @__PURE__ */ jsx93("div", { className: "rounded-lg border border-ant-border-secondary bg-ant-bg-container p-5 md:p-6", children: /* @__PURE__ */ jsxs45(
+        FormProvider,
+        {
+          schema,
+          config: formConfig,
+          initialValues: formData ?? void 0,
+          children: [
+            /* @__PURE__ */ jsx93(FormDataBridge2, { formDataRef, validateRef }),
+            /* @__PURE__ */ jsx93(FormRenderer, { columns: 2 })
+          ]
+        },
+        `${mode}-${dataVersion}`
+      ) }),
+      afterForm,
+      canViewWorkflow && /* @__PURE__ */ jsxs45("div", { className: "rounded-lg border border-ant-border-secondary bg-ant-bg-container p-5 md:p-6", children: [
+        /* @__PURE__ */ jsx93("div", { className: "mb-4 flex items-center justify-between gap-3", children: /* @__PURE__ */ jsxs45("div", { children: [
+          /* @__PURE__ */ jsx93("h3", { className: "text-base font-semibold text-ant-color-text", children: "\u5BA1\u6279\u8FDB\u5EA6" }),
+          /* @__PURE__ */ jsx93("p", { className: "mt-1 text-xs text-ant-color-text-tertiary", children: "\u8282\u70B9\u3001\u5BA1\u6279\u4EBA\u3001\u5904\u7406\u610F\u89C1\u548C\u7B49\u5F85\u72B6\u6001" })
+        ] }) }),
+        renderTimeline ? renderTimeline(progressList) : /* @__PURE__ */ jsx93(
+          ApprovalTimeline,
+          {
+            tasks: progressList,
+            showRemarks: true,
+            showApproverInfo
+          }
+        )
+      ] }),
+      enableChangeRecords && canViewChangeRecords && /* @__PURE__ */ jsx93(
+        RecordChangePanel,
+        {
+          records,
+          loading: recordsLoading,
+          total: recordsTotal,
+          page: recordsPage,
+          hasMore,
+          onLoadMore: loadMore,
+          onRefresh: refreshRecords,
+          onExpand: refreshRecords
+        }
+      )
+    ] }),
     /* @__PURE__ */ jsx93(
-      SummaryPanel,
+      Modal9,
       {
-        title: processInfo?.title || instanceInfo?.title || schema.formMeta.title,
-        eyebrow: `\u6D41\u7A0B\u5B9E\u4F8B ${formInstanceId?.slice(0, 8) || "-"}`,
-        creator: processInfo?.originatorName ? {
-          name: processInfo.originatorName,
-          department: processInfo.originatorDepartment
-        } : void 0,
-        createdAt: processInfo?.createdAt,
-        status: statusMeta,
-        metaItems: [
-          { key: "currentTask", label: "\u5F53\u524D\u8282\u70B9", value: currentTask?.nodeName || "\u65E0" },
+        getContainer: false,
+        title: "\u64A4\u9500\u6D41\u7A0B",
+        open: withdrawOpen,
+        okText: "\u786E\u8BA4\u64A4\u9500",
+        cancelText: "\u53D6\u6D88",
+        confirmLoading: withdrawLoading,
+        okButtonProps: { danger: true },
+        onOk: handleFooterWithdraw,
+        onCancel: handleFooterWithdrawCancel,
+        destroyOnHidden: true,
+        children: /* @__PURE__ */ jsx93(AntForm, { form: withdrawForm, layout: "vertical", children: /* @__PURE__ */ jsx93(
+          AntForm.Item,
           {
-            key: "processStatus",
-            label: "\u5B9E\u4F8B\u72B6\u6001",
-            value: statusMeta?.label || processStatus || "-"
+            name: "reason",
+            label: "\u64A4\u9500\u539F\u56E0",
+            rules: [{ required: true, message: "\u8BF7\u586B\u5199\u64A4\u9500\u539F\u56E0" }],
+            children: /* @__PURE__ */ jsx93(Input13.TextArea, { rows: 4, maxLength: 500, showCount: true, placeholder: "\u8BF7\u8F93\u5165\u64A4\u9500\u539F\u56E0" })
           }
-        ]
+        ) })
       }
-    ),
-    beforeForm,
-    mode === "edit" && /* @__PURE__ */ jsx93("div", { className: "rounded-lg border border-blue-200 bg-blue-50 px-4 py-3 text-sm text-blue-700 transition-all duration-150", children: "\u6B63\u5728\u7F16\u8F91\u8868\u5355\uFF0C\u4FEE\u6539\u540E\u8BF7\u91CD\u65B0\u63D0\u4EA4" }),
-    /* @__PURE__ */ jsx93("div", { className: "rounded-lg border border-ant-border-secondary bg-ant-bg-container p-5 md:p-6", children: /* @__PURE__ */ jsxs45(FormProvider, { schema, config: formConfig, initialValues: formData ?? void 0, children: [
-      /* @__PURE__ */ jsx93(FormDataBridge2, { formDataRef }),
-      /* @__PURE__ */ jsx93(FormRenderer, { columns: 2 })
-    ] }) }),
-    afterForm,
-    /* @__PURE__ */ jsxs45("div", { className: "rounded-lg border border-ant-border-secondary bg-ant-bg-container p-5 md:p-6", children: [
-      /* @__PURE__ */ jsx93("div", { className: "mb-4 flex items-center justify-between gap-3", children: /* @__PURE__ */ jsxs45("div", { children: [
-        /* @__PURE__ */ jsx93("h3", { className: "text-base font-semibold text-ant-color-text", children: "\u5BA1\u6279\u8FDB\u5EA6" }),
-        /* @__PURE__ */ jsx93("p", { className: "mt-1 text-xs text-ant-color-text-tertiary", children: "\u8282\u70B9\u3001\u5BA1\u6279\u4EBA\u3001\u5904\u7406\u610F\u89C1\u548C\u7B49\u5F85\u72B6\u6001" })
-      ] }) }),
-      renderTimeline ? renderTimeline(progressList) : /* @__PURE__ */ jsx93(ApprovalTimeline, { tasks: progressList, showRemarks: true, showApproverInfo: true })
-    ] })
-  ] }) });
+    )
+  ] });
 };
 var ProcessDetailTemplate = (props) => {
   const { schema, formUuid, appType, formInstanceId } = props;
@@ -12241,6 +12637,7 @@ export {
   getProcessBasic,
   getProcessDefinition,
   getProcessProgress,
+  getReturnableNodeResult,
   getReturnableNodes,
   getSystemFieldsForFormType,
   getViewPermission,