openxiangda 1.0.140 → 1.0.142

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

@@ -6161,6 +6161,12 @@ var OpenXiangdaProvider = ({
     () => createAuthorizedFetch(resolvedFetch, accessToken),
     [accessToken, resolvedFetch]
   );
+  const getAuthHeaders = (0, import_react14.useCallback)(() => {
+    const state2 = accessTokenRef.current;
+    if (!state2) return {};
+    const token = resolveAccessTokenForCurrentRoute(state2);
+    return token ? { authorization: `Bearer ${token}` } : {};
+  }, []);
   const [state, setState] = (0, import_react14.useState)({
     data: null,
     loading: true,
@@ -6230,10 +6236,19 @@ var OpenXiangdaProvider = ({
       servicePrefix,
       fetchImpl: authorizedFetch,
       baseFetchImpl: resolvedFetch,
+      getAuthHeaders,
       reload,
       setAccessToken
     }),
-    [authorizedFetch, reload, resolvedAppType, resolvedFetch, servicePrefix, state]
+    [
+      authorizedFetch,
+      getAuthHeaders,
+      reload,
+      resolvedAppType,
+      resolvedFetch,
+      servicePrefix,
+      state
+    ]
   );
   return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(OpenXiangdaRuntimeContext.Provider, { value, children });
 };
@@ -7189,7 +7204,31 @@ var parseResponse = async (response) => {
     message: response.statusText
   };
 };
