内容管理合并组件

o2web/gulpfile.js

@@ -213,6 +213,7 @@ function createCMSXFormConcatTask(path, isMin, thisOptions) {
         var option = thisOptions || options;
         var src = [
             'source/o2_core/o2/widget/AttachmentController.js',
+            'source/o2_core/o2/xScript/CMSEnvironment.js',
             'source/o2_core/o2/xScript/CMSMacro.js',
             'source/o2_core/o2/widget/Tab.js',
             'source/o2_core/o2/widget/O2Identity.js',
@@ -220,58 +221,77 @@ function createCMSXFormConcatTask(path, isMin, thisOptions) {
             'source/' + processPath + '/$Module.js',
             'source/' + processPath + '/$Input.js',
             'source/' + processPath + '/Div.js',
-            'source/' + processPath + '/Combox.js',
+            //'source/' + processPath + '/Combox.js',
             'source/' + processPath + '/DatagridMobile.js',
             'source/' + processPath + '/DatagridPC.js',
             'source/' + processPath + '/Textfield.js',
-            'source/' + processPath + '/Personfield.js',
+            //'source/' + processPath + '/Personfield.js',
             'source/' + processPath + '/Button.js',
-            'source/' + processPath + '/ViewSelector.js',
+            //'source/' + processPath + '/ViewSelector.js',
             'source/' + processPath + '/Org.js',
             // 'source/' + processPath + '/*.js',
             'source/' + processPath + '/Actionbar.js',
-            'source/' + processPath + '/Address.js',
+            //'source/' + processPath + '/Address.js',
             'source/' + processPath + '/Attachment.js',
             'source/' + processPath + '/Calendar.js',
             'source/' + processPath + '/Checkbox.js',
             'source/' + processPath + '/Datagrid.js',
-            'source/' + processPath + '/Form.js',
             'source/' + processPath + '/Html.js',
             'source/' + processPath + '/Htmleditor.js',
-            'source/' + processPath + '/Iframe.js',
+            //'source/' + processPath + '/Iframe.js',
             'source/' + processPath + '/Label.js',
             'source/' + processPath + '/Number.js',
             'source/' + processPath + '/Common.js',
             'source/' + processPath + '/Image.js',
+            'source/' + processPath + '/ImageClipper.js',
             'source/' + processPath + '/Html.js',
             'source/' + processPath + '/Radio.js',
             'source/' + processPath + '/Select.js',
-            'source/' + processPath + '/Stat.js',
-            'source/' + processPath + '/Statement.js',
-            'source/' + processPath + '/StatementSelector.js',
-            'source/' + processPath + '/Subform.js',
+            //'source/' + processPath + '/Stat.js',
+            //'source/' + processPath + '/Statement.js',
+            //'source/' + processPath + '/StatementSelector.js',
+            //'source/' + processPath + '/Subform.js',
             'source/' + processPath + '/Tab.js',
             'source/' + processPath + '/Table.js',
             'source/' + processPath + '/Textarea.js',
-            'source/' + processPath + '/Tree.js',
-            'source/' + processPath + '/View.js',
+            //'source/' + processPath + '/Tree.js',
+            //'source/' + processPath + '/View.js',
             // 'source/x_component_process_Work/Processor.js',
             // '!source/' + processPath + '/Office.js'
 
-            'source/' + path + '/widget/Comment.js',
-            'source/' + path + '/widget/Log.js',
+
+            'source/o2_core/o2/widget/SimpleToolbar.js',
             'source/' + path + '/ModuleImplements.js',
             'source/' + path + '/Package.js',
+            'source/' + path + '/Form.js',
+            //'source/' + path + '/widget/Comment.js',
+            'source/' + path + '/widget/Log.js',
             'source/' + path + '/Org.js',
-            'source/' + path + '/Personfield.js',
             'source/' + path + '/Author.js',
             'source/' + path + '/Reader.js',
-            'source/' + path + '/Personfield.js',
-            'source/' + path + '/Readerfield.js',
-            'source/' + path + '/Authorfield.js',
-            'source/' + path + '/Orgfield.js',
-            'source/' + path + '/*.js',
-            '!source/' + path + '/Office.js'
+            'source/' + path + '/Textfield.js',
+            'source/' + path + '/Actionbar.js',
+            'source/' + path + '/Attachment.js',
+            'source/' + path + '/Calendar.js',
+            'source/' + path + '/Checkbox.js',
+            'source/' + path + '/Datagrid.js',
+            'source/' + path + '/Htmleditor.js',
+            'source/' + path + '/ImageClipper.js',
+            'source/' + path + '/Label.js',
+            'source/' + path + '/Number.js',
+            'source/' + path + '/Html.js',
+            'source/' + path + '/Radio.js',
+            'source/' + path + '/Select.js',
+            'source/' + path + '/Tab.js',
+            'source/' + path + '/Table.js',
+            'source/' + path + '/Textarea.js'
+
+            //'source/' + path + '/Personfield.js',
+            //'source/' + path + '/Readerfield.js',
+            //'source/' + path + '/Authorfield.js',
+            //'source/' + path + '/Orgfield.js',
+            // 'source/' + path + '/*.js',
+            // '!source/' + path + '/Office.js'
         ];
         var dest = option.dest+'/' + path + '/';
         return gulp.src(src)

o2web/source/x_component_cms_Document/Main.js

@@ -365,7 +365,7 @@ MWF.xApplication.cms.Document.Main = new Class({
     openDocument: function(){
         if (this.form){
             // MWF.xDesktop.requireApp("cms.Xform", "Form", function(){
-            MWF.xDesktop.requireApp("cms.Xform", "$all", function(){
+                MWF.xDesktop.requireApp("cms.Xform", "$all", function(){
                 this.appForm = new MWF.CMSForm(this.formNode, this.form, {
                     "readonly": this.readonly,
                     "autoSave" : this.options.autoSave,

o2web/source/x_component_cms_Xform/ModuleImplements.js

@@ -105,4 +105,8 @@ if( !MWF.CMS$Input_Process ){
         }
     });
 
-}
+}
+
+MWF.xApplication.cms = MWF.xApplication.cms || {};
+MWF.xApplication.cms.Xform = MWF.xApplication.cms.Xform || {};
+MWF.xApplication.cms.Xform.ModuleImplements = {};

o2web/source/x_component_cms_Xform/Package.js

@@ -112,4 +112,6 @@ MWF.xApplication.cms.Xform.Html = MWF.CMSHtml =  new Class({
 //MWF.xDesktop.requireApp("cms.Xform", "Log", null, false);
 //MWF.xDesktop.requireApp("cms.Xform", "View", null, false);
 //MWF.xDesktop.requireApp("cms.Xform", "ViewSelector", null, false);
-//MWF.xDesktop.requireApp("cms.Xform", "Stat", null, false);
+//MWF.xDesktop.requireApp("cms.Xform", "Stat", null, false);
+
+MWF.xApplication.cms.Xform.Package = {};

o2web/source/x_component_cms_Xform/widget/Comment.js

@@ -603,13 +603,14 @@ O2CMSComment.Form = new Class({
         "hasTopIcon" : true,
         "hasTopContent" : true,
         "hasBottom": true,
-        "title": MWF.xApplication.cms.Xform.LP.commentFormTitle,
+        // "title": MWF.xApplication.cms.Xform.LP.commentFormTitle,
         "draggable": true,
         "closeAction": true,
         "toMain" : true
     },
     _createTableContent: function(){
         this.lp = MWF.xApplication.cms.Xform.LP;
+        if( this.formTopTextNode )this.formTopTextNode.set("text", this.lp.commentFormTitle);
         if( this.isNew ){
             MWF.Actions.get("x_cms_assemble_control").getUUID( function(id){
                 this.advanceCommentId = id;