@base-web-kits/base-tools-web 1.1.0-alpha.0 → 1.1.0-alpha.2

package/dist/index.js

@@ -507,9 +507,9 @@ __export(ts_exports, {
   appendUrlParam: () => appendUrlParam,
   arrayMove: () => arrayMove,
   buildOSSUrl: () => buildOSSUrl,
-  createRandId: () => createRandId,
   createTimeRandId: () => createTimeRandId,
   createUUID: () => createUUID,
+  createViewRandId: () => createViewRandId,
   dayjs: () => dayjs,
   getAgeByBirthdate: () => getAgeByBirthdate,
   getByteLength: () => getByteLength,
@@ -959,7 +959,7 @@ function createUUID() {
     return v.toString(16);
   });
 }
-function createRandId(prefix = "id_") {
+function createViewRandId(prefix = "id_") {
   return `${prefix}${Math.random().toString(36).substring(2, 16)}`;
 }
 function createTimeRandId(digits = 6) {
@@ -1494,7 +1494,7 @@ function request(config) {
   let chunkCallback = null;
   const task = {
     abort: () => controller.abort(),
-    onChunkReceived: (cb) => {
+    onProgressUpdate: (cb) => {
       chunkCallback = cb;
     },
     offChunkReceived: () => {
@@ -1527,11 +1527,27 @@ function request(config) {
       const isArrayData = !isObjectData && Array.isArray(data);
       const fillData = isObjectData ? (0, ts_exports.pickBy)(data, (val) => val !== void 0) : data;
       const fillHeader = header ? (0, ts_exports.pickBy)(header, (val) => !!val) : {};
-      if (!isGet && fillData && (isObjectData || isArrayData) && !fillHeader["Content-Type"]) {
+      const contentTypeKey = Object.keys(fillHeader).find(
+        (k) => k.toLowerCase() === "content-type"
+      );
+      const contentType = contentTypeKey ? fillHeader[contentTypeKey].toLowerCase() : "";
+      if (!isGet && fillData && (isObjectData || isArrayData) && !contentType) {
         fillHeader["Content-Type"] = "application/json";
       }
       const fillUrl = isGet && isObjectData ? appendUrlParam(url, fillData) : url;
-      const fillBody = !isGet && fillData ? isObjectData || isArrayData ? JSON.stringify(fillData) : fillData : void 0;
+      let fillBody;
+      if (!isGet && fillData) {
+        if (isObjectData && contentType.includes("application/x-www-form-urlencoded")) {
+          fillBody = toSearchParams(fillData);
+        } else if (isObjectData && contentType.includes("multipart/form-data")) {
+          fillBody = toFormData(fillData);
+          if (contentTypeKey) delete fillHeader[contentTypeKey];
+        } else if (isObjectData || isArrayData) {
+          fillBody = JSON.stringify(fillData);
+        } else {
+          fillBody = fillData;
+        }
+      }
       const logConfig = { ...config, data: fillData, header: fillHeader, url: fillUrl };
       const startTime = Date.now();
       const isCache = cacheTime && cacheTime > 0;
@@ -1686,6 +1702,40 @@ async function parseResponse(response, responseType) {
   }
   return resData;
 }
+function toSearchParams(data) {
+  const params = new URLSearchParams();
+  for (const key in data) {
+    const val = data[key];
+    if (val === null) continue;
+    if (Array.isArray(val)) {
+      val.forEach((v) => params.append(key, typeof v === "object" ? JSON.stringify(v) : String(v)));
+    } else {
+      params.append(key, typeof val === "object" ? JSON.stringify(val) : String(val));
+    }
+  }
+  return params;
+}
+function toFormData(data) {
+  const formData = new FormData();
+  for (const key in data) {
+    const val = data[key];
+    if (val === null) continue;
+    if (Array.isArray(val)) {
+      val.forEach(
+        (v) => formData.append(
+          key,
+          v instanceof Blob ? v : typeof v === "object" ? JSON.stringify(v) : String(v)
+        )
+      );
+    } else {
+      formData.append(
+        key,
+        val instanceof Blob ? val : typeof val === "object" ? JSON.stringify(val) : String(val)
+      );
+    }
+  }
+  return formData;
+}
 
 // src/web/storage/index.ts
 var WK = {