Merge branch 'dev' into feature/20190923-feature

mock/api/editor/info.json

+{
+	"success": true,
+	"data": {
+		"name": "Zeroing Editor",
+		"version": "1.0.0",
+		"templates": {
+			"builtin": [
+				"blank"
+			],
+			"custom": []
+		},
+		"processes": [
+			{
+				"id": "entry",
+				"name": "Entry",
+				"group": "base",
+				"options": {},
+				"output": [
+					"success"
+				]
+			},
+			{
+				"id": "wait",
+				"name": "Wait",
+				"group": "base",
+				"options": {
+					"duration": {
+						"type": "number",
+						"default": 1000
+					}
+				},
+				"output": [
+					"complete"
+				]
+			},
+			{
+				"id": "prefab1",
+				"name": "Prefab1",
+				"isPrefab": true,
+				"sub": {
+					"1": {
+						"uuid": "1",
+						"alias": "入口",
+						"meta": "entry",
+						"output": {
+							"success": [
+								"2"
+							]
+						}
+					},
+					"2": {
+						"uuid": "2",
+						"meta": "wait",
+						"alias": "等待",
+						"options": {
+							"duration": 500
+						}
+					}
+				}
+			}
+		],
+		"scripts": [
+			{
+				"id": "wave",
+				"name": "Wave",
+				"options": {
+					"duration": {
+						"type": "number",
+						"default": 1000
+					},
+					"type": {
+						"type": "string",
+						"default": "yoyo"
+					},
+					"ease": {
+						"type": "string",
+						"default": "linear"
+					},
+					"autoPlay": {
+						"type": "boolean",
+						"default": false
+					}
+				}
+			}
+		]
+	}
+}
\ No newline at end of file

mock/api/editor/info/index.js

@@ -24,15 +24,6 @@ const data = {
 				},
 				output: ['complete'],
 			},
-			{
-				id: 'test',
-				name: 'Test',
-				group: 'test',
-				options: {
-					duration: {type: 'number', default: 1000},
-				},
-				output: ['complete'],
-			},
 			{
 				id: 'prefab1',
 				name: 'Prefab1',

mock/api/project/query/data.json

+{
+	"success": true,
+	"data": {
+		"id": "6566c4a3f237",
+		"name": "测试",
+		"creator": "卞龙亭",
+		"operator": "卞龙亭",
+		"create_time": "2019-09-19T06:56:01.000Z",
+		"update_time": "2019-09-19T06:56:01.000Z",
+		"data": "{\"views\":[{\"name\":\"view1\",\"type\":\"node\",\"properties\":{},\"uuid\":\"3a357816-5581-41ba-aa6f-4a6cc40ae396\",\"children\":[{\"name\":\"rect\",\"type\":\"rect\",\"properties\":{\"width\":50,\"height\":50,\"fillColor\":\"rgba(105, 182, 255, 1)\",\"strokeWidth\":0,\"x\":10,\"y\":10},\"events\":{\"click\":{\"once\":false,\"behaviors\":[{\"uuid\":\"aa1\",\"alias\":\"主过程\",\"meta\":\"main\"}]}},\"scripts\":[{\"script\":\"wave\",\"options\":{\"duration\":500,\"autoPlay\":true,\"type\":\"cubicIn\"}}],\"uuid\":\"f97bbf76-6923-4669-b5a3-e6382753e49a\"}]}],\"assets\":[],\"dataMapping\":[],\"processMap\":{\"main\":{\"id\":\"main\",\"name\":\"Main\",\"options\":{},\"subEntry\":\"1\",\"sub\":{\"a1\":{\"uuid\":\"a1\",\"alias\":\"入口\",\"meta\":\"entry\",\"output\":{\"success\":[\"a2\"]},\"design\":{\"x\":10,\"y\":10}},\"a2\":{\"uuid\":\"a2\",\"alias\":\"test\",\"meta\":\"test\",\"options\":{\"text\":\"hello\"},\"output\":{\"success\":[],\"failed\":[]},\"design\":{\"x\":20,\"y\":100}}}},\"test\":{\"id\":\"test\",\"name\":\"Test\",\"options\":{\"text\":{\"type\":\"string\",\"default\":\"\"}},\"output\":[\"success\",\"failed\"]}}}"
+	}
+}
\ No newline at end of file

mock/api/project/query/data1.json

-{
-	"success": true,
-	"data": {
-		"id": "6566c4a3f237",
-		"name": "呼呼",
-		"creator": "卞龙亭",
-		"data": "{\"views\":[{\"name\":\"aaa\",\"type\":\"node\",\"children\":[{\"name\":\"node\",\"type\":\"image\"}]},{\"name\":\"aaa\",\"type\":\"node\",\"children\":[{\"name\":\"node\",\"type\":\"node\"},{\"name\":\"node\",\"type\":\"node\"}]}],\"assets\":[{\"name\":\"2ACA84D91EAAE90EDBFF78CBF5E727AB.png\",\"url\":\"//yun.duiba.com.cn/aurora/58323a0469a7467c99b34f8933ea65b507a0c655.png\",\"uuid\":\"3e496939-5fe6-42f2-b8fa-42c7a742e880\"},{\"name\":\"还以为是bug.jpg\",\"url\":\"//yun.duiba.com.cn/aurora/094832ace87c94bdb9e4a7821b3a3ebca0df2cd7.jpg\",\"uuid\":\"ec67a8a0-8708-43a4-888e-efb0fe7c2bd6\"},{\"name\":\"17344D055C89C3CFADB0C51E1A1E064E.gif\",\"url\":\"//yun.duiba.com.cn/aurora/1ad10a4cf3488ef1400af1d6f353d9c577fe1049.gif\",\"uuid\":\"429803eb-0f68-4071-b68c-468980883ac4\"}],\"dataMapping\":[]}"
-	}
-}
\ No newline at end of file