sy-form-components 0.2.1 → 0.2.3

package/dist/index.mjs

@@ -3672,7 +3672,12 @@ var CHUNK_UPLOAD_THRESHOLD = 10 * 1024 * 1024;
 var trimTrailingSlash = (value) => String(value || "").replace(/\/$/, "");
 var getDefaultBaseUrl = () => {
   const globalEnv = globalThis.process?.env;
-  return trimTrailingSlash(globalEnv?.FORM_API_BASE_URL || globalEnv?.BASE_API_URL || "");
+  const envBaseUrl = globalEnv?.FORM_API_BASE_URL || globalEnv?.BASE_API_URL;
+  if (envBaseUrl) return trimTrailingSlash(envBaseUrl);
+  const browserGlobal = typeof window !== "undefined" ? window : void 0;
+  const windowBaseUrl = browserGlobal?.FORM_API_BASE_URL || browserGlobal?.BASE_API_URL || browserGlobal?.__FORM_API_BASE_URL__ || browserGlobal?.__LOWCODE_API_BASE_URL__;
+  if (windowBaseUrl) return trimTrailingSlash(windowBaseUrl);
+  return typeof window !== "undefined" ? "/service" : "";
 };
 var appendQuery = (url, params) => {
   if (!params) return url;
@@ -4940,6 +4945,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;
@@ -4955,7 +5029,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);
@@ -4984,7 +5058,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) {
@@ -4997,7 +5071,7 @@ function useFormDetail(options) {
         setLoading(false);
       }
     }
-  }, [request, formUuid, appType, formInstanceId, onPermissionDenied]);
+  }, [request, formUuid, appType, formInstanceId, fieldIds, onPermissionDenied]);
   useEffect27(() => {
     loadData();
   }, [loadData]);
@@ -5062,7 +5136,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);
@@ -5110,7 +5184,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);
@@ -5144,7 +5218,7 @@ function useProcessDetail(options) {
         setLoading(false);
       }
     }
-  }, [request, formUuid, appType, formInstanceId]);
+  }, [request, formUuid, appType, formInstanceId, fieldIds]);
   useEffect28(() => {
     loadData();
   }, [loadData]);
