From e73b918567432e345cfab9f81206db63eb2adcc1 Mon Sep 17 00:00:00 2001 From: shaoying Date: Fri, 5 Feb 2021 01:04:24 +0800 Subject: [PATCH] opt wx --- frame.js | 1 + lib/user.js | 4 +++- page/index.css | 10 ++++++++-- pane/Header.js | 2 +- plugin/local/code/inner.js | 5 +++-- plugin/local/wiki/word.css | 4 ++-- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/frame.js b/frame.js index 96014a5a..4dbdfc25 100644 --- a/frame.js +++ b/frame.js @@ -484,6 +484,7 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, }, [], function(can) {}) Volcanos("onlayout", {help: "页面布局", list: [], _init: function(can) { var target = document.body, width = window.innerWidth, height = window.innerHeight + can.user.isMobile && can.page.ClassList.add(can, document.body, "mobile") can.user.isMobile && can.page.ClassList.set(can, document.body, "landscape", width > height) can.page.Select(can, target, ["fieldset.head", "fieldset.foot"], function(field) { diff --git a/lib/user.js b/lib/user.js index a8746b3e..d23b0bc1 100644 --- a/lib/user.js +++ b/lib/user.js @@ -56,7 +56,9 @@ Volcanos("user", {help: "用户模块", agent: { }, topic: function(can, name) { can.page.Modify(can, document.body, {className: name}) - if (can.user.isMobile) { can.page.ClassList.add(can, document.body, "mobile") } + var width = window.innerWidth, height = window.innerHeight + can.user.isMobile && can.page.ClassList.add(can, document.body, "mobile") + can.user.isMobile && can.page.ClassList.set(can, document.body, "landscape", width > height) }, toast: function(can, text, title, duration, progress) { var meta = typeof text == "object"? text: {text: text, title: title||can._help, duration: duration, progress: progress} diff --git a/page/index.css b/page/index.css index e78c93f3..a883a90f 100644 --- a/page/index.css +++ b/page/index.css @@ -7,6 +7,12 @@ body.mobile.landscape fieldset.Footer.foot { body.mobile.landscape fieldset.Action.main { margin-top:0; margin-bottom:0; } +body.mobile.landscape fieldset.Header.head div.state.time { + display:block; +} +body.mobile fieldset.Header.head div.state.time { + display:none; +} body.mobile fieldset.Header.head { position:fixed; top:0; width:-webkit-fill-available; @@ -186,7 +192,7 @@ div.hidden { fieldset>form.option>div.item { float:left; margin-right:3px; - min-height:25px; vertical-align:middle; + min-height:26px; vertical-align:middle; } fieldset>form.option>div.item label { display:none; @@ -227,7 +233,7 @@ fieldset>form.option>div.item.textarea { fieldset div.action>div.item { float:left; margin-right:3px; - height:25px; vertical-align:middle; + height:28px; vertical-align:middle; } fieldset div.action>div.item.space { width:10px; diff --git a/pane/Header.js b/pane/Header.js index 147a2e6e..e4ba73b6 100644 --- a/pane/Header.js +++ b/pane/Header.js @@ -28,7 +28,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, }) }, _state: function(can, msg, target) { - can.core.List(can.user.isMobile? ["username"]: can.Conf("state")||["time", "username"], function(item) { + can.core.List(can.Conf("state")||["time", "username"], function(item) { can.page.Append(can, target, [{view: ["state "+item, "div", (can.Conf(item)||"").slice(0, 8)], onclick: function(event) { can.core.CallFunc([can.onaction, item], [event, can, item]) }, _init: function(target) { diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 5ce43f6f..a48a7847 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -1,8 +1,9 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, list, cb, target) { can.history = can.history || [] can.onmotion.clear(can), can.ui = can.onlayout.profile(can) - can.page.Modify(can, can.ui.project, {style: {"max-height": can.Conf("height")-320}}) - can.page.Modify(can, can.ui.content, {style: {"max-height": can.Conf("height")-320}}) + var height = can.Conf("height")-320; height < 240 && (height = 240) + can.page.Modify(can, can.ui.project, {style: {"max-height": height}}) + can.page.Modify(can, can.ui.content, {style: {"max-height": height}}) can.page.Modify(can, can.ui.content, {style: {"min-width": can.Conf("width")-170}}) can.page.Modify(can, can.ui.display, {style: {display: "none"}}) diff --git a/plugin/local/wiki/word.css b/plugin/local/wiki/word.css index dea29cd7..f1ff81c0 100644 --- a/plugin/local/wiki/word.css +++ b/plugin/local/wiki/word.css @@ -79,9 +79,9 @@ fieldset.word fieldset.story { fieldset.word.float { width:-webkit-fill-available; - position:absolute; left:0; top:0; + position:fixed; left:0; top:0; background-color:aliceblue; - color:black; + color:black; z-index:20; } fieldset.word.float>div.output { background-color:aliceblue;