Browse Source

Update v

up-style-manager
Artur Arseniev 5 years ago
parent
commit
33d3e934ca
  1. 6
      src/style_manager/model/PropertyComposite.js

6
src/style_manager/model/PropertyComposite.js

@ -93,7 +93,7 @@ export default Property.extend({
}, },
__getFromStyle(style = {}) { __getFromStyle(style = {}) {
let result = style; let result = {};
const fromStyle = this.get('fromStyle'); const fromStyle = this.get('fromStyle');
if (fromStyle) { if (fromStyle) {
@ -112,9 +112,11 @@ export default Property.extend({
result[prop.getId()] = value || ''; result[prop.getId()] = value || '';
}); });
result = { result = {
...style,
...result, ...result,
...style,
}; };
} else {
result = style;
} }
} }

Loading…
Cancel
Save