提交 8d9d7d4e 编写于 作者: NoSubject's avatar NoSubject

Merge branch 'fix/note_current' into 'wrdp'

修复便签没有默认打开的问题

See merge request o2oa/o2oa!6273
...@@ -429,6 +429,7 @@ o2.xDesktop.Default = new Class({ ...@@ -429,6 +429,7 @@ o2.xDesktop.Default = new Class({
this.apps[appStatus.appId] = app; this.apps[appStatus.appId] = app;
if ((this.status.currentApp === appStatus.appId)) currentTaskitem=taskitem; if ((this.status.currentApp === appStatus.appId)) currentTaskitem=taskitem;
if (appStatus.appId=="Note") app.setCurrent();
}.bind(this)); }.bind(this));
if (currentTaskitem) { if (currentTaskitem) {
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
"position": "absolute", "position": "absolute",
"-webkit-user-select": "none", "-webkit-user-select": "none",
"-moz-user-select": "none", "-moz-user-select": "none",
"box-shadow": "0px 0px 10px #333", "box-shadow": "0px 0px 10px #cccccc",
"border": "1px solid #000", "border": "1px solid #999999",
"z-index": 100 "z-index": 100
}, },
"itemTitleNode": { "itemTitleNode": {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册