bkui-vue 2.0.1-beta.37 → 2.0.1-beta.39

package/lib/upload/index.js

@@ -1292,6 +1292,11 @@ var EThemes;
   EThemes["DRAGGABLE"] = "draggable";
   EThemes["PICTURE"] = "picture";
 })(EThemes || (EThemes = {}));
+var ETypes;
+(function (ETypes) {
+  ETypes["FORMDATA"] = "formdata";
+  ETypes["BINARY"] = "binary";
+})(ETypes || (ETypes = {}));
 var EUploadStatus;
 (function (EUploadStatus) {
   EUploadStatus["FAIL"] = "fail";
@@ -1299,6 +1304,7 @@ var EUploadStatus;
   EUploadStatus["SUCCESS"] = "success";
   EUploadStatus["UPLOADING"] = "uploading";
 })(EUploadStatus || (EUploadStatus = {}));
+;
 ;// CONCATENATED MODULE: ../../packages/upload/src/props.ts
 /*
  * Tencent is pleased to support the open source community by making
@@ -1327,7 +1333,19 @@ var EUploadStatus;
  */
 
 var themes = [EThemes.BUTTON, EThemes.DRAGGABLE, EThemes.PICTURE];
+var types = [ETypes.FORMDATA, ETypes.BINARY];
 /* harmony default export */ const props = ({
+  type: {
+    type: String,
+    "default": 'formdata',
+    validator: function validator(val) {
+      if (!val || types.includes(val)) {
+        return true;
+      }
+      console.error("invalid type, ".concat(val, ", the type must be one of \u3010").concat(types.join(' | '), "\u3011"));
+      return false;
+    }
+  },
   theme: {
     type: String,
     "default": 'draggable',
@@ -2052,7 +2070,9 @@ var ajaxUpload = function ajaxUpload(option) {
     throw new Error('XMLHttpRequest is undefined');
   }
   var xhr = new XMLHttpRequest();
-  var action = option.action;
+  var action = option.action,
+    type = option.type;
+  var isFormdata = type === 'formdata';
   if (xhr.upload) {
     xhr.upload.addEventListener('progress', function (event) {
       var progressEvent = event;
@@ -2061,7 +2081,7 @@ var ajaxUpload = function ajaxUpload(option) {
     });
   }
   var formData = new FormData();
-  if (option.data) {
+  if (isFormdata && option.data) {
     var appendData = option.data;
     if (!Array.isArray(appendData)) {
       appendData = [appendData];
@@ -2075,7 +2095,7 @@ var ajaxUpload = function ajaxUpload(option) {
       }
     });
   }
-  if (option.formDataAttributes) {
+  if (isFormdata && option.formDataAttributes) {
     var _appendData = option.formDataAttributes;
     if (!Array.isArray(_appendData)) {
       _appendData = [_appendData];
@@ -2084,7 +2104,9 @@ var ajaxUpload = function ajaxUpload(option) {
       if (Array.isArray(item.value)) formData.append.apply(formData, [item.name].concat(_toConsumableArray(item.value)));else formData.append(item.name, item.value);
     });
   }
-  formData.append(option.filename, option.file, option.file.name);
+  if (isFormdata) {
+    formData.append(option.filename, option.file, option.file.name);
+  }
   xhr.addEventListener('error', function () {
     option.onError(new Error('An error occurred during upload'));
   });
@@ -2128,7 +2150,7 @@ var ajaxUpload = function ajaxUpload(option) {
       xhr.setRequestHeader(key, String(value));
     }
   }
-  xhr.send(formData);
+  xhr.send(isFormdata ? formData : option.file);
   return xhr;
 };
 // 该方法用于在不同的浏览器使用不同的方式
@@ -2733,7 +2755,8 @@ function upload_arrayLikeToArray(arr, len) { if (len == null || len > arr.length
       return _upload.apply(this, arguments);
     }
     function send(file, sendFiles) {
-      var headers = props.headers,
+      var type = props.type,
+        headers = props.headers,
         header = props.header,
         data = props.data,
         formDataAttributes = props.formDataAttributes,
@@ -2747,6 +2770,7 @@ function upload_arrayLikeToArray(arr, len) { if (len == null || len > arr.length
         customRequest = props.customRequest;
       var uid = file.uid;
       var options = {
+        type: type,
         headers: headers,
         header: header,
         withCredentials: withCredentials,

package/lib/upload/props.d.ts

@@ -1,6 +1,11 @@
-import { APIResponse, EThemes, ExtraFormData, FormDataAttr, HeaderDataAttr, MaxSize, UploadFile, UploadRawFile, UploadRequestHandler } from './upload.type';
+import { APIResponse, EThemes, ETypes, ExtraFormData, FormDataAttr, HeaderDataAttr, MaxSize, UploadFile, UploadRawFile, UploadRequestHandler } from './upload.type';
 import type { PropType } from 'vue';
 declare const _default: {
+    type: {
+        type: PropType<"formdata" | "binary">;
+        default: "formdata" | "binary";
+        validator: (val: ETypes) => boolean;
+    };
     theme: {
         type: PropType<"button" | "picture" | "draggable">;
         default: "button" | "picture" | "draggable";

package/lib/upload/upload.d.ts

@@ -1,5 +1,10 @@
 import { APIResponse, EThemes, UploadFile, UploadRawFile } from './upload.type';
 declare const _default: import("vue").DefineComponent<{
+    type: {
+        type: import("vue").PropType<"formdata" | "binary">;
+        default: "formdata" | "binary";
+        validator: (val: import("./upload.type").ETypes) => boolean;
+    };
     theme: {
         type: import("vue").PropType<"button" | "picture" | "draggable">;
         default: "button" | "picture" | "draggable";
@@ -110,6 +115,11 @@ declare const _default: import("vue").DefineComponent<{
         default: number;
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("done" | "error" | "progress" | "delete" | "success" | "exceed")[], "done" | "error" | "progress" | "delete" | "success" | "exceed", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    type: {
+        type: import("vue").PropType<"formdata" | "binary">;
+        default: "formdata" | "binary";
+        validator: (val: import("./upload.type").ETypes) => boolean;
+    };
     theme: {
         type: import("vue").PropType<"button" | "picture" | "draggable">;
         default: "button" | "picture" | "draggable";
@@ -228,6 +238,7 @@ declare const _default: import("vue").DefineComponent<{
     onExceed?: (...args: any[]) => any;
 }, {
     name: string;
+    type: "formdata" | "binary";
     data: import("./upload.type").ExtraFormData | import("./upload.type").ExtraFormData[];
     header: import("./upload.type").HeaderDataAttr | import("./upload.type").HeaderDataAttr[];
     extCls: string;

package/lib/upload/upload.type.d.ts

@@ -7,6 +7,11 @@ export declare const enum EThemes {
     PICTURE = "picture"
 }
 export type Theme = Lowercase<keyof typeof EThemes>;
+export declare const enum ETypes {
+    FORMDATA = "formdata",
+    BINARY = "binary"
+}
+export type Type = Lowercase<keyof typeof ETypes>;
 export declare const enum EUploadStatus {
     FAIL = "fail",
     NEW = "new",
@@ -56,11 +61,12 @@ export type UploadProps = ExtractPropTypes<typeof uploadProps>;
 export interface UploadRequestOptions {
     action: string;
     method: string;
+    type: Type;
     data?: ExtraFormData | ExtraFormData[];
     formDataAttributes?: FormDataAttr | FormDataAttr[];
     filename: string;
     file: File;
-    headers?: Headers | Record<string, null | number | string | undefined>;
+    headers?: Headers | Record<string, string | number | null | undefined>;
     header?: HeaderDataAttr | HeaderDataAttr[];
     withCredentials: boolean;
     sliceUrl: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "2.0.1-beta.37",
+  "version": "2.0.1-beta.39",
   "workspaces": [
     "packages/**",
     "scripts/cli",