Merge branch 'feature/CMS.form_element' into 'wrdp'

Merge of feature/CMS.form_element 内容管理增加VueElement to wrdp

See merge request o2oa/o2oa!6171

o2web/gulpfile.js

@@ -309,7 +309,21 @@ function createCMSXFormConcatTask(path, isMin, thisOptions) {
             'source/' + processPath + '/Tab.js',
             'source/' + processPath + '/Table.js',
             'source/' + processPath + '/Textarea.js',
-            'source/' + processPath + '/Documenteditor.js',
+            'source/' + processPath + '/$ElModule.js',
+            'source/' + processPath + '/$Elinput.js',
+            'source/' + processPath + '/Elcascader.js',
+            'source/' + processPath + '/Elradio.js',
+            'source/' + processPath + '/Elcheckbox.js',
+            'source/' + processPath + '/Elcommon.js',
+            'source/' + processPath + '/Elcontainer.js',
+            'source/' + processPath + '/Elicon.js',
+            'source/' + processPath + '/Elinput.js',
+            'source/' + processPath + '/Elnumber.js',
+            'source/' + processPath + '/Elselect.js',
+            'source/' + processPath + '/Elslider.js',
+            'source/' + processPath + '/Elswitch.js',
+            'source/' + processPath + '/Elautocomplete.js',
+            'source/' + processPath + '/Elbutton.js',
             //'source/' + processPath + '/Tree.js',
             //'source/' + processPath + '/View.js',
             // 'source/x_component_process_Work/Processor.js',
@@ -343,7 +357,20 @@ function createCMSXFormConcatTask(path, isMin, thisOptions) {
             'source/' + path + '/Select.js',
             'source/' + path + '/Tab.js',
             'source/' + path + '/Table.js',
-            'source/' + path + '/Textarea.js'
+            'source/' + path + '/Textarea.js',
+            'source/' + path + '/Elcascader.js',
+            'source/' + path + '/Elradio.js',
+            'source/' + path + '/Elcheckbox.js',
+            'source/' + path + '/Elcommon.js',
+            'source/' + path + '/Elcontainer.js',
+            'source/' + path + '/Elicon.js',
+            'source/' + path + '/Elinput.js',
+            'source/' + path + '/Elnumber.js',
+            'source/' + path + '/Elselect.js',
+            'source/' + path + '/Elslider.js',
+            'source/' + path + '/Elswitch.js',
+            'source/' + path + '/Elautocomplete.js',
+            'source/' + path + '/Elbutton.js'
 
             //'source/' + path + '/Personfield.js',
             //'source/' + path + '/Readerfield.js',

o2web/source/x_component_cms_FormDesigner/$Main/bottom/toolsGroup.json

@@ -23,11 +23,11 @@
     "name": "filetext",
     "json": "tools-filetext.json",
     "text": MWF.xApplication.cms.FormDesigner.LP.modules.group_filetext,
+  },
+  {
+    "name": "element",
+    "json": "tools-element.json",
+    "text": MWF.xApplication.cms.FormDesigner.LP.modules.group_element,
+    "className": "Textfield"
   }
-//  {
-//    "name": "element",
-//    "json": "tools-element.json",
-//    "text": MWF.xApplication.cms.FormDesigner.LP.modules.group_element,
-//    "className": "Textfield"
-//  }
 ]

o2web/source/x_component_cms_FormDesigner/$Main/default/toolsGroup.json

@@ -28,11 +28,11 @@
     "name": "filetext",
     "json": "tools-filetext.json",
     "text": MWF.xApplication.cms.FormDesigner.LP.modules.group_filetext,
+  },
+  {
+    "name": "element",
+    "json": "tools-element.json",
+    "text": MWF.xApplication.cms.FormDesigner.LP.modules.group_element,
+    "className": "Textfield"
   }
-//  {
-//    "name": "element",
-//    "json": "tools-element.json",
-//    "text": MWF.xApplication.cms.FormDesigner.LP.modules.group_element,
-//    "className": "Textfield"
-//  }
 ]

o2web/source/x_component_cms_FormDesigner/Main.js

