getColumnsDatas 重名了

one_stop_public/Table/globalFunction.js

@@ -165,7 +165,7 @@ export function getColumns(columns) {
     columnsList[i] = new Array(getColumnsWidth(columns)).fill({});
   }
 
-  function getColumnsData(data = [], res = [], level = 1) {
+  function getColumnsDatas(data = [], res = [], level = 1) {
     try {
       for (let item of data) {
         //item.key = i;
@@ -182,7 +182,7 @@ export function getColumns(columns) {
         if (!isLast) {
           if (Array.isArray(item.children)) {
             let x = level + 1;
-            getColumnsData(item.children, res, x);
+            getColumnsDatas(item.children, res, x);
           }
         } else {
           col++;
@@ -387,7 +387,7 @@ export function getColumnsDataRealize({
   if (styles) {
     content.styles = styles;
   }
-  
+
   try {
     let getFileData = giveFilePostDataInfoForTrue(
       {
@@ -437,6 +437,7 @@ export function getColumnsData({
   ext = 'xlsx',
   eliminateRow = [],
   eliminateCol = [],
+  docxSheet = {},
 }) {
   columns = deepCopy(columns);
   data = deepCopy(data);
@@ -492,8 +493,8 @@ export function getColumnsData({
       });
     });
   } catch (err) {
-    console.table("getColumnsDataRealize", err);
-  }  
+    console.table("getColumnsData", err);
+  }
   let content = {
     sheets: [
       {
@@ -526,6 +527,12 @@ export function getColumnsData({
       },
     },
   };
+  if(ext === "docx"){
+    content.sheets[0] = {
+      ...content.sheets[0],
+      ...docxSheet
+    }
+  }
   if (styles) {
     content.styles = styles;
   }