Sfoglia il codice sorgente

Merge branch 'fix/clear_homepage' into 'wrdp'

ctrl+Alt+d清除桌面会关闭首页的bug修复

See merge request o2oa/o2oa!2022
胡起 5 anni fa
parent
commit
4644f67d99

+ 1 - 0
o2web/source/o2_core/o2/xDesktop/Default.js

@@ -247,6 +247,7 @@ o2.xDesktop.Default = new Class({
 
         taskitem = layout.desktop.createTaskItem(app);
         app.taskitem = taskitem;
+        app.isIndex = true;
         this.apps[app.options.appId] = app;
         taskitem.textNode.click();
     },

+ 1 - 1
o2web/source/o2_core/o2/xDesktop/shortcut.js

@@ -27,7 +27,7 @@ MWF.shortcut = {
     clearDesktop: function(){
         var keys = Array.clone(Object.keys(layout.desktop.apps));
         keys.each(function(key){
-            layout.desktop.apps[key].close();
+            if (!layout.desktop.apps[key].isIndex) layout.desktop.apps[key].close();
         });
         keys = null;
     },