emacroh5lib 1.0.70 → 1.0.73

package/package.json

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

package/src/index.ts

@@ -1,5 +1,5 @@
 
-import { EMacro } from "./utilities/File";
+import { EMacro } from "./utilities/EMacro";
 
 
 import FileViewer from './views/FileViewer/index.vue'

package/src/utilities/{File.ts → EMacro.ts}

@@ -6,7 +6,7 @@ import createTaskQueue from 'sync-task-queue'
 
 export namespace EMacro {
 
-    export const version = "1.1"
+    export const version = "1.72"
 
     export class File {
 
@@ -64,11 +64,21 @@ 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)
 
                 for (let index in fileChunks) {
@@ -85,7 +95,8 @@ export namespace EMacro {
                         'lastModifiedDate': file.lastModifiedDate,  // 最后修改时间
                         'md5': md5,
                         'index': i,
-                        'dataType': 'base64' // 数据的类型
+                        'dataType': 'base64', // 数据的类型
+                        'directoryName': directoryName // 数据的类型
                     }
                     await chunkFileHandle(chunkFile)
                 }
@@ -94,11 +105,12 @@ export namespace EMacro {
             completeHandle(files)
         }
 
-        public static selectFile(options: any = { multiple: true, accept: "*/*" }): Promise<FileList | null> {
+        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 {
@@ -238,8 +250,11 @@ export namespace EMacro {
         return base64;
     }
 
-
-
+    export const extensionToLowerCase = (fileName: string) => {
+        const n = fileName.lastIndexOf(".");
+        const extension = fileName.substring(n).toLowerCase();
+        return fileName.substring(0, n) + extension;
+    }
 
 }
 

package/src/views/ImageViewer/index.vue

@@ -122,9 +122,7 @@
                     this.index = this.currentIndex;
                     this.init();
 
-                    setTimeout(() => {
-                        this.switchAction("prev");
-                    }, 100);
+                    setTimeout(() => { this.switchAction("prev"); }, 200);
                 } else {
                     this.$emit("close");
                 }
@@ -198,11 +196,10 @@
 
                 Promise.race(promises).then((data) => {
 
+                    this.image = this.$refs["duoViewerImage"];
                     setTimeout(() => {
                         this.switchAction("prev");
-                    }, 100);
-
-                    this.image = this.$refs["duoViewerImage"];
+                    }, 200);
                     this.initDrag();
                     this.$emit("loadComplete");
                     const { width, height } = this.listDataCache[index];

package/src/views/TestView/index.vue

@@ -43,7 +43,7 @@
   import DragResizeView from "@/views/DragResizeView/index.vue";
   import Draw from "@/views/Draw/index.vue";
   import { formatJson, export_json_to_excel, number_to_excel, testToExcel } from "./Export2Excel"
-  import { EMacro } from "../../utilities/File";
+  import { EMacro } from "../../utilities/EMacro";
   import axios from 'axios'
   import Cookie from 'js-cookie'
   import LAY_EXCEL from 'lay-excel';

package/src/views/VideoViewer/index.vue

@@ -47,7 +47,7 @@
 
 <script>
 
-    import { EMacro } from "../../utilities/File";
+    import { EMacro } from "../../utilities/EMacro";
 
     export default {
         name: "ImageViewer",