@@ -5481,6 +5555,22 @@ function useChangeRecords(options) {
 
 // src/hooks/useFormNavigation.ts
 import { useState as useState24, useCallback as useCallback11, useRef as useRef11, useEffect as useEffect31 } from "react";
+var normalizeBasePath = (basePath) => {
+  const normalized = String(basePath || "").replace(/^\/+|\/+$/g, "");
+  return normalized ? `/${normalized}` : "";
+};
+var inferBasePath = (appType) => {
+  if (typeof window === "undefined") return "";
+  const pathname = window.location?.pathname || "";
+  const marker = `/${appType}/`;
+  const markerIndex = pathname.indexOf(marker);
+  if (markerIndex <= 0) return "";
+  return pathname.slice(0, markerIndex);
+};
+var buildDetailUrl = (appType, formUuid, formInstId, detailType, basePath) => {
+  const prefix = normalizeBasePath(basePath ?? inferBasePath(appType));
+  return `${prefix}/${appType}/${detailType}/${formUuid}?formInstId=${encodeURIComponent(formInstId)}`;
+};
 function useFormNavigation(options) {
   const {
     appType,
@@ -5488,6 +5578,7 @@ function useFormNavigation(options) {
     formType = "form",
     mode = "redirect",
     redirectDelay = 3e3,
+    basePath,
     onStay
   } = options;
   const [isRedirecting, setIsRedirecting] = useState24(false);
@@ -5507,15 +5598,21 @@ function useFormNavigation(options) {
   }, []);
   const navigateToDetail = useCallback11(
     (formInstId) => {
-      window.location.href = `/${appType}/formDetail/${formUuid}?formInstId=${formInstId}`;
+      window.location.href = buildDetailUrl(appType, formUuid, formInstId, "formDetail", basePath);
     },
-    [appType, formUuid]
+    [appType, basePath, formUuid]
   );
   const navigateToProcessDetail = useCallback11(
     (formInstId) => {
-      window.location.href = `/${appType}/processDetail/${formUuid}?formInstId=${formInstId}`;
+      window.location.href = buildDetailUrl(
+        appType,
+        formUuid,
+        formInstId,
+        "processDetail",
+        basePath
+      );
     },
-    [appType, formUuid]
+    [appType, basePath, formUuid]
   );
   const startRedirectCountdown = useCallback11(
     (targetUrl) => {
@@ -5569,10 +5666,16 @@ function useFormNavigation(options) {
         onStay?.(formInstId);
         return;
       }
-      const targetUrl = formType === "process" ? `/${appType}/processDetail/${formUuid}?formInstId=${formInstId}` : `/${appType}/formDetail/${formUuid}?formInstId=${formInstId}`;
+      const targetUrl = buildDetailUrl(
+        appType,
+        formUuid,
+        formInstId,
+        formType === "process" ? "processDetail" : "formDetail",
+        basePath
+      );
       startRedirectCountdown(targetUrl);
     },
-    [mode, formType, appType, formUuid, onStay, startRedirectCountdown]
+    [mode, formType, appType, formUuid, basePath, onStay, startRedirectCountdown]
   );
   return {
     navigateToDetail,
@@ -6250,6 +6353,12 @@ import { useState as useState29, useCallback as useCallback13 } from "react";
 import { Button as Button9 } from "antd";
 import { CheckCircleFilled } from "@ant-design/icons";
 import { Fragment as Fragment5, jsx as jsx82, jsxs as jsxs28 } from "react/jsx-runtime";
+var pickFormInstanceId = (value) => {
+  if (!value) return void 0;
+  if (typeof value === "string") return value;
+  if (typeof value !== "object") return void 0;
+  return value.formInstanceId || value.formInstId || value.instanceId || value.id || pickFormInstanceId(value.result) || pickFormInstanceId(value.data);
+};
 var SubmitSuccessCard = ({
   info,
   mode,
@@ -6299,7 +6408,7 @@ var InnerFormContent = ({
   renderSuccess,
   onSubmitSuccess
 }) => {
-  const { validateAll, getFormData: getFormData2, resetForm } = useFormContext();
+  const { validateAll, getFormData: getFormData2, resetForm, api } = useFormContext();
   const [submitted, setSubmitted] = useState29(false);
   const [successInfo, setSuccessInfo] = useState29(null);
   const [submitting, setSubmitting] = useState29(false);
@@ -6311,7 +6420,8 @@ var InnerFormContent = ({
     appType: config.appType,
     formUuid: config.formUuid,
     formType,
-    mode: submitSuccessMode === "continue" ? "stay" : submitSuccessMode
+    mode: submitSuccessMode === "continue" ? "stay" : submitSuccessMode,
+    basePath: config.navigation?.basePath
   });
   const handleSubmit = useCallback13(async () => {
     const valid = await validateAll();
@@ -6326,9 +6436,24 @@ var InnerFormContent = ({
           return;
         }
       }
-      const formInstId = `inst_${Date.now()}`;
+      const submitResponse = config.mode === "edit" && config.formInstanceId ? await api.updateFormData({
+        appType: config.appType,
+        formUuid: config.formUuid,
+        formInstId: config.formInstanceId,
+        formInstanceId: config.formInstanceId,
+        updateFormDataJson: JSON.stringify(formData)
+      }) : await api.submitFormData({
+        appType: config.appType,
+        formUuid: config.formUuid,
+        data: formData
+      });
+      const formInstId = pickFormInstanceId(submitResponse) || config.formInstanceId || `inst_${Date.now()}`;
       if (config.submit?.afterSubmit) {
-        await config.submit.afterSubmit({ formInstanceId: formInstId, data: formData });
+        await config.submit.afterSubmit({
+          formInstanceId: formInstId,
+          data: formData,
+          response: submitResponse
+        });
       }
       if (enableDraft) {
         clearDraft();
@@ -6350,6 +6475,7 @@ var InnerFormContent = ({
     validateAll,
     getFormData2,
     config,
+    api,
     enableDraft,
     clearDraft,
     onSubmitSuccess,
@@ -6469,7 +6595,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";
@@ -6549,6 +6675,7 @@ var InnerDetailContent = ({
   onDelete,
   onSave
 }) => {
+  const fieldIds = useMemo8(() => schema.fields.map((field) => field.fieldId), [schema.fields]);
   const {
     loading,
     mode,
@@ -6562,7 +6689,7 @@ var InnerDetailContent = ({
     canEdit,
     canDelete,
     canViewChangeRecords
-  } = useFormDetail({ formUuid, appType, formInstanceId });
+  } = useFormDetail({ formUuid, appType, formInstanceId, fieldIds });
   const {
     records,
     loading: recordsLoading,
@@ -6673,7 +6800,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
@@ -6695,6 +6822,7 @@ var InnerProcessContent = ({
   onActionComplete
 }) => {
   const formDataRef = useRef12(void 0);
+  const fieldIds = useMemo9(() => schema.fields.map((field) => field.fieldId), [schema.fields]);
   const {
     loading,
     processInfo,
@@ -6711,7 +6839,7 @@ var InnerProcessContent = ({
     switchToEdit,
     switchToReadonly,
     refreshProgress
-  } = useProcessDetail({ formUuid, appType, formInstanceId });
+  } = useProcessDetail({ formUuid, appType, formInstanceId, fieldIds });
   const { approve, reject, withdraw, save, resubmit } = useApprovalActions({
     formInstanceId,
     formUuid,
@@ -6910,6 +7038,7 @@ export {
   defineFormSchema,
   deleteFormData,
   evaluateEffects,
+  extractFormValues,
   getChangeRecords,
   getFormData,
   getProcessBasic,