evo/EvoCalculator
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get preparedValues from calculation response

Browse Source
This commit is contained in:
Chika 2020-12-29 13:47:34 +03:00
parent a0184c9b9d
commit def0aecec3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/stores/CalculationStore/Effects/actions/calculate/index.js
View File

@ -82,7 +82,7 @@ export default async () => {
results.showResultsTable(preparedData, res);
results.showResults(preparedData, res);
return { ...res, ...preparedData };
return Object.assign(preparedData, res);
})
.catch(err => {
openNotification({

2
src/core/types/Calculation/Responses.ts
View File

@ -1,3 +1,4 @@
import { PreparedValues } from './Prepare';
import { TCRMEntity } from '../Entities/crmEntities';
import { TEntities } from '../Entities/crmEntityNames';
import { ColumnsNames, IColumn, PostValues } from './Core';
@ -9,4 +10,5 @@ export interface IGetCRMEntitiesResponse {
export interface IGetCalculationResponse {
columns: { [column in ColumnsNames]?: IColumn };
postValues: PostValues;
preparedValues: PreparedValues;
}