diff --git a/panel/action.js b/panel/action.js index dd1108ef..445dc832 100644 --- a/panel/action.js +++ b/panel/action.js @@ -26,7 +26,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg) can.page.Append(can, can._action, [{view: [html.TABS, html.DIV, meta.name], onclick: function(event) { can.onmotion.select(can, can._output, html.FIELDSET_PLUGIN, sub._target) can.onmotion.select(can, can._action, html.DIV_TABS, event.target) - }, onmouseenter: sub._legend.onmouseenter}]) + }, onmouseenter: sub._legend.onmouseenter, ondblclick: sub._legend.onclick}]) }, _menu: function(can, msg) { if (can.user.mod.isPod||can.user.isMobile) { return } can.setHeaderMenu(can.base.Obj(msg.Option(chat.MENUS), can.Conf(chat.MENUS)||can.onaction._menus), function(event, button, list) { diff --git a/plugin/input/key.js b/plugin/input/key.js index c11af2e6..f5706c64 100644 --- a/plugin/input/key.js +++ b/plugin/input/key.js @@ -27,7 +27,11 @@ Volcanos("onfigure", {help: "控件详情", list: [], key: { switch (event.key) { case lang.SHIFT: break case lang.CONTROL: break - case lang.ENTER: sub.close(); break + case lang.ENTER: + if (event.ctrlKey && can.page.tagis(html.TEXTAREA, target)) { + can.base.isFunc(last) && last(event, can) + } + sub && sub.close(); break case lang.ESCAPE: event.target.blur(); break case lang.PS: can.onfigure.key._show(event, sub, meta.name, null, target, target.value+ice.PS); break case lang.TAB: @@ -36,7 +40,7 @@ Volcanos("onfigure", {help: "控件详情", list: [], key: { break } default: - can.onmotion.selectTableInput(event, sub, target, function() { + sub && can.onmotion.selectTableInput(event, sub, target, function() { can.onfigure.key._show(event, sub, meta.name, null, target) }), can.base.isFunc(last) && last(event, can) }