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

fix merge empty array when apply options

Browse Source
This commit is contained in:
vchikalkin 2021-03-24 16:16:18 +03:00 committed by Chika
parent e5c12ae061
commit f6af605359
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ 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 { merge } from 'lodash';
import { isNil, mergeWith } from 'lodash';
const valuesData = {
values: initialValues,
@ -50,7 +50,12 @@ const valuesActions = {
this.options[elementName] = options;
},
applyOptions(options) {
this.options = merge(this.options, options);
this.options = mergeWith(this.options, options, (obj, src) => {
if (!isNil(src)) {
return src;
}
return obj;
});
},
getFilter(elementName) {