@domain.js/main 1.0.0-alpha.4 → 1.0.0-alpha.6

package/dist/http/utils.d.ts

@@ -23,7 +23,9 @@ export declare function Utils(cnf: Cnf): {
         Querystring: Record<string, any>;
         Params: Record<string, any>;
         Body: Record<string, any>;
-    }>): Promise<{}>;
+    }>): Promise<{
+        [x: string]: any;
+    }>;
     /**
      *
      * 输出csv相关

package/dist/http/utils.js

@@ -150,26 +150,42 @@ function Utils(cnf) {
             else if (req.body) {
                 params.__raw = req.body;
             }
-            // 逗号分隔的属性，自动转换为 array
-            for (const k of str2arr) {
-                if (params[k] && lodash_1.default.isString(params[k]))
-                    params[k] = params[k].split(",");
-            }
-            // 检查请求是否包含文件上传
+            // 处理 multipart：同时解析字段与文件
             let files = {};
             try {
-                // 只有在 multipart 请求时才处理文件
                 if ((_a = req.headers["content-type"]) === null || _a === void 0 ? void 0 : _a.includes("multipart/form-data")) {
-                    const uploadedFile = await req.file();
-                    if (uploadedFile) {
-                        files = await RestifyFileConvertUploadFiles(uploadedFile);
+                    const fields = {};
+                    const parts = req.parts();
+                    for await (const part of parts) {
+                        if (part.type === "file") {
+                            const saved = await RestifyFileConvertUploadFiles(part);
+                            Object.assign(files, saved);
+                        }
+                        else if (part.type === "field") {
+                            const key = part.fieldname;
+                            const value = part.value;
+                            if (fields[key] !== undefined) {
+                                fields[key] = Array.isArray(fields[key])
+                                    ? [...fields[key], value]
+                                    : [fields[key], value];
+                            }
+                            else {
+                                fields[key] = value;
+                            }
+                        }
                     }
+                    // 将表单字段合并进 params
+                    params = { ...fields, ...params };
                 }
             }
             catch (error) {
-                // 如果文件处理出错，记录错误但不中断请求处理
                 console.warn("File upload processing error:", error);
             }
+            // 逗号分隔的属性，自动转换为 array（在合并字段之后处理）
+            for (const k of str2arr) {
+                if (params[k] && lodash_1.default.isString(params[k]))
+                    params[k] = params[k].split(",");
+            }
             // 将上传文件附加到 params 中
             return { ...params, ...files };
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domain.js/main",
-  "version": "1.0.0-alpha.4",
+  "version": "1.0.0-alpha.6",
   "description": "DDD framework",
   "main": "dist/index.js",
   "bin": {