Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!3111

o2web/source/o2_core/o2.js

@@ -77,7 +77,7 @@ if (!window.Promise){
     }
     this.o2 = window.o2 || {};
     this.o2.version = {
-        "v": "5.4.1",
+        "v": "6.0",
         "build": "2020.06.12",
         "info": "O2OA 活力办公 创意无限. Copyright © 2020, o2oa.net O2 Team All rights reserved."
     };

o2web/source/o2_core/o2/xDesktop/Default.js

@@ -1386,9 +1386,9 @@ o2.xDesktop.Default.StartMenu = new Class({
             if ( this.checkMenuItem(value, currentNames) ) this.createApplicationMenuItem(value);
         }.bind(this));
 
-        if (json_portal && json_portal.length) json_portal.each(function(value){
-            this.createPortalMenuItem(value);
-        }.bind(this));
+        // if (json_portal && json_portal.length) json_portal.each(function(value){
+        //     this.createPortalMenuItem(value);
+        // }.bind(this));
 
         if (json_portal && json_portal.length) json_portal.each(function(value){
             value.type = "portal";