Merge remote-tracking branch 'origin/apps_dev' into apps_dev

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/util/ShapeUtil.java

@@ -129,6 +129,10 @@ public class ShapeUtil {
 			if( !jsonObj.containsKey("groupPath") ||  UtilString.isEmpty(jsonObj.getString("groupPath")) ) {
 				continue; //排除组
 			}
+			//特殊处理key为textarea 实际应为type的异常
+			if (!jsonObj.containsKey("type")&&jsonObj.containsKey("textarea")){
+				jsonObj.put("type",jsonObj.get("textarea"));
+			}
 			if( !jsonObj.containsKey("type") ||  UtilString.isEmpty(jsonObj.getString("type")) ) {
 				continue; //排除无type的
 			}