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

fixes #2

Browse Source
This commit is contained in:
vchikalkin 2021-08-17 13:50:04 +03:00 committed by Chika
parent 9439c39f5b
commit 1d93a63bc7
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/client/Containers/Calculation/lib/fetchData/index.js
View File

@ -1,4 +1,6 @@
import CalculationStore from 'client/stores/CalculationStore';
import initialOptions from 'client/stores/CalculationStore/config/initialOptions';
import initialValues from 'client/stores/CalculationStore/config/initialValues';
import UserStore from 'client/stores/UserStore';
import CrmService from 'core/services/CrmService';
import { Process } from 'core/types/Calculation/Store/process';
@ -34,7 +36,7 @@ export default () =>
.then(
([
{ entities: ownerOptions },
{ entities: initialOptions },
{ entities: options },
{ entities: staticEntities },
{
entities: { systemuser },
@ -43,10 +45,16 @@ export default () =>
entities: { insuranceCompany },
},
]) => {
CalculationStore.applyOptions(ownerOptions);
CalculationStore.applyOptions(initialOptions);
CalculationStore.applyStaticData(staticEntities);
CalculationStore.applyStaticData({ systemuser: [systemuser] });
CalculationStore.applyOptions({
...initialOptions,
...ownerOptions,
...options,
});
CalculationStore.applyStaticData({
...staticEntities,
systemuser: [systemuser],
});
CalculationStore.setValues(initialValues, true);
CalculationStore.setTableColumns('tableInsurance')({
options: { insuranceCompany },
});

6
src/client/stores/CalculationStore/Data/values.js
View File

@ -1,15 +1,13 @@
import { getValueName } from 'client/Containers/Calculation/lib/elements/tools';
import initialFilters from 'client/stores/CalculationStore/config/initialFilters';
import initialOptions from 'client/stores/CalculationStore/config/initialOptions';
import initialStatuses from 'client/stores/CalculationStore/config/initialStatuses';
import initialValues from 'client/stores/CalculationStore/config/initialValues';
import { isNil, mergeWith, pick } from 'lodash';
const valuesData = {
values: initialValues,
values: {},
statuses: initialStatuses,
validations: {},
options: initialOptions,
options: {},
filters: initialFilters,
};