diff --git a/panel/Action.js b/panel/Action.js index fbd2a295..2317c0ad 100644 --- a/panel/Action.js +++ b/panel/Action.js @@ -42,7 +42,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg) sub.page.Modify(sub, Volcanos.meta.data.menu.first, {style: { left: event.target.offsetLeft+can.run(event, ["search", "River.onexport.width"]), - top: event.target.offsetTop-can._output.scrollTop+event.target.offsetHeight+can.run(event, ["search", "Header.onexport.height"]), + top: event.target.offsetTop-(can.user.isMobile? can._target.parentNode.parentNode.scrollTop: can._output.scrollTop)+event.target.offsetHeight+can.run(event, ["search", "Header.onexport.height"]), }}) }, }) diff --git a/panel/Header.js b/panel/Header.js index ac6b3280..7a24fd59 100644 --- a/panel/Header.js +++ b/panel/Header.js @@ -267,8 +267,9 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, msg, }, username: function(event, can) { - can.onaction.carte(event, can, ["shareuser", "usernick", "clear", "logout"]) - can.onlayout.figure(event, can, can.menu.first) + var ui = can.onaction.carte(event, can, ["shareuser", "usernick", "clear", "logout"]) + + can.user.isMobile && can.page.Modify(can, ui.first, {style: {left: 320}}) }, shareuser: function(event, can) { can.user.share(can, can.request(event), [can._ACTION, can._SHARE, "type", "login"]) diff --git a/panel/River.js b/panel/River.js index 740e2fce..0692e423 100644 --- a/panel/River.js +++ b/panel/River.js @@ -46,7 +46,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, }, {style: {left: can._target.offsetWidth}}) }, can._output) - can.page.Modify(can, item, {onmouseenter: function(event) { + !can.user.isMobile && can.page.Modify(can, item, {onmouseenter: function(event) { can.menu = can.user.carte(event, can, can.ondetail, can.ondetail.list, function(ev, item, meta) { can.ondetail[item](event, can, item, value.hash) }, {style: {left: can._target.offsetWidth}})