From 728e77a71b275fa6671edd3a4cb4ebd346e7cada Mon Sep 17 00:00:00 2001 From: shaoying Date: Thu, 22 Apr 2021 22:45:44 +0800 Subject: [PATCH] opt some --- panel/Header.css | 1 + panel/Header.js | 3 ++- panel/River.js | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/panel/Header.css b/panel/Header.css index e82275c0..cecc28b2 100644 --- a/panel/Header.css +++ b/panel/Header.css @@ -1,5 +1,6 @@ fieldset.Header { height:32px; padding:0 5px; + overflow:hidden; z-index:1000; } fieldset.Header>div.output { diff --git a/panel/Header.js b/panel/Header.js index 36fee063..def9f8f5 100644 --- a/panel/Header.js +++ b/panel/Header.js @@ -20,6 +20,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.onimport._search(can, msg, target) can.onimport._agent(can, msg, target) can.onimport._menu(can, msg, target) + typeof cb == "function" && cb(msg) can.page.Modify(can, can._output, {onmouseover: function(event) { can.menu && can.page.Remove(can, can.menu.first) @@ -224,7 +225,7 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, msg, can.menu && can.page.Remove(can, can.menu.first) can.menu = can.user.carte(event, can, can.onaction, list, cb) can.page.Modify(can, can.menu.first, {style: {top: -list.length*15, left: event.target.offsetLeft}}) - can.onmotion.downward(can, can.menu.first, can._target.offsetHeight, 10-list.length) + can.onmotion.downward(can, can.menu.first, can._target.offsetHeight, 2) }, River: function(can) { can.run({}, ["search", "River.onmotion.toggle"]) }, diff --git a/panel/River.js b/panel/River.js index 020378f1..552176e5 100644 --- a/panel/River.js +++ b/panel/River.js @@ -14,8 +14,16 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, }, {style: {left: can._target.offsetWidth}}) }, target) + can.page.Modify(can, view, {onmouseenter: function(event) { + can.onaction.carte(event, can, can.ondetail.list) + }}) + if (index == 0 || [value.hash, value.name].indexOf(can._main_river) > -1) { select = view } }), select && select.click(), typeof cb == "function" && cb(msg) + + can.page.Modify(can, can._output, {onmouseover: function(event) { + can.menu && can.page.Remove(can, can.menu.first) + }}) }, }) Volcanos("onengine", {help: "解析引擎", list: [], engine: function(event, can, msg, panel, cmds, cb) { @@ -70,6 +78,10 @@ Volcanos("onaction", {help: "控件交互", list: [], _init: function(can, msg, can.user.carte(event, can, can.ondetail, ["共享应用", "添加工具", "保存参数", "重命名应用", "删除应用"], function(ev, item, meta) { can.ondetail[item](event, can, item, river, storm.hash) }, {style: {left: can._target.offsetWidth}}) + }, _init: function(view) { + can.page.Modify(can, view, {onmouseenter: function(event) { + can.onaction.carte(event, can, ["共享应用", "添加工具", "保存参数", "重命名应用", "删除应用"]) + }}) }} }) }]).first, list.children.length > 0 && list.children[select].click() @@ -97,6 +109,13 @@ Volcanos("onaction", {help: "控件交互", list: [], _init: function(can, msg, }) }) }, + carte: function(event, can, list, cb) { + can.menu && can.page.Remove(can, can.menu.first) + can.menu = can.user.carte(event, can, can.ondetail, list, cb) + can.page.Modify(can, can.menu.first, {style: {left: can._target.offsetWidth, top: event.target.offsetTop+60-can._output.scrollTop}}) + + // can.onmotion.downward(can, can.menu.first, can._target.offsetHeight, 10-list.length) + }, "创建": function(event, can) { can.onaction.create(event, can) }, "刷新": function(event, can) {