Merge remote-tracking branch 'origin/fix/#177'

xiaokaike · Mar 5, 2020 · f914997 · f914997
2 parents 63ce390 + 501e3e5
commit f914997
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/example/App.vue b/example/App.vue
@@ -83,9 +83,9 @@ let defaultProps = {
     a: 0.9
   },
   rgba: {
-    r: 25,
-    g: 77,
-    b: 51,
+    r: 159,
+    g: 96,
+    b: 43,
     a: 0.9
   },
   a: 0.9

diff --git a/src/mixin/color.js b/src/mixin/color.js
@@ -9,6 +9,12 @@ function _colorChange (data, oldHue) {
     color = tinycolor(data.hsl)
   } else if (data && data.hex && data.hex.length > 0) {
     color = tinycolor(data.hex)
+  } else if (data && data.hsv) {
+    color = tinycolor(data.hsv)
+  } else if (data && data.rgba) {
+    color = tinycolor(data.rgba)
+  } else if (data && data.rgb) {
+    color = tinycolor(data.rgb)
   } else {
     color = tinycolor(data)
   }