-var createDefaultRequest = (baseUrl) => async (config) => {
+var applyAuthHeaders = (headers, getAuthHeaders) => {
+  const authHeaders = getAuthHeaders?.();
+  if (authHeaders) {
+    new Headers(authHeaders).forEach((value, key) => {
+      if (!headers.has(key)) headers.set(key, value);
+    });
+  }
+  const token = typeof window !== "undefined" ? window.localStorage?.getItem("token") : void 0;
+  if (token && !headers.has("authorization")) {
+    headers.set("authorization", token);
+  }
+};
+var applyXhrAuthHeaders = (xhr, getAuthHeaders) => {
+  let hasAuthorization = false;
+  const authHeaders = getAuthHeaders?.();
+  if (authHeaders) {
+    new Headers(authHeaders).forEach((value, key) => {
+      if (key.toLowerCase() === "authorization") hasAuthorization = true;
+      xhr.setRequestHeader(key, value);
+    });
+  }
+  const token = typeof window !== "undefined" ? window.localStorage?.getItem("token") : void 0;
+  if (token && !hasAuthorization) xhr.setRequestHeader("authorization", token);
+};
+var createDefaultRequest = (baseUrl, fetchImpl = fetch, getAuthHeaders) => async (config) => {
   const method = config.method ?? "get";
   const url = appendQuery2(joinUrl(baseUrl, config.url), config.params);
   const headers = new Headers(config.headers);
@@ -7202,11 +7241,8 @@ var createDefaultRequest = (baseUrl) => async (config) => {
       body = JSON.stringify(config.data);
     }
   }
-  const token = typeof window !== "undefined" ? window.localStorage?.getItem("token") : void 0;
-  if (token && !headers.has("authorization")) {
-    headers.set("authorization", token);
-  }
-  const response = await fetch(url, {
+  applyAuthHeaders(headers, getAuthHeaders);
+  const response = await fetchImpl(url, {
     method,
     headers,
     body,
@@ -7274,7 +7310,7 @@ var normalizeUploadData = (data, file, bucketName, baseUrl = "") => {
     variants
   };
 };
-var uploadWithXhr = (baseUrl, file, bucketName, onProgress, options = {}) => new Promise((resolve, reject) => {
+var uploadWithXhr = (baseUrl, file, bucketName, onProgress, options = {}, getAuthHeaders) => new Promise((resolve, reject) => {
   if (globalThis.process?.env?.VITEST) {
     onProgress?.(100);
     resolve({
@@ -7304,8 +7340,7 @@ var uploadWithXhr = (baseUrl, file, bucketName, onProgress, options = {}) => new
     )
   );
   xhr.withCredentials = true;
-  const token = typeof window !== "undefined" ? window.localStorage?.getItem("token") : void 0;
-  if (token) xhr.setRequestHeader("authorization", token);
+  applyXhrAuthHeaders(xhr, getAuthHeaders);
   xhr.upload.onprogress = (event) => {
     if (event.lengthComputable) {
       onProgress?.(Math.round(event.loaded / event.total * 100));
@@ -7409,7 +7444,8 @@ async function uploadChunkedFile(request, file, bucketName, baseUrl, onProgress,
       fileSize: file.size,
       chunkSize: DEFAULT_CHUNK_SIZE,
       bucketName,
-      visibility: options.visibility
+      visibility: options.visibility,
+      contentType: file.type || void 0
     }
   });
   const uploadInfo = initiate.data || initiate.result;
@@ -7468,7 +7504,7 @@ var createSegmentProgress = (onProgress, start, end) => (percent) => {
   onProgress?.(Math.round(next));
 };
 var getAttachmentUrl = (item) => item.publicUrl || item.previewUrl || item.downloadUrl || item.url || "";
-async function uploadSingleRuntimeFile(request, baseUrl, file, bucketName, onProgress, options) {
+async function uploadSingleRuntimeFile(request, baseUrl, file, bucketName, onProgress, options, getAuthHeaders) {
   const singleOptions = stripImageCompressionOptions(options);
   if (singleOptions.uploadProvider === "builtin-oss") {
     return uploadBuiltinOssFile(request, file, bucketName, onProgress, singleOptions);
@@ -7479,7 +7515,7 @@ async function uploadSingleRuntimeFile(request, baseUrl, file, bucketName, onPro
   if (file.size > CHUNK_UPLOAD_THRESHOLD) {
     return uploadChunkedFile(request, file, bucketName, baseUrl, onProgress);
   }
-  return uploadWithXhr(baseUrl, file, bucketName, onProgress);
+  return uploadWithXhr(baseUrl, file, bucketName, onProgress, {}, getAuthHeaders);
 }
 function toImageVariantMetadata(uploaded, variant) {
   return {
@@ -7493,7 +7529,7 @@ function toImageVariantMetadata(uploaded, variant) {
     quality: variant.quality
   };
 }
-async function uploadFileWithImageVariants(request, baseUrl, file, bucketName, onProgress, options) {
+async function uploadFileWithImageVariants(request, baseUrl, file, bucketName, onProgress, options, getAuthHeaders) {
   let variants = [];
   try {
     variants = await createCompressedImageVariants(file, options.imageCompression);
@@ -7501,7 +7537,15 @@ async function uploadFileWithImageVariants(request, baseUrl, file, bucketName, o
     variants = [];
   }
   if (variants.length === 0) {
-    return uploadSingleRuntimeFile(request, baseUrl, file, bucketName, onProgress, options);
+    return uploadSingleRuntimeFile(
+      request,
+      baseUrl,
+      file,
+      bucketName,
+      onProgress,
+      options,
+      getAuthHeaders
+    );
   }
   const originalProgressEnd = 70;
   const uploaded = await uploadSingleRuntimeFile(
@@ -7510,7 +7554,8 @@ async function uploadFileWithImageVariants(request, baseUrl, file, bucketName, o
     file,
     bucketName,
     createSegmentProgress(onProgress, 0, originalProgressEnd),
-    options
+    options,
+    getAuthHeaders
   );
   const imageVariants = { ...uploaded.variants || {} };
   const variantProgressStep = (100 - originalProgressEnd) / variants.length;
@@ -7525,7 +7570,8 @@ async function uploadFileWithImageVariants(request, baseUrl, file, bucketName, o
         variant.file,
         bucketName,
         createSegmentProgress(onProgress, start, end),
-        options
+        options,
+        getAuthHeaders
       );
       imageVariants[variant.kind] = toImageVariantMetadata(variantUpload, variant);
     } catch {
@@ -7542,11 +7588,20 @@ async function uploadFileWithImageVariants(request, baseUrl, file, bucketName, o
 }
 function createFormRuntimeApi(config) {
   const { baseUrl = getDefaultBaseUrl(), ...overrides } = config ?? {};
-  const request = overrides.request ?? createDefaultRequest(baseUrl);
+  const { fetchImpl, getAuthHeaders } = overrides;
+  const request = overrides.request ?? createDefaultRequest(baseUrl, fetchImpl, getAuthHeaders);
   const defaults = {
     request,
     uploadFile: async (file, bucketName = "files", onProgress, options = {}) => {
-      return uploadFileWithImageVariants(request, baseUrl, file, bucketName, onProgress, options);
+      return uploadFileWithImageVariants(
+        request,
+        baseUrl,
+        file,
+        bucketName,
+        onProgress,
+        options,
+        getAuthHeaders
+      );
     },
     uploadPublicFile: async (file, bucketName = DEFAULT_PUBLIC_FILE_BUCKET, onProgress) => {
       if (file.size > CHUNK_UPLOAD_THRESHOLD) {
@@ -7556,7 +7611,7 @@ function createFormRuntimeApi(config) {
       }
       return uploadWithXhr(baseUrl, file, bucketName, onProgress, {
         visibility: "public"
-      });
+      }, getAuthHeaders);
     },
     deleteFile: async (objectName, bucketName = "files", options = {}) => {
       if (options.uploadProvider === "builtin-oss" || options.storageScope === "platform") {
@@ -21494,6 +21549,60 @@ var unwrap = (response) => {
   return response;
 };
 var pickData = (value) => value?.data ?? value?.result ?? value;
+var normalizePlatformComponentName = (componentName) => {
+  const value = String(componentName || "").trim();
+  return value || "TextField";
+};
+var extractSlotNodes = (value) => {
+  if (!value) return [];
+  if (Array.isArray(value)) {
+    return value.flatMap((item) => extractSlotNodes(item));
+  }
+  if (typeof value !== "object") return [];
+  if (value.type === "JSSlot" && value.value) {
+    return extractSlotNodes(value.value);
+  }
+  if (value.componentName || Array.isArray(value.children)) {
+    return [value];
+  }
+  return Object.values(value).flatMap((item) => extractSlotNodes(item));
+};
+var extractFieldsFromComponentsTree = (componentsTree) => {
+  const roots = Array.isArray(componentsTree) ? componentsTree : [componentsTree];
+  const fields = [];
+  const seen = /* @__PURE__ */ new Set();
+  const walk = (components) => {
+    if (!Array.isArray(components)) return;
+    components.forEach((component) => {
+      if (!component || typeof component !== "object") return;
+      const props = component.props || {};
+      const fieldId = String(props.fieldId || component.fieldId || component.id || "").trim();
+      if (props.isFormComponent === true && fieldId && !seen.has(fieldId)) {
+        seen.add(fieldId);
+        fields.push({
+          ...props,
+          id: props.id || component.id || fieldId,
+          fieldId,
+          componentName: normalizePlatformComponentName(
+            props.componentName || component.componentName
+          ),
+          label: props.label || component.title || props.title || fieldId,
+          title: props.title || component.title || props.label || fieldId,
+          required: props.required ?? component.required
+        });
+      }
+      if (component.componentName === "SubFormField") return;
+      if (Array.isArray(component.children)) {
+        walk(component.children);
+      }
+      Object.values(props).forEach((propValue) => {
+        walk(extractSlotNodes(propValue));
+      });
+    });
+  };
+  walk(roots);
+  return fields;
+};
 var normalizeActionSummary = (value) => {
   const raw = pickData(value) || {};
   const actions = Array.from(
@@ -21522,6 +21631,11 @@ var normalizeField = (key, field, system = false) => ({
   width: field?.width,
   system
 });
+var createDefaultLayout = (fields) => fields.map((field) => ({
+  id: `layout_${field.fieldId}`,
+  type: "field",
+  fieldId: field.fieldId
+}));
 var SYSTEM_VALUE_ALIASES = {
   formInstanceId: ["formInstanceId", "formInstId", "form_instance_id", "processInstanceId"],
   instanceTitle: ["instanceTitle", "instance_title", "processInstanceTitle", "title"],
@@ -21635,20 +21749,25 @@ var BASE_SYSTEM_FIELDS = [
   )
 ];
 var getSystemFieldsForFormType = (formType) => formType === "process" ? [...BASE_SYSTEM_FIELDS, ...PROCESS_SYSTEM_FIELDS] : BASE_SYSTEM_FIELDS;
-var normalizeDataManagementFields = (payload) => {
+var normalizeDataManagementFields = (payload, options = {}) => {
   const data = pickData(payload);
   const rawSchema = data?.schema || data?.formSchema || data?.publishedSchema || data;
-  const schemaAppType = rawSchema?.formMeta?.appType || data?.appType;
-  const schemaFormUuid = rawSchema?.formMeta?.formUuid || data?.formUuid;
-  const schemaTitle = rawSchema?.formMeta?.title || data?.title || data?.name || data?.formName || schemaFormUuid;
-  const formType = data?.formType || data?.schema?.formType || data?.schema?.template?.formType || rawSchema?.template?.formType || data?.type;
-  const rawFields = data?.formFields || data?.schema?.formFields || data?.fields || data?.schema?.fields || data?.formSchema?.fields || [];
-  const fields = Array.isArray(rawFields) ? rawFields.map((field) => normalizeField(field?.fieldId || field?.id, field)) : Object.entries(rawFields).map(([key, field]) => normalizeField(key, field));
+  const schemaAppType = rawSchema?.formMeta?.appType || rawSchema?.appType || data?.appType || options.appType;
+  const schemaFormUuid = rawSchema?.formMeta?.formUuid || rawSchema?.formUuid || data?.formUuid || options.formUuid;
+  const schemaTitle = rawSchema?.formMeta?.title || rawSchema?.title || data?.title || data?.name || data?.formName || schemaFormUuid;
+  const formType = data?.formType || data?.schema?.formType || data?.schema?.template?.formType || rawSchema?.formType || rawSchema?.template?.formType || data?.type;
+  const rawFields = data?.formFields || data?.schema?.formFields || rawSchema?.formFields || data?.fields || data?.schema?.fields || data?.formSchema?.fields || rawSchema?.fields || [];
+  const extractedFields = Array.isArray(rawFields) && rawFields.length === 0 && rawSchema?.componentsTree ? extractFieldsFromComponentsTree(rawSchema.componentsTree) : rawFields;
+  const fields = (Array.isArray(extractedFields) ? extractedFields.map((field) => normalizeField(field?.fieldId || field?.id, field)) : Object.entries(extractedFields).map(([key, field]) => normalizeField(key, field))).filter((field) => field.componentName !== "PageSection");
+  const schemaFields = Array.isArray(rawSchema?.fields) ? rawSchema.fields : fields;
+  const hasSchemaFields = Array.isArray(rawSchema?.fields) || fields.length > 0;
   return {
-    fields: fields.filter((field) => field.componentName !== "PageSection"),
+    fields,
     formType,
-    schema: rawSchema && Array.isArray(rawSchema.fields) && schemaAppType && schemaFormUuid ? {
+    schema: rawSchema && hasSchemaFields && schemaAppType && schemaFormUuid ? {
       ...rawSchema,
+      fields: schemaFields,
+      layout: rawSchema.layout || createDefaultLayout(fields),
       formMeta: {
         formUuid: schemaFormUuid,
         appType: schemaAppType,
@@ -21739,7 +21858,7 @@ async function getDataManagementSchema(request, params) {
     method: "get",
     params
   });
-  const result = normalizeDataManagementFields(response);
+  const result = normalizeDataManagementFields(response, params);
   if (result.schema) {
     result.schema = {
       ...result.schema,
@@ -22823,6 +22942,7 @@ var DataManagementList = ({
   title,
   formTitle,
   formType: propFormType,
+  schema: providedSchema,
   forcedConfig,
   showForcedConfig = true,
   detailRenderer,
@@ -23040,7 +23160,10 @@ var DataManagementList = ({
       setTotal(0);
       setSelectedRowKeys([]);
       try {
-        const schemaResult = await getDataManagementSchema(request, { appType, formUuid });
+        const schemaResult = providedSchema ? normalizeDataManagementFields(
+          { appType, formUuid, schema: providedSchema },
+          { appType, formUuid }
+        ) : await getDataManagementSchema(request, { appType, formUuid });
         if (!mounted) return;
         const allFields = uniqueFields([
           ...schemaResult.fields,
@@ -23116,6 +23239,7 @@ var DataManagementList = ({
     loadData,
     menuFormUuid,
     propFormType,
+    providedSchema,
     request,
     title
   ]);
@@ -24062,61 +24186,7 @@ var DataManagementList = ({
 };
 
 // packages/sdk/src/runtime/host/formSchema.ts
-var normalizePlatformComponentName = (componentName) => {
-  const value = String(componentName || "").trim();
-  return value || "TextField";
-};
-var extractSlotNodes = (value) => {
-  if (!value) return [];
-  if (Array.isArray(value)) {
-    return value.flatMap((item) => extractSlotNodes(item));
-  }
-  if (typeof value !== "object") return [];
-  if (value.type === "JSSlot" && value.value) {
-    return extractSlotNodes(value.value);
-  }
-  if (value.componentName || Array.isArray(value.children)) {
-    return [value];
-  }
-  return Object.values(value).flatMap((item) => extractSlotNodes(item));
-};
-var extractFieldsFromComponentsTree = (componentsTree) => {
-  const roots = Array.isArray(componentsTree) ? componentsTree : [componentsTree];
-  const fields = [];
-  const seen = /* @__PURE__ */ new Set();
-  const walk = (components) => {
-    if (!Array.isArray(components)) return;
-    components.forEach((component) => {
-      if (!component || typeof component !== "object") return;
-      const props = component.props || {};
-      const fieldId = String(props.fieldId || component.fieldId || component.id || "").trim();
-      if (props.isFormComponent === true && fieldId && !seen.has(fieldId)) {
-        seen.add(fieldId);
-        fields.push({
-          ...props,
-          id: props.id || component.id || fieldId,
-          fieldId,
-          componentName: normalizePlatformComponentName(
-            props.componentName || component.componentName
-          ),
-          label: props.label || component.title || props.title || fieldId,
-          title: props.title || component.title || props.label || fieldId,
-          required: props.required ?? component.required
-        });
-      }
-      if (component.componentName === "SubFormField") return;
-      if (Array.isArray(component.children)) {
-        walk(component.children);
-      }
-      Object.values(props).forEach((propValue) => {
-        walk(extractSlotNodes(propValue));
-      });
-    });
-  };
-  walk(roots);
-  return fields;
-};
-var createDefaultLayout = (fields) => fields.map((field) => ({
+var createDefaultLayout2 = (fields) => fields.map((field) => ({
   id: `layout_${field.fieldId}`,
   type: "field",
   fieldId: field.fieldId
@@ -24132,7 +24202,7 @@ var normalizeRuntimeFormSchema = (payload, options) => {
   return {
     ...rawSchema,
     fields,
-    layout: rawSchema.layout || createDefaultLayout(fields),
+    layout: rawSchema.layout || createDefaultLayout2(fields),
     formMeta: {
       appType: options.appType,
       formUuid: options.formUuid,