@@ -1476,6 +1476,15 @@ MWF.xApplication.cms.FormDesigner.Main = new Class({
     recordStatus: function(){
         return {"id": this.options.id};
     },
+    clearNoDomModule: function(){
+	    var _self = this;
+        this.confirm("warn", new Event(),  MWF.APPFD.LP.clearNoDomModuleTitle, MWF.APPFD.LP.clearNoDomModuleContent, 460, 120, function(){
+            _self.form._clearNoDomModule();
+            this.close();
+        }, function(){
+            this.close();
+        });
+    },
     onPostClose: function(){
         if (this.pcForm){
             MWF.release(this.pcForm.moduleList);

o2web/source/x_component_cms_FormDesigner/Module/Elautocomplete.js

+MWF.xApplication.cms.FormDesigner.Module = MWF.xApplication.cms.FormDesigner.Module || {};
+MWF.xDesktop.requireApp("process.FormDesigner", "Module.Elautocomplete", null, false);
+MWF.xApplication.cms.FormDesigner.Module.Elautocomplete = MWF.CMSFCElautocomplete = new Class({
+	Extends: MWF.FCElautocomplete,
+	Implements : [MWF.CMSFCMI]
+});

o2web/source/x_component_cms_FormDesigner/Module/Elbutton.js

+MWF.xApplication.cms.FormDesigner.Module = MWF.xApplication.cms.FormDesigner.Module || {};
+MWF.xDesktop.requireApp("process.FormDesigner", "Module.Elbutton", null, false);
+MWF.xApplication.cms.FormDesigner.Module.Elbutton = MWF.CMSFCElbutton = new Class({
+	Extends: MWF.FCElbutton,
+	Implements : [MWF.CMSFCMI]
+});

o2web/source/x_component_cms_FormDesigner/Module/Elcascader.js

+MWF.xApplication.cms.FormDesigner.Module = MWF.xApplication.cms.FormDesigner.Module || {};
+MWF.xDesktop.requireApp("process.FormDesigner", "Module.Elcascader", null, false);
+MWF.xApplication.cms.FormDesigner.Module.Elcascader = MWF.CMSFCElcascader = new Class({
+	Extends: MWF.FCElcascader,
+	Implements : [MWF.CMSFCMI]
+});

o2web/source/x_component_cms_FormDesigner/Module/Elcheckbox.js

+MWF.xApplication.cms.FormDesigner.Module = MWF.xApplication.cms.FormDesigner.Module || {};
+MWF.xDesktop.requireApp("process.FormDesigner", "Module.Elcheckbox", null, false);
+MWF.xApplication.cms.FormDesigner.Module.Elcheckbox = MWF.CMSFCElcheckbox = new Class({
+	Extends: MWF.FCElcheckbox,
+	Implements : [MWF.CMSFCMI]
+});

o2web/source/x_component_cms_FormDesigner/Module/Elcommon.js

+MWF.xApplication.cms.FormDesigner.Module = MWF.xApplication.cms.FormDesigner.Module || {};
+MWF.xDesktop.requireApp("process.FormDesigner", "Module.Elcommon", null, false);
+MWF.xApplication.cms.FormDesigner.Module.Elcommon = MWF.CMSFCElcommon = new Class({
+	Extends: MWF.FCElcommon,
+	Implements : [MWF.CMSFCMI]
+});

o2web/source/x_component_cms_FormDesigner/Module/Elcontainer.js

+MWF.xApplication.cms.FormDesigner.Module = MWF.xApplication.cms.FormDesigner.Module || {};
+MWF.xDesktop.requireApp("process.FormDesigner", "Module.Elcontainer$Container", null, false);
+MWF.xDesktop.requireApp("process.FormDesigner", "Module.Elcontainer", null, false);
+MWF.xApplication.cms.FormDesigner.Module.Elcontainer = MWF.CMSFCElcontainer = new Class({
+	Extends: MWF.FCElcontainer,
+	Implements : [MWF.CMSFCMI]
+});

o2web/source/x_component_cms_FormDesigner/Module/Elicon.js

+MWF.xApplication.cms.FormDesigner.Module = MWF.xApplication.cms.FormDesigner.Module || {};
+MWF.xDesktop.requireApp("process.FormDesigner", "Module.Elicon", null, false);
+MWF.xApplication.cms.FormDesigner.Module.Elicon = MWF.CMSFCElicon = new Class({
+	Extends: MWF.FCElicon,
+	Implements : [MWF.CMSFCMI]
+});

o2web/source/x_component_cms_FormDesigner/Module/Elinput.js

+MWF.xApplication.cms.FormDesigner.Module = MWF.xApplication.cms.FormDesigner.Module || {};
+MWF.xDesktop.requireApp("process.FormDesigner", "Module.Elinput", null, false);
+MWF.xApplication.cms.FormDesigner.Module.Elinput = MWF.CMSFCElinput = new Class({
+	Extends: MWF.FCElinput,
+	Implements : [MWF.CMSFCMI]
+});

o2web/source/x_component_cms_FormDesigner/Module/Elnumber.js

+MWF.xApplication.cms.FormDesigner.Module = MWF.xApplication.cms.FormDesigner.Module || {};
+MWF.xDesktop.requireApp("process.FormDesigner", "Module.Elnumber", null, false);
+MWF.xApplication.cms.FormDesigner.Module.Elnumber = MWF.CMSFCElnumber = new Class({
+	Extends: MWF.FCElnumber,
+	Implements : [MWF.CMSFCMI]
+});

o2web/source/x_component_cms_FormDesigner/Module/Elradio.js

+MWF.xApplication.cms.FormDesigner.Module = MWF.xApplication.cms.FormDesigner.Module || {};
+MWF.xDesktop.requireApp("process.FormDesigner", "Module.Elradio", null, false);
+MWF.xApplication.cms.FormDesigner.Module.Elradio = MWF.CMSFCElradio = new Class({
+	Extends: MWF.FCElradio,
+	Implements : [MWF.CMSFCMI]
+});

o2web/source/x_component_cms_FormDesigner/Module/Elselect.js

+MWF.xApplication.cms.FormDesigner.Module = MWF.xApplication.cms.FormDesigner.Module || {};
+MWF.xDesktop.requireApp("process.FormDesigner", "Module.Elselect", null, false);
+MWF.xApplication.cms.FormDesigner.Module.Elselect = MWF.CMSFCElselect = new Class({
+	Extends: MWF.FCElselect,
+	Implements : [MWF.CMSFCMI]
+});

o2web/source/x_component_cms_FormDesigner/Module/Elslider.js

+MWF.xApplication.cms.FormDesigner.Module = MWF.xApplication.cms.FormDesigner.Module || {};
+MWF.xDesktop.requireApp("process.FormDesigner", "Module.Elslider", null, false);
+MWF.xApplication.cms.FormDesigner.Module.Elslider = MWF.CMSFCElslider = new Class({
+	Extends: MWF.FCElslider,
+	Implements : [MWF.CMSFCMI]
+});

o2web/source/x_component_cms_FormDesigner/Module/Elswitch.js

+MWF.xApplication.cms.FormDesigner.Module = MWF.xApplication.cms.FormDesigner.Module || {};
+MWF.xDesktop.requireApp("process.FormDesigner", "Module.Elswitch", null, false);
+MWF.xApplication.cms.FormDesigner.Module.Elswitch = MWF.CMSFCElswitch = new Class({
+	Extends: MWF.FCElswitch,
+	Implements : [MWF.CMSFCMI]
+});

o2web/source/x_component_cms_FormDesigner/Module/Form.js

@@ -234,12 +234,13 @@ MWF.xApplication.cms.FormDesigner.Module.Form = MWF.CMSFCForm = new Class({
 			}.bind(this), async);
 		}
 	},
-	showProperty: function(){
+	showProperty: function(callback){
 		if (!this.property){
 			this.property = new MWF.xApplication.cms.FormDesigner.Property(this, this.designer.propertyContentArea, this.designer, {
 				"path": this.options.propertyPath,
 				"onPostLoad": function(){
 					this.property.show();
+					if (callback) callback();
 				}.bind(this)
 			});
 			this.property.load();

o2web/source/x_component_cms_FormDesigner/Module/Package.js

@@ -53,4 +53,19 @@ MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Statement", null, false);
 MWF.xDesktop.requireApp("cms.FormDesigner", "Module.StatementSelector", null, false);
 MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Importer", null, false);
 MWF.xDesktop.requireApp("cms.FormDesigner", "Module.SmartBI", null, false);
-MWF.xDesktop.requireApp("cms.FormDesigner", "Module.WritingBoard", null, false);
\ No newline at end of file
+MWF.xDesktop.requireApp("cms.FormDesigner", "Module.WritingBoard", null, false);
+MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Elbutton", null, false);
+MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Elcontainer", null, false);
+MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Elicon", null, false);
+MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Elradio", null, false);
+MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Elcheckbox", null, false);
+MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Importer", null, false);
+MWF.xDesktop.requireApp("cms.FormDesigner", "Module.ReadLog", null, false);
+MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Elinput", null, false);
+MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Elcommon", null, false);
+MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Elautocomplete", null, false);
+MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Elnumber", null, false);
+MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Elswitch", null, false);
+MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Elslider", null, false);
+MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Elselect", null, false);
+MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Elcascader", null, false);
\ No newline at end of file

o2web/source/x_component_cms_FormDesigner/Preview.js

@@ -19,7 +19,8 @@ MWF.xApplication.cms.FormDesigner.Preview = MWF.CMSFCPreview = new Class({
         this._loadCss();
 
         this.form = form;
-		this.data = form._getFormData();
+		// this.data = form._getFormData();
+        this.data = this.form.data;
 	},
     loadFormData: function(node){
         MWF.getJSON("../x_desktop/res/preview/cmsdoc.json", function(json){

o2web/source/x_component_cms_Xform/Elautocomplete.js

+MWF.xDesktop.requireApp("process.Xform", "Elautocomplete", null, false);
+MWF.xApplication.cms.Xform.Elautocomplete = MWF.CMSElautocomplete =  new Class({
+	Extends: MWF.APPElautocomplete
+}); 
\ No newline at end of file

o2web/source/x_component_cms_Xform/Elbutton.js

+MWF.xDesktop.requireApp("process.Xform", "Elbutton", null, false);
+MWF.xApplication.cms.Xform.Elbutton = MWF.CMSElbutton =  new Class({
+	Extends: MWF.APPElbutton
+}); 
\ No newline at end of file

o2web/source/x_component_cms_Xform/Elcascader.js

+MWF.xDesktop.requireApp("process.Xform", "Elcascader", null, false);
+MWF.xApplication.cms.Xform.Elcascader = MWF.CMSElcascader =  new Class({
+	Extends: MWF.APPElcascader
+}); 
\ No newline at end of file

o2web/source/x_component_cms_Xform/Elcheckbox.js

+MWF.xDesktop.requireApp("process.Xform", "Elcheckbox", null, false);
+MWF.xApplication.cms.Xform.Elcheckbox = MWF.CMSElcheckbox =  new Class({
+	Extends: MWF.APPElcheckbox
+}); 
\ No newline at end of file

o2web/source/x_component_cms_Xform/Elcommon.js

+MWF.xDesktop.requireApp("process.Xform", "Elcommon", null, false);
+MWF.xApplication.cms.Xform.Elcommon = MWF.CMSElcommon =  new Class({
+	Extends: MWF.APPElcommon
+}); 
\ No newline at end of file

o2web/source/x_component_cms_Xform/Elcontainer.js

+MWF.xDesktop.requireApp("process.Xform", "Elcontainer", null, false);
+MWF.xApplication.cms.Xform.Elcontainer = MWF.CMSElcontainer =  new Class({
+	Extends: MWF.APPElcontainer
+});
+
+MWF.xApplication.cms.Xform.Elcontainer$Main = MWF.CMSElcontainer$Main =  new Class({
+	Extends: MWF.APPElcontainer$Main
+});
+MWF.xApplication.cms.Xform.Elcontainer$Aside = MWF.CMSElcontainer$Aside =  new Class({
+	Extends: MWF.APPElcontainer$Aside
+});
+MWF.xApplication.cms.Xform.Elcontainer$Header = MWF.CMSElcontainer$Header =  new Class({
+	Extends: MWF.APPElcontainer$Header
+});
+MWF.xApplication.cms.Xform.Elcontainer$Footer = MWF.CMSElcontainer$Footer =  new Class({
+	Extends: MWF.APPElcontainer$Footer
+});
\ No newline at end of file

o2web/source/x_component_cms_Xform/Elicon.js

+MWF.xDesktop.requireApp("process.Xform", "Elicon", null, false);
+MWF.xApplication.cms.Xform.Elicon = MWF.CMSElicon =  new Class({
+	Extends: MWF.APPElicon
+}); 
\ No newline at end of file

o2web/source/x_component_cms_Xform/Elinput.js

+MWF.xDesktop.requireApp("process.Xform", "Elinput", null, false);
+MWF.xApplication.cms.Xform.Elinput = MWF.CMSElinput =  new Class({
+	Extends: MWF.APPElinput
+}); 
\ No newline at end of file

o2web/source/x_component_cms_Xform/Elnumber.js

+MWF.xDesktop.requireApp("process.Xform", "Elnumber", null, false);
+MWF.xApplication.cms.Xform.Elnumber = MWF.CMSElnumber =  new Class({
+	Extends: MWF.APPElnumber
+}); 
\ No newline at end of file

o2web/source/x_component_cms_Xform/Elradio.js

+MWF.xDesktop.requireApp("process.Xform", "Elradio", null, false);
+MWF.xApplication.cms.Xform.Elradio = MWF.CMSElradio =  new Class({
+	Extends: MWF.APPElradio
+}); 
\ No newline at end of file

o2web/source/x_component_cms_Xform/Elselect.js

+MWF.xDesktop.requireApp("process.Xform", "Elselect", null, false);
+MWF.xApplication.cms.Xform.Elselect = MWF.CMSElselect =  new Class({
+	Extends: MWF.APPElselect
+}); 
\ No newline at end of file

o2web/source/x_component_cms_Xform/Elslider.js

+MWF.xDesktop.requireApp("process.Xform", "Elslider", null, false);
+MWF.xApplication.cms.Xform.Elslider = MWF.CMSElslider =  new Class({
+	Extends: MWF.APPElslider
+}); 
\ No newline at end of file

o2web/source/x_component_cms_Xform/Elswitch.js

+MWF.xDesktop.requireApp("process.Xform", "Elswitch", null, false);
+MWF.xApplication.cms.Xform.Elswitch = MWF.CMSElswitch =  new Class({
+	Extends: MWF.APPElswitch
+}); 
\ No newline at end of file

o2web/source/x_component_process_FormDesigner/Module/Table.js

@@ -200,7 +200,7 @@ MWF.xApplication.process.FormDesigner.Module.Table = MWF.FCTable = new Class({
 				}.bind(this));
 				this.form.multimoduleActionsArea.setStyle("width", 18*this.options.multiActions.length);
 			}
-		}else{
+		}else if(this.form.multimoduleActionsArea){
 			this.form.multimoduleActionsArea.setStyle("display", "none");
 		}
 	},

o2web/source/x_component_process_FormDesigner/Property.js

@@ -59,8 +59,10 @@ MWF.xApplication.process.FormDesigner.Property = MWF.FCProperty = new Class({
                 if (this.htmlString){
                     var lp;
                     if( this.options.appType === "cms" ) {
+                        this.appType = "cms";
                         lp = MWF.xApplication.cms.FormDesigner.LP.propertyTemplate;
                     }else if( this.designer && this.designer.options && this.designer.options.name && this.designer.options.name.indexOf("cms") === 0 ){
+                        this.appType = "cms";
                         lp = MWF.xApplication.cms.FormDesigner.LP.propertyTemplate;
                     }else{
                         lp = MWF.xApplication.process.FormDesigner.LP.propertyTemplate;
@@ -2211,6 +2213,11 @@ MWF.xApplication.process.FormDesigner.Property = MWF.FCProperty = new Class({
 	//},
     loadPropertyTab: function(){
         var tabNodes = this.propertyContent.getElements(".MWFTab");
+        if( this.appType === "cms" ){
+            tabNodes = tabNodes.filter(function(node){
+                return node.get("title") !== MWF.xApplication.process.FormDesigner.LP.propertyTemplate.section;
+            })
+        }
         var groupObject = {};  //data-group 属性可以表示不同的分组
         if (tabNodes.length){
             tabNodes.each( function(node){