From 3495b8ac4da424d34d32ff67bbe63768fa89059a Mon Sep 17 00:00:00 2001 From: harveyshao Date: Mon, 26 Dec 2022 15:25:23 +0800 Subject: [PATCH] opt some --- frame.js | 9 ++++++--- lib/misc.js | 4 ++-- lib/user.js | 4 ++-- page/index.css | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/frame.js b/frame.js index 2ad2561b..4386e5c4 100644 --- a/frame.js +++ b/frame.js @@ -595,13 +595,16 @@ Volcanos(chat.ONMOTION, {_init: function(can, target) { move: function(can, target, layout, cb) { var begin; layout = layout||{} can.page.style(can, target, layout), target.onmousedown = function(event) { - if (can.page.tagis(event.target, html.BUTTON, html.SELECT)) { return } - if (!event.ctrlKey && !can.page.tagis(target, html.FIELDSET)) { return } + if (event.target != target && !event.ctrlKey) { return } + can.onkeymap.prevent(event) + // if (can.page.tagis(event.target, html.BUTTON, html.SELECT)) { return } + // if (!event.ctrlKey && !can.page.tagis(target, html.FIELDSET)) { return } layout.height = target.offsetHeight, layout.width = target.offsetWidth layout.left = target.offsetLeft, layout.top = target.offsetTop begin = can.base.Copy({x: event.x, y: event.y}, layout) }, target.onmouseup = function(event) { begin = null }, target.onmousemove = function(event) { if (!begin) { return } - if (can.page.tagis(event.target, html.BUTTON, html.SELECT)) { return } + // if (event.target != target) { return } + // if (can.page.tagis(event.target, html.BUTTON, html.SELECT)) { return } if (event.shiftKey) { layout.height = begin.height + event.y - begin.y, layout.width = begin.width + event.x - begin.x can.page.style(can, target, html.HEIGHT, layout.height, html.WIDTH, layout.width) diff --git a/lib/misc.js b/lib/misc.js index 1a116e65..3c7817f2 100644 --- a/lib/misc.js +++ b/lib/misc.js @@ -113,7 +113,7 @@ Volcanos("misc", {Message: function(event, can) { var msg = {} xhr.upload.onprogress = function(event) { can.base.isFunc(msg._progress) && msg._progress(event, parseInt(event.loaded*100/event.total), event.total, event.loaded) } } else if (can.user.isMailMaster) { var data = can.core.ItemForm(form, function(value, index, key) { return key+ice.EQ+encodeURIComponent(value) }).join("&") - if (data) { url += (url.indexOf(url, "?") == -1? "?": "&")+data } + if (data) { xhr.open(msg._method||web.POST, url += (url.indexOf(url, "?") == -1? "?": "&")+data) } } else { var data = can.core.ItemForm(form, function(v, i, k) { return k+ice.EQ+encodeURIComponent(v) }).join("&") xhr.setRequestHeader(web.ContentType, web.ContentFORM) @@ -177,7 +177,7 @@ Volcanos("misc", {Message: function(event, can) { var msg = {} if (can.base.isUndefined(key)) { return args } else if (can.base.isObject(key)) { can.core.Item(key, function(k, v) { args[k] === ""? delete(args[k]): (args[k] = v) }) } else if (can.base.isUndefined(value)) { return args[key] } else { - args[key] == ""? delete(args[key]): (args[key] = value) + value === ""? delete(args[key]): (args[key] = value) } var search = can.base.Args(args); return search? location.search = search: location.href = location.pathname }, diff --git a/lib/user.js b/lib/user.js index 22f80155..2154bc02 100644 --- a/lib/user.js +++ b/lib/user.js @@ -81,7 +81,7 @@ Volcanos("user", {info: {}, agent: { close: function(event) { can.page.Remove(can, action._target), action.timer.stop = true }, timer: can.core.Timer({interval: 100, length: (meta.duration||1000)/100}, function(event, interval, index) { if (index > 30) { ui.duration.innerHTML = index/10+"s..." } - }, function() { action.close() }), _target: ui._target, ui: ui, + }, function() { action.close() }), _target: ui._target, }); can.onmotion.story.auto(can, ui._target), meta.resize && can.onmotion.delayResize(can, ui._target, meta.resize) return can._toast && (can._toast.close(), delete(can._toast)), can._toast = action }, @@ -213,7 +213,7 @@ Volcanos("user", {info: {}, agent: { }) }))]) }, - }, can.base.Obj(method, can.user.isMobile? ["密码登录"]: ["扫码授权"]), can.page.Append(can, document.body, [{view: "input login"}])._target); layout() + }, can.base.Obj(method, can.user.isMobile? ["密码登录"]: ["扫码授权"]), can.page.Append(can, document.body, [{view: "input login float"}])._target); layout() }, logout: function(can, force) { if (force||can.user.confirm("logout?")) { can.runAction({}, aaa.LOGOUT, [], function(msg) { can.misc.Search(can, chat.SHARE)? can.misc.Search(can, chat.SHARE, ""): can.user.reload(true) diff --git a/page/index.css b/page/index.css index 97f1e1cf..f3d90c44 100644 --- a/page/index.css +++ b/page/index.css @@ -2,7 +2,7 @@ body { background-color:black; color:cyan; font-size:16px; } legend { background-color:cadetblue; color:white; padding:0 20px; margin-right:5px; } select { background-color:black; color:cyan; padding:0 10px; margin-right:5px; } -textarea { background-color:cyan; padding:5px; width:400px; } +textarea { background-color:cyan; padding:5px; width:400px; resize:vertical; } input { background-color:cyan; padding:0 5px; margin-right:5px; } input:not([type=button]) { width:120px; } input[name=text] { width:160px; } @@ -98,7 +98,7 @@ body>div.carte div.item { background-color:#0e3369b3; padding:3px 12px; } body>div.carte div.space { border-bottom:solid 1px gray; } body>div.input div.content { overflow:auto; } body>div.input td { padding:5px; } -body>div.input select { width:181px; } +body>div.input select { width:171px; } body>div.input input[type=text] { width:171px; } body>div.input input[name=password] { padding:5px; border:0; width:171px; } body>div.input input[name=username] { padding:5px; border:0; width:171px; }