Merge branch 'fix/datatable' into 'develop'

Merge of fix/datatable 修复数据表格和数据模板区段依据脚本执行多次的问题 to develop

See merge request o2oa/o2oa!1118

(cherry picked from commit 179c5c59)

a45f656d 修复数据表格和数据模板区段依据脚本执行多次的问题

o2web/source/x_component_process_Xform/DatatablePC.js

@@ -2152,7 +2152,7 @@ MWF.xApplication.process.Xform.DatatablePC.Line =  new Class({
 		var moduleNodes = this.form._getModuleNodes(this.node, true);
 
 		//合并状态或拆分状态
-		var sectionKey = this.options.sectionKey || this.datatable._getSectionBy();
+		var sectionKey = this.options.sectionKey || this.datatable.sectionBy;
 		moduleNodes.each(function (node) {
 			var mwfType = node.get("MWFtype");
 			if (mwfType === "form")return;

o2web/source/x_component_process_Xform/Datatemplate.js

@@ -1574,7 +1574,7 @@ MWF.xApplication.process.Xform.Datatemplate.Line =  new Class({
 		var moduleNodes = this.form._getModuleNodes(this.node);
 
 		//拆分状态
-		var sectionKey = this.options.sectionKey || this.template._getSectionBy();
+		var sectionKey = this.options.sectionKey || this.template.sectionBy;
 
 		moduleNodes.each(function (node) {
 			if (node.get("MWFtype") !== "form") {