openxiangda 1.0.134 → 1.0.136

package/packages/sdk/dist/runtime/index.cjs

@@ -91,6 +91,7 @@ module.exports = __toCommonJS(runtime_exports);
 var isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 var isSearchRuleLike = (value) => isRecord(value) && typeof value.key === "string" && (value.componentName === void 0 || typeof value.componentName === "string");
 var isBlobLike = (value) => typeof Blob !== "undefined" && value instanceof Blob;
+var nowMs = () => typeof performance !== "undefined" && typeof performance.now === "function" ? performance.now() : Date.now();
 var normalizeMethod = (value) => {
   const method = String(value || "get").toLowerCase();
   if (method === "get" || method === "post" || method === "put" || method === "delete" || method === "patch") {
@@ -349,6 +350,26 @@ var normalizeJsonResponse = (rawResponse) => {
     raw: rawResponse
   };
 };
+var createMissingFormInstanceIdError = (response) => {
+  const error = new Error(
+    "\u4FDD\u5B58\u63A5\u53E3\u672A\u8FD4\u56DE formInstId/formInstanceId\u3002\u4FDD\u5B58\u63A5\u53E3\u53EA\u627F\u8BFA\u8FD4\u56DE\u5B9E\u4F8B\u6807\u8BC6\u548C\u5DF2\u751F\u6210\u7684\u6D41\u6C34\u53F7\uFF1B\u5982\u9700\u5B8C\u6574\u884C\u6570\u636E\u3001\u516C\u5F0F\u56DE\u586B\u6216\u5176\u4ED6\u670D\u52A1\u7AEF\u5B57\u6BB5\uFF0C\u8BF7\u5728\u4FDD\u5B58\u6210\u529F\u540E\u663E\u5F0F\u8C03\u7528 sdk.form.getDetail\u3002"
+  );
+  error.response = response;
+  error.raw = response.raw;
+  return error;
+};
+var isRequestTracingEnabled = (context, options) => {
+  if (options.trace) return true;
+  const env = context.env || {};
+  const value = env.OPENXIANGDA_REQUEST_TRACE ?? env.openxiangdaRequestTrace ?? env.requestTrace;
+  return value === true || value === "true" || value === "1";
+};
+var buildRequestDedupeKey = (payload) => JSON.stringify({
+  path: payload.path,
+  method: payload.method,
+  query: payload.query || "",
+  headers: payload.headers || {}
+});
 var normalizeBinaryResponse = (rawResponse) => {
   if (isRecord(rawResponse) && isBlobLike(rawResponse.blob)) {
     return rawResponse;
@@ -420,12 +441,90 @@ var pickCreatedFormInstanceId = (value) => {
     return text || void 0;
   }
   if (!isRecord(value)) return void 0;
-  const direct = value.formInstId || value.formInstanceId || value.instanceId || value.id || value.result || value.data;
-  if (direct !== value) {
-    return pickCreatedFormInstanceId(direct);
+  const direct = value.formInstId || value.formInstanceId || value.instanceId || value.id;
+  if (direct !== value && direct !== void 0 && direct !== null) {
+    const picked = pickCreatedFormInstanceId(direct);
+    if (picked) return picked;
+  }
+  for (const candidate of [value.result, value.data, value.raw]) {
+    const picked = pickCreatedFormInstanceId(candidate);
+    if (picked) return picked;
+  }
+  return void 0;
+};
+var pickCreatedProcessInstanceId = (value) => {
+  if (!value || typeof value === "string") return void 0;
+  if (!isRecord(value)) return void 0;
+  const direct = value.processInstanceId || value.processInstId;
+  if (typeof direct === "string" && direct.trim()) return direct.trim();
+  for (const candidate of [value.result, value.data, value.raw]) {
+    const picked = pickCreatedProcessInstanceId(candidate);
+    if (picked) return picked;
   }
   return void 0;
 };
+var pickSerialNumbers = (value) => {
+  if (!value || typeof value === "string" || !isRecord(value)) return void 0;
+  const direct = value.serialNumbers;
+  if (isRecord(direct)) {
+    const entries = Object.entries(direct).map(([key, item]) => [key, String(item ?? "").trim()]).filter(([, item]) => Boolean(item));
+    if (entries.length > 0) return Object.fromEntries(entries);
+  }
+  for (const candidate of [value.result, value.data, value.raw]) {
+    const picked = pickSerialNumbers(candidate);
+    if (picked) return picked;
+  }
+  return void 0;
+};
+var pickSerialNumber = (value) => {
+  if (!value || typeof value === "string") return void 0;
+  if (!isRecord(value)) return void 0;
+  const direct = value.serialNumber || value.serialNo || value.sequenceNo;
+  if (typeof direct === "string" && direct.trim()) return direct.trim();
+  const serialNumbers = pickSerialNumbers(value);
+  if (serialNumbers) {
+    const first = Object.values(serialNumbers)[0];
+    if (first) return first;
+  }
+  for (const candidate of [value.result, value.data, value.raw]) {
+    const picked = pickSerialNumber(candidate);
+    if (picked) return picked;
+  }
+  return void 0;
+};
+var normalizeFormCreateResponse = (response, formInstanceId) => {
+  const processInstanceId = pickCreatedProcessInstanceId(response);
+  const serialNumbers = pickSerialNumbers(response);
+  const serialNumber = pickSerialNumber(response);
+  const sourceResult = isRecord(response.result) ? response.result : {};
+  const normalizedResult = {
+    ...sourceResult,
+    formInstId: formInstanceId,
+    formInstanceId,
+    result: typeof response.result === "string" && response.result.trim() ? response.result.trim() : sourceResult.result || formInstanceId,
+    ...processInstanceId ? { processInstanceId } : {},
+    ...serialNumber ? { serialNumber } : {},
+    ...serialNumbers ? { serialNumbers } : {}
+  };
+  const normalizedData = isRecord(response.data) ? {
+    ...response.data,
+    formInstId: response.data.formInstId || formInstanceId,
+    formInstanceId: response.data.formInstanceId || formInstanceId,
+    ...processInstanceId ? { processInstanceId } : {},
+    ...serialNumber ? { serialNumber } : {},
+    ...serialNumbers ? { serialNumbers } : {}
+  } : response.data;
+  return {
+    ...response,
+    formInstId: formInstanceId,
+    formInstanceId,
+    ...processInstanceId ? { processInstanceId } : {},
+    ...serialNumber ? { serialNumber } : {},
+    ...serialNumbers ? { serialNumbers } : {},
+    result: normalizedResult,
+    data: normalizedData
+  };
+};
 var isStableCreateLookupValue = (value) => {
   if (value === void 0 || value === null || value === "") return false;
   return typeof value === "string" || typeof value === "number" || typeof value === "boolean";
@@ -460,20 +559,6 @@ var firstListItem = (value) => {
   }
   return void 0;
 };
-var attachFormInstanceId = (response, formInstanceId) => {
-  const withIds = (value) => isRecord(value) ? {
-    ...value,
-    formInstId: value.formInstId || formInstanceId,
-    formInstanceId: value.formInstanceId || formInstanceId
-  } : value;
-  return {
-    ...response,
-    formInstId: formInstanceId,
-    formInstanceId,
-    result: response.result === null || response.result === void 0 ? formInstanceId : withIds(response.result),
-    data: response.data === void 0 ? response.data : withIds(response.data)
-  };
-};
 var withDefaultAppType = (context, params) => {
   if (!params) {
     return params;
@@ -593,6 +678,8 @@ var redirectAfterLogout = (context, options) => {
   );
 };
 var createPageSdk = (context) => {
+  const inFlightGetRequests = /* @__PURE__ */ new Map();
+  const recentRequestStats = /* @__PURE__ */ new Map();
   const request = async (options) => {
     const payload = {
       path: options.path,
@@ -601,17 +688,54 @@ var createPageSdk = (context) => {
       body: options.body,
       headers: options.headers
     };
-    try {
+    const traceEnabled = isRequestTracingEnabled(context, options);
+    const traceLabel = options.traceLabel || `${payload.method.toUpperCase()} ${payload.path}`;
+    const dedupeKey = options.dedupe !== false && payload.method === "get" ? buildRequestDedupeKey(payload) : void 0;
+    if (traceEnabled && dedupeKey) {
+      const currentAt = nowMs();
+      const previous = recentRequestStats.get(dedupeKey);
+      const nextCount = previous && currentAt - previous.lastAt < 500 ? previous.count + 1 : 1;
+      recentRequestStats.set(dedupeKey, { count: nextCount, lastAt: currentAt });
+      if (nextCount > 1) {
+        console.warn(
+          `[OpenXiangda SDK] repeated request within 500ms (${nextCount}): ${traceLabel}`
+        );
+      }
+    }
+    if (dedupeKey && inFlightGetRequests.has(dedupeKey)) {
+      if (traceEnabled) {
+        console.debug(`[OpenXiangda SDK] deduped in-flight request: ${traceLabel}`);
+      }
+      return inFlightGetRequests.get(dedupeKey);
+    }
+    const task = (async () => {
+      const startedAt = nowMs();
       const rawResponse = await context.bridge.invoke(
         "transport.request",
         payload
       );
-      return ensureSuccess(
+      const normalized = ensureSuccess(
         normalizeJsonResponse(rawResponse),
         payload
       );
+      if (traceEnabled) {
+        console.debug(
+          `[OpenXiangda SDK] ${traceLabel} ${Math.round(nowMs() - startedAt)}ms`
+        );
+      }
+      return normalized;
+    })();
+    if (dedupeKey) {
+      inFlightGetRequests.set(dedupeKey, task);
+    }
+    try {
+      return await task;
     } catch (error) {
       throw toSdkError(error, payload);
+    } finally {
+      if (dedupeKey && inFlightGetRequests.get(dedupeKey) === task) {
+        inFlightGetRequests.delete(dedupeKey);
+      }
     }
   };
   const download = async (options) => {
@@ -729,16 +853,17 @@ var createPageSdk = (context) => {
           processStartMode: params.processStartMode
         }
       });
-      if (params.lookupAfterCreate === false) {
-        return response;
-      }
       const directId = pickCreatedFormInstanceId(response);
       if (directId) {
-        return attachFormInstanceId(response, directId);
+        return normalizeFormCreateResponse(response, directId);
+      }
+      if (!params.lookupAfterCreate) {
+        throw createMissingFormInstanceIdError(response);
       }
       const filters = buildCreateLookupFilters(params.data || {}, params.lookupFields);
       if (!filters) {
-        return response;
+        if (params.lookupAfterCreate === "legacy") return response;
+        throw createMissingFormInstanceIdError(response);
       }
       const lookupResponse = await request({
         path: buildAppPath(
@@ -756,7 +881,9 @@ var createPageSdk = (context) => {
         }
       });
       const lookupId = pickCreatedFormInstanceId(firstListItem(lookupResponse));
-      return lookupId ? attachFormInstanceId(response, lookupId) : response;
+      if (lookupId) return normalizeFormCreateResponse(response, lookupId);
+      if (params.lookupAfterCreate === "legacy") return response;
+      throw createMissingFormInstanceIdError(response);
     },
     update: (params) => request({
       path: buildAppPath(
@@ -19111,7 +19238,23 @@ 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);
+  const direct = value.formInstanceId || value.formInstId || value.instanceId || value.id;
+  if (direct) return pickFormInstanceId(direct);
+  for (const candidate of [value.result, value.data, value.raw]) {
+    const picked = pickFormInstanceId(candidate);
+    if (picked) return picked;
+  }
+  return void 0;
+};
+var getSubmitResultFormInstanceId = (submitResponse, config, submitBehavior) => {
+  const responseId = pickFormInstanceId(submitResponse);
+  if (responseId) return responseId;
+  if (submitBehavior !== "create" && config.formInstanceId) {
+    return config.formInstanceId;
+  }
+  throw new Error(
+    "\u63D0\u4EA4\u63A5\u53E3\u672A\u8FD4\u56DE formInstId/formInstanceId\u3002\u4FDD\u5B58\u63A5\u53E3\u53EA\u8FD4\u56DE\u5B9E\u4F8B\u6807\u8BC6\u548C\u5DF2\u751F\u6210\u7684\u6D41\u6C34\u53F7\uFF1B\u5982\u9700\u5B8C\u6574\u6570\u636E\u3001\u516C\u5F0F\u56DE\u586B\u6216\u5176\u4ED6\u670D\u52A1\u7AEF\u5B57\u6BB5\uFF0C\u8BF7\u4FDD\u5B58\u6210\u529F\u540E\u518D\u67E5\u8BE2\u8BE6\u60C5\u3002"
+  );
 };
 var normalizeFormDataForSubmit = (schema, formData) => {
   const next = { ...formData };
@@ -19310,7 +19453,7 @@ var InnerFormContent = ({
           selectedApprovers: initiatorSelectedApprovers,
           initiatorSelectedApprovers
         });
-        const formInstId = pickFormInstanceId(submitResponse) || config.formInstanceId || `inst_${Date.now()}`;
+        const formInstId = getSubmitResultFormInstanceId(submitResponse, config, submitBehavior);
         if (config.submit?.afterSubmit) {
           await config.submit.afterSubmit({
             formInstanceId: formInstId,
@@ -19334,6 +19477,7 @@ var InnerFormContent = ({
         }
       } catch (error) {
         console.error("[FormSubmitTemplate] Submit failed:", error);
+        import_antd36.message.error(error instanceof Error ? error.message : "\u63D0\u4EA4\u5931\u8D25");
       } finally {
         setSubmitting(false);
       }
@@ -21226,6 +21370,7 @@ var StandardFormPage = ({
   formInstanceId,
   defaultUploadProvider,
   submitBehavior,
+  compatibility,
   onSubmit,
   onSubmitSuccess,
   inDrawer
@@ -21299,6 +21444,7 @@ var StandardFormPage = ({
         defaultUploadProvider,
         submitBehavior,
         permissions,
+        compatibility,
         api
       },
       formType,
@@ -22630,6 +22776,7 @@ var DataManagementList = ({
   detailPageUrlBuilder,
   submitRenderer,
   requestOverride,
+  allowSchemaFallback = false,
   rowActions = [],
   maxVisibleRowActions
 }) => {
@@ -22797,6 +22944,11 @@ var DataManagementList = ({
         const nextSearchKeyWord = saved?.filter?.searchKeyWord || "";
         const nextFilterGroup = hydrateFilterGroup(saved?.filter?.group);
         const nextFormType = propFormType || schemaResult.formType || "form";
+        if (!schemaResult.schema && !allowSchemaFallback) {
+          throw new Error(
+            `\u8868\u5355 schema \u4E0D\u5B58\u5728\u6216\u672A\u53D1\u5E03: ${formUuid}\u3002\u8BF7\u5148\u53D1\u5E03\u8868\u5355 schema\uFF1B\u4E25\u683C\u6A21\u5F0F\u4E0D\u4F1A\u751F\u6210\u515C\u5E95\u8868\u5355\u3002`
+          );
+        }
         setFields(allFields);
         setRuntimeFormSchema(
           schemaResult.schema || buildFallbackFormSchema({
@@ -22827,7 +22979,7 @@ var DataManagementList = ({
         });
       } catch (error) {
         console.error("[DataManagementList] load schema failed:", error);
-        import_antd39.message.error("\u52A0\u8F7D\u8868\u5355\u914D\u7F6E\u5931\u8D25");
+        import_antd39.message.error(error instanceof Error ? error.message : "\u52A0\u8F7D\u8868\u5355\u914D\u7F6E\u5931\u8D25");
       } finally {
         if (mounted) setSchemaLoading(false);
       }
@@ -22838,6 +22990,7 @@ var DataManagementList = ({
     };
   }, [
     appType,
+    allowSchemaFallback,
     forcedConfig,
     formTitle,
     formUuid,