Merge branch 'cherry-pick-b223e949' into 'develop'

Merge branch 'feature/【门户管理】插入组件元素时新增不包裹div的选项 into 'release'

See merge request o2oa/o2oa!910

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) {

o2web/source/x_component_portal_PageDesigner/Module/Widgetmodules/widgetSelect.html

@@ -5,6 +5,13 @@
       <td align="right">选择部件</td>
       <td colspan="2" id="MWFWidgetSelectTd"></td>
     </tr>
+    <tr>
+      <td align="right">是否包裹div</td>
+      <td colspan="2">
+        <input class="wrapDiv" type="radio" name="wrapDiv" value="yes" checked }/>是
+        <input class="wrapDiv" type="radio" name="wrapDiv" value="no"}/>否
+      </td>
+    </tr>
 
     <!--<tr>-->
       <!--<td align="right">组件标识冲突处理</td>-->