emacroh5lib 1.0.87 → 1.0.89

package/dist/emacroh5lib.min.js.LICENSE.txt

@@ -36,6 +36,10 @@ Licensed under MIT. https://github.com/101arrowz/fflate/blob/master/LICENSE
 version 0.6.9
 */
 
+/*! sheetjs (C) 2013-present SheetJS -- http://sheetjs.com */
+
+/*! xlsx.js (C) 2013-present SheetJS -- http://sheetjs.com */
+
 /**
   * vue-class-component v7.2.3
   * (c) 2015-present Evan You

package/package.json

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

package/src/utilities/E9ChartUtils.js

@@ -8,13 +8,12 @@
  *  interval    轮播时间间隔，单位毫秒，默认为2000
  *  loopSeries  boolean类型，默认为false。
  *              true表示循环所有series的tooltip，false则显示指定seriesIndex的tooltip
- * 	seriesIndex 默认为0，指定某个系列（option中的series索引）循环显示tooltip，
- * 	            当loopSeries为true时，从seriesIndex系列开始执行.
+ *  seriesIndex 默认为0，指定某个系列（option中的series索引）循环显示tooltip， 当loopSeries为true时，从seriesIndex系列开始执行.
  *  }
  * @returns {{clearLoop: clearLoop}}
  */
 const loopShowTooltip = function (chart, chartOption, options) {
-    var defaultOptions = {
+    let defaultOptions = {
         interval: 3000,
         loopSeries: true,
         seriesIndex: 0,
@@ -28,13 +27,13 @@ const loopShowTooltip = function (chart, chartOption, options) {
         chartOption = chart.getOption();
     }
 
-    var dataIndex = 0; // 数据索引，初始化为-1，是为了判断是否是第一次执行
-    var seriesIndex = 0; // 系列索引
-    var timeTicket = 0;
-    var seriesLen = chartOption.series.length; // 系列个数
-    var dataLen = 0; // 某个系列数据个数
-    var chartType; // 系列类型
-    var first = true;
+    let dataIndex = 0; // 数据索引，初始化为-1，是为了判断是否是第一次执行
+    let seriesIndex = 0; // 系列索引
+    let timeTicket = 0;
+    let seriesLen = chartOption.series.length; // 系列个数
+    let dataLen = 0; // 某个系列数据个数
+    let chartType; // 系列类型
+    let first = true;
 
     // 不循环series时seriesIndex指定显示tooltip的系列，不指定默认为0，指定多个则默认为第一个
     // 循环series时seriesIndex指定循环的series，不指定则从0开始循环所有series，指定单个则相当于不循环，指定多个
@@ -68,11 +67,11 @@ const loopShowTooltip = function (chart, chartOption, options) {
                 chart.setOption(chartOption);
             }
 
-            var series = chartOption.series;
+            let series = chartOption.series;
             chartType = series[seriesIndex].type; // 系列类型
             dataLen = series[seriesIndex].data.length; // 某个系列的数据个数
 
-            var tipParams = { seriesIndex: seriesIndex };
+            let tipParams = { seriesIndex: seriesIndex };
             switch (chartType) {
                 case 'map':
                 case 'pie':
@@ -146,7 +145,7 @@ const loopShowTooltip = function (chart, chartOption, options) {
         }
     }
 
-    var zRender = chart.getZr();
+    const zRender = chart.getZr();
 
     function zRenderMouseMove(param) {
         if (param.event) {

package/src/utilities/EMacro.ts

@@ -1,7 +1,7 @@
 
-import XLSX from "xlsx";
+import * as XLSX from "xlsx";
 // import XLSX from "./dist/xlsx.js";
-  
+
 
 // const XLSX = require("./dist/xlsx.js")
 import BMF from 'browser-md5-file';
@@ -10,303 +10,316 @@ import createTaskQueue from 'sync-task-queue'
 
 import { saveAs } from 'file-saver';
 
-export namespace EMacro {
-
-    export const version = "1.72"
+ const version = "1.73"
 
-    export class File {
+ class File {
 
-        public static getFileMD5(file) {
-            return new Promise((res, rej) => {
+    public static getFileMD5(file) {
+        return new Promise((resolve, reject) => {
 
-                const fileReader = new FileReader()
-                fileReader.readAsBinaryString(file);
-                fileReader.onload = e => {
-                    const bmf = new BMF();
-                    bmf.md5(file, (err, md5) => {
-                        if (err !== null) {
-                            rej(err)
-                        } else {
-                            res(md5)
-                        }
-                    }, progress => {
-                        console.log('getFileMD5 progress number:', progress);
-                    });
-                }
+            const fileReader = new FileReader()
+            fileReader.readAsBinaryString(file);
+            fileReader.onload = e => {
+                const bmf = new BMF();
+                bmf.md5(file, (err, md5) => {
+                    if (err !== null) {
+                        resolve(err)
+                    } else {
+                        reject(md5)
+                    }
+                }, progress => {
+                    console.log('getFileMD5 progress number:', progress);
+                });
+            }
 
-            })
-        }
+        })
+    }
 
-        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);
-            });
-        }
+    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, chunkSize: number = 1024 * 1024 * 1): any {
-
-            let { size } = file
-            let totalChunks = Math.ceil(size / chunkSize)
-            let fileChunks = new Array<any>()
-            if (size > chunkSize) {
-                for (let i = 0; i < totalChunks; i++) {
-                    let start = i * chunkSize
-                    let end = (i + 1) * chunkSize
-                    let chunk = file.slice(start, end)
-                    fileChunks.push(chunk)
-                }
-            } else {
-                fileChunks.push(file)
+    public static getFileChunks(file: any, chunkSize: number = 1024 * 1024 * 1): any {
+
+        let { size } = file
+        let totalChunks = Math.ceil(size / chunkSize)
+        let fileChunks = new Array<any>()
+        if (size > chunkSize) {
+            for (let i = 0; i < totalChunks; i++) {
+                let start = i * chunkSize
+                let end = (i + 1) * chunkSize
+                let chunk = file.slice(start, end)
+                fileChunks.push(chunk)
             }
-            return { "fileChunks": fileChunks, "sliceSize": chunkSize, "chunksLength": fileChunks.length }
+        } else {
+            fileChunks.push(file)
         }
+        return {
+            fileChunks: fileChunks,
+            sliceSize: chunkSize,
+            chunksLength: fileChunks.length
+        }
+    }
 
-        // 文件上传
-        public static async uploadFiles(files, chunkFileHandle, fileComplete = (file) => { }, completeHandle = (files) => { }, chunkSize: number = 1024 * 1024 * 1) {
+    // 文件上传
+    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("文件异常")
-            }
+        if (files[0].fileName == "" || files[0].fileSize == "" || files[0].fileSize == 0) {
+            throw new Error("文件异常")
+        }
 
-            for (let i = 0; i < files.length; i++) {
-                const file = files[i];
-                const md5 = await File.getFileMD5(file)
+        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 { 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)
-                }
+            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
-                    let chunkFile = {
-                        'chunkIndex': Number(index), // 分片位置
-                        'chunksLength': chunksLength, // 分片长度
-                        'sliceSize': sliceSize, // 分片大小
-                        'chunkSize': chunk.size, // 当前分片实际大小
-                        'fileSize': file.size, // 文件总大小
-                        'fileName': file.name, // 文件名
-                        'lastModifiedDate': file.lastModifiedDate,  // 最后修改时间
-                        'md5': md5,
-                        'index': i,
-                        'dataType': 'base64', // 数据的类型
-                        'directoryName': directoryName, // 数据的类型
-                        'total': files.length, // 总共文件数
-                        'data': base64.split(';base64,')[1], // 文件数据 
-                    }
-                    await chunkFileHandle(chunkFile)
+            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, // 文件名
+                    lastModifiedDate: file.lastModifiedDate,  // 最后修改时间
+                    md5: md5,
+                    index: i,
+                    dataType: 'base64', // 数据的类型
+                    directoryName: directoryName, // 数据的类型
+                    total: files.length, // 总共文件数
+                    data: base64.split(';base64,')[1], // 文件数据 
                 }
-                fileComplete(file);
+                await chunkFileHandle(chunkFile)
             }
-            completeHandle(files)
+            fileComplete(file);
         }
+        completeHandle(files)
+    }
 
-        public static selectFile(options: any = { multiple: true, accept: "*/*" }, isDirectory = false): Promise<FileList | null> {
-            return new Promise((res: (value: FileList) => void, rej) => {
-                const el = document.createElement("input");
-                el.type = "file";
-                el.accept = options.accept;
-                el.webkitdirectory = isDirectory;
-                el.multiple = options.multiple;
-                el.addEventListener("change", (_) => {
-                    try {
-                        if (el.files === null) {
-                            rej(null);
-                        } else {
-                            res(el.files);
-                        }
-                    } catch (error) {
-                        rej(error)
+    public static selectFile(options: any = { multiple: true, accept: "*/*" }, isDirectory = false): Promise<FileList | null> {
+        return new Promise((resolve: (value: FileList) => void, reject) => {
+            const el = document.createElement("input");
+            el.type = "file";
+            el.accept = options.accept;
+            el.webkitdirectory = isDirectory;
+            el.multiple = options.multiple;
+            el.addEventListener("change", (_) => {
+                try {
+                    if (!el.files) {
+                        reject(new Error("无法读取文件"));
+                    } else {
+                        resolve(el.files);
                     }
-                });
-                el.click();
+                } catch (error) {
+                    reject(error)
+                }
             });
-        }
+            el.click();
+        });
+    }
 
-        public static readLocalExcel(onloadend: (file, workbook) => void, options: any = { multiple: true, accept: "*/*" }) {
+    public static readLocalExcel(onloadend: (file, workbook) => void, options: any = { multiple: true, accept: "*/*" }) {
 
-            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();
-                    reader.readAsArrayBuffer(file);
-                    reader.onloadend = async function (e: any) {
-                        let workbook = XLSX.read(e.target.result, { type: "binary" });
-                        onloadend(file, workbook);
-                    }
+        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();
+                reader.readAsArrayBuffer(file);
+                reader.onloadend = async function (e: any) {
+                    let workbook = XLSX.read(e.target.result, { type: "binary" });
+                    onloadend(file, workbook);
                 }
-            }).catch(e => {
-                throw e;
-            })
-        }
-
-        // type: 'base64' | 'binary' | 'buffer' | 'file' | 'array' | 'string'
-        public static toExcel(data, type) {
-            let workbook = XLSX.read(data, { type: type });
-            return workbook;
-        }
+            }
+        }).catch(e => {
+            throw e;
+        })
+    }
 
