diff --git a/o2web/source/x_component_portal_PageDesigner/Module/Widgetmodules.js b/o2web/source/x_component_portal_PageDesigner/Module/Widgetmodules.js index 8f6c183dd15039586d5f74674f8b9e2aae934892..b4ebcc02db6ccd2babd25035bc2de1d4195f06d3 100644 --- a/o2web/source/x_component_portal_PageDesigner/Module/Widgetmodules.js +++ b/o2web/source/x_component_portal_PageDesigner/Module/Widgetmodules.js @@ -60,7 +60,12 @@ MWF.xApplication.portal.PageDesigner.Module.Widgetmodules = MWF.PCWidgetmodules return; } - module.appendWidgetModules( widgetid, relativeNode, position ); + var wrapDiv = "yes"; + dlg.node.getElements(".wrapDiv").each( function (el) { + if( el.get("checked") )wrapDiv = el.get("value"); + }); + + module.appendWidgetModules( widgetid, relativeNode, position, wrapDiv ); this.close(); } }, @@ -143,7 +148,7 @@ MWF.xApplication.portal.PageDesigner.Module.Widgetmodules = MWF.PCWidgetmodules this.form.moveModule = null; delete this; }, - appendWidgetModules: function( widgetid, relativeNode, position ){ + appendWidgetModules: function( widgetid, relativeNode, position, wrapDiv ){ MWF.Actions.get("x_portal_assemble_designer").getWidget(widgetid, function(json){ var parentModule = this.parentContainer || this.inContainer || this.onDragModule; @@ -180,10 +185,20 @@ MWF.xApplication.portal.PageDesigner.Module.Widgetmodules = MWF.PCWidgetmodules this.page.json.moduleList[moduleJson.id] = moduleJson; }.bind(this)); - - debugger; - - this.page.parseModules(this.containerModule, this.node); + if( wrapDiv === "no" ){ + this.node.getChildren().each( function (el) { + if( el.get("MWFType") && el.get("id")){ + var id = el.get("id"); + el.inject( relativeNode || this.copyNode, position || "before" ); + } + }.bind(this)); + this.page.parseModules( parentModule, parentModule.node); + //this.containerModule.delete(); + this.page.selected(); + this.containerModule.destroy(); + }else{ + this.page.parseModules(this.containerModule, this.node); + } //var copyModuleNode = this.node.getFirst(); //while (copyModuleNode) { diff --git a/o2web/source/x_component_portal_PageDesigner/Module/Widgetmodules/widgetSelect.html b/o2web/source/x_component_portal_PageDesigner/Module/Widgetmodules/widgetSelect.html index e0ab2972da1119f7a448a93693ee4175ca9dcafd..43b3c1c3e8baab86ee9d7feba8356d9427e8f39c 100644 --- a/o2web/source/x_component_portal_PageDesigner/Module/Widgetmodules/widgetSelect.html +++ b/o2web/source/x_component_portal_PageDesigner/Module/Widgetmodules/widgetSelect.html @@ -5,6 +5,13 @@ 选择部件 + + 是否包裹div + + 是 + 否 + +