diff --git a/o2web/source/o2_core/o2.js b/o2web/source/o2_core/o2.js index 8c55b26e5ae44d3726942a9a3c3ca019177d649d..63ea6665f604d2233341858cf820ad84a6a4d834 100644 --- a/o2web/source/o2_core/o2.js +++ b/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." }; diff --git a/o2web/source/o2_core/o2/xDesktop/Default.js b/o2web/source/o2_core/o2/xDesktop/Default.js index fe90c07602eb6ad0558b150825a59e8e5da1c4d5..a6122816d1fe9d3897c8a175527b2ae7321018b6 100644 --- a/o2web/source/o2_core/o2/xDesktop/Default.js +++ b/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";