内容管理速度优化

o2web/gulpfile.js

@@ -882,6 +882,7 @@ function createBaseDocumentConcatBodyTask(path, isMin, thisOptions) {
             'source/' + path + '/js/base_document_style_temp.js',
 
             'source/o2_core/o2/widget/Common.js',
+            'source/o2_core/o2/widget/Dialog.js',
             'source/o2_core/o2/widget/UUID.js',
             'source/o2_core/o2/widget/Menu.js',
             'source/o2_core/o2/widget/Mask.js',
@@ -892,6 +893,7 @@ function createBaseDocumentConcatBodyTask(path, isMin, thisOptions) {
             'source/o2_core/o2/xDesktop/Dialog.js',
             'source/o2_core/o2/xDesktop/Menu.js',
             'source/o2_core/o2/xDesktop/UserData.js',
+            'source/x_component_Template/MPopupForm.js',
             'source/o2_core/o2/xDesktop/Authentication.js',
             'source/o2_core/o2/xDesktop/Window.js',
 
@@ -1052,7 +1054,7 @@ function getAppTask(path, isMin, thisOptions) {
         createBasePortalConcatTask(path, isMin, thisOptions);
         createBaseDocumentConcatTask(path, isMin, thisOptions);
         createBaseConcatTask(path, isMin, thisOptions);
-        return gulp.series(path, path+".base_work", path+".base_portal", path+".base");
+        return gulp.series(path, path+".base_work", path+".base_portal", path+".base_document", path+".base");
         //return gulp.series(path, path+".base_work : concat");
     }else{
         createDefaultTask(path, isMin, thisOptions);

o2web/source/o2_core/o2/xScript/Environment.js

@@ -3011,7 +3011,7 @@ MWF.xScript.Environment = function(ev){
          * @param {String} app  - 流程应用的名称、别名或ID。
          * @param {String} process  - 要启动的流程的名称、别名或ID。
          * @param {Object} [data]   - 流程启动时默认的业务数据。
-         * @param {String} [identity]  - 流程启动所使用的身份。如果此参数为空，且当前人有多个身份的情况下，会弹出身份选择对话框；否则使用默认身份。。
+         * @param {String} [identity]  - 流程启动所使用的身份。如果此参数为空，且当前人有多个身份的情况下，会弹出身份选择对话框；否则使用默认身份。
          * @param {Function} [callback]  - 流程启动后的回调函数。
          * @param {Boolean} [target]  - 为true时，在当前页面打开启动的流程实例；否则打开新窗口。默认false。
          * @param {Boolean} [latest]  - 为true时，如果当前用户已经创建了此流程的实例，并且没有流转过，直接调用此实例为新流程实例；否则创建一个新实例。默认false。

o2web/source/x_component_cms_Document/Main.js

@@ -1,5 +1,6 @@
 MWF.xApplication.cms = MWF.xApplication.cms || {};
 MWF.xApplication.cms.Document = MWF.xApplication.cms.Document || {};
+MWF.xApplication.cms.Document.options = MWF.xApplication.cms.Document.options || Object.clone(o2.xApplication.Common.options);
 MWF.xApplication.cms.Document.options.multitask = true;
 MWF.xApplication.cms.Document.Main = new Class({
 	Extends: MWF.xApplication.Common.Main,

o2web/source/x_component_cms_Document/lp/zh-cn.js

@@ -40,4 +40,5 @@ MWF.xApplication.cms.Document.LP = {
     "unselectHotPic" : "请先选择图片",
     "cancelHotPicComfirmTitle" : "取消热点",
     "cancelHotPicComfirmContent" : "确定取消该文档的热点？"
-};
+};
+MWF.xApplication.cms.Document["lp."+o2.language] = MWF.xApplication.cms.Document.LP;

o2web/source/x_component_cms_Xform/Form.js

@@ -2,7 +2,7 @@ MWF.xApplication.cms = MWF.xApplication.cms || {};
 MWF.xApplication.cms.Xform = MWF.xApplication.cms.Xform || {};
 
 MWF.require("MWF.widget.Common", null, false);
-MWF.require("MWF.xAction.org.express.RestActions", null, false);
+// MWF.require("MWF.xAction.org.express.RestActions", null, false);
 MWF.xDesktop.requireApp("Selector", "package", null, false);
 MWF.xDesktop.requireApp("process.Xform", "Form", null, false);
 MWF.require("MWF.widget.O2Identity", null, false);

o2web/source/x_component_cms_Xform/lp/zh-cn.js

@@ -1,6 +1,8 @@
 MWF.xApplication.process = MWF.xApplication.process || {};
 MWF.xApplication.process.Xform = MWF.xApplication.process.Xform || {};
 MWF.xDesktop.requireApp("process.Xform", "lp."+MWF.language, null, false);
+MWF.xApplication.cms = MWF.xApplication.cms || {};
+MWF.xApplication.cms.Xform = MWF.xApplication.cms.Xform || {};
 MWF.xApplication.cms.Xform.LP = Object.merge( MWF.xApplication.process.Xform.LP, {
     "dataSaved": "数据保存成功",
     "documentPublished" : "发布成功" ,
@@ -59,4 +61,5 @@ MWF.xApplication.cms.Xform.LP = Object.merge( MWF.xApplication.process.Xform.LP,
     //"readdDocument" : "，",
     //"historyRead" : "共",
     //"times" : "次"
-});
+});
+MWF.xApplication.cms.Xform["lp."+o2.language] = MWF.xApplication.cms.Xform.LP;