sy-form-components 0.2.3 → 0.2.5

package/dist/index.mjs

@@ -4331,26 +4331,79 @@ var TASK_STATUS_META = {
 };
 
 // src/core/processApi.ts
+var normalizeProcessTask = (value) => {
+  const taskId = value?.taskId ?? value?.id ?? value?.task_id ?? "";
+  return {
+    ...value,
+    id: value?.id ?? taskId,
+    taskId,
+    nodeId: value?.nodeId ?? value?.node_id ?? "",
+    nodeType: value?.nodeType ?? value?.node_type ?? "approval",
+    nodeName: value?.nodeName ?? value?.title ?? value?.name ?? value?.nodeId ?? "\u5BA1\u6279\u8282\u70B9",
+    status: value?.status ?? "pending",
+    assigneeId: value?.assigneeId ?? value?.assignee
+  };
+};
+var normalizeProcessTasks = (value) => {
+  if (Array.isArray(value)) return value.map(normalizeProcessTask);
+  if (!value || typeof value !== "object") return [];
+  if (Array.isArray(value.tasks)) return value.tasks.map(normalizeProcessTask);
+  if (Array.isArray(value.currentTasks)) return value.currentTasks.map(normalizeProcessTask);
+  if (Array.isArray(value.list)) return value.list.map(normalizeProcessTask);
+  if (Array.isArray(value.items)) return value.items.map(normalizeProcessTask);
+  if (Array.isArray(value.records)) return value.records.map(normalizeProcessTask);
+  return [];
+};
+var normalizeProcessBasic = (value) => {
+  const raw = value ?? {};
+  const instance = raw.instance ?? raw;
+  const currentTask = raw.currentTask ? normalizeProcessTask(raw.currentTask) : void 0;
+  return {
+    ...raw,
+    instanceId: raw.instanceId ?? raw.id ?? instance.formInstanceId ?? instance.id,
+    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,
+    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
+  };
+};
+var normalizeApprovalPermission = (value) => {
+  const raw = value ?? {};
+  const currentTasks = normalizeProcessTasks(raw.currentTasks);
+  const hasPermission = Boolean(raw.hasPermission ?? raw.isApprover ?? currentTasks.length > 0);
+  return {
+    ...raw,
+    hasPermission,
+    isApprover: Boolean(raw.isApprover ?? hasPermission),
+    canUndo: Boolean(raw.canUndo ?? raw.canWithdraw),
+    currentTasks
+  };
+};
 async function getProcessBasic(request, formInstId) {
   const response = await request({
     url: `/workflow/instance/${formInstId}/basic`,
     method: "get"
   });
-  return response.data || response.result;
+  return normalizeProcessBasic(response.data || response.result);
 }
 async function getProcessProgress(request, formInstId) {
   const response = await request({
-    url: `/workflow/instance/${formInstId}`,
+    url: `/workflow/instance/${formInstId}/all-tasks`,
     method: "get"
   });
-  return response.data || response.result || [];
+  return normalizeProcessTasks(response.data || response.result);
 }
 async function checkUserApproval(request, formInstId) {
   const response = await request({
     url: `/workflow/instance/${formInstId}/permission`,
     method: "get"
   });
-  return response.data || response.result;
+  return normalizeApprovalPermission(response.data || response.result);
 }
 async function handleApproval(request, params) {
   const response = await request({
@@ -5134,7 +5187,23 @@ function useFormDetail(options) {
 }
 
 // src/hooks/useProcessDetail.ts
-import { useState as useState21, useEffect as useEffect28, useCallback as useCallback8, useRef as useRef8 } from "react";
+import { useState as useState21, useEffect as useEffect28, useCallback as useCallback8, useRef as useRef8, useMemo as useMemo8 } from "react";
+var DEFAULT_APPROVAL_ACTIONS = [
+  { action: "agree", name: { zh_CN: "\u540C\u610F" } },
+  { action: "rejected", name: { zh_CN: "\u62D2\u7EDD" } }
+];
+var WITHDRAW_ACTION = { action: "withdraw", name: { zh_CN: "\u64A4\u9500" } };
+function mergeCurrentTask(processTask, approvalTask) {
+  if (!approvalTask) return processTask ?? null;
+  if (!processTask) return approvalTask;
+  return {
+    ...processTask,
+    ...approvalTask,
+    nodeName: processTask.nodeName || approvalTask.nodeName,
+    title: processTask.title || approvalTask.title,
+    actions: processTask.actions ?? approvalTask.actions
+  };
+}
 function useProcessDetail(options) {
   const { formUuid, appType, formInstanceId, fieldIds } = options;
   const { api } = useFormContext();
@@ -5147,6 +5216,7 @@ function useProcessDetail(options) {
   const [instanceInfo, setInstanceInfo] = useState21(null);
   const [isApprover, setIsApprover] = useState21(false);
   const [canWithdraw, setCanWithdraw] = useState21(false);
+  const [approvalTasks, setApprovalTasks] = useState21([]);
   const [permissions, setPermissions] = useState21(null);
   const [processDefinition, setProcessDefinition] = useState21(null);
   const mountedRef = useRef8(true);
@@ -5156,7 +5226,10 @@ function useProcessDetail(options) {
       mountedRef.current = false;
     };
   }, []);
-  const currentTask = processInfo?.currentTask ?? null;
+  const currentTask = useMemo8(
+    () => mergeCurrentTask(processInfo?.currentTask, approvalTasks[0]),
+    [processInfo?.currentTask, approvalTasks]
+  );
   const processStatus = processInfo?.processStatus ?? null;
   const isOriginatorReturn = currentTask?.nodeType === "originator_return";
   const isProcessCompleted = processStatus === "completed" || processStatus === "terminated";
@@ -5167,7 +5240,14 @@ function useProcessDetail(options) {
     isApprover,
     mode
   });
-  const activeActions = isApprover && currentTask?.actions ? currentTask.actions : [];
+  const activeActions = useMemo8(() => {
+    if (!isApprover) 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]);
   const loadData = useCallback8(async () => {
     if (!mountedRef.current) return;
     setLoading(true);
@@ -5182,6 +5262,7 @@ function useProcessDetail(options) {
       setProcessInfo(basicResult);
       setIsApprover(approvalResult?.isApprover ?? false);
       setCanWithdraw(approvalResult?.canUndo ?? false);
+      setApprovalTasks(approvalResult?.currentTasks ?? []);
       setPermissions(permResult);
       setInstanceInfo(formResult);
       setFormData(extractFormValues(formResult, fieldIds));
@@ -5212,6 +5293,7 @@ function useProcessDetail(options) {
         setProcessInfo(null);
         setFormData(null);
         setInstanceInfo(null);
+        setApprovalTasks([]);
       }
     } finally {
       if (mountedRef.current) {
@@ -5937,15 +6019,17 @@ var ApprovalTimeline = ({
   showRemarks = true,
   compactMode = false
 }) => {
-  if (!tasks || tasks.length === 0) {
+  const taskList = Array.isArray(tasks) ? tasks : [];
+  if (taskList.length === 0) {
     return /* @__PURE__ */ jsx77("div", { className: `bg-white rounded-xl shadow-sm border border-gray-100 p-6 ${className}`, children: /* @__PURE__ */ jsx77("p", { className: "text-sm text-gray-400 text-center", children: "\u6682\u65E0\u5BA1\u6279\u8BB0\u5F55" }) });
   }
-  return /* @__PURE__ */ jsx77("div", { className: `${className}`, children: tasks.map((task, index) => {
+  return /* @__PURE__ */ jsx77("div", { className: `${className}`, children: taskList.map((task, index) => {
+    const taskKey = task.taskId || task.id || `${task.nodeId}-${index}`;
     if (renderNode) {
-      return /* @__PURE__ */ jsx77("div", { children: renderNode(task, index) }, task.taskId);
+      return /* @__PURE__ */ jsx77("div", { children: renderNode(task, index) }, taskKey);
     }
     const phase = getNodePhase(task);
-    const isLast = index === tasks.length - 1;
+    const isLast = index === taskList.length - 1;
     const statusMeta = TASK_STATUS_META[task.status];
     return /* @__PURE__ */ jsxs23("div", { className: "flex gap-4", children: [
       /* @__PURE__ */ jsxs23("div", { className: "flex flex-col items-center", children: [
@@ -5999,7 +6083,7 @@ var ApprovalTimeline = ({
           ]
         }
       ) })
-    ] }, task.taskId);
+    ] }, taskKey);
   }) });
 };
 
@@ -6595,7 +6679,7 @@ var FormSubmitTemplate = ({
 };
 
 // src/templates/FormDetailTemplate.tsx
-import { useCallback as useCallback14, useMemo as useMemo8 } from "react";
+import { useCallback as useCallback14, useMemo as useMemo9 } from "react";
 
 // src/templates/PageSkeleton.tsx
 import { Skeleton as Skeleton3 } from "antd";
@@ -6675,7 +6759,7 @@ var InnerDetailContent = ({
   onDelete,
   onSave
 }) => {
-  const fieldIds = useMemo8(() => schema.fields.map((field) => field.fieldId), [schema.fields]);
+  const fieldIds = useMemo9(() => schema.fields.map((field) => field.fieldId), [schema.fields]);
   const {
     loading,
     mode,
@@ -6800,7 +6884,7 @@ var FormDetailTemplate = (props) => {
 };
 
 // src/templates/ProcessDetailTemplate.tsx
-import { useCallback as useCallback15, useMemo as useMemo9, useRef as useRef12 } from "react";
+import { useCallback as useCallback15, useMemo as useMemo10, useRef as useRef12 } from "react";
 import { Fragment as Fragment7, jsx as jsx85, jsxs as jsxs31 } from "react/jsx-runtime";
 function FormDataBridge({
   formDataRef
@@ -6822,7 +6906,7 @@ var InnerProcessContent = ({
   onActionComplete
 }) => {
   const formDataRef = useRef12(void 0);
-  const fieldIds = useMemo9(() => schema.fields.map((field) => field.fieldId), [schema.fields]);
+  const fieldIds = useMemo10(() => schema.fields.map((field) => field.fieldId), [schema.fields]);
   const {
     loading,
     processInfo,
@@ -6844,7 +6928,7 @@ var InnerProcessContent = ({
     formInstanceId,
     formUuid,
     appType,
-    currentTaskId: currentTask?.taskId,
+    currentTaskId: currentTask?.taskId ?? currentTask?.id,
     onActionComplete: async (action) => {
       onActionComplete?.(action);
       await refreshProgress();