emacroh5lib 1.0.16 → 1.0.20

package/dist/main.css

@@ -1,18 +1,3 @@
-.app-container[data-v-7a6f68ae] {
-  height: 100%;
-  width: 100%;
-  margin: 0;
-  padding: 0;
-  background-color: aqua;
-}
-.click-button[data-v-7a6f68ae] {
-  padding: 10px;
-  font-size: 16px;
-  color: white;
-  border-radius: 15px;
-  background-color: blue;
-}
-
 .duo-viewer {
   position: fixed;
   top: 0;
@@ -199,60 +184,3 @@
   border-radius: 0.15em;
 }
 
-.app-container[data-v-ab09ceac] {
-  height: 100%;
-  width: 100%;
-  margin: 0;
-  padding: 0;
-}
-.vdr[data-v-ab09ceac] {
-  position: absolute;
-  box-sizing: border-box;
-}
-.vdr.active[data-v-ab09ceac]:before {
-  content: '';
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-  box-sizing: border-box;
-  outline: 1px dashed #d6d6d6;
-}
-.vdr-stick[data-v-ab09ceac] {
-  box-sizing: border-box;
-  position: absolute;
-  font-size: 1px;
-  background: #ffffff;
-  border: 1px solid #6c6c6c;
-  box-shadow: 0 0 2px #bbb;
-}
-.inactive .vdr-stick[data-v-ab09ceac] {
-  display: none;
-}
-.vdr-stick-tl[data-v-ab09ceac],
-.vdr-stick-br[data-v-ab09ceac] {
-  cursor: nwse-resize;
-}
-.vdr-stick-tm[data-v-ab09ceac],
-.vdr-stick-bm[data-v-ab09ceac] {
-  left: 50%;
-  cursor: ns-resize;
-}
-.vdr-stick-tr[data-v-ab09ceac],
-.vdr-stick-bl[data-v-ab09ceac] {
-  cursor: nesw-resize;
-}
-.vdr-stick-ml[data-v-ab09ceac],
-.vdr-stick-mr[data-v-ab09ceac] {
-  top: 50%;
-  cursor: ew-resize;
-}
-.vdr-stick.not-resizable[data-v-ab09ceac] {
-  display: none;
-}
-.content-container[data-v-ab09ceac] {
-  display: block;
-  position: relative;
-}
-

package/package.json

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

package/src/index.ts

@@ -4,7 +4,8 @@ import { EMacro } from "./utilities/File";
 
 import FileViewer from './views/FileViewer/index.vue'
 import ImageViewer from './views/ImageViewer/index.vue'
-import DragResizeView from './views/DragResizeViewTs/index.vue'
+import DragResizeView from './views/DragResizeView/index.vue'
+import DragView from './views/Draw/index.vue'
 import MessageBoxTest from "@/components/MessageBoxTest";
 
 const components = [FileViewer, ImageViewer, DragResizeView];

package/src/utilities/File.ts

@@ -1,3 +1,4 @@
+
 import * as XLSX from "xlsx";
 
 export namespace EMacro {
@@ -6,7 +7,76 @@ export namespace EMacro {
 
     export class File {
 
-        private static selectFile(options: any = { multiple: true, accept: "*/*" }) {
+        public static getFileMD5(file: File): string {
+
+           throw "NG"
+        }
+
+        private static getBase64(blob) {
+            return new Promise((resolve, reject) => {
+                const reader = new FileReader();
+                reader.readAsDataURL(blob);
+                reader.onload = () => resolve(reader.result);
+                reader.onerror = error => reject(error);
+            });
+        }
+
+        public static getFileChunks(file: any): any {
+            let { size } = file
+            const sliceSize = 1024 * 1024 * 2;
+            let totalChunks = Math.ceil(size / sliceSize)
+            let fileChunks = new Array<any>()
+            if (size > sliceSize) {
+                for (let i = 0; i < totalChunks; i++) {
+                    let start = i * sliceSize
+                    let end = (i + 1) * sliceSize
+                    let chunk = file.slice(start, end)
+                    fileChunks.push(chunk)
+                }
+            } else {
+                fileChunks.push(file)
+            }
+            return { "fileChunks": fileChunks, "sliceSize": sliceSize, "chunksLength": fileChunks.length }
+        }
+
+        // 文件上传
+        public static uploadFiles(files, savePath, postFunc, errFunc, uploadedFunc) {
+
+            if (files[0].fileName == "" || files[0].fileSize == "" || files[0].fileSize == 0) {
+                throw new Error("请选择要上传的文件")
+            }
+
+            let that = this
+            for (let i = 0; i < files.length; i++) {
+                const file = files[i];
+                let { fileChunks, sliceSize, chunksLength } = File.getFileChunks(file.file)
+                for (let index in fileChunks) {
+                    let chunk = fileChunks[Number(index)]
+
+                    setTimeout(async () => {
+                        await File.getBase64(chunk).then((base64: any) => {
+                            let data = {
+                                'chunkIndex': Number(index), // 分片位置
+                                'chunksLength': chunksLength, // 分片长度
+                                'sliceSize': sliceSize, // 分片大小
+                                'chunkSize': chunk.size, // 当前分片实际大小
+                                'fileSize': file.file.size, // 文件总大小
+                                'fileName': file.file.name, // 文件名
+                                'data': base64.split(';base64,')[1], // 文件数据 
+                                'lastModifiedDate': file.file.lastModifiedDate,  // 最后修改时间
+                                'dataType': 'base64', // 数据的类型
+                                'savePath': savePath
+                            }
+                            postFunc(data)
+                        }).catch((err) => {
+                            errFunc({ err: err, file: file.file, chunkIndex: index, fileName: file.file.name })
+                        })
+                    }, 10);
+                }
+            }
+        }
+
+        public static selectFile(options: any = { multiple: true, accept: "*/*" }): Promise<FileList | null> {
             return new Promise((res: (value: FileList) => void, rej) => {
                 const el = document.createElement("input");
                 el.type = "file";
@@ -29,7 +99,10 @@ export namespace EMacro {
 
         public static readLocalExcel(onloadend: (file, workbook) => void, options: any = { multiple: true, accept: "*/*" }) {
 
-            this.selectFile(options).then((files: FileList) => {
+            this.selectFile(options).then((files: FileList | null) => {
+                if (files === null) {
+                    return
+                }
                 for (let i = 0; i < files.length; i++) {
                     const file = files[i];
                     let reader = new FileReader();
@@ -47,8 +120,7 @@ export namespace EMacro {
     }
 
 }
- 
 
 
 
- 
+

package/src/views/{DragResizeViewTs → DragResizeView}/index.less

@@ -1,10 +1,3 @@
-.app-container {
-    height: 100%;
-    width: 100%;
-    margin: 0;
-    padding: 0;
-}
-
 .vdr {
     position: absolute;
     box-sizing: border-box;
@@ -26,7 +19,7 @@
     position: absolute;
     font-size: 1px;
     background: #ffffff;
-    border: 1px solid #6c6c6c;
+    border: 2px solid #6c6c6c;
     box-shadow: 0 0 2px #bbb;
 }