diff --git a/frame.js b/frame.js index 7d689be2..1cef6036 100644 --- a/frame.js +++ b/frame.js @@ -203,11 +203,15 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, _list.push("prev", "next") break default: - var ls = can.core.Split(list[i], "\t \n", ":="); if (ls.length == 1) { _list.push(list[i]) } else { + if (can.base.isObject(list[i])) { _list.push(list[i]); break } + var ls = can.core.Split(list[i], "\t \n", ":=@"); if (ls.length == 1) { _list.push(list[i]) } else { var item = {name: ls[0]}; for (var j = 1; j < ls.length; j+=2) { switch (ls[j]) { case ":": item.type = ls[j+1]; break case "=": item.value = ls[j+1]; break + case "@": item.action = ls[j+1]; (function() { + item._init = function(target) { can.onappend.figure(can, item, target) } + })(); break } }; _list.push(item) } @@ -784,6 +788,7 @@ Volcanos("onmotion", {help: "动态特效", list: [], _init: function(can, targe }, selectField: function(event, can) { + if (event.key == "Enter") { return can.run(event) } if (!event.ctrlKey || event.key < "0" || event.key > "9") { return } if (event.shiftKey) { return can.page.Select(can, can._option, "input[type=button]", function(item, index) { diff --git a/page/index.css b/page/index.css index 872e966e..f0a7e189 100644 --- a/page/index.css +++ b/page/index.css @@ -36,8 +36,11 @@ background-color:#7dc6d7eb; td>input[type=button][name=create] { background-color:blue; } td>input[type=button][name=remove] { background-color:red; } -td>input[type=button][name=start] { background-color:blue; } +td>input[type=button][name=start] { background-color:#52ce78; } +td>input[type=button][name=open] { background-color:blue; } td>input[type=button][name=stop] { background-color:red; } +td>input[type=button][name=delete] { background-color:red; } +td>input[type=button][name=insert] { background-color:blue; } div.tabs { background-color:#00000038; color:white; padding:5px; margin:0 1px; } div.code { background-color:#343a3445; color:white; padding:10px; border:solid 3px green; } @@ -130,11 +133,14 @@ body.white table.content { color:black; } body.white table.content tr { background-color:#e1f1ff1f; } body.white table.content th { background-color:#99CCFF; } -body.white td>input[type=button][value=结束] { background-color:red; } -body.white td>input[type=button][value=停止] { background-color:red; } -body.white td>input[type=button][value=启动] { background-color:#52ce78; } +body.white td>input[type=button][name=结束] { background-color:red; } +body.white td>input[type=button][name=stop] { background-color:red; } +body.white td>input[type=button][name=open] { background-color:blue; } +body.white td>input[type=button][name=start] { background-color:#52ce78; } body.white td>input[type=button][name=create] { background-color:blue; } body.white td>input[type=button][name=remove] { background-color:red; } +body.white td>input[type=button][name=insert] { background-color:blue; } +body.white td>input[type=button][name=delete] { background-color:red; } body.print { background-color:white; color:black; } body.print legend, body.print select, body.print input[type=text] { box-shadow:0px 0px 0px 0px #626bd0; } @@ -236,4 +242,4 @@ body.white input[type=button]:hover { background-color:#FFCC33; border:2px solid body.white table.content th:hover, body.white table.content td.select, body.white table.content td:hover { background-color:#6495ed63; } body.white table.content tr:hover { background-color:#4682b46b; } body.white div.item.select, body.white div.item:hover { background-color:steelblue; } - +body.white fieldset.float table { color:white; } diff --git a/plugin/local/team/plan.js b/plugin/local/team/plan.js index c5437940..b26c9a8b 100644 --- a/plugin/local/team/plan.js +++ b/plugin/local/team/plan.js @@ -1,9 +1,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { can.onmotion.clear(can, target) can.ui = can.onlayout.profile(can) - can.onmotion.hidden(can, can._action) can.onimport[can.Option("scale")||"week"](can, msg) - // can.page.Modify(can, can._output, {style: {"min-height": 452}}) can.page.Modify(can, can.ui.project, {style: {"max-height": can.ui.content.offsetHeight}}) can.page.Modify(can, can.ui.profile, {style: {"max-height": can.ui.content.offsetHeight}}) can.page.Modify(can, can.ui.profile, {style: {display: "block"}}) @@ -150,6 +148,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, }, }, [""]) Volcanos("onaction", {help: "组件交互", list: [ + "insert", "export", "import", ["level", "all", "l1", "l2", "l3", "l4", "l5"], ["status", "all", "prepare", "process", "cancel", "finish"], ["score", "all", "s1", "s2", "s3", "s4", "s5"], diff --git a/plugin/state.js b/plugin/state.js index 41deb80c..95df5114 100644 --- a/plugin/state.js +++ b/plugin/state.js @@ -52,9 +52,11 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, conf, _open: function(can, msg) { can.user.open(msg.Option("_arg")); return true }, _hold: function(can, msg) { return true }, _back: function(can) { - can._history.pop(); for (var his = can._history.pop(); his; his = can._history.pop()) { - if (his[0] == ctx.ACTION) { continue } - can.page.SelectArgs(can, can._option, "", function(item, index) { item.value = his[index]||"" }), can.Update() + can._history.pop(); for (var his = can._history.pop(); his; his = can._history.pop()) { if (his[0] == ctx.ACTION) { continue } + var index = 0 + can.page.SelectArgs(can, can._option, "", function(item) { item.value = his[index++]||"" }) + can.page.SelectArgs(can, can._action, "", function(item) { item.value = his[index++]||"" }) + can.Update() break } !his && can.Update()