n20-common-lib 1.3.43 → 1.3.46

package/nstc-g6/components/NstcUploadCustomExcel/NstcUploadCustomExcel.vue

@@ -21,310 +21,308 @@
       accept=".xlsx, .xls, .csv"
       @change="handleClick"
     />
-    <i class="el-icon-upload" />
+    <i class="el-icon-upload"></i>
   </div>
 </template>
 
 <script>
-import XLSX from "xlsx";
-import { mapperData } from "@/utils/mapper_aims.js";
+import XLSX from 'xlsx'
+import { mapperData } from '../../utils/mapper_aims.js'
 export default {
-  name: "NstcUploadCustomExcel",
+  name: 'NstcUploadCustomExcel',
   props: {
     beforeUpload: Function, // eslint-disable-line
-    onSuccess: Function, // eslint-disable-line
+    onSuccess: Function // eslint-disable-line
   },
   data() {
     return {
       loading: false,
       excelData: {
         header: null,
-        results: null,
+        results: null
       },
       excelDataAll: {},
-      analysisText: "analysis",
+      analysisText: 'analysis',
       columnsList: [],
-      columnsListNew: [],
-    };
+      columnsListNew: []
+    }
   },
   methods: {
     generateData(datas, list) {
       // this.excelData.header = header
       // this.excelData.results = results
-      this.onSuccess && this.onSuccess(datas, list);
+      this.onSuccess && this.onSuccess(datas, list)
     },
     handleDrop(e) {
-      e.stopPropagation();
-      e.preventDefault();
-      if (this.loading) return;
-      const files = e.dataTransfer.files;
+      e.stopPropagation()
+      e.preventDefault()
+      if (this.loading) return
+      const files = e.dataTransfer.files
       if (files.length !== 1) {
-        this.$message.error("Only support uploading one file!");
-        return;
+        this.$message.error('Only support uploading one file!')
+        return
       }
-      const rawFile = files[0]; // only use files[0]
+      const rawFile = files[0] // only use files[0]
 
       if (!this.isExcel(rawFile)) {
         this.$message.error(
-          "Only supports upload .xlsx, .xls, .csv suffix files"
-        );
-        return false;
+          'Only supports upload .xlsx, .xls, .csv suffix files'
+        )
+        return false
       }
-      this.upload(rawFile);
-      e.stopPropagation();
-      e.preventDefault();
+      this.upload(rawFile)
+      e.stopPropagation()
+      e.preventDefault()
     },
     handleDragover(e) {
-      e.stopPropagation();
-      e.preventDefault();
-      e.dataTransfer.dropEffect = "copy";
+      e.stopPropagation()
+      e.preventDefault()
+      e.dataTransfer.dropEffect = 'copy'
     },
     handleUpload() {
-      this.$refs["excel-upload-input"].click();
+      this.$refs['excel-upload-input'].click()
     },
     handleClick(e) {
-      const files = e.target.files;
-      const rawFile = files[0]; // only use files[0]
-      if (!rawFile) return;
-      this.upload(rawFile);
+      const files = e.target.files
+      const rawFile = files[0] // only use files[0]
+      if (!rawFile) return
+      this.upload(rawFile)
     },
     upload(rawFile) {
-      this.$refs["excel-upload-input"].value = null; // fix can't select the same excel
+      this.$refs['excel-upload-input'].value = null // fix can't select the same excel
 
       if (!this.beforeUpload) {
-        this.readerData(rawFile);
-        return;
+        this.readerData(rawFile)
+        return
       }
-      const before = this.beforeUpload(rawFile);
+      const before = this.beforeUpload(rawFile)
       if (before) {
-        this.readerData(rawFile);
+        this.readerData(rawFile)
       }
     },
