Comparing version 1.0.4 to 1.0.5
# Changelog | ||
## 1.0.5 / 2017-11-14 | ||
* [[651da18](http://gitlab.alibaba-inc.com/nuke/view/commit/651da1850e220ad6deaa40dcde7a1468e1cdd724)] - `fix` fix style undefined bug | ||
## 1.0.4 / 2017-11-13 | ||
@@ -5,0 +9,0 @@ |
@@ -165,7 +165,8 @@ 'use strict'; | ||
key: 'calcInheritStyle', | ||
value: function calcInheritStyle(styles) { | ||
value: function calcInheritStyle(customStyles) { | ||
if (!customStyles) return {}; | ||
var insideStyle = {}; | ||
_inherit2.default.map(function (item) { | ||
if (styles[item]) { | ||
insideStyle[item] = styles[item]; | ||
if (customStyles[item]) { | ||
insideStyle[item] = customStyles[item]; | ||
} | ||
@@ -172,0 +173,0 @@ }); |
{ | ||
"name": "nuke-view", | ||
"version": "1.0.4", | ||
"version": "1.0.5", | ||
"description": "视图", | ||
@@ -5,0 +5,0 @@ "main": "lib/index", |
25366
372