fix bugs

UPDATELOG.md

@@ -1,4 +1,5 @@
 ### RAP v0.9.1 ###
+* [功能] 支持MockJS自定义函数，在有@mock=标签时忽略;分割表达式。修复控制台不显示MockJS自定义函数的问题。
 * [功能] 参数化MockJS模板生成现在支持Key了(以前只支持value)。2014-05-29
 * [BUG] 修复RESTful正则语法的BUG。2014-05-29
 

WebContent/tester/pageTester.js

@@ -288,9 +288,28 @@ YUI().use('handlebars', 'node', 'event', 'jsonp', 'jsonp-url', 'json-stringify',
             return obj;
         }
     }
+
+    function convertFuncValsToString(obj) {
+    	if (typeof obj !== 'object' || obj === null) {
+    		return;
+    	}
+    	var key, val;
+    	for (key in obj) {
+    		val = obj[key];
+    		if (obj.hasOwnProperty(key)) {
+    			if (typeof val === 'function') {
+    				obj[key] = val.toString();
+    			} else {
+    				convertFuncValsToString(obj[key]);
+    			}
+    		}
+    	}
+    }
+
 
 
     function testResHandler(response, form, btn) {
+    	convertFuncValsToString(response);
         var jsonString = Y.JSON.stringify(response);
         var path = Y.one('#txtRootPath').get('value');
         var obj = eval("(" + jsonString + ")");

src/com/taobao/rigel/rap/mock/service/impl/MockMgrImpl.java

@@ -616,7 +616,12 @@ private String mockValue(Parameter para, int index) {
 	}
 
 	private String mockjsValue(Parameter para, int index) {
-		String[] tags = para.getMockDataTEMP().split(";");
+		String mockData =  para.getMockDataTEMP();
+		String[] tags = mockData.split(";");
+		if (mockData.contains("@mock=")) {
+			tags = new String[1];
+			tags[0] = mockData.substring(mockData.indexOf("@mock="));
+		}
 		boolean escape = true;
 		Map<String, String> tagMap = new HashMap<String, String>();
 		parseTags(tags, tagMap, true);