n20-common-lib 2.7.3 → 2.7.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.7.3",
+  "version": "2.7.5",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/FileImport/index.vue

@@ -15,6 +15,7 @@
         :showErrorExport="showErrorExport"
         :validate-result="validateResult"
         :validate-confirm="validateConfirm"
+        @importError="importError"
         :pagination="pagination"
       >
         <span ref="upload-trigger" slot="trigger">upload</span>

package/src/utils/xls2json.js

@@ -1,6 +1,6 @@
 import importG from './importGlobal.js'
 
-export default async function toJson(file, name) {
+export default async function toJson(file, name, formAt = 'yyyy-MM-dd') {
   const { read, utils } = await importG('xlsx', () => import(/*webpackChunkName: "xlsx"*/ 'xlsx'))
 
   const getHeaderRow = (sheet) => {
@@ -18,7 +18,7 @@ export default async function toJson(file, name) {
     if (file instanceof Blob) {
       file.arrayBuffer().then((array) => {
         try {
-          const workbook = read(array, { type: 'array', cellDates: true, raw: true })
+          const workbook = read(array, { type: 'array', cellDates: true, dateNF: formAt, raw: true })
           resolve(workbook)
         } catch (err) {
           reject(err)
@@ -26,7 +26,7 @@ export default async function toJson(file, name) {
       })
     } else if (file instanceof ArrayBuffer) {
       try {
-        const workbook = read(file, { type: 'array', cellDates: true, raw: true })
+        const workbook = read(file, { type: 'array', cellDates: true, dateNF: formAt, raw: true })
         resolve(workbook)
       } catch (err) {
         reject(err)
@@ -60,7 +60,7 @@ export default async function toJson(file, name) {
 
     // let cols = utils.sheet_to_csv(workSheet, { FS: '†', blankrows: false }).split('\n')[0].replace(/†+$/, '').split('†')
     // rows.push(cols)
-    let rowsC = utils.sheet_to_json(workSheet, { header: 1, defval: '', cellDates: true, raw: true })
+    let rowsC = utils.sheet_to_json(workSheet, { header: 1, defval: '', cellDates: true, dateNF: formAt, raw: false })
     return Promise.resolve(rowsC)
   })
 }