emacroh5lib 1.0.20 → 1.0.23

package/package.json

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

package/src/utilities/File.ts

@@ -9,7 +9,7 @@ export namespace EMacro {
 
         public static getFileMD5(file: File): string {
 
-           throw "NG"
+            throw "NG"
         }
 
         private static getBase64(blob) {
@@ -22,7 +22,9 @@ export namespace EMacro {
         }
 
         public static getFileChunks(file: any): any {
-            let { size } = file
+
+            let {size}  = file
+
             const sliceSize = 1024 * 1024 * 2;
             let totalChunks = Math.ceil(size / sliceSize)
             let fileChunks = new Array<any>()
@@ -40,19 +42,20 @@ export namespace EMacro {
         }
 
         // 文件上传
-        public static uploadFiles(files, savePath, postFunc, errFunc, uploadedFunc) {
+        public static uploadFiles(files, postFunc, errFunc = (err) => {
+            console.error(err);
+        }) {
 
             if (files[0].fileName == "" || files[0].fileSize == "" || files[0].fileSize == 0) {
-                throw new Error("请选择要上传的文件")
+                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)
+                const file = files[i]; 
+                let { fileChunks, sliceSize, chunksLength } = File.getFileChunks(file)
                 for (let index in fileChunks) {
                     let chunk = fileChunks[Number(index)]
-
                     setTimeout(async () => {
                         await File.getBase64(chunk).then((base64: any) => {
                             let data = {
@@ -60,16 +63,15 @@ export namespace EMacro {
                                 'chunksLength': chunksLength, // 分片长度
                                 'sliceSize': sliceSize, // 分片大小
                                 'chunkSize': chunk.size, // 当前分片实际大小
-                                'fileSize': file.file.size, // 文件总大小
-                                'fileName': file.file.name, // 文件名
+                                'fileSize': file.size, // 文件总大小
+                                'fileName': file.name, // 文件名
                                 'data': base64.split(';base64,')[1], // 文件数据 
-                                'lastModifiedDate': file.file.lastModifiedDate,  // 最后修改时间
-                                'dataType': 'base64', // 数据的类型
-                                'savePath': savePath
+                                'lastModifiedDate': file.lastModifiedDate,  // 最后修改时间
+                                'dataType': 'base64' // 数据的类型
                             }
                             postFunc(data)
                         }).catch((err) => {
-                            errFunc({ err: err, file: file.file, chunkIndex: index, fileName: file.file.name })
+                            errFunc({ err: err, file: file.file, chunkIndex: index, fileName: file.name })
                         })
                     }, 10);
                 }

package/src/views/TestView/index.vue

@@ -3,15 +3,18 @@
 
     <button @click="handleOpen">打开查看器</button>
     <button @click="exportExcel($event)">透过Excel模板导出表格</button>
+    <button @click="selectFile($event)">选择文件</button>
 
     <image-viewer :list="srcList" @open="openCallback" @close="closeCallback" :show.sync="showViewer"
       :currentIndex="currentIndex" />
 
 
+
+
     <div class="list" id="list">
 
-      <DragResizeView v-for="(rect, index) in rects" :key="index" :isStorage="true" :name="rect.name" :w="rect.width" :h="rect.height"
-        :x="rect.left" :y="rect.top" :parentW="listWidth" :parentH="listHeight" :axis="rect.axis"
+      <DragResizeView v-for="(rect, index) in rects" :key="index" :isStorage="true" :name="rect.name" :w="rect.width"
+        :h="rect.height" :x="rect.left" :y="rect.top" :parentW="listWidth" :parentH="listHeight" :axis="rect.axis"
         :isActive="rect.active" :minw="rect.minw" :minh="rect.minh" :isDraggable="rect.draggable"
         :isResizable="rect.resizable" :parentLimitation="rect.parentLim" :snapToGrid="rect.snapToGrid"
         :aspectRatio="rect.aspectRatio" :z="rect.zIndex" :contentClass="rect.class" v-on:activated="activateEv(index)"
@@ -37,10 +40,15 @@ 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 axios from 'axios'
+import Cookie from 'js-cookie'
 
 
 
 import LAY_EXCEL from 'lay-excel';
+import { error } from "jquery";
 
 @Component({
   components: {
@@ -199,6 +207,37 @@ export default class TestView extends Vue {
     LAY_EXCEL.exportExcel(list, '表格导出.xlsx', 'xlsx')
   }
 
+  public selectFile(e) {
+
+
+    EMacro.File.selectFile().then((files) => {
+      EMacro.File.uploadFiles(files, file => {
+
+        file.savePath = "C:\\MES\\EMacroAndroidServer_Windows_v1.1\\EMacroAssets\\file\\" + file.fileName
+
+        let postData = { 'id': 0, 'message': '', 'action': 'uploadSOPFile', 'user': {}, 'data': file }
+        axios.post("http://121.228.113.68:8019/H5/prod/Command/requestVueData", postData, {
+          timeout: 6000,
+          headers: {
+            Authorization: "Basic RU1hY3JvOkVNYWNybw==",
+            "Content-Type": "application/json;charset=UTF-8",
+          }
+        }).then(data => {
+
+          console.log("上传返回", data);
+
+        }).catch(err => {
+          console.error("上传错误: ", err);
+        })
+
+      })
+
+    }).catch(err => {
+      console.error(err);
+    })
+
+  }
+
   activateEv(index) {
     console.log("activateEv index", index);
   }

package/tsconfig.json

@@ -11,7 +11,7 @@
     "declarationMap": false, // 是否生成声明文件map文件（便于调试）
     "moduleResolution": "node",
     "module": "esnext",
-    "target": "es6", // 转化成的目标语言
+    "target": "esnext", // 转化成的目标语言
     "baseUrl": "./",
     "strict": true,
     "jsx": "preserve",