Merge remote-tracking branch 'origin/master'

one_stop_public/Table/giveSmartFormGlobalProps.js

@@ -6,6 +6,7 @@ import { giveFilePostDataInfoForTrue } from '@/webPublic/one_stop_public/Base16'
 import {
   getSpanJson,
   getColumns,
+  getColumnsData,
   getColumnsDataRealize,
   getColumnsSqlKeyRealize,
   getWord,
@@ -42,6 +43,7 @@ export function giveSmartFormGlobalProps({
       getSpanJson,
       getColumns,
       getColumnsDataRealize,
+      getColumnsData,
       getColumnsSqlKeyRealize,
       getWord,
       getFileAndShow,
@@ -60,6 +62,8 @@ export function giveSmartFormGlobalProps({
           `列表获取纵向合并数据 ;参数-> mergeKey : 需要合并的表头key data : 列表数据 eliminateStr : 需要忽略合并的数据`,
         'getColumns(columns)':
           `获取ant表头的属性 ;参数->columns : ant的表头`,
+        'getColumnsData({data, mergeKey, columns, styles, defect, fileName, ext , eliminateStr})':
+            `获取列表合并的数据;参数-> 前三个必填data, mergeKey, columns`,
         'getColumnsDataRealize({data, mergeKey, columns, styles, defect, fileName, ext , eliminateStr})':
           `下载列表合并的数据;参数-> 前三个必填data, mergeKey, columns`,
         'getColumnsSqlKeyRealize({sqlKey, columns, styles, fileName, ext})':

one_stop_public/Table/globalFunction.js

@@ -372,6 +372,71 @@ export function getColumnsDataRealize({
   ext = 'xlsx',
   eliminateRow = [],
   eliminateCol = [],
+}) {
+  let content = getColumnsData({
+    data,
+    mergeKey,
+    columns,
+    styles,
+    defect,
+    fileName,
+    ext,
+    eliminateRow,
+    eliminateCol,
+  });
+  if (styles) {
+    content.styles = styles;
+  }
+  
+  try {
+    let getFileData = giveFilePostDataInfoForTrue(
+      {
+        content: JSON.stringify(content),
+        title: fileName,
+      },
+      `${apiUrl + '/DataObjApi/exportCustom'}`,
+    );
+    let token = getToken();
+    downloadFile(
+      getFileData.url,
+      {
+        ...getFileData.datas,
+        token: token,
+      },
+      fileName,
+      ext,
+    );
+  } catch (err) {
+    console.table("getColumnsDataRealize", err);
+  }
+
+}
+
+/**
+ *
+ * @param {data,columns,styles,defect,fileName,ext,url,eliminateRow,eliminateCol} param
+ * 表头和数据导出（合并表格）
+ * data : ant基础数据
+ * columns : ant表头基础数据
+ * styles : 导出excl样式
+ * defect : 为null时默认数据
+ * fileName : 导出文件名
+ * ext : 导出后缀 目前xecl、dbf
+ * url : 接口地址
+ * eliminateRow : 列需要忽略合并的数据
+ * eliminateCol : 行需要忽略合并的数据
+ *
+ */
+export function getColumnsData({
+  data = [],
+  mergeKey = [],
+  columns,
+  styles,
+  defect = null,
+  fileName = '导出文件',
+  ext = 'xlsx',
+  eliminateRow = [],
+  eliminateCol = [],
 }) {
   columns = deepCopy(columns);
   data = deepCopy(data);
@@ -428,9 +493,7 @@ export function getColumnsDataRealize({
     });
   } catch (err) {
     console.table("getColumnsDataRealize", err);
-  }
-
-
+  }  
   let content = {
     sheets: [
       {
@@ -466,30 +529,9 @@ export function getColumnsDataRealize({
   if (styles) {
     content.styles = styles;
   }
-  try {
-    let getFileData = giveFilePostDataInfoForTrue(
-      {
-        content: JSON.stringify(content),
-        title: fileName,
-      },
-      `${apiUrl + '/DataObjApi/exportCustom'}`,
-    );
-    let token = getToken();
-    downloadFile(
-      getFileData.url,
-      {
-        ...getFileData.datas,
-        token: token,
-      },
-      fileName,
-      ext,
-    );
-  } catch (err) {
-    console.table("getColumnsDataRealize", err);
-  }
+  return content
 
 }
-
 // ant列表组件合并表格 render属性，合并纵向、横向。
 export function renderContentAll(value, row, index, key, spanData, cloumnNames = []) {
   let colSpan,
@@ -758,7 +800,9 @@ export function upObjKey(obj, setKey = {}, defaultValue = "") {
               obj, e, newKey, type, timeFormat, defaultValue
             })
           };
-          delete nowObj[e];
+          if (e != newKey) {
+            delete nowObj[e];
+          }
         }
       }
       if (objType === "[object Array]" && Array.isArray(obj) && obj.length > 0) {
@@ -774,7 +818,9 @@ export function upObjKey(obj, setKey = {}, defaultValue = "") {
                 obj: v, e, newKey, type, timeFormat, defaultValue
               })
             };
-            delete newJson[e];
+            if (e != newKey) {
+              delete newJson[e];
+            }
           }
           nowObj.push(newJson);
         })
@@ -821,6 +867,7 @@ function getSetKeyJson({
   // delete obj[e];
   switch (type) {
     case "time":
+      debugger
       newKeyObj[newKey] = (timeFormat && value ? moment(value).format(timeFormat) : value) || defaultValue;
       break;
     default: