内容管理表单组件合并

o2web/gulpfile.js

@@ -206,14 +206,13 @@ function createXFormConcatTask(path, isMin, thisOptions) {
     });
 }
 
-
 function createCMSXFormConcatTask(path, isMin, thisOptions) {
     var processPath = "x_component_process_Xform";
     gulp.task(path+" : concat", function(){
         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/CMSEnvironment.js',
             'source/o2_core/o2/xScript/CMSMacro.js',
             'source/o2_core/o2/widget/Tab.js',
             'source/o2_core/o2/widget/O2Identity.js',
@@ -236,7 +235,6 @@ function createCMSXFormConcatTask(path, isMin, thisOptions) {
             'source/' + processPath + '/Calendar.js',
             'source/' + processPath + '/Checkbox.js',
             'source/' + processPath + '/Datagrid.js',
-            'source/' + processPath + '/Html.js',
             'source/' + processPath + '/Htmleditor.js',
             //'source/' + processPath + '/Iframe.js',
             'source/' + processPath + '/Label.js',
@@ -272,6 +270,7 @@ function createCMSXFormConcatTask(path, isMin, thisOptions) {
             'source/' + path + '/Textfield.js',
             'source/' + path + '/Actionbar.js',
             'source/' + path + '/Attachment.js',
+            'source/' + path + '/Button.js',
             'source/' + path + '/Calendar.js',
             'source/' + path + '/Checkbox.js',
             'source/' + path + '/Datagrid.js',
@@ -279,7 +278,6 @@ function createCMSXFormConcatTask(path, isMin, thisOptions) {
             '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',
@@ -844,6 +842,147 @@ function createBasePortalConcatTask(path, isMin, thisOptions){
     createBasePortalConcatDelTempTask(path);
     gulp.task( path+".base_portal", gulp.series(path+".base_portal : action", path+".base_portal : style", path+".base_portal : concat", path+".base_portal : clean"));
 }
+
+
+function createBaseDocumentConcatActionTask(path){
+    gulp.task(path+".base_document : action", function(){
+        return gulp.src([
+            "source/o2_core/o2/xAction/services/x_organization_assemble_authentication.json",
+            "source/o2_core/o2/xAction/services/x_organization_assemble_control.json",
+            "source/o2_core/o2/xAction/services/x_cms_assemble_control.json",
+            "source/o2_core/o2/xAction/services/x_program_center.json",
+            "source/o2_core/o2/xAction/services/x_organization_assemble_personal.json"
+        ])
+            .pipe(concat_Actions())
+            .pipe(concat('js/base_document_actions_temp.js'))
+            .pipe(gulp.dest('source/x_desktop/'))
+    })
+}
+
+function createBaseDocumentConcatStyleTask(path){
+    gulp.task(path+".base_document : style", function(){
+        return gulp.src([
+            "source/x_component_cms_Document/$Main/default/css.wcss",
+            "source/x_component_cms_Xform/$Form/default/css.wcss",
+            "source/o2_core/o2/widget/$AttachmentController/default/css.wcss"
+        ])
+            .pipe(concat_Style())
+            .pipe(concat('js/base_document_style_temp.js'))
+            .pipe(gulp.dest('source/x_desktop/'))
+    })
+}
+
+function createBaseDocumentConcatBodyTask(path, isMin, thisOptions) {
+    gulp.task(path+".base_document : concat", function(){
+        var option = thisOptions || options;
+        var src = [
+            'source/' + path + '/js/base_concat_head.js',
+            'source/o2_core/o2/lp/'+(option.lp || 'zh-cn')+'.js',
+
+            'source/' + path + '/js/base_document_style_temp.js',
+
+            'source/o2_core/o2/widget/Common.js',
+            'source/o2_core/o2/widget/UUID.js',
+            'source/o2_core/o2/widget/Menu.js',
+            'source/o2_core/o2/widget/Mask.js',
+            'source/o2_core/o2/xDesktop/Common.js',
+            'source/o2_core/o2/xDesktop/Actions/RestActions.js',
+            'source/o2_core/o2/xAction/RestActions.js',
+            'source/o2_core/o2/xDesktop/Access.js',
+            'source/o2_core/o2/xDesktop/Dialog.js',
+            'source/o2_core/o2/xDesktop/Menu.js',
+            'source/o2_core/o2/xDesktop/UserData.js',
+            'source/o2_core/o2/xDesktop/Authentication.js',
+            'source/o2_core/o2/xDesktop/Window.js',
+
+            'source/x_component_Common/Main.js',
+
+            'source/x_component_cms_Document/lp/'+(option.lp || 'zh-cn')+'.js',
+            'source/x_component_process_Xform/lp/'+(option.lp || 'zh-cn')+'.js',
+            'source/x_component_Selector/lp/'+(option.lp || 'zh-cn')+'.js',
+            'source/x_component_cms_xform/lp/'+(option.lp || 'zh-cn')+'.js',
+
+            'source/x_component_cms_Document/Main.js',
+
+            'source/x_component_Selector/package.js',
+
+            'source/o2_core/o2/xScript/Actions/UnitActions.js',
+            'source/o2_core/o2/xScript/Actions/CMSScriptActions.js',
+            'source/o2_core/o2/xScript/CMSEnvironment.js',
+
+            'source/o2_core/o2/xAction/services/x_organization_assemble_authentication.js',
+            'source/o2_core/o2/xAction/services/x_cms_assemble_control.js',
+            'source/o2_core/o2/xAction/services/x_organization_assemble_control.js',
+            'source/o2_core/o2/xAction/services/x_organization_assemble_personal.js',
+
+            'source/' + path + '/js/base_document_actions_temp.js',
+
+            'source/' + path + '/js/base.js'
+        ];
+        var dest = option.dest+'/' + path + '/';
+        return gulp.src(src)
+            .pipe(sourceMap.init())
+            .pipe(concat('js/base_document.js'))
+            .pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/')))
+            .pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
+                host: option.host,
+                user: option.user || 'anonymous',
+                pass: option.pass || '@anonymous',
+                port: option.port || 21,
+                remotePath: (option.remotePath || '/') + path
+            })))
+            .pipe(gulpif((option.upload == 'sftp' && option.host != ''), sftp({
+                host: option.host,
+                user: option.user || 'anonymous',
+                pass: option.pass || null,
+                port: option.port || 22,
+                remotePath: (option.remotePath || '/') + path
+            })))
+            .pipe(gulp.dest(dest))
+            // .pipe(gulp.src(src))
+            .pipe(concat('js/base_document.min.js'))
+            .pipe(uglify())
+            .pipe( sourceMap.write("") )
+            // .pipe(rename({ extname: '.min.js' }))
+            .pipe(gulpif((option.upload == 'local' && option.location != ''), gulp.dest(option.location + path + '/')))
+            .pipe(gulpif((option.upload == 'ftp' && option.host != ''), ftp({
+                host: option.host,
+                user: option.user || 'anonymous',
+                pass: option.pass || '@anonymous',
+                port: option.port || 21,
+                remotePath: (option.remotePath || '/') + path
+            })))
+            .pipe(gulpif((option.upload == 'sftp' && option.host != ''), sftp({
+                host: option.host,
+                user: option.user || 'anonymous',
+                pass: option.pass || null,
+                port: option.port || 22,
+                remotePath: (option.remotePath || '/') + path
+            })))
+            .pipe(gulp.dest(dest))
+    });
+}
+
+function createBaseDocumentConcatDelTempTask(path) {
+    gulp.task(path+".base_document : clean", function(cb){
+        var dest = [
+            'source/'+path+'/js/base_document_actions_temp.js',
+            'source/'+path+'/js/base_document_style_temp.js'
+        ];
+        return del(dest, cb);
+    });
+}
+
+function createBaseDocumentConcatTask(path, isMin, thisOptions){
+    createBaseDocumentConcatActionTask(path);
+    createBaseDocumentConcatStyleTask(path);
+    createBaseDocumentConcatBodyTask(path, isMin, thisOptions);
+    createBaseDocumentConcatDelTempTask(path);
+    gulp.task( path+".base_document", gulp.series(path+".base_document : action", path+".base_document : style", path+".base_document : concat", path+".base_document : clean"));
+}
+
+
+
 function createBaseConcatTask(path, isMin, thisOptions){
     gulp.task(path+".base", function(){
         var option = thisOptions || options;

o2web/source/o2_core/o2/widget/Calendar.js

@@ -884,7 +884,6 @@ o2.widget.Calendar = o2.Calendar = new Class({
 		}
 	},
 	_setTimeDate: function(node, h, m, s){
-		;
 		if( !this.options.secondEnable ){
 			var div = this.contentTimeTable.getElement(".MWF_calendar_time_s");
 			if( div )div.hide();

o2web/source/x_component_cms_Xform/Package.js

@@ -88,7 +88,7 @@ MWF.xApplication.cms.Xform.Image = MWF.CMSImage =  new Class({
 //MWF.xDesktop.requireApp("cms.Xform", "Table", null, false);
 //MWF.xDesktop.requireApp("cms.Xform", "Datagrid", null, false);
 
-MWF.xDesktop.requireApp("cms.Xform", "Html", null, false);
+MWF.xDesktop.requireApp("process.Xform", "Html", null, false);
 MWF.xApplication.cms.Xform.Html = MWF.CMSHtml =  new Class({
 	Extends: MWF.APPHtml
 });