sy-form-components 0.2.1 → 0.2.2

package/dist/index.d.mts

@@ -93,6 +93,9 @@ interface FormEngineConfig {
         redirectUrl?: string;
     };
     api?: FormRuntimeApiConfig;
+    navigation?: {
+        basePath?: string;
+    };
     effects?: FormEffect[];
 }
 /** 字段联动效果 */
@@ -996,6 +999,7 @@ interface UseFormNavigationOptions {
     formType?: 'form' | 'process';
     mode?: 'redirect' | 'stay' | 'callback';
     redirectDelay?: number;
+    basePath?: string;
     onStay?: (formInstId: string) => void;
 }
 interface UseFormNavigationReturn {
@@ -1006,9 +1010,6 @@ interface UseFormNavigationReturn {
     countdown: number;
     cancelRedirect: () => void;
 }
-/**
- * 页面导航 hook
- */
 declare function useFormNavigation(options: UseFormNavigationOptions): UseFormNavigationReturn;
 
 interface UseDraftStorageOptions {

package/dist/index.d.ts

@@ -93,6 +93,9 @@ interface FormEngineConfig {
         redirectUrl?: string;
     };
     api?: FormRuntimeApiConfig;
+    navigation?: {
+        basePath?: string;
+    };
     effects?: FormEffect[];
 }
 /** 字段联动效果 */
@@ -996,6 +999,7 @@ interface UseFormNavigationOptions {
     formType?: 'form' | 'process';
     mode?: 'redirect' | 'stay' | 'callback';
     redirectDelay?: number;
+    basePath?: string;
     onStay?: (formInstId: string) => void;
 }
 interface UseFormNavigationReturn {
@@ -1006,9 +1010,6 @@ interface UseFormNavigationReturn {
     countdown: number;
     cancelRedirect: () => void;
 }
-/**
- * 页面导航 hook
- */
 declare function useFormNavigation(options: UseFormNavigationOptions): UseFormNavigationReturn;
 
 interface UseDraftStorageOptions {

package/dist/index.js

@@ -3793,7 +3793,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;
@@ -5602,6 +5607,22 @@ function useChangeRecords(options) {
 
 // src/hooks/useFormNavigation.ts
 var import_react49 = require("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,
@@ -5609,6 +5630,7 @@ function useFormNavigation(options) {
     formType = "form",
     mode = "redirect",
     redirectDelay = 3e3,
+    basePath,
     onStay
   } = options;
   const [isRedirecting, setIsRedirecting] = (0, import_react49.useState)(false);
@@ -5628,15 +5650,21 @@ function useFormNavigation(options) {
   }, []);
   const navigateToDetail = (0, import_react49.useCallback)(
     (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 = (0, import_react49.useCallback)(
     (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 = (0, import_react49.useCallback)(
     (targetUrl) => {
@@ -5690,10 +5718,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,
@@ -6371,6 +6405,12 @@ var import_react54 = require("react");
 var import_antd27 = require("antd");
 var import_icons5 = require("@ant-design/icons");
 var import_jsx_runtime82 = require("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,
@@ -6420,7 +6460,7 @@ var InnerFormContent = ({
   renderSuccess,
   onSubmitSuccess
 }) => {
-  const { validateAll, getFormData: getFormData2, resetForm } = useFormContext();
+  const { validateAll, getFormData: getFormData2, resetForm, api } = useFormContext();
   const [submitted, setSubmitted] = (0, import_react54.useState)(false);
   const [successInfo, setSuccessInfo] = (0, import_react54.useState)(null);
   const [submitting, setSubmitting] = (0, import_react54.useState)(false);
@@ -6432,7 +6472,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 = (0, import_react54.useCallback)(async () => {
     const valid = await validateAll();
@@ -6447,9 +6488,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();
@@ -6471,6 +6527,7 @@ var InnerFormContent = ({
     validateAll,
     getFormData2,
     config,
+    api,
     enableDraft,
     clearDraft,
     onSubmitSuccess,