n20-common-lib 2.5.56 → 2.5.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.5.56",
+  "version": "2.5.57",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/utils/xls2json.js

@@ -3,10 +3,20 @@ import importG from './importGlobal.js'
 export default async function toJson(file, name) {
   const { read, utils } = await importG('xlsx', () => import(/*webpackChunkName: "xlsx"*/ 'xlsx'))
 
+  const getHeaderRow = (sheet) => {
+    const headers = []
+    let cell = []
+    sheet['!merges'].forEach((item) => {
+      cell.push(utils.decode_range(utils.encode_cell(item.s) + ':' + utils.encode_cell(item.e)))
+    })
+    console.log(cell, 'range')
+
+    return headers
+  }
+
   let pro = new Promise((resolve, reject) => {
     if (file instanceof Blob) {
       file.arrayBuffer().then((array) => {
-        console.log(array)
         try {
           const workbook = read(array, { type: 'array', cellDates: true, raw: true })
           resolve(workbook)
@@ -28,26 +38,29 @@ export default async function toJson(file, name) {
     let sheetName = name || workbook.SheetNames[0]
     let workSheet = workbook.Sheets[sheetName]
     if (!workSheet) return Promise.reject(`工作表:${name} 不存在`)
+    // let rows = []
+    const merges = workSheet['!merges'] || []
+    if (merges.length > 0) {
+      merges.forEach((merge) => {
+        const rangeStart = merge.s
+        const rangeEnd = merge.e
+        const start = utils.encode_cell(rangeStart)
+        // const end = utils.encode_cell(rangeEnd)
+        const mergedValue = workSheet[start].v // 获取合并单元格的值
 
-    let rows = []
-
-    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, { cellDates: true, raw: true })
-    rowsc.forEach((r) => {
-      let row = []
-      cols.forEach((c) => {
-        let d = r[c]
-        if (d instanceof Date && d.getHours() === 23 && d.getMinutes() === 59) {
-          d.setDate(d.getDate() + 1)
-          d.setHours(0, 0, 0)
+        // 将合并信息应用到所有单元格
+        for (let i = rangeStart.r; i <= rangeEnd.r; i++) {
+          for (let j = rangeStart.c; j <= rangeEnd.c; j++) {
+            const cellAddress = utils.encode_cell({ r: i, c: j })
+            workSheet[cellAddress] = { t: 's', v: mergedValue } // 使用 's' 类型表示字符串
+          }
         }
-
-        row.push(d)
       })
-      rows.push(row)
-    })
-    return Promise.resolve(rows)
+    }
+
+    // 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 })
+    return Promise.resolve(rowsC)
   })
 }