bkui-vue 2.0.1-beta.60.fix.1 → 2.0.1-beta.62

package/lib/tree/use-node-attribute.d.ts

@@ -1,45 +1,53 @@
-import { TreePropTypes } from './props';
+import { TreeNode, TreePropTypes } from './props';
 declare const _default: (flatData: {
-    data: any[];
-    schema: WeakMap<Object, any>;
+    data: TreeNode[];
+    schema: WeakMap<TreeNode, unknown>;
 }, props?: TreePropTypes) => {
-    getSchemaVal: (node: any) => any;
-    getNodeAttr: (node: any, attr: string) => any;
-    getNodeId: (node: any) => any;
-    getNodeById: (id: any) => any;
-    getNodeParentId: (node: any) => any;
-    getParentNodeData: (node: any) => any;
+    getSchemaVal: (node: TreeNode) => unknown;
+    getNodeAttr: (node: TreeNode, attr: string) => any;
+    getNodeId: (node: TreeNode) => any;
+    getNodeById: (id: string | unknown) => TreeNode;
+    getNodeParentId: (node: TreeNode) => any;
+    getParentNodeData: (node: TreeNode | string) => any;
     getNodePathById: (id: string) => any;
     getNodeAttrById: (id: string, attr: string) => any;
     getNodeParentIdById: (id: string) => any;
-    getParentNodeAttr: (node: any, attrName: string) => any;
-    getParentNode: (node: any) => any;
-    setNodeAttr: (node: any, attr: string, val: any, id?: any) => void;
-    setNodeAttrById: (id: any, attr: string, val: any) => void;
-    getNodePath: (node: any) => any;
-    isRootNode: (node: any | string) => any;
-    isNodeOpened: (node: any) => any;
-    hasChildNode: (node: any) => any;
-    isItemOpen: (item: any) => any;
-    isNodeChecked: (node: any) => any;
-    isNodeMatched: (node: any) => any;
-    isNodeLoading: (node: any) => any;
-    checkNodeIsOpen: (node: any) => any;
-    getSourceNodeByPath: (path: string, uid?: string) => any;
-    getSourceNodeByUID: (uid: string) => any;
-    isMatchedNode: (node: any) => any;
-    resolveScopedSlotParam: (item: any) => {
+    getParentNodeAttr: (node: TreeNode, attrName: string) => any;
+    getParentNode: (node: TreeNode) => any;
+    setNodeAttr: (node: TreeNode, attr: string, val: unknown, id?: any) => void;
+    setNodeAttrById: (id: unknown, attr: string, val: unknown) => void;
+    getNodePath: (node: TreeNode) => any;
+    isRootNode: (node: TreeNode | string) => any;
+    isNodeOpened: (node: TreeNode) => any;
+    hasChildNode: (node: TreeNode) => any;
+    isItemOpen: (item: TreeNode) => any;
+    isNodeChecked: (node: TreeNode) => any;
+    isNodeMatched: (node: TreeNode) => any;
+    isNodeLoading: (node: TreeNode) => any;
+    checkNodeIsOpen: (node: TreeNode) => any;
+    getSourceNodeByPath: (path: string, uid?: string) => any[];
+    getSourceNodeByUID: (uid: string) => TreeNode;
+    isMatchedNode: (node: TreeNode) => any;
+    resolveScopedSlotParam: (item: TreeNode) => {
         [x: string]: any;
         fullPath: any;
         uuid: any;
         parent: any;
         parentId: any;
     };
-    setTreeNodeLoading: (node: any, value: boolean) => void;
-    extendNodeAttr: (item: any) => any;
-    getChildNodes: (node: any) => any;
-    extendNodeScopedData: (item: any) => {
-        data: any;
+    setTreeNodeLoading: (node: TreeNode, value: boolean) => void;
+    extendNodeAttr: (item: TreeNode) => TreeNode & {
+        __attr__: {
+            [x: string]: any;
+            fullPath: any;
+            uuid: any;
+            parent: any;
+            parentId: any;
+        };
+    };
+    getChildNodes: (node: TreeNode) => TreeNode[];
+    extendNodeScopedData: (item: TreeNode) => {
+        data: TreeNode;
         attributes: {
             [x: string]: any;
             fullPath: any;
@@ -48,12 +56,12 @@ declare const _default: (flatData: {
             parentId: any;
         };
     };
-    getIntersectionResponse: (target: HTMLElement | Record<string, any>) => {
+    getIntersectionResponse: (target: HTMLElement | TreeNode) => {
         level: any;
-        target: HTMLElement | Record<string, any>;
+        target: HTMLElement | TreeNode;
         index: any;
         parent: any;
-        node: HTMLElement | Record<string, any>;
+        node: HTMLElement | TreeNode;
         isRoot: any;
     };
 };

package/lib/tree/use-search.d.ts

@@ -1,6 +1,6 @@
 import { SearchOption, TreePropTypes } from './props';
 declare const _default: (props: TreePropTypes) => {
-    searchFn: (itemValue: number | string, item: any) => any;
+    searchFn: (itemValue: unknown, item: unknown) => boolean;
     refSearch: import("vue").Ref<string | number | boolean | SearchOption>;
     isSearchActive: import("vue").ComputedRef<boolean>;
     isSearchDisabled: boolean;

package/lib/tree/use-tree-init.d.ts

@@ -1,13 +1,16 @@
-import { TreePropTypes } from './props';
+import { TreeNode, TreePropTypes } from './props';
 declare const _default: (props: TreePropTypes) => {
     flatData: {
-        data: any[];
-        schema: WeakMap<Object, any> & Omit<WeakMap<Object, any>, keyof WeakMap<any, any>>;
+        data: {
+            [x: string]: unknown;
+            children?: any[];
+        }[];
+        schema: WeakMap<TreeNode, Record<string, unknown>> & Omit<WeakMap<TreeNode, Record<string, unknown>>, keyof WeakMap<any, any>>;
         levelLineSchema: {};
     };
-    asyncNodeClick: (item: any) => Promise<any>;
+    asyncNodeClick: (item: TreeNode) => Promise<boolean> | Promise<void | Record<string, unknown>>;
     deepAutoOpen: () => void;
-    afterDataUpdate: (callFn: (d: any) => any) => void;
+    afterDataUpdate: (callFn: (d: any) => void) => void;
     registerNextLoop: (key: string, event: any, reset?: boolean) => void;
     onSelected: (event: (d: any) => void) => void;
 };

package/lib/tree/util.d.ts

@@ -1,22 +1,22 @@
-import { TreePropTypes } from './props';
+import { TreeNode, TreePropTypes } from './props';
 export type IFlatData = {
-    data: any[];
-    schema: WeakMap<Object, any>;
+    data: TreeNode[];
+    schema: WeakMap<TreeNode, Record<string, unknown>>;
 };
 /**
  * 获取当前节点显示Label
  * @param item 当前节点
  * @param props Props
  */
-export declare const getLabel: (item: any, props: TreePropTypes) => any;
+export declare const getLabel: (item: TreeNode, props: TreePropTypes) => unknown;
 /**
  * 根据Props获取Tree样式设置
  * @param item
  * @param props
  * @returns
  */
-export declare const getTreeStyle: (item: any, props: TreePropTypes) => {
-    '--level-line': any;
+export declare const getTreeStyle: (item: TreeNode, props: TreePropTypes) => {
+    '--level-line': unknown;
     '--lineHeight': string;
     '--indent': string;
     '--offset-left': string;
@@ -27,16 +27,16 @@ export declare const getTreeStyle: (item: any, props: TreePropTypes) => {
  * @param props
  * @returns
  */
-export declare const getNodeItemStyle: any;
+export declare const getNodeItemStyle: (item: TreeNode, props: TreePropTypes, flatData: IFlatData, showTree?: boolean) => {};
 /**
  * 获取当前渲染节点Class List
  * @param item
  * @returns
  */
-export declare const getNodeItemClass: (item: any, schema: WeakMap<Object, any>, props: TreePropTypes, showTree?: boolean) => {
-    [x: string]: any;
-    'is-root': any;
-    'is-open': any;
+export declare const getNodeItemClass: (item: TreeNode, schema: WeakMap<TreeNode, Record<string, unknown>>, props: TreePropTypes, showTree?: boolean) => {
+    [x: string]: unknown;
+    'is-root': unknown;
+    'is-open': unknown;
     'is-virtual-render': boolean;
     'level-line': boolean;
 };
@@ -45,12 +45,12 @@ export declare const getNodeItemClass: (item: any, schema: WeakMap<Object, any>,
  * @param item
  * @returns
  */
-export declare const getNodeRowClass: (item: any, schema: WeakMap<Object, any>) => {
-    [x: string]: any;
-    'is-checked': any;
-    'is-selected': any;
-    'node-folder': any;
-    'node-leaf': any;
+export declare const getNodeRowClass: (item: TreeNode, schema: WeakMap<TreeNode, Record<string, unknown>>) => {
+    [x: string]: unknown;
+    'is-checked': unknown;
+    'is-selected': unknown;
+    'node-folder': unknown;
+    'node-leaf': unknown;
 };
 /**
  * 根据路径更新指定节点Child-Data
@@ -60,7 +60,7 @@ export declare const getNodeRowClass: (item: any, schema: WeakMap<Object, any>)
  * @param nodekey 节点key
  * @param nodeValue 节点值
  */
-export declare const updateTreeNode: (path: string, treeData: any[], childKey: string, nodekey: string, nodeValue: any) => void;
+export declare const updateTreeNode: (path: string, treeData: TreeNode[], childKey: string, nodekey: string, nodeValue: Record<string, unknown>[]) => void;
 /**
  * 根据路径更新指定节点Child-Data
  * @param path 节点路径
@@ -68,7 +68,7 @@ export declare const updateTreeNode: (path: string, treeData: any[], childKey: s
  * @param childKey Child Key
  * @param assignVal value
  */
-export declare const assignTreeNode: (path: string, treeData: any[], childKey: string, assignVal: any) => void;
-export declare const resolveNodeItem: (node: any) => any;
+export declare const assignTreeNode: (path: string, treeData: TreeNode[], childKey: string, assignVal: Record<string, unknown>) => void;
+export declare const resolveNodeItem: (node: TreeNode) => TreeNode;
 export declare const resolvePropIsMatched: (node: any, prop: any, id: any) => any;
-export declare const showCheckbox: (props: TreePropTypes, node?: any) => any;
+export declare const showCheckbox: (props: TreePropTypes, node?: TreeNode) => any;

package/lib/upload/index.d.ts

@@ -1,5 +1,10 @@
 declare const Upload: {
     new (...args: any[]): import("vue").CreateComponentPublicInstance<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";
@@ -88,7 +93,7 @@ declare const Upload: {
             type: import("vue").PropType<(event: Event) => boolean | void>;
         };
         beforeUpload: {
-            type: import("vue").PropType<(file: import("./upload.type").UploadRawFile) => boolean | Promise<boolean>>;
+            type: import("vue").PropType<(file: import("./upload.type").UploadRawFile, uploadFiles: File[]) => boolean | Promise<boolean>>;
         };
         beforeRemove: {
             type: import("vue").PropType<(file: import("./upload.type").UploadFile, uploadFiles: import("./upload.type").UploadFile[]) => boolean | Promise<boolean>>;
@@ -117,6 +122,11 @@ declare const Upload: {
         onSuccess?: (...args: any[]) => any;
         onExceed?: (...args: any[]) => any;
     }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("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";
@@ -205,7 +215,7 @@ declare const Upload: {
             type: import("vue").PropType<(event: Event) => boolean | void>;
         };
         beforeUpload: {
-            type: import("vue").PropType<(file: import("./upload.type").UploadRawFile) => boolean | Promise<boolean>>;
+            type: import("vue").PropType<(file: import("./upload.type").UploadRawFile, uploadFiles: File[]) => boolean | Promise<boolean>>;
         };
         beforeRemove: {
             type: import("vue").PropType<(file: import("./upload.type").UploadFile, uploadFiles: import("./upload.type").UploadFile[]) => boolean | Promise<boolean>>;
@@ -235,6 +245,7 @@ declare const Upload: {
         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;
@@ -263,6 +274,11 @@ declare const Upload: {
         M: {};
         Defaults: {};
     }, 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";
@@ -351,7 +367,7 @@ declare const Upload: {
             type: import("vue").PropType<(event: Event) => boolean | void>;
         };
         beforeUpload: {
-            type: import("vue").PropType<(file: import("./upload.type").UploadRawFile) => boolean | Promise<boolean>>;
+            type: import("vue").PropType<(file: import("./upload.type").UploadRawFile, uploadFiles: File[]) => boolean | Promise<boolean>>;
         };
         beforeRemove: {
             type: import("vue").PropType<(file: import("./upload.type").UploadFile, uploadFiles: import("./upload.type").UploadFile[]) => boolean | Promise<boolean>>;
@@ -381,6 +397,7 @@ declare const Upload: {
         onExceed?: (...args: any[]) => any;
     }, () => JSX.Element, {}, {}, {}, {
         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;
@@ -406,6 +423,11 @@ declare const Upload: {
     __isTeleport?: never;
     __isSuspense?: never;
 } & import("vue").ComponentOptionsBase<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";
@@ -494,7 +516,7 @@ declare const Upload: {
         type: import("vue").PropType<(event: Event) => boolean | void>;
     };
     beforeUpload: {
-        type: import("vue").PropType<(file: import("./upload.type").UploadRawFile) => boolean | Promise<boolean>>;
+        type: import("vue").PropType<(file: import("./upload.type").UploadRawFile, uploadFiles: File[]) => boolean | Promise<boolean>>;
     };
     beforeRemove: {
         type: import("vue").PropType<(file: import("./upload.type").UploadFile, uploadFiles: import("./upload.type").UploadFile[]) => boolean | Promise<boolean>>;
@@ -524,6 +546,7 @@ declare const Upload: {
     onExceed?: (...args: any[]) => any;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("done" | "error" | "progress" | "delete" | "success" | "exceed")[], "done" | "error" | "progress" | "delete" | "success" | "exceed", {
     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/index.js

@@ -1292,6 +1292,11 @@ var EThemes;
   EThemes["DRAGGABLE"] = "draggable";
   EThemes["PICTURE"] = "picture";
 })(EThemes || (EThemes = {}));
+var ETypes;
+(function (ETypes) {
+  ETypes["BINARY"] = "binary";
+  ETypes["FORMDATA"] = "formdata";
+})(ETypes || (ETypes = {}));
 var EUploadStatus;
 (function (EUploadStatus) {
   EUploadStatus["FAIL"] = "fail";
@@ -1327,7 +1332,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 +2069,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 +2080,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 +2094,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 +2103,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 +2149,7 @@ var ajaxUpload = function ajaxUpload(option) {
       xhr.setRequestHeader(key, String(value));
     }
   }
-  xhr.send(formData);
+  xhr.send(isFormdata ? formData : option.file);
   return xhr;
 };
 // 该方法用于在不同的浏览器使用不同的方式
@@ -2706,7 +2727,7 @@ function upload_arrayLikeToArray(arr, len) { if (len == null || len > arr.length
             case 2:
               _context.prev = 2;
               _context.next = 5;
-              return (_props$beforeUpload = props.beforeUpload) === null || _props$beforeUpload === void 0 ? void 0 : _props$beforeUpload.call(props, file);
+              return (_props$beforeUpload = props.beforeUpload) === null || _props$beforeUpload === void 0 ? void 0 : _props$beforeUpload.call(props, file, sendFiles);
             case 5:
               beforeResult = _context.sent;
               _context.next = 11;
@@ -2733,7 +2754,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 +2769,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";
@@ -89,7 +94,7 @@ declare const _default: {
         type: PropType<(event: Event) => boolean | void>;
     };
     beforeUpload: {
-        type: PropType<(file: UploadRawFile) => Promise<boolean> | boolean>;
+        type: PropType<(file: UploadRawFile, uploadFiles: File[]) => Promise<boolean> | boolean>;
     };
     beforeRemove: {
         type: PropType<(file: UploadFile, uploadFiles: UploadFile[]) => Promise<boolean> | boolean>;