Merge remote-tracking branch 'origin/master'

one_stop_public/Table/globalFunction.js

@@ -12,16 +12,19 @@ const apiUrl = queryOauthActionPath();
  * 列表获取纵向合并数据
  * mergeKey : 需要合并的表头key
  * data : 列表数据
- * eliminateStr : 需要忽略合并的数据
+ * eliminateRow : 列需要忽略合并的数据
+ * eliminateCol : 行需要忽略合并的数据
  *
  * 返回值
  * rowSpanData 列合并数据，colSpanData行合并数据
  * */
-export function getSpanJson(mergeKey, data, eliminateStr = []) {
+export function getSpanJson({
+    mergeKey, data, eliminateRow = [], eliminateCol = []
+}) {
     try {
         return {
-            rowSpanData: getRowSpanJson(mergeKey, data, eliminateStr),
-            colSpanData: getColSpanJson(mergeKey, data, eliminateStr),
+            rowSpanData: getRowSpanJson(mergeKey, data, eliminateRow),
+            colSpanData: getColSpanJson(mergeKey, data, eliminateCol),
         };
     } catch (err) {
         console.table(err);
@@ -105,6 +108,8 @@ function getColSpanJson(cloumnNames, data, eliminateStr = []) {
                 colSpanJson[triggerColIndex][idx] = triggerColSum;
                 colSpanJson[keyItem][idx] = 0;
                 triggerColIndex = null;
+            } else if(isCol && triggerColIndex !== null ) {
+                colSpanJson[keyItem][idx] = 0;
             } else {
                 colSpanJson[keyItem][idx] = colSum;
             }
@@ -305,7 +310,8 @@ export function getColumnsSqlKeyRealize({
  * fileName : 导出文件名
  * ext : 导出后缀 目前xecl、dbf
  * url : 接口地址
- * eliminateStr : 忽略合并的值
+ * eliminateRow : 列需要忽略合并的数据
+ * eliminateCol : 行需要忽略合并的数据
  * 返回值
  * */
 export function getColumnsDataRealize({
@@ -316,10 +322,11 @@ export function getColumnsDataRealize({
     defect = null,
     fileName = '导出文件',
     ext = 'xlsx',
-    eliminateStr = [],
+    eliminateRow = [],
+    eliminateCol = [],
 }) {
     let { columnsList, columnsMerges, columnsKey, columnsHeight } = getColumns(columns);
-    let { colSpanData, rowSpanData } = getSpanJson(mergeKey, data, eliminateStr);
+    let { colSpanData, rowSpanData } = getSpanJson({ mergeKey, data, eliminateRow, eliminateCol });
     // 处理数据
     let bodyData = [];
     let dataMerges = [];