Merge branch 'feature/Forum.add_delete_type' into 'develop'

Merge of fix/[企业社区]修复删除主回复后还显示下层回复的问题 to develop

See merge request o2oa/o2oa!222

o2web/source/o2_core/o2/widget/ScrollBar.js

@@ -71,7 +71,7 @@ o2.widget.ScrollBar = new Class({
 			e.stopPropagation();
 		}.bind(this);
 
-		layout.desktop.addEvent("resize", this.checkScrollFun);
+		if(layout.desktop && layout.desktop.addEvent)layout.desktop.addEvent("resize", this.checkScrollFun);
 		//layout.desktop.addEvent("onresize", this.checkScrollFun);
 		this.node.addEvent("mouseover", this.checkScrollStopFun);
 		this.node.addEvent("mouseout", this.checkScrollStopFun);

o2web/source/x_component_ForumDocument/Main.js

@@ -2100,9 +2100,16 @@ MWF.xApplication.ForumDocument.ReplyDocument = new Class({
 		this.app.confirm("warn", ev, this.lp.deleteReplyTitle, this.lp.deleteReplyText, 350, 120, function(){
 			//_self.view._removeDocument(_self.data, false);
 			_self.actions.deleteReply( _self.data.id, function(){
-				_self.destroy();
-				_self.app.adjustReplyCount( -1 );
-				_self.app.notice( _self.lp.deleteReplySuccess, "ok")
+				if( MWFForum.getSystemConfigValue("BBS_REPLY_DELETETYPE").toLowerCase() === "recursively" ){
+					_self.destroy();
+					_self.app.adjustReplyCount( -1 );
+					_self.view.reload();
+					_self.app.notice( _self.lp.deleteReplySuccess, "ok")
+				}else{
+					_self.destroy();
+					_self.app.adjustReplyCount( -1 );
+					_self.app.notice( _self.lp.deleteReplySuccess, "ok")
+				}
 			}.bind(this) );
 			this.close();
 		}, function(){