@lambo-design/shared 1.0.0-beta.314 → 1.0.0-beta.316

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/shared",
-  "version": "1.0.0-beta.314",
+  "version": "1.0.0-beta.316",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/utils/excel.js

@@ -5,6 +5,10 @@ XLSX.set_cptable(cpexcel);
 import {deepCopy} from "./assist";
 import XLSXStyle from '@lambo-design/xlsx-style'
 
+/**
+ * 表头内容转换规则
+ * @type {{'': string, '#': string, 序号: string, 操作: string, 编号: string}}
+ */
 const titleRules = {
   '': '',
   '#': '#',
@@ -12,6 +16,10 @@ const titleRules = {
   '编号': '编号',
   '操作': '操作',
 }
+/**
+ * 列类型转换规则
+ * @type {{'single-selection': string, select: string, selection: string, checkbox: string, index: string, radio: string}}
+ */
 const typeRules = {
   'index': 'index',
   'select': 'select',
@@ -21,6 +29,62 @@ const typeRules = {
   'radio': 'radio'
 }
 
+/**
+ * 标题样式
+ * @type {{border: {top: {color: {rgb: string}, style: string}, left: {color: {rgb: string}, style: string}, bottom: {color: {rgb: string}, style: string}, right: {color: {rgb: string}, style: string}}, alignment: {horizontal: string, vertical: string}, fill: {fgColor: {rgb: string}, bgColor: {indexed: number}}}}
+ */
+let titleStyle = {
+  border: {
+    left: {style: 'thin', color: {rgb: "000000"}},
+    top: {style: 'thin', color: {rgb: "000000"}},
+    right: {style: 'thin', color: {rgb: "000000"}},
+    bottom: {style: 'thin', color: {rgb: "000000"}},
+  },
+  font: { bold: true },
+  alignment: {horizontal: "center", vertical: "center"}
+}
+/**
+ * 表头样式
+ * @type {{border: {top: {color: {rgb: string}, style: string}, left: {color: {rgb: string}, style: string}, bottom: {color: {rgb: string}, style: string}, right: {color: {rgb: string}, style: string}}, alignment: {horizontal: string, vertical: string}, fill: {fgColor: {rgb: string}, bgColor: {indexed: number}}}}
+ */
+let headStyle = {
+  border: {
+    left: {style: 'thin', color: {rgb: "000000"}},
+    top: {style: 'thin', color: {rgb: "000000"}},
+    right: {style: 'thin', color: {rgb: "000000"}},
+    bottom: {style: 'thin', color: {rgb: "000000"}},
+  },
+  alignment: {horizontal: "center", vertical: "center"},
+  fill: {bgColor: {indexed: 64}, fgColor: {rgb: "5A9BD5"}}
+}
+/**
+ * 表格斑马纹样式
+ * @type {{border: {top: {color: {rgb: string}, style: string}, left: {color: {rgb: string}, style: string}, bottom: {color: {rgb: string}, style: string}, right: {color: {rgb: string}, style: string}}, alignment: {vertical: string}, fill: {fgColor: {rgb: string}, bgColor: {indexed: number}}}}
+ */
+let bodyPairStyle = {
+  border: {
+    left: {style: 'thin', color: {rgb: "000000"}},
+    top: {style: 'thin', color: {rgb: "000000"}},
+    right: {style: 'thin', color: {rgb: "000000"}},
+    bottom: {style: 'thin', color: {rgb: "000000"}},
+  },
+  alignment: {vertical: "center"},
+  fill: {bgColor: {indexed: 64}, fgColor: {rgb: "DDEBF7"}}
+}
+/**
+ * 表格普通样式
+ * @type {{border: {top: {color: {rgb: string}, style: string}, left: {color: {rgb: string}, style: string}, bottom: {color: {rgb: string}, style: string}, right: {color: {rgb: string}, style: string}}, alignment: {vertical: string}}}
+ */
+let bodyStyle = {
+  border: {
+    left: {style: 'thin', color: {rgb: "000000"}},
+    top: {style: 'thin', color: {rgb: "000000"}},
+    right: {style: 'thin', color: {rgb: "000000"}},
+    bottom: {style: 'thin', color: {rgb: "000000"}},
+  },
+  alignment: {vertical: "center"}
+}
+
 /**
  * 过滤掉filterData中titleRules、typeRules相关的列
  * @param filterData
@@ -266,30 +330,32 @@ function auto_width(ws, data) {
   ws['!cols'] = result;
 }
 
-function merge_title(ws,title) {
+
+
+function merge_cell({ws,data,startRow}) {
   let mergeData = [];
 
-  for (let i = 0; i < title.length; i++) {
-    for (let j = 0; j < title[i].length; j++) {
-      let currentCellValue = title[i][j];
-      let merge = { s: { r: i, c: j }, e: { r: i, c: j } };
+  for (let i = 0; i < data.length; i++) {
+    for (let j = 0; j < data[i].length; j++) {
+      let currentCellValue = data[i][j];
+      let merge = { s: { r: i + startRow, c: j }, e: { r: i + startRow, c: j } };
 
       // Check horizontal direction for merges
       while (
-          j + 1 < title[i].length &&
-          title[i][j + 1] === currentCellValue &&
-          !isCellMerged(mergeData, { r: i, c: j + 1 })
+          j + 1 < data[i].length &&
+          data[i][j + 1] === currentCellValue &&
+          !isCellMerged(mergeData, { r: i + startRow, c: j + 1 })
           ) {
         merge.e.c = j + 1;
         j++;
       }
 
       // Check vertical direction for merges
-      let originalRow = i;
+      let originalRow = i + startRow;
       while (
-          i + 1 < title.length &&
-          title[i + 1][j] === currentCellValue &&
-          !isCellMerged(mergeData, { r: i + 1, c: j })
+          i + 1 < data.length &&
+          data[i + 1][j] === currentCellValue &&
+          !isCellMerged(mergeData, { r: i + startRow + 1, c: j })
           ) {
         i++;
 
@@ -321,23 +387,23 @@ function merge_title(ws,title) {
     ws['!merges'] = mergeData;
   }
 
-  // Helper function to check if a cell is already part of a merge range
-  function isCellMerged(mergeData, cell) {
-    for (let merge of mergeData) {
-      if (
-          cell.r >= merge.s.r &&
-          cell.r <= merge.e.r &&
-          cell.c >= merge.s.c &&
-          cell.c <= merge.e.c
-      ) {
-        return true;
-      }
+}
+// Helper function to check if a cell is already part of a merge range
+function isCellMerged(mergeData, cell) {
+  for (let merge of mergeData) {
+    if (
+        cell.r >= merge.s.r &&
+        cell.r <= merge.e.r &&
+        cell.c >= merge.s.c &&
+        cell.c <= merge.e.c
+    ) {
+      return true;
     }
-    return false;
   }
+  return false;
 }
 
-function merge_content(ws, tableData, spanColumnKeys, titleLen) {
+function merge_content({ws, tableData, spanColumnKeys, startRow}) {
   if (spanColumnKeys == null || spanColumnKeys.length === 0) {
     return null;
   }
@@ -352,7 +418,7 @@ function merge_content(ws, tableData, spanColumnKeys, titleLen) {
   }
   for (let i = 0; i < dLen; i++) {
     for (let j = 0; j < kLen; j++) {
-      let merge = {s: {r: i + titleLen, c: j}, e: {r: i + titleLen, c: j}}
+      let merge = {s: {r: i + startRow, c: j}, e: {r: i + startRow, c: j}}
       flag = false
       //如果单元格和右侧内容相同则合并
       let n = 1;
@@ -372,7 +438,7 @@ function merge_content(ws, tableData, spanColumnKeys, titleLen) {
           break
         }
         params[i + m][j].disable = true
-        merge.e.r = i + titleLen + m
+        merge.e.r = i + startRow + m
         flag = true
         m++;
       }
@@ -385,7 +451,7 @@ function merge_content(ws, tableData, spanColumnKeys, titleLen) {
   ws['!merges'] = ws['!merges'].concat(mergeData)
 }
 
-function add_style(ws, title) {
+function add_style({ws, title, startRow}) {
 
   // 补充空白数据
   let rangs = ws['!ref'].split(":");
@@ -408,55 +474,35 @@ function add_style(ws, title) {
     }
   })
 
-  let titleStyle = {
-    border: {
-      left: {style: 'thin', color: {rgb: "000000"}},
-      top: {style: 'thin', color: {rgb: "000000"}},
-      right: {style: 'thin', color: {rgb: "000000"}},
-      bottom: {style: 'thin', color: {rgb: "000000"}},
-    },
-    alignment: {horizontal: "center", vertical: "center"},
-    fill: {bgColor: {indexed: 64}, fgColor: {rgb: "5A9BD5"}}
-  }
-  let bodyPairStyle = {
-    border: {
-      left: {style: 'thin', color: {rgb: "000000"}},
-      top: {style: 'thin', color: {rgb: "000000"}},
-      right: {style: 'thin', color: {rgb: "000000"}},
-      bottom: {style: 'thin', color: {rgb: "000000"}},
-    },
-    alignment: {vertical: "center"},
-    fill: {bgColor: {indexed: 64}, fgColor: {rgb: "DDEBF7"}}
-  }
-  let bodyStyle = {
-    border: {
-      left: {style: 'thin', color: {rgb: "000000"}},
-      top: {style: 'thin', color: {rgb: "000000"}},
-      right: {style: 'thin', color: {rgb: "000000"}},
-      bottom: {style: 'thin', color: {rgb: "000000"}},
-    },
-    alignment: {vertical: "center"}
-  }
+  let titleReg = new RegExp("^[A-Z]1$", "im");
+  let titleExtReg = new RegExp("^[A-Z][2-" + parseInt(startRow>0?startRow:2) + "]$", "im");
+  let headReg = new RegExp("^[A-Z]+[" + parseInt(startRow + 1) + "-" + parseInt(startRow + title.length) + "]$", "im");
+  let bodyReg = new RegExp("^[A-Z]+([" + parseInt(startRow + title.length) + "-9]|[1-9]\\d+)$", "im");
   Object.keys(ws).forEach(item => {
-
-    /**
-     * 加载表头样式：蓝色背景，水平垂直居中，边框
-     */
-    var reg = new RegExp("^[A-Z]+[1 -" + title.length + "]$", "gim");
-    if (reg.test(item)) {
+    if(titleReg.test(item)&&startRow>0){
+      /**
+       * 加载标题样式：加粗，水平垂直居中，边框
+       */
       ws[item].s = titleStyle
-    } else
-
-        /**
-         * 表体样式： 垂直居中，边框
-         */
-    if (/^[A-Z]+\d+$/.test(item)) {
+    }else if(titleExtReg.test(item)&&startRow>0){
+      /**
+       * 加载标题扩展信息样式：加粗，水平垂直居中，边框
+       */
+      ws[item].s = bodyStyle
+    } else if (headReg.test(item)) {
+      /**
+       * 加载表头样式：蓝色背景，水平垂直居中，边框
+       */
+      ws[item].s = headStyle
+    } else if (bodyReg.test(item)) {
+      /**
+       * 表体样式： 垂直居中，边框
+       */
       if (parseInt(item.replace(/[^0-9]/ig, "")) % 2 === 0) {
         ws[item].s = bodyStyle
       } else {
         ws[item].s = bodyPairStyle
       }
-
     }
   })
   /* ws.B2 = {
@@ -495,17 +541,24 @@ export const export_json_to_excel = ({data, key, title, filename, spanColumns, a
     const arr = json_to_array(key, data);
     auto_width(ws, arr);
   }
-  merge_content(ws, data, spanColumns)
+  merge_content(ws, data, spanColumns, title.length)
   XLSX.utils.book_append_sheet(wb, ws, '');
   XLSX.writeFile(wb, filename + '.' + format);
 }
 
-export const export_array_to_excel = ({key, data, title, filename, spanColumns, autoWidth, format}) => {
+export const export_array_to_excel = ({key, data, title, header = [], footer = [], filename, spanColumns, autoWidth, format}) => {
   const wb = XLSX.utils.book_new();
-  const arr = json_to_array(key, data);
+  let arr = json_to_array(key, data);
   for (var i = title.length; i > 0; i--) {
     arr.unshift(title[i - 1])
   }
+  if(header){
+    arr = [...header,...arr]
+  }
+  if(footer){
+    arr = [...arr,...footer]
+  }
+
   const ws = XLSX.utils.aoa_to_sheet(arr);
   if (autoWidth) {
     auto_width(ws, arr);
@@ -513,10 +566,12 @@ export const export_array_to_excel = ({key, data, title, filename, spanColumns,
   // 合并表头
   if (!ws['!merges']) ws['!merges'] = [];
   if (title.length > 1) {
-    merge_title(ws, title)
+    merge_cell({ws, data:title, startRow: header.length})
   }
-  merge_content(ws, data, spanColumns, title.length)
-  add_style(ws, title)
+  merge_cell({ws,data:header,startRow: 0 })
+  console.log(data)
+  merge_content(ws, data, spanColumns, title.length + header.length)
+  add_style({ws, title, startRow: header.length})
   XLSX.utils.book_append_sheet(wb, ws, '');
   if(format === 'csv'){
     XLSX.writeFile(wb, filename + '.' + format,{