openxiangda 1.0.258 → 1.0.260

package/packages/sdk/source/admin-list/AdminList.tsx

@@ -748,6 +748,35 @@ export function AdminList<Row>(props: AdminListProps<Row>) {
     [dataSource, notificationApi],
   )
 
+  const downloadExportTask = async (task: AdminListExportTask) => {
+    try {
+      if (dataSource.downloadExportTask) {
+        await dataSource.downloadExportTask(task, { fileName })
+        return
+      }
+      if (
+        typeof window !== "undefined" &&
+        task.downloadUrl &&
+        (/^(https?:)?\/\//i.test(task.downloadUrl) ||
+          /^(blob|data):/i.test(task.downloadUrl))
+      ) {
+        window.open(task.downloadUrl, "_blank", "noopener")
+        return
+      }
+      throw new Error("当前数据源未配置导出文件下载能力")
+    } catch (downloadError) {
+      notificationApi.error({
+        key: `admin-list-export-download:${task.id}`,
+        title: "下载失败",
+        description:
+          downloadError instanceof Error
+            ? downloadError.message
+            : String(downloadError || "请稍后重试"),
+        duration: 0,
+      })
+    }
+  }
+
   const executeExport = async (scope: "selected" | "all") => {
     if (!dataSource.createExportTask) return
     setExporting(true)
@@ -806,11 +835,7 @@ export function AdminList<Row>(props: AdminListProps<Row>) {
             <Button
               size="small"
               type="primary"
-              onClick={() => {
-                if (typeof window !== "undefined") {
-                  window.open(finished.downloadUrl, "_blank", "noopener")
-                }
-              }}
+              onClick={() => void downloadExportTask(finished)}
             >
               下载文件
             </Button>

package/packages/sdk/source/admin-list/dataSources.ts

@@ -11,6 +11,61 @@ import type {
   AdminListResult,
 } from "./types"
 import { createAdminListPreferenceStore } from "./preferences"
+import type { PageBinaryResponse } from "openxiangda/runtime"
+
+const getHeaderValue = (
+  headers: PageBinaryResponse["headers"],
+  name: string,
+) => {
+  const match = Object.entries(headers || {}).find(
+    ([key]) => key.toLowerCase() === name.toLowerCase(),
+  )
+  return match?.[1] || ""
+}
+
+const decodeFileName = (value: string) => {
+  try {
+    return decodeURIComponent(value)
+  } catch {
+    return value
+  }
+}
+
+const parseContentDispositionFileName = (value: string) => {
+  const utf8Match = value.match(/filename\*=UTF-8''([^;]+)/i)
+  if (utf8Match?.[1]) return decodeFileName(utf8Match[1].trim())
+  const plainMatch = value.match(/filename="?([^";]+)"?/i)
+  return plainMatch?.[1] ? decodeFileName(plainMatch[1].trim()) : ""
+}
+
+const resolveExportFileName = (
+  response: PageBinaryResponse,
+  fallbackName: string,
+) => {
+  const disposition =
+    getHeaderValue(response.headers, "content-disposition") ||
+    (response.fileName?.includes("filename") ? response.fileName : "")
+  const candidate =
+    parseContentDispositionFileName(disposition) ||
+    response.fileName ||
+    fallbackName
+  return candidate.split(/[\\/]/).pop() || fallbackName
+}
+
+const saveExportBlob = (
+  response: PageBinaryResponse,
+  fallbackName: string,
+) => {
+  if (typeof window === "undefined" || typeof document === "undefined") return
+  const objectUrl = window.URL.createObjectURL(response.blob)
+  const anchor = document.createElement("a")
+  anchor.href = objectUrl
+  anchor.download = resolveExportFileName(response, fallbackName)
+  document.body.appendChild(anchor)
+  anchor.click()
+  anchor.remove()
+  window.URL.revokeObjectURL(objectUrl)
+}
 
 const nonEmpty = (value: unknown) =>
   value !== undefined &&
@@ -99,6 +154,7 @@ const createExportClient = (
   source: Record<string, unknown>,
 ) => {
   const appType = options.appType || options.sdk.context.app.appType || ""
+  const requestedFileNames = new Map<string, string>()
   const basePath = `/openxiangda-api/v1/apps/${encodeURIComponent(
     appType,
   )}/admin-list/exports`
@@ -110,6 +166,7 @@ const createExportClient = (
           typeof rowId === "number" ? rowId : String(rowId),
         ),
       }
+      let task: AdminListExportTask
       if (options.sdk.export?.create) {
         const response = await options.sdk.export.create({
           appType,
@@ -122,21 +179,24 @@ const createExportClient = (
         if (!response.result) {
           throw new Error("创建导出任务失败：服务端未返回任务")
         }
-        return response.result
-      }
-      const response = await options.sdk.request<AdminListExportTask>({
-        path: basePath,
-        method: "post",
-        body: {
-          listKey: options.listKey,
-          source,
-          ...normalizedInput,
-        },
-      })
-      if (!response.result) {
-        throw new Error("创建导出任务失败：服务端未返回任务")
+        task = response.result
+      } else {
+        const response = await options.sdk.request<AdminListExportTask>({
+          path: basePath,
+          method: "post",
+          body: {
+            listKey: options.listKey,
+            source,
+            ...normalizedInput,
+          },
+        })
+        if (!response.result) {
+          throw new Error("创建导出任务失败：服务端未返回任务")
+        }
+        task = response.result
       }
-      return response.result
+      if (input.fileName) requestedFileNames.set(task.id, input.fileName)
+      return task
     },
     getExportTask: async (taskId: string) => {
       if (options.sdk.export?.get) {
@@ -155,6 +215,24 @@ const createExportClient = (
       }
       return response.result
     },
+    downloadExportTask: async (
+      task: AdminListExportTask,
+      downloadOptions: { fileName?: string } = {},
+    ) => {
+      if (!task.downloadUrl) {
+        throw new Error("导出任务未返回下载地址")
+      }
+      const response = await options.sdk.transport.download({
+        path: task.downloadUrl,
+        method: "get",
+      })
+      const fallbackName =
+        downloadOptions.fileName ||
+        requestedFileNames.get(task.id) ||
+        `${options.listKey}.xlsx`
+      saveExportBlob(response, fallbackName)
+      requestedFileNames.delete(task.id)
+    },
   }
 }
 

package/packages/sdk/source/admin-list/index.ts

@@ -19,6 +19,7 @@ export type {
   AdminListDataViewSourceOptions,
   AdminListDensity,
   AdminListExportInput,
+  AdminListExportDownloadOptions,
   AdminListExportScope,
   AdminListExportTask,
   AdminListExportTaskStatus,

package/packages/sdk/source/admin-list/types.ts

@@ -187,6 +187,10 @@ export interface AdminListExportTask {
   expiresAt?: string
 }
 
+export interface AdminListExportDownloadOptions {
+  fileName?: string
+}
+
 export interface AdminListDataSource<Row> {
   key?: string
   query: (query: AdminListQuery) => Promise<AdminListResult<Row>>
@@ -195,6 +199,10 @@ export interface AdminListDataSource<Row> {
     input: AdminListExportInput,
   ) => Promise<AdminListExportTask>
   getExportTask?: (taskId: string) => Promise<AdminListExportTask>
+  downloadExportTask?: (
+    task: AdminListExportTask,
+    options?: AdminListExportDownloadOptions,
+  ) => Promise<void>
 }
 
 export interface AdminListDataSourceOptions {