sa2kit 1.6.105 → 1.6.111

package/dist/showmasterpiece/ui/web/index.mjs

@@ -7317,9 +7317,9 @@ var UniversalExportClient = class {
       };
       if (typeof request.configId === "string") {
         requestBody.configId = request.configId;
-      } else {
+      } else if (request.configId && typeof request.configId === "object") {
         requestBody.config = request.configId;
-        if (request.configId?.id) {
+        if (request.configId.id) {
           requestBody.configId = request.configId.id;
         }
       }
@@ -7468,7 +7468,10 @@ var UniversalExportClient = class {
    * 转换API返回的导出结果
    */
   transformExportResultFromAPI(apiResult) {
-    const fileBlob = this.createFileBlobFromBase64(apiResult.fileData, apiResult.fileName);
+    const fileBlob = this.createFileBlobFromBase64(
+      apiResult.fileData ?? apiResult.fileBlob,
+      apiResult.fileName
+    );
     return {
       exportId: apiResult.exportId,
       fileName: apiResult.fileName,
@@ -8272,10 +8275,10 @@ var BookingAdminPanel = ({
           "Content-Type": "application/json"
         },
         body: JSON.stringify({
+          configId: exportConfig.id,
           config: exportConfig,
           data: exportData,
           customFileName: `\u9884\u8BA2\u4FE1\u606F_${(/* @__PURE__ */ new Date()).toISOString().split("T")[0]}${enableUserPriceCalculation ? "_\u542B\u7528\u6237\u603B\u4EF7" : ""}`,
-          // 不传递分页参数，避免导出时被分页限制
           pagination: void 0
         })
       });
@@ -8284,10 +8287,11 @@ var BookingAdminPanel = ({
         throw new Error(errorData.error || `\u5BFC\u51FA\u5931\u8D25: ${response.statusText}`);
       }
       const responseData = await response.json();
-      if (responseData.result && responseData.result.fileData) {
+      const base64Payload = responseData.result?.fileData ?? responseData.result?.fileBlob;
+      if (responseData.result && base64Payload) {
         console.log("\u{1F4C1} [BookingAdminPanel] \u68C0\u6D4B\u5230\u6587\u4EF6\u6570\u636E\uFF0C\u5F00\u59CB\u4E0B\u8F7D");
-        const { fileData, fileName } = responseData.result;
-        const binaryString = atob(fileData);
+        const { fileName } = responseData.result;
+        const binaryString = atob(base64Payload);
         const bytes = new Uint8Array(binaryString.length);
         for (let i = 0; i < binaryString.length; i++) {
           bytes[i] = binaryString.charCodeAt(i);