diff --git a/src/components/Data.jsx b/src/components/Data.jsx
index 6aa12bd..35106ff 100644
--- a/src/components/Data.jsx
+++ b/src/components/Data.jsx
@@ -35,7 +35,8 @@ export const TableExportBtn = (props) => {
const output_name = `${props.label}`;
const [columnsMap, setColumnsMap] = useState([]);
useEffect(() => {
- const flatCols = props.columns.flatMap((v, k) => (v.children ? v.children.map((vc) => ({ ...vc, title: `${v.title}-${vc.title}` })) : v)).filter(c => c.title);
+ const flatCols = props.columns.flatMap((v, k) => (v.children ? v.children.map((vc) => ({ ...vc, title: `${v.title}-${vc.title || ''}` })) : v)).filter(c => c.title);
+ // console.log('flatCols', flatCols);
setColumnsMap(flatCols);
return () => {};
@@ -50,11 +51,12 @@ export const TableExportBtn = (props) => {
const itemMapped = columnsMap.reduce((sv, kset) => {
const render_val = typeof kset?.render === 'function' ? kset.render('', item) : null;
const data_val = kset?.dataIndex ? (Array.isArray(kset.dataIndex) ? getNestedValue(item, kset.dataIndex) : item[kset.dataIndex]) : undefined;
- const v = { [kset.title]: render_val || data_val };
+ const v = { [kset.title]: data_val || render_val };
return { ...sv, ...v };
}, {});
return itemMapped;
});
+ // console.log('data', data);
const ws = utils.json_to_sheet(data, { header: columnsMap.filter((r) => r.dataIndex).map((r) => r.title) });
const wb = utils.book_new();
utils.book_append_sheet(wb, ws, 'sheet');
diff --git a/src/views/AgentGroupCount.jsx b/src/views/AgentGroupCount.jsx
index 07b6e69..3aea2a4 100644
--- a/src/views/AgentGroupCount.jsx
+++ b/src/views/AgentGroupCount.jsx
@@ -5,6 +5,7 @@ import { observer } from 'mobx-react';
import 'moment/locale/zh-cn';
import { utils, writeFileXLSX } from 'xlsx';
import SearchForm from './../components/search/SearchForm';
+import { TableExportBtn } from './../components/Data';
const AgentGroupCount = () => {
const { customerServicesStore, date_picker_store } = useContext(stores_Context);
@@ -56,14 +57,7 @@ const AgentGroupCount = () => {
scroll={{ x: 1000 }}
/>