Merge branch 'cherry-pick-370010da' into 'develop_java8'

修复cms表单设计中滚动条丢失的问题，修复Elementui组件重复显示问题

See merge request o2oa/o2oa!294

o2web/source/x_component_cms_FormDesigner/Main.js

@@ -216,21 +216,27 @@ MWF.xApplication.cms.FormDesigner.Main = new Class({
         }.bind(this));
         this.loadForm();
 
-        if (this.toolbarContentNode){
-            this.setScrollBar(this.toolbarContentNode, null, {
-                "V": {"x": 0, "y": 0},
-                "H": {"x": 0, "y": 0}
+        MWF.require("MWF.widget.ScrollBar", function(){
+            new MWF.widget.ScrollBar(this.propertyDomScrollArea, {
+                "style":"default", "where": "before", "distance": 30, "friction": 4, "indent": false, "axis": {"x": false, "y": true}
             });
-            //this.setScrollBar(this.propertyDomScrollArea, "form_property", {
-            //	"V": {"x": 0, "y": 0},
-            //	"H": {"x": 0, "y": 0}
-            //});
-            MWF.require("MWF.widget.ScrollBar", function(){
-                new MWF.widget.ScrollBar(this.propertyDomScrollArea, {
-                    "style":"default", "where": "before", "distance": 30, "friction": 4, "indent": false, "axis": {"x": false, "y": true}
-                });
-            }.bind(this));
-        }
+        }.bind(this));
+
+        // if (this.toolbarContentNode){
+        //     this.setScrollBar(this.toolbarContentNode, null, {
+        //         "V": {"x": 0, "y": 0},
+        //         "H": {"x": 0, "y": 0}
+        //     });
+        //     //this.setScrollBar(this.propertyDomScrollArea, "form_property", {
+        //     //	"V": {"x": 0, "y": 0},
+        //     //	"H": {"x": 0, "y": 0}
+        //     //});
+        //     MWF.require("MWF.widget.ScrollBar", function(){
+        //         new MWF.widget.ScrollBar(this.propertyDomScrollArea, {
+        //             "style":"default", "where": "before", "distance": 30, "friction": 4, "indent": false, "axis": {"x": false, "y": true}
+        //         });
+        //     }.bind(this));
+        // }
     },
     initOptions: function(){
         this.toolsData = null;

o2web/source/x_component_process_Xform/$ElModule.js

@@ -67,7 +67,7 @@ o2.xApplication.process.Xform.$ElModule = MWF.APP$ElModule =  new Class(
         this.node.appendHTML(this._createElementHtml(), "before");
         var input = this.node.getPrevious();
 
-        //this.node.destroy();
+        this.node.destroy();
         this.node = input;
         this.node.set({
             "id": this.json.id,