emacroh5lib 1.0.28 → 1.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emacroh5lib",
-  "version": "1.0.28",
+  "version": "1.0.31",
   "description": "EMacro前端组件库",
   "main": "dist/emacroh5lib.min.js",
   "scripts": {
@@ -14,7 +14,7 @@
     "serve": "webpack serve",
     "dev": "vue-cli-service test:e2e",
     "commit": "cz",
-    "push": "webpack --mode=production --node-env=production && npm publish  --registry https://registry.npmjs.org",
+    "push": "npm run build && npm publish  --registry https://registry.npmjs.org",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [
@@ -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 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("文件异常")
@@ -69,41 +67,31 @@ export namespace EMacro {
 
             for (let i = 0; i < files.length; i++) {
                 const file = files[i];
-                let { fileChunks, sliceSize, chunksLength } = File.getFileChunks(file, chunkSize)
-
-                File.getFileMD5(file).then(md5 => {
-
-                    const taskQueue = createTaskQueue();
-
-                    for (let index in fileChunks) {
-                        let chunk = fileChunks[Number(index)]
+                const md5 = await File.getFileMD5(file)
 
-                        File.getBase64(chunk).then((base64: any) => {
-                            let data = {
-                                'chunkIndex': Number(index), // 分片位置
-                                'chunksLength': chunksLength, // 分片长度
-                                'sliceSize': sliceSize, // 分片大小
-                                'chunkSize': chunk.size, // 当前分片实际大小
-                                'fileSize': file.size, // 文件总大小
-                                'fileName': file.name, // 文件名
-                                'data': base64.split(';base64,')[1], // 文件数据 
-                                'lastModifiedDate': file.lastModifiedDate,  // 最后修改时间
-                                'md5': md5,
-                                'dataType': 'base64' // 数据的类型
-                            }
-
-                            taskQueue.enqueue(postFunc(data)).then((res) => console.log('文件上传chunkIndex: ', index, res));
+                let { fileChunks, sliceSize, chunksLength } = File.getFileChunks(file, chunkSize)
 
-                        }).catch((err) => {
-                            errFunc({ err: err, file: file.file, chunkIndex: index, fileName: file.name })
-                        })
+                for (let index in fileChunks) {
+                    let chunk = fileChunks[Number(index)]
+                    const base64 = await File.getBase64(chunk) as string
+                    let chunkFile = {
+                        'chunkIndex': Number(index), // 分片位置
+                        'chunksLength': chunksLength, // 分片长度
+                        'sliceSize': sliceSize, // 分片大小
+                        'chunkSize': chunk.size, // 当前分片实际大小
+                        'fileSize': file.size, // 文件总大小
+                        'fileName': file.name, // 文件名
+                        'data': base64.split(';base64,')[1], // 文件数据 
+                        'lastModifiedDate': file.lastModifiedDate,  // 最后修改时间
+                        'md5': md5,
+                        'index': i,
+                        'dataType': 'base64' // 数据的类型
                     }
-
-                }).catch(err => {
-                    throw err
-                })
-
+                    await chunkFileHandle(chunkFile)
+                }
+                fileComplete(file);
             }
+            completeHandle(files)
         }
 
         public static selectFile(options: any = { multiple: true, accept: "*/*" }): Promise<FileList | null> {
@@ -149,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/ImageViewer/index.vue

@@ -4,7 +4,7 @@
             <img ref="duoViewerImage" :src="realSrc" alt="image" class="duo-viewer-mask__image" />
         </div>
         <div class="duo-viewer-footer">
-            <div class="duo-viewer-footer__title">{{ realSrc }}</div>
+            <div class="duo-viewer-footer__title">{{ realName }}</div>
             <div class="duo-viewer-footer__toolbar">
                 <ul>
                     <li class="duo-viewer-footer__zoom-in" data-viewer-action="zoom-in"></li>
@@ -71,6 +71,18 @@
                 type: Number,
                 default: 0,
             },
+            name: {
+                type: [String, Array],
+                default: null,
+            },
+            shrink: {
+                type: Number,
+                default: .4,
+            },
+            enlarge: {
+                type: Number,
+                default: .6,
+            }
         },
         computed: {
             listLength() {
@@ -79,6 +91,17 @@
             realSrc() {
                 return this.list[this.index];
             },
+            realName() {
+                if (this.name == null) {
+                    return this.list[this.index];
+                } else if (typeof this.name == "string") {
+                    return this.name
+                } else if (Array.isArray(this.name)) {
+                    return this.name[this.index];
+                } else {
+                    return "未命名"
+                }
+            },
             currentData() {
                 return this.listDataCache[this.index];
             },
@@ -312,11 +335,11 @@
                 if (h <= 20 && type === "out") return;
 
                 if (type === "out") {
-                    this.setStyleByName(image, "width", `${w * 0.45}px`);
-                    this.setStyleByName(image, "height", `${h * 0.45}px`);
+                    this.setStyleByName(image, "width", `${w * this.shrink}px`);
+                    this.setStyleByName(image, "height", `${h * this.shrink}px`);
                 } else {
-                    this.setStyleByName(image, "width", `${w * (1 + 0.35)}px`);
-                    this.setStyleByName(image, "height", `${h * (1 + 0.35)}px`);
+                    this.setStyleByName(image, "width", `${w * (1 + this.enlarge)}px`);
+                    this.setStyleByName(image, "height", `${h * (1 + this.enlarge)}px`);
                 }
 
                 this.currentData.width = this.getStyleByName(this.image, "width");
@@ -362,6 +385,10 @@
                         // up
                         this.zoom("in");
                     }
+                    if (e && e.keyCode == 27) {
+                        // esc
+                        this.handleClose()
+                    }
                 });
             },
 

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"