冲突解决

WebContent/process/pages/formmodel/js/formmodelTab.js

@@ -136,7 +136,6 @@ function addRow(){
 //加载增加子页面成功后的回调
 function addUrlOnloadCallback(is_row){
 	is_row.MODEL_CONTENT='';
-	initUeditor(is_row);
 }
 //保存
 function insertData(is_entity){
@@ -174,18 +173,6 @@ function updateUrlOnloadCallback(is_row){
 			break;
 		}
 	}
-	initUeditor(is_row);
-}
-
-function initUeditor(is_row){
-	return
-	UE.delEditor('ueditId');
-	var ue=UE.getEditor('ueditId',{});
-	 ue.ready(function(){
-	      //设置编辑器的内容
-	      ue.setContent(is_row.MODEL_CONTENT);
-	      
-	    });
 }
 
 //保存

src_process/com/gaowj/formmodel/action/viewAction.java

@@ -35,6 +35,7 @@ public class viewAction extends BasicAction{
 		}
 		
 		request.setAttribute("is_row", query2);
+
 		return "formmodelTabDetail";
 	}