Merge remote-tracking branch 'origin/develop' into develop

o2web/source/o2_core/o2/xDesktop/Actions/RestActions.js

@@ -502,9 +502,11 @@ MWF.xDesktop.Actions.RestActions = new Class({
             //var _self = this;
             messageItem.close = function(callback, e){
                 if (this.status=="progress"){
-                    flag = false;
-                    var text = MWF.LP.desktop.action.cancelUpload.replace(/{name}/g, (file.name||""));
-                    MWF.xDesktop.confirm("wram", e, MWF.LP.desktop.action.cancelUploadTitle, text, "400", "140", function(){
+                    var flag = false;
+                    var name = (file.name||"");
+                    name = name.length > 50 ? name.substr(0, 50)+"..." : name;
+                    var text = MWF.LP.desktop.action.cancelUpload.replace(/{name}/g, (name));
+                    MWF.xDesktop.confirm("wram", e, MWF.LP.desktop.action.cancelUploadTitle, text, "400", "180", function(){
                         xhr.abort();
                         //xhr.upload.timeout = 1;
                         this.close();

o2web/source/x_component_Template/utils/RangeArrayUtils.js

@@ -71,8 +71,8 @@ window.RangeArrayUtils = {
     },
     //区域是否相交
     isIntersection : function( range1, range2 ){
-        var r1 = typeOf( range1 == "array" ) ? range1 : this.getRangeObject( range1 );
-        var r2 = typeOf( range2 == "array" ) ? range2 : this.getRangeObject( range2 );
+        var r1 = typeOf( range1 ) === "object" ? range1 : this.getRangeObject( range1 );
+        var r2 = typeOf( range2 ) === "object" ? range2 : this.getRangeObject( range2 );
         if( r1.start > r2.end )return false;
         if( r2.start > r1.end )return false;
         return true;

o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat_extend.json

@@ -19,13 +19,13 @@
       "isResize" : false,
       "duration" : 0
     },
-    "attachmentStyle": {
-      "style": "mobile_blue_flat",
-      "actionShowText": true,
-      "isReplaceHidden": true,
-      "iconConfigUrl": "../x_component_File/$Main/mobile_blue_flat/icon.json",
-      "iconFolderUrl": "../x_component_File/$Main/mobile_blue_flat/file/"
-    },
+//    "attachmentStyle": {
+//      "style": "mobile_blue_flat",
+//      "actionShowText": true,
+//      "isReplaceHidden": true,
+//      "iconConfigUrl": "../x_component_File/$Main/mobile_blue_flat/icon.json",
+//      "iconFolderUrl": "../x_component_File/$Main/mobile_blue_flat/file/"
+//    },
     "hideModuleIcon": true,
     "nodeStyleWithhideModuleIcon": {
       "margin-right": "0px"