emacroh5lib 1.0.73 → 1.0.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emacroh5lib",
-  "version": "1.0.73",
+  "version": "1.0.77",
   "description": "EMacro前端组件库",
   "main": "dist/emacroh5lib.min.js",
   "scripts": {

package/src/utilities/EMacro.ts

@@ -64,23 +64,22 @@ export namespace EMacro {
             if (files[0].fileName == "" || files[0].fileSize == "" || files[0].fileSize == 0) {
                 throw new Error("文件异常")
             }
-            let directoryName = "";
-            if (files[0].webkitRelativePath != null && files[0].webkitRelativePath.trim() != "" ) {
-                let n = files[0].webkitRelativePath.indexOf("\\")
-                if (n  == -1 ) {
-                    n = files[0].webkitRelativePath.indexOf("/")
-                }
-                if (n != -1) {
-                    directoryName = files[0].webkitRelativePath.substring(0, n)
-                }
-            }
 
             for (let i = 0; i < files.length; i++) {
                 const file = files[i];
                 const md5 = await File.getFileMD5(file)
- 
+
                 let { fileChunks, sliceSize, chunksLength } = File.getFileChunks(file, chunkSize)
 
+                let directoryName = "";
+                if (files[i].webkitRelativePath != null && files[i].webkitRelativePath.trim() != "") {
+                    let n = files[i].webkitRelativePath.lastIndexOf("\\")
+                    if (n == -1) 
+                        n = files[i].webkitRelativePath.lastIndexOf("/")
+                    if (n != -1) 
+                        directoryName = files[i].webkitRelativePath.substring(0, n)
+                }
+
                 for (let index in fileChunks) {
                     let chunk = fileChunks[Number(index)]
                     const base64 = await File.getBase64(chunk) as string
@@ -91,12 +90,13 @@ export namespace EMacro {
                         'chunkSize': chunk.size, // 当前分片实际大小
                         'fileSize': file.size, // 文件总大小
                         'fileName': file.name, // 文件名
-                        'data': base64.split(';base64,')[1], // 文件数据 
                         'lastModifiedDate': file.lastModifiedDate,  // 最后修改时间
                         'md5': md5,
                         'index': i,
                         'dataType': 'base64', // 数据的类型
-                        'directoryName': directoryName // 数据的类型
+                        'directoryName': directoryName, // 数据的类型
+                        'total': files.length, // 总共文件数
+                        'data': base64.split(';base64,')[1], // 文件数据 
                     }
                     await chunkFileHandle(chunkFile)
                 }
@@ -105,7 +105,7 @@ export namespace EMacro {
             completeHandle(files)
         }
 
-        public static selectFile(options: any = { multiple: true, accept: "*/*" }, isDirectory = false): Promise<FileList | null> {
+        public static selectFile(options: any = { multiple: true, accept: "*/*" }, isDirectory = true): Promise<FileList | null> {
             return new Promise((res: (value: FileList) => void, rej) => {
                 const el = document.createElement("input");
                 el.type = "file";
@@ -115,7 +115,7 @@ export namespace EMacro {
                 el.addEventListener("change", (_) => {
                     try {
                         if (el.files === null) {
-                            rej(null)
+                            rej(null);
                         } else {
                             res(el.files);
                         }