允许数据表格单元格拖入多个组件

o2web/source/x_component_process_FormDesigner/Module/$Element.js

@@ -13,9 +13,11 @@ MWF.xApplication.process.FormDesigner.Module.$Element = MWF.FC$Element = new Cla
 	
 	_dragIn: function(module){
 		module.onDragModule = this;
-        if (this.parentContainer.moduleName === "datagrid$Data" || this.parentContainer.moduleName === "datatable$Data"){
-            this.parentContainer._dragIn(module);
-        }else{
+        if (this.parentContainer.moduleName === "datagrid$Data") {
+			this.parentContainer._dragIn(module);
+		}else if( this.parentContainer.moduleName === "datatable$Data" && !this.parentContainer.options.allowModules.contains( module.moduleName )){
+			this.parentContainer._dragIn(module);
+		}else{
             module.inContainer = null;
             module.parentContainer = this.parentContainer;
             module.nextModule = this;

o2web/source/x_component_process_FormDesigner/Module/Datatable$Data.js

@@ -164,19 +164,34 @@ MWF.xApplication.process.FormDesigner.Module.Datatable$Data = MWF.FCDatatable$Da
         }
     },
 	_dragIn: function(module){
-		if (this.treeNode.firstChild || this.json.cellType == "sequence"){
+		if (this.json.cellType == "sequence"){ //this.treeNode.firstChild ||
 			this.parentContainer._dragIn(module);
 		}else{
 			if (this.options.allowModules.indexOf(module.moduleName)!=-1){
+
+				this.parentContainer._dragOut(module);
+
+				// if (!this.Component) module.inContainer = this;
+				// module.parentContainer = this;
+				// module.nextModule = null;
+				// this.node.setStyles({"border": "1px solid #ffa200"});
+				// var copyNode = module._getCopyNode();
+				// copyNode.inject(this.node);
+
+				module.onDragModule = this;
 				if (!this.Component) module.inContainer = this;
 				module.parentContainer = this;
 				module.nextModule = null;
-				this.node.setStyles({"border": "1px solid #ffa200"});
 
-				//this._showInjectAction( module );
+				this.node.setStyles({"border": "1px solid #ffa200"});
 
-				var copyNode = module._getCopyNode();
-				copyNode.inject(this.node);
+				if (module.controlMode){
+					if (module.copyNode) module.copyNode.hide();
+				}else{
+					var copyNode = module._getCopyNode(this);
+					copyNode.show();
+					copyNode.inject(this.node);
+				}
 			}else{
 				this.parentContainer._dragIn(module);
 			}

o2web/source/x_component_process_Xform/$ElModule.js

@@ -11,7 +11,7 @@ o2.xApplication.process.Xform.$ElModule = MWF.APP$ElModule =  new Class(
     Extends: MWF.APP$Module,
     options: {
         /**
-         * 组件加载前触发。当前组件的queryLoad事件还没有在form里注册，通过this.form.get("fieldId")不能获取到当前组件，需要用this.target获取当前组件。
+         * 组件加载前触发。queryLoad执行的时候，当前组件没有在form里注册，通过this.form.get("fieldId")不能获取到当前组件，需要用this.target获取。
          * @event MWF.xApplication.process.Xform.$Module#queryLoad
          * @see {@link https://www.yuque.com/o2oa/ixsnyt/hm5uft#i0zTS|组件事件说明}
          */

o2web/source/x_component_process_Xform/$Module.js

@@ -10,7 +10,7 @@ MWF.xApplication.process.Xform.$Module = MWF.APP$Module =  new Class(
     Implements: [Events],
     options: {
         /**
-         * 组件加载前触发。当前组件的queryLoad事件运行时还没有在form里注册，通过this.form.get("fieldId")不能获取到当前组件，需要用this.target获取。
+         * 组件加载前触发。queryLoad执行的时候，当前组件没有在form里注册，通过this.form.get("fieldId")不能获取到当前组件，需要用this.target获取。
          * @event MWF.xApplication.process.Xform.$Module#queryLoad
          * @event MWF.xApplication.process.Xform.$Module#queryLoad
          * @see {@link https://www.yuque.com/o2oa/ixsnyt/hm5uft#i0zTS|组件事件说明}