Merge branch 'dev' into feature/20190923-feature

mock/api/editor/info.json

@@ -68,12 +68,28 @@
 						"type": "number",
 						"default": 1000
 					},
-					"type": {
+					"name": {
 						"type": "string",
-						"default": "yoyo"
+						"default": "hello"
+					},
+					"color": {
+						"type": "color",
+						"default": "#123456"
+					},
+					"type": {
+						"type": [
+							"rotate",
+							"jump",
+							"breath"
+						],
+						"default": "rotate"
 					},
 					"ease": {
-						"type": "string",
+						"type": [
+							"linear",
+							"cubic",
+							"back"
+						],
 						"default": "linear"
 					},
 					"autoPlay": {