-    
+
     readerData(rawFile) {
-      this.loading = true;
+      this.loading = true
       //清空表头
-      this.columnsList = [];
-      this.columnsListNew = [];
+      this.columnsList = []
+      this.columnsListNew = []
       return new Promise((resolve) => {
-        const reader = new FileReader();
+        const reader = new FileReader()
 
         // 重写FileReader上的readAsBinaryString方法
         FileReader.prototype.readAsBinaryString = (rawFile) => {
-          var binary = "";
-          var wb; // 读取完成的数据
-          var reader = new FileReader();
+          var binary = ''
+          var wb // 读取完成的数据
+          var reader = new FileReader()
           reader.onload = () => {
             // 读取成Uint8Array，再转换为Unicode编码（Unicode占两个字节）
-            var bytes = new Uint8Array(reader.result);
-            var length = bytes.byteLength;
+            var bytes = new Uint8Array(reader.result)
+            var length = bytes.byteLength
             for (var i = 0; i < length; i++) {
-              binary += String.fromCharCode(bytes[i]);
+              binary += String.fromCharCode(bytes[i])
             }
             // 接下来就是xlsx了，具体可看api
             wb = XLSX.read(binary, {
-              type: "binary",
-            });
-            let datas = [];
+              type: 'binary'
+            })
+            let datas = []
             for (let st = 0; st < wb.SheetNames.length; st++) {
-              var sheet = wb.Sheets[wb.SheetNames[st]];
-              let ref = sheet["!ref"];
-              if (ref == undefined || ref == "undefined") {
-                continue;
+              var sheet = wb.Sheets[wb.SheetNames[st]]
+              let ref = sheet['!ref']
+              if (ref == undefined || ref == 'undefined') {
+                continue
               }
-              var result0 = [];
-              var result1 = [];
-              var result2 = [];
-              var row;
-              var rowNum;
-              var colNum;
-              var range = XLSX.utils.decode_range(ref);
+              var result0 = []
+              var result1 = []
+              var result2 = []
+              var row
+              var rowNum
+              var colNum
+              var range = XLSX.utils.decode_range(ref)
               for (rowNum = range.s.r; rowNum <= range.e.r; rowNum++) {
-                row = [];
+                row = []
                 for (colNum = range.s.c; colNum <= range.e.c; colNum++) {
                   var nextCell =
                     sheet[
                       XLSX.utils.encode_cell({
                         r: rowNum,
-                        c: colNum,
+                        c: colNum
                       })
-                    ];
+                    ]
 
-                  if (typeof nextCell === "undefined") {
-                    row.push(void 0);
+                  if (typeof nextCell === 'undefined') {
+                    row.push(void 0)
                   } else {
-                    let cellw = nextCell.v;
-                    if (cellw == "" || cellw == null || cellw === "undefined") {
-                      row.push(cellw);
+                    let cellw = nextCell.v
+                    if (cellw == '' || cellw == null || cellw === 'undefined') {
+                      row.push(cellw)
                     } else {
-                      let val = cellw.toString().trim();
-                      row.push(val);
+                      let val = cellw.toString().trim()
+                      row.push(val)
                     }
                   }
                 }
-                result0.push(row);
+                result0.push(row)
               }
-              console.log("处理的数据", result0);
-              let lastIndex = 0; //最长数组位置
-              let lastLength = 0; //最长数组长度
+              console.log('处理的数据', result0)
+              let lastIndex = 0 //最长数组位置
+              let lastLength = 0 //最长数组长度
               for (let i = 0; i < result0.length; i++) {
-                let rows = result0[i];
-                let temp = [];
+                let rows = result0[i]
+                let temp = []
                 for (let item of rows) {
                   if (item) {
-                    temp.push(item);
+                    temp.push(item)
                   }
                 }
                 if (lastLength < temp.length) {
-                  lastIndex = i;
-                  lastLength = temp.length;
+                  lastIndex = i
+                  lastLength = temp.length
                 }
-                temp.splice(0, temp.length); //清空
+                temp.splice(0, temp.length) //清空
               }
-              result1 = result0.slice(0, lastIndex);
-              result2 = result0.slice(lastIndex, result0.length);
+              result1 = result0.slice(0, lastIndex)
+              result2 = result0.slice(lastIndex, result0.length)
               // outdata = XLSX.utils.sheet_to_json(sheet);
               // 自定义方法向父组件传递数据
               // that.$emit("getResult", outdata);
 
               // window.console.log(JSON.stringify(result1))
               // window.console.log(JSON.stringify(result2))
-              var json = {};
-              var jsons = [];
+              var json = {}
+              var jsons = []
               for (let i = 0; i < result1.length; i++) {
-                let content = result1[i];
+                let content = result1[i]
                 for (let j = 0; j < content.length; j++) {
-                  let key = content[j];
+                  let key = content[j]
                   if (Object.prototype.hasOwnProperty.call(mapperData, key)) {
                     this.columnsList.push({
                       prop: mapperData[key],
-                      label: key,
-                    });
-                    json[mapperData[key]] = content[++j];
+                      label: key
+                    })
+                    json[mapperData[key]] = content[++j]
                   } else {
-                    json[content[j]] = content[++j];
+                    json[content[j]] = content[++j]
                   }
                 }
               }
-              var title = result2[0];
+              var title = result2[0]
               //过滤result2全为空的行
               result2 = result2.filter((item) => {
-                let flag = 0;
+                let flag = 0
                 item.forEach((cloum) => {
                   if (!cloum) {
-                    flag++;
+                    flag++
                   }
-                });
-                return flag < item.length;
-              });
-              console.log("---------", result2);
+                })
+                return flag < item.length
+              })
+              console.log('---------', result2)
               for (let k = 1; k < result2.length; k++) {
-                let content = result2[k];
-                let tempJson = {};
-                Object.assign(tempJson, json);
+                let content = result2[k]
+                let tempJson = {}
+                Object.assign(tempJson, json)
                 for (let l = 0; l < title.length; l++) {
-                  let key = title[l];
+                  let key = title[l]
                   if (Object.prototype.hasOwnProperty.call(mapperData, key)) {
                     this.columnsList.push({
                       prop: mapperData[key],
-                      label: key,
-                    });
-                    key = mapperData[key];
+                      label: key
+                    })
+                    key = mapperData[key]
                   } else {
-                    key = title[l];
+                    key = title[l]
                   }
