sy-form-components 0.2.2 → 0.2.4

package/dist/index.mjs

@@ -4331,6 +4331,15 @@ var TASK_STATUS_META = {
 };
 
 // src/core/processApi.ts
+var normalizeProcessTasks = (value) => {
+  if (Array.isArray(value)) return value;
+  if (!value || typeof value !== "object") return [];
+  if (Array.isArray(value.tasks)) return value.tasks;
+  if (Array.isArray(value.list)) return value.list;
+  if (Array.isArray(value.items)) return value.items;
+  if (Array.isArray(value.records)) return value.records;
+  return [];
+};
 async function getProcessBasic(request, formInstId) {
   const response = await request({
     url: `/workflow/instance/${formInstId}/basic`,
@@ -4340,10 +4349,10 @@ async function getProcessBasic(request, formInstId) {
 }
 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({
@@ -4945,6 +4954,75 @@ function useFieldPermission(options) {
 
 // src/hooks/useFormDetail.ts
 import { useState as useState20, useEffect as useEffect27, useCallback as useCallback7, useRef as useRef7 } from "react";
+
+// src/utils/formInstanceData.ts
+var FORM_INSTANCE_METADATA_KEYS = /* @__PURE__ */ new Set([
+  "appType",
+  "code",
+  "createdAt",
+  "createdBy",
+  "createdByDepartmentId",
+  "createdByDepartmentName",
+  "createdByName",
+  "creator",
+  "data",
+  "error",
+  "formInstId",
+  "formInstanceId",
+  "formUuid",
+  "instanceTitle",
+  "message",
+  "result",
+  "success",
+  "title",
+  "updatedAt"
+]);
+var isPlainRecord = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
+var parseJsonRecord = (value) => {
+  if (typeof value !== "string" || value.trim() === "") return null;
+  try {
+    const parsed = JSON.parse(value);
+    return isPlainRecord(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+};
+var pickKnownFields = (source, fieldIds) => {
+  if (fieldIds?.length) {
+    const values = {};
+    for (const fieldId of fieldIds) {
+      if (Object.prototype.hasOwnProperty.call(source, fieldId)) {
+        values[fieldId] = source[fieldId];
+      }
+    }
+    return values;
+  }
+  return Object.fromEntries(
+    Object.entries(source).filter(([key]) => !FORM_INSTANCE_METADATA_KEYS.has(key))
+  );
+};
+var extractFormValues = (formInstance, fieldIds) => {
+  if (!isPlainRecord(formInstance)) return null;
+  const nestedCandidates = [
+    formInstance.data,
+    parseJsonRecord(formInstance.data),
+    formInstance.formData,
+    parseJsonRecord(formInstance.formData),
+    formInstance.values,
+    formInstance.fieldValues,
+    parseJsonRecord(formInstance.formDataJson),
+    parseJsonRecord(formInstance.dataJson)
+  ];
+  for (const candidate of nestedCandidates) {
+    if (isPlainRecord(candidate)) {
+      return pickKnownFields(candidate, fieldIds);
+    }
+  }
+  const flatValues = pickKnownFields(formInstance, fieldIds);
+  return Object.keys(flatValues).length > 0 ? flatValues : null;
+};
+
+// src/hooks/useFormDetail.ts
 function buildFieldBehaviors(permissions, mode) {
   const behaviors = {};
   if (!permissions) return behaviors;
@@ -4960,7 +5038,7 @@ function buildFieldBehaviors(permissions, mode) {
   return behaviors;
 }
 function useFormDetail(options) {
-  const { formUuid, appType, formInstanceId, onPermissionDenied } = options;
+  const { formUuid, appType, formInstanceId, fieldIds, onPermissionDenied } = options;
   const { api } = useFormContext();
   const request = api.request;
   const [loading, setLoading] = useState20(true);
@@ -4989,7 +5067,7 @@ function useFormDetail(options) {
       }
       setPermissions(permResult);
       setInstanceInfo(formResult);
-      setFormData(formResult?.data ?? null);
+      setFormData(extractFormValues(formResult, fieldIds));
     } catch (error) {
       console.error("[useFormDetail] Failed to load data:", error);
       if (mountedRef.current) {
@@ -5002,7 +5080,7 @@ function useFormDetail(options) {
         setLoading(false);
       }
     }
-  }, [request, formUuid, appType, formInstanceId, onPermissionDenied]);
+  }, [request, formUuid, appType, formInstanceId, fieldIds, onPermissionDenied]);
   useEffect27(() => {
     loadData();
   }, [loadData]);
@@ -5067,7 +5145,7 @@ function useFormDetail(options) {
 // src/hooks/useProcessDetail.ts
 import { useState as useState21, useEffect as useEffect28, useCallback as useCallback8, useRef as useRef8 } from "react";
 function useProcessDetail(options) {
-  const { formUuid, appType, formInstanceId } = options;
+  const { formUuid, appType, formInstanceId, fieldIds } = options;
   const { api } = useFormContext();
   const request = api.request;
   const [loading, setLoading] = useState21(true);
@@ -5115,7 +5193,7 @@ function useProcessDetail(options) {
       setCanWithdraw(approvalResult?.canUndo ?? false);
       setPermissions(permResult);
       setInstanceInfo(formResult);
-      setFormData(formResult?.data ?? null);
+      setFormData(extractFormValues(formResult, fieldIds));
       if (permResult?.operations?.includes("VIEW_PROCESS") || permResult?.operations?.length > 0) {
         try {
           const progress = await getProcessProgress(request, formInstanceId);
@@ -5149,7 +5227,7 @@ function useProcessDetail(options) {
         setLoading(false);
       }
     }
-  }, [request, formUuid, appType, formInstanceId]);
+  }, [request, formUuid, appType, formInstanceId, fieldIds]);
   useEffect28(() => {
     loadData();
   }, [loadData]);
@@ -5868,15 +5946,16 @@ 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) => {
     if (renderNode) {
       return /* @__PURE__ */ jsx77("div", { children: renderNode(task, index) }, task.taskId);
     }
     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: [
@@ -6526,7 +6605,7 @@ var FormSubmitTemplate = ({
 };
 
 // src/templates/FormDetailTemplate.tsx
-import { useCallback as useCallback14 } from "react";
+import { useCallback as useCallback14, useMemo as useMemo8 } from "react";
 
 // src/templates/PageSkeleton.tsx
 import { Skeleton as Skeleton3 } from "antd";
@@ -6606,6 +6685,7 @@ var InnerDetailContent = ({
   onDelete,
   onSave
 }) => {
+  const fieldIds = useMemo8(() => schema.fields.map((field) => field.fieldId), [schema.fields]);
   const {
     loading,
     mode,
@@ -6619,7 +6699,7 @@ var InnerDetailContent = ({
     canEdit,
     canDelete,
     canViewChangeRecords
-  } = useFormDetail({ formUuid, appType, formInstanceId });
+  } = useFormDetail({ formUuid, appType, formInstanceId, fieldIds });
   const {
     records,
     loading: recordsLoading,
@@ -6730,7 +6810,7 @@ var FormDetailTemplate = (props) => {
 };
 
 // src/templates/ProcessDetailTemplate.tsx
-import { useCallback as useCallback15, useRef as useRef12 } from "react";
+import { useCallback as useCallback15, useMemo as useMemo9, useRef as useRef12 } from "react";
 import { Fragment as Fragment7, jsx as jsx85, jsxs as jsxs31 } from "react/jsx-runtime";
 function FormDataBridge({
   formDataRef
@@ -6752,6 +6832,7 @@ var InnerProcessContent = ({
   onActionComplete
 }) => {
   const formDataRef = useRef12(void 0);
+  const fieldIds = useMemo9(() => schema.fields.map((field) => field.fieldId), [schema.fields]);
   const {
     loading,
     processInfo,
@@ -6768,7 +6849,7 @@ var InnerProcessContent = ({
     switchToEdit,
     switchToReadonly,
     refreshProgress
-  } = useProcessDetail({ formUuid, appType, formInstanceId });
+  } = useProcessDetail({ formUuid, appType, formInstanceId, fieldIds });
   const { approve, reject, withdraw, save, resubmit } = useApprovalActions({
     formInstanceId,
     formUuid,
@@ -6967,6 +7048,7 @@ export {
   defineFormSchema,
   deleteFormData,
   evaluateEffects,
+  extractFormValues,
   getChangeRecords,
   getFormData,
   getProcessBasic,