From 49d0c1ab0ea1e014cef8e6b1e75d6d30451555b0 Mon Sep 17 00:00:00 2001 From: harveyshao Date: Mon, 13 Feb 2023 09:52:42 +0800 Subject: [PATCH] opt some --- plugin/input/date.js | 1 + plugin/input/province.js | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plugin/input/date.js b/plugin/input/date.js index 46b6ec07..396fb9ba 100644 --- a/plugin/input/date.js +++ b/plugin/input/date.js @@ -24,6 +24,7 @@ Volcanos(chat.ONFIGURE, {date: { } show(now), can._show = function(d) { d? _cb(show(now = new Date(now.getTime()+d*24*3600*1000))): _cb(show(now)) } })}, onkeydown: function(event, can, meta, cb, target, sub, last) { if (sub && sub.hidden()) { return last(event) } switch (event.key) { + case lang.ESCAPE: sub.close(); break case "n": can.page.SelectInput(can, sub._action, mdb.NEXT, function(target) { target.click(), sub._show() }); break case "p": can.page.SelectInput(can, sub._action, mdb.PREV, function(target) { target.click(), sub._show() }); break case "t": can.page.SelectInput(can, sub._action, "today", function(target) { target.click(), sub._show() }); break diff --git a/plugin/input/province.js b/plugin/input/province.js index 11d8cbc7..b4d50e01 100644 --- a/plugin/input/province.js +++ b/plugin/input/province.js @@ -1,8 +1,12 @@ Volcanos(chat.ONFIGURE, {province: { onclick: function(event, can, meta, target, cbs) { cbs(function(can, cb) { can.require(["/require/shylinux.com/x/echarts/echarts.js", "/require/shylinux.com/x/echarts/china.js"], function() { - var chart = echarts.init(can.page.Append(can, can._output, [{type: html.DIV, style: {width: can.page.width()/2, height: can.page.height()/2}}])._target) + var chart = echarts.init(can.page.Appends(can, can._output, [{type: html.DIV, style: {width: can.page.width()/2, height: can.page.height()/2}}])._target) chart.setOption({geo: {map: 'china'}}), chart.on(html.CLICK, function(params) { target.value = params.name, can.close() }) - }) - }) } + }), can.onappend._action(can, [cli.CLOSE], can._action, {close: function() { can.close() }}) + }) }, + onkeydown: function(event, can, meta, cb, target, sub, last) { if (sub && sub.hidden()) { return last(event) } switch (event.key) { + case lang.ESCAPE: sub.close(); break + } + }, }}) \ No newline at end of file