-                  let val = content[l];
+                  let val = content[l]
 
                   if (!tempJson[key]) {
-                    tempJson[key] = val;
+                    tempJson[key] = val
                   }
                 }
-                jsons.push(tempJson);
+                jsons.push(tempJson)
               }
               // window.console.log("jsons:" + JSON.stringify(jsons))
-              window.console.log("jsons:", jsons);
+              window.console.log('jsons:', jsons)
 
-              datas.push(jsons);
+              datas.push(jsons)
             }
 
             //处理数据
 
             // this.excelDataAll = datas
 
-            let datasAll = [].concat(...datas);
-            console.log("datasAll", datasAll);
-            let reg = /.*[\u4e00-\u9fa5]+.*$/;
+            let datasAll = [].concat(...datas)
+            console.log('datasAll', datasAll)
+            let reg = /.*[\u4e00-\u9fa5]+.*$/
 
             datasAll.forEach((item) => {
               for (const key in item) {
                 if (
-                  key === "recAmount" ||
-                  key === "payAmount" ||
-                  key === "amount" ||
-                  key === "balance"
+                  key === 'recAmount' ||
+                  key === 'payAmount' ||
+                  key === 'amount' ||
+                  key === 'balance'
                 ) {
-                  item[key] && (item[key] = Number(item[key].replace(/,/g, "")));
+                  item[key] && (item[key] = Number(item[key].replace(/,/g, '')))
                 }
-                if (reg.test(key) || key === "undefined" || key === "") {
-                  delete item[key];
+                if (reg.test(key) || key === 'undefined' || key === '') {
+                  delete item[key]
                 }
               }
-            });
+            })
 
             datasAll = datasAll.filter((item) => {
-              let num = Object.keys(item).length;
-              let flag = num;
+              let num = Object.keys(item).length
+              let flag = num
               for (var key in item) {
                 if (!item[key]) {
-                  flag--;
+                  flag--
                 }
               }
-              return flag > 0;
-            });
-            console.log("datas", datasAll);
-            let obj = {};
+              return flag > 0
+            })
+            console.log('datas', datasAll)
+            let obj = {}
             for (let i = 0; i < this.columnsList.length; i++) {
               if (
                 !obj[this.columnsList[i].label] &&
                 !obj[this.columnsList[i].prop]
               ) {
-                this.columnsListNew.push(this.columnsList[i]);
-                obj[this.columnsList[i].label] = true;
-                obj[this.columnsList[i].prop] = true;
+                this.columnsListNew.push(this.columnsList[i])
+                obj[this.columnsList[i].label] = true
+                obj[this.columnsList[i].prop] = true
               }
             }
             // console.log("表头", this.columnsListNew);
-            this.generateData(datasAll, this.columnsListNew);
+            this.generateData(datasAll, this.columnsListNew)
 
-            resolve();
-          };
-          reader.readAsArrayBuffer(rawFile);
-        };
-        reader.readAsBinaryString(rawFile);
-      });
+            resolve()
+          }
+          reader.readAsArrayBuffer(rawFile)
+        }
+        reader.readAsBinaryString(rawFile)
+      })
     },
     getHeaderRow(sheet) {
-      console.log(sheet);
-      const headers = [];
-      const range = XLSX.utils.decode_range(sheet["!ref"]);
-      let C;
-      const R = range.s.r;
+      console.log(sheet)
+      const headers = []
+      const range = XLSX.utils.decode_range(sheet['!ref'])
+      let C
+      const R = range.s.r
       /* start in the first row */
       for (C = range.s.c; C <= range.e.c; ++C) {
         /* walk every column in the range */
-        const cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })];
+        const cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })]
         /* find the cell in the first row */
-        let hdr = "UNKNOWN " + C; // <-- replace with your desired default
-        if (cell && cell.t) hdr = XLSX.utils.format_cell(cell);
-        headers.push(hdr);
+        let hdr = 'UNKNOWN ' + C // <-- replace with your desired default
+        if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
+        headers.push(hdr)
       }
-      return headers;
+      return headers
     },
     isExcel(file) {
-      return /\.(xlsx|xls|csv)$/.test(file.name);
-    },
-  },
-};
+      return /\.(xlsx|xls|csv)$/.test(file.name)
+    }
+  }
+}
 </script>
-
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.3.43",
+  "version": "1.3.46",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -44,7 +44,8 @@
     "jsonwebtoken": "^8.5.1",
     "normalize.css": "^8.0.1",
     "numerify": "*",
-    "qrcode": "^1.5.0",
+    "panzoom": "*",
+    "qrcode": "*",
     "resize-detector": "*",
     "vuedraggable": "*"
   },