emacroh5lib 1.0.30 → 1.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emacroh5lib",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "description": "EMacro前端组件库",
   "main": "dist/emacroh5lib.min.js",
   "scripts": {
@@ -106,4 +106,4 @@
     "xlsx": "^0.18.5",
     "xlsx-style": "^0.8.13"
   }
-}
+}

package/src/utilities/File.ts

@@ -6,7 +6,7 @@ import createTaskQueue from 'sync-task-queue'
 
 export namespace EMacro {
 
-    export const version = "1.0"
+    export const version = "1.1"
 
     export class File {
 
@@ -59,9 +59,7 @@ export namespace EMacro {
         }
 
         // 文件上传
-        public static async uploadFiles(files, postFunc, chunkSize: number = 1024 * 1024 * 1, errFunc = (err) => {
-            console.error(err);
-        }) {
+        public static async uploadFiles(files, chunkFileHandle, fileComplete = (file) => { }, completeHandle = (files) => { }, chunkSize: number = 1024 * 1024 * 1) {
 
             if (files[0].fileName == "" || files[0].fileSize == "" || files[0].fileSize == 0) {
                 throw new Error("文件异常")
@@ -76,7 +74,7 @@ export namespace EMacro {
                 for (let index in fileChunks) {
                     let chunk = fileChunks[Number(index)]
                     const base64 = await File.getBase64(chunk) as string
-                    let data = {
+                    let chunkFile = {
                         'chunkIndex': Number(index), // 分片位置
                         'chunksLength': chunksLength, // 分片长度
                         'sliceSize': sliceSize, // 分片大小
@@ -86,12 +84,14 @@ export namespace EMacro {
                         'data': base64.split(';base64,')[1], // 文件数据 
                         'lastModifiedDate': file.lastModifiedDate,  // 最后修改时间
                         'md5': md5,
+                        'index': i,
                         'dataType': 'base64' // 数据的类型
                     }
-                    await postFunc(data)
+                    await chunkFileHandle(chunkFile)
                 }
-
+                fileComplete(file);
             }
+            completeHandle(files)
         }
 
         public static selectFile(options: any = { multiple: true, accept: "*/*" }): Promise<FileList | null> {
@@ -137,6 +137,23 @@ export namespace EMacro {
 
     }
 
+    export const fullScreen = (docElm: any = null) => {
+        if (docElm === null) {
+            docElm = document.documentElement
+        }
+        if (docElm.requestFullscreen) {
+            docElm.requestFullscreen();
+        } else if (docElm.mozRequestFullScreen) {
+            docElm.mozRequestFullScreen();
+        } else if (docElm.msRequestFullscreen) {
+            docElm.msRequestFullscreen();
+        } else if (docElm.oRequestFullscreen) {
+            docElm.oRequestFullscreen();
+        } else if (docElm.webkitRequestFullScreen) {
+            docElm.webkitRequestFullScreen();
+        }
+    }
+
 }
 
 

package/src/views/TestView/index.vue

@@ -10,8 +10,6 @@
       :currentIndex="currentIndex" />
 
 
-
-
     <div class="list" id="list">
 
       <DragResizeView v-for="(rect, index) in rects" :key="index" :isStorage="true" :name="rect.name" :w="rect.width"