Merge branch 'fix/cms_form_toolbar' into 'develop'

Merge of fix/cms_form_toolbar 表单保存的时候自动清除不在dom树里的moduleJSON to develop

See merge request o2oa/o2oa!433

o2web/source/x_component_cms_FormDesigner/$Main/bottom/formToolbars.html

@@ -17,6 +17,8 @@
 	
 	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="help.png" title="帮助" MWFButtonAction="formHelp" MWFButtonText=""></span>
 
+	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="clear.png" title="清除未在HTML树中的组件配置" MWFButtonAction="clearNoDomModule" MWFButtonText=""></span>
+
     <span MWFnodetype="MWFToolBarSeparator"></span>
     <input type="checkbox" value="autoSave" id="MWFFormAutoSaveCheck">自动保存
 

o2web/source/x_component_cms_FormDesigner/$Main/default/formToolbars.html

@@ -20,6 +20,8 @@
 	
 	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="help.png" title="帮助" MWFButtonAction="formHelp" MWFButtonText=""></span>
 
+	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="clear.png" title="清除未在HTML树中的组件配置" MWFButtonAction="clearNoDomModule" MWFButtonText=""></span>
+
     <span MWFnodetype="MWFToolBarSeparator"></span>
     <input type="checkbox" value="autoSave" id="MWFFormAutoSaveCheck">自动保存
 

o2web/source/x_component_process_FormDesigner/Module/Form.js

@@ -910,9 +910,10 @@ MWF.xApplication.process.FormDesigner.Module.Form = MWF.FCForm = new Class({
 
         this._clearNoId(copy);
         var html = copy.outerHTML;
-		//this._clearNoDomModule();
 		copy.destroy();
 
+		this._clearNoDomModule();
+
 		this.data.json.mode = this.options.mode;
 		this.data.html = html;