diff --git a/lib/page.js b/lib/page.js index 3f6cd960..9fa8abca 100644 --- a/lib/page.js +++ b/lib/page.js @@ -165,10 +165,10 @@ var page = Volcanos("page", {help: "网页模块", // 创建节点 name = name || data.className || type || ""; !data.name && item.name && (data.name = item.name) - var node = can.page.Create(can, type, data); - value.last = node, value.first || (value.first = node), name && (value[name] = value[data.className||""] = value[type] = node); - item.list && can.page.Append(can, node, item.list, value); - target && target.append && target.append(node); + var node = can.page.Create(can, type, data) + value.last = node, value.first = value.first || node, value[name||""] = value[data.className||""] = value[type] = node + item.list && can.page.Append(can, node, item.list, value) + target && target.append && target.append(node) }) return value }), diff --git a/pane/Header.css b/pane/Header.css index ffc833cd..791453ca 100644 --- a/pane/Header.css +++ b/pane/Header.css @@ -24,6 +24,11 @@ fieldset.Header>div.output>div.search>input { fieldset.Header>div.output>div.search>input:focus { width:240px; } +fieldset.Header>div.output>div.item { + margin-left:5px; + cursor:pointer; + float:left; +} fieldset.Header>div.output>div.state { diff --git a/pane/Header.js b/pane/Header.js index 13a313c9..d603b1f8 100644 --- a/pane/Header.js +++ b/pane/Header.js @@ -61,22 +61,33 @@ Volcanos("onexport", {help: "导出数据", list: [], _init: function(can, msg, }) }) - var search = can.page.Append(can, can._output, [{view: "search", list: [{type: "input", - onfocus: function(event) { + can.page.Append(can, can._output, [{view: "search", list: [{type: "input", onkeydown: function(event) { + switch (event.key) { + case "Enter": can.run(event, ["search", "Search.onimport.input", event.target.value]); break + } + }, }], }]) - }, - onkeydown: function(event) { - switch (event.key) { - case "Enter": - can.run(event, ["search", "Search.onimport.input", event.target.value], function() { + var height = document.body.offsetHeight + var ui = can.page.Append(can, can._output, can.core.List(["Search", "River", "Storm", "Footer"], function(item) { + return {view: "item", list: [{type: "input", data: {name: item, type: "button", value: item.toLowerCase()}, + onclick: function(event) { + if (item == "Footer") { can.page.Select(can, document.body, "fieldset.Action", function(item) { + if (item.style.height) { + height = document.body.offsetHeight + can.page.Select(can, item, "div.output")[0].style.height = "" + item.style.height = "" + } else { + can.page.Select(can, item, "div.output")[0].style.height = height-100+"px" + item.style.height = height-88+"px" + } + }) } - }) - } - }, - }]}]).input - document.body.onkeydown = function(event) { - event.key == "Space" && search.focus() - } + can.page.Select(can, document.body, "fieldset."+item, function(item) { + can.page.Modify(can, item, {style: {display: item.style.display == "none"? "block": "none"}}) + }) + }, + }]} + })); ui.River.click(), ui.Footer.click(), ui.Storm.click() typeof cb == "function" && cb() }) diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 7ca6c1e9..0c61e3b8 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -1,4 +1,5 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, list, cb, target) { target.innerHTML = "" + if (can.Conf("height") < 600) { can.Conf("height", 600) } can.onimport._share(can); var width = can.Conf("width"), height = can.Conf("height") can.page.Modify(can, target, {style: {"max-height": height-160+"px"}})