|
|
@@ -817,7 +817,7 @@ export default {
|
|
|
},
|
|
|
*exportToExcel(action, { select, take, put }) {
|
|
|
const dashboardDesigner = yield select(state => state.dashboardDesigner);
|
|
|
- const { name, filters, items } = dashboardDesigner;
|
|
|
+ const { code, name, filters, items } = dashboardDesigner;
|
|
|
try {
|
|
|
yield put({ type: 'setField', name: 'loading', value: true });
|
|
|
|
|
|
@@ -835,8 +835,13 @@ export default {
|
|
|
string: 'String'
|
|
|
};
|
|
|
if(viewType === 'chart') {
|
|
|
- let sync = yield put({ type: 'chartDesigner/getChartTableData',
|
|
|
- chartCode, chartType, chartOption, filters: getTrueFilters(item, filters) });
|
|
|
+ let sync = yield put({
|
|
|
+ type: 'chartDesigner/getChartTableData',
|
|
|
+ chartCode, chartType, chartOption,
|
|
|
+ filters: getTrueFilters(item, filters),
|
|
|
+ inDashboard: true,
|
|
|
+ dashboardCode: code
|
|
|
+ });
|
|
|
yield take('chartDesigner/getChartTableData/@@end');
|
|
|
yield sync.then(tableData => {
|
|
|
let { columns: tcolumns, dataSource: tdatasource } = tableData;
|