-        public static downloadExcel(workbook, name) {
- 
-            /* bookType can be 'xlsx' or 'xlsm' or 'xlsb' */
-            const wopts:any = { bookType: 'xls', bookSST: false, type: 'binary',  cellStyles: true };
+    // type: 'base64' | 'binary' | 'buffer' | 'file' | 'array' | 'string'
+    public static toExcel(data, type) {
+        let workbook = XLSX.read(data, { type: type });
+        return workbook;
+    }
 
-            var wbout = XLSX.write(workbook, wopts);
+    public static downloadExcel(workbook, name) {
 
-            function s2ab(s) {
-                var buf = new ArrayBuffer(s.length);
-                var view = new Uint8Array(buf);
-                for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
-                return buf;
-            }
+        /* bookType can be 'xlsx' or 'xlsm' or 'xlsb' */
+        const wopts: any = { bookType: 'xls', bookSST: false, type: 'binary', cellStyles: true };
 
-            /* the saveAs call downloads a file on the local machine */
-            saveAs(new Blob([s2ab(wbout)], { type: 'application/octet-stream' }), name)
+        const wbout = XLSX.write(workbook, wopts);
 
+        function s2ab(s) {
+            const buf = new ArrayBuffer(s.length);
+            const view = new Uint8Array(buf);
+            for (let i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
+            return buf;
         }
 
+        /* the saveAs call downloads a file on the local machine */
+        saveAs(new Blob([s2ab(wbout)], { type: 'application/octet-stream' }), name)
+
     }
 
-    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();
-        }
+}
+
+
+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();
+    }
+}
 
-    // 获取最大公约数
-    function getGcd(a, b) {
-        let n1, n2;
-        if (a > b) {
-            n1 = a;
-            n2 = b;
-        } else {
-            n1 = b;
-            n2 = a;
-        }
+// 获取最大公约数
+function getGcd(a, b) {
+    let n1, n2;
+    if (a > b) {
+        n1 = a;
+        n2 = b;
+    } else {
+        n1 = b;
+        n2 = a;
+    }
 
-        let remainder = n1 % n2;
-        if (remainder === 0) {
-            return n2;
-        } else {
-            return getGcd(n2, remainder)
-        }
+    let remainder = n1 % n2;
+    if (remainder === 0) {
+        return n2;
+    } else {
+        return getGcd(n2, remainder)
     }
+}
 
-    export const getVideoScale = async (url: string) => {
-        const video = document.createElement('video');
-        video.setAttribute("width", "10");
-        video.setAttribute("height", "10");
-        video.setAttribute("style", "position: absolute;opacity: 0;z-index: -5;top: 0;");
-        video.setAttribute("src", url);
+const getVideoScale = async (url: string) => {
+    const video = document.createElement('video');
+    video.setAttribute("width", "10");
+    video.setAttribute("height", "10");
+    video.setAttribute("style", "position: absolute;opacity: 0;z-index: -5;top: 0;");
+    video.setAttribute("src", url);
 
-        document.body.appendChild(video);
+    document.body.appendChild(video);
 
-        const p = new Promise(function (resolve, reject) {
-            video.addEventListener('canplay', function (e: any) {
-                const gcd = getGcd(e.target.videoWidth, e.target.videoHeight);
-                resolve([e.target.videoWidth / gcd, e.target.videoHeight / gcd])
-            })
+    const p = new Promise(function (resolve, reject) {
+        video.addEventListener('canplay', function (e: any) {
+            const gcd = getGcd(e.target.videoWidth, e.target.videoHeight);
+            resolve([e.target.videoWidth / gcd, e.target.videoHeight / gcd])
         })
-        const res = await p;
-        document.body.removeChild(video);
-        return res
-    }
+    })
+    const res = await p;
+    document.body.removeChild(video);
+    return res
+}
+
+// 读取video中某一帧转为图片base64
+const getVideoBase64 = async (url: string, timestamp = -1, bufftime = 2000) => {
+
+    const scale = await getVideoScale(url) as any;
+    const width = scale[0] + ''
+    const height = scale[1] + ''
+    const base64 = await new Promise(function (resolve) {
+        let dataURL = ''
+        let video = document.createElement('video')
+        video.setAttribute('crossOrigin', 'anonymous') //处理跨域
+        video.setAttribute('src', url)
+        video.setAttribute('width', width)
+        video.setAttribute('height', height)
+        video.setAttribute('autoplay', 'autoplay')
+        document.body.appendChild(video)
+        video.addEventListener('loadeddata', function () {
+
+            video.pause()
+
+            if (timestamp === -1) {
+                timestamp = Math.random() * video.duration
+            }
+            video.currentTime = timestamp
+
+            /*  
+            使用定时器为了视频跳转到某一帧的时候视频进行缓冲,等视频加载完成之后进行截图
+            如果截图是黑屏说明视频未加载完成就开始截屏了
+        */
+            setTimeout(() => {
+                let canvas = document.createElement('canvas');
+                // const width = canvas.width; //canvas的尺寸和图片一样
+                // const height = canvas.height;
+                canvas.width = video.width
+                canvas.height = video.height
+                canvas.getContext('2d')!.drawImage(video, 0, 0, video.width, video.height) //绘制canvas
+                dataURL = canvas.toDataURL('image/jpeg') //转换为base64
+                document.body.removeChild(video)
+                resolve(dataURL)
+            }, bufftime);
 
-    // 读取video中某一帧转为图片base64
-    export const getVideoBase64 = async (url: string, timestamp: number = -1, bufftime: number = 2000) => {
-
-        const scale = await getVideoScale(url) as any;
-        const width = scale[0] + ''
-        const height = scale[1] + ''
-        const base64 = await new Promise(function (resolve) {
-            let dataURL = ''
-            let video = document.createElement('video')
-            video.setAttribute('crossOrigin', 'anonymous') //处理跨域
-            video.setAttribute('src', url)
-            video.setAttribute('width', width)
-            video.setAttribute('height', height)
-            video.setAttribute('autoplay', 'autoplay')
-            document.body.appendChild(video)
-            video.addEventListener('loadeddata', function () {
-
-                video.pause()
-
-                if (timestamp === -1) {
-                    timestamp = Math.random() * video.duration
-                }
-                video.currentTime = timestamp
-
-                /*  
-                使用定时器为了视频跳转到某一帧的时候视频进行缓冲,等视频加载完成之后进行截图
-                如果截图是黑屏说明视频未加载完成就开始截屏了
-            */
-                setTimeout(() => {
-                    let canvas = document.createElement('canvas');
-                    // const width = canvas.width; //canvas的尺寸和图片一样
-                    // const height = canvas.height;
-                    canvas.width = video.width
-                    canvas.height = video.height
-                    canvas.getContext('2d')!.drawImage(video, 0, 0, video.width, video.height) //绘制canvas
-                    dataURL = canvas.toDataURL('image/jpeg') //转换为base64
-                    document.body.removeChild(video)
-                    resolve(dataURL)
-                }, bufftime);
-
-            })
         })
+    })
 
-        return base64;
-    }
+    return base64;
+}
 
-    export function getType(values) {
-        return Object
-            .prototype
-            .toString
-            .call(values)
-            .replace(/\[(\S+) (\S+)\]/, '$2')
-    }
+function getType(values) {
+    return Object
+        .prototype
+        .toString
+        .call(values)
+        .replace(/\[(\S+) (\S+)\]/, '$2')
+}
 
-    export const extensionToLowerCase = (fileName: string) => {
-        const n = fileName.lastIndexOf(".");
-        const extension = fileName.substring(n).toLowerCase();
-        return fileName.substring(0, n) + extension;
-    }
+const extensionToLowerCase = (fileName: string) => {
+    const n = fileName.lastIndexOf(".");
+    const extension = fileName.substring(n).toLowerCase();
+    return fileName.substring(0, n) + extension;
+}
 
-    export const isURL = (strUrl) => {
-        const regular = /^\b(((https?|ftp):\/\/)?[-a-z0-9]+(\.[-a-z0-9]+)*\.(?:com|edu|gov|int|mil|net|org|biz|info|name|museum|asia|coop|aero|[a-z][a-z]|((25[0-5])|(2[0-4]\d)|(1\d\d)|([1-9]\d)|\d))\b(\/[-a-z0-9_:\@&?=+,.!\/~%\$]*)?)$/i;
-        if (regular.test(strUrl.trim())) {
-            return true;
-        } else {
-            return false;
-        }
+const isURL = (strUrl) => {
+    const regular = /^\b(((https?|ftp):\/\/)?[-a-z0-9]+(\.[-a-z0-9]+)*\.(?:com|edu|gov|int|mil|net|org|biz|info|name|museum|asia|coop|aero|[a-z][a-z]|((25[0-5])|(2[0-4]\d)|(1\d\d)|([1-9]\d)|\d))\b(\/[-a-z0-9_:\\@&?=+,.!\\/~%\\$]*)?)$/i;
+    if (regular.test(strUrl.trim())) {
+        return true;
+    } else {
+        return false;
     }
+}
+
 
- 
+export  const EMacro =  {
 
+    version,
+    File,
+    fullScreen,
+    getGcd,
+    getVideoScale,
+    getVideoBase64,
+    getType,
+    extensionToLowerCase,
+    isURL
 }