diff --git a/frame.js b/frame.js index 8762ea21..4e3bc524 100644 --- a/frame.js +++ b/frame.js @@ -13,7 +13,6 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta, var pane = can[meta.main.name], msg = can.request({}) pane.onkeypop._init(pane, target), pane.onmotion._init(pane) pane.onaction._init(pane, msg, [], cb, pane._target) - pane.onengine._daemon(pane, pane.user.title()) }) }, _daemon: function(can, name, cb) { @@ -99,7 +98,6 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta, "studio": {name: "研发 studio", action: [ {name: "vimer", help: "编辑器", index: "web.code.vimer", args: ["src/", "main.go"]}, {name: "repos", help: "代码库", index: "web.code.git.status"}, - {name: "total", help: "统计量", index: "web.code.git.total"}, {name: "plan", help: "任务表", index: "web.team.plan"}, {name: "contexts", help: "上下文", index: "web.wiki.word", args: ["src/main.shy"]}, ]}, diff --git a/lib/user.js b/lib/user.js index e9838c78..b1f18a60 100644 --- a/lib/user.js +++ b/lib/user.js @@ -183,7 +183,9 @@ Volcanos("user", {help: "用户模块", agent: { item._input? /* input */ {type: "input", data: (item.type = item._input, item), _init: _init}: item.length > 0? /* select */ {select: [item]}: /* other */ item, - ]}, + ], _init: function(target) { + target.value = target.value || msg.Option(item.name) + }}, ]} })}, {view: "action", list: button||[{button: ["提交", function(event) { diff --git a/page/index.css b/page/index.css index 3136c12e..5d792880 100644 --- a/page/index.css +++ b/page/index.css @@ -190,17 +190,17 @@ fieldset>div.output div.project div.list { } body>fieldset.input { - position:fixed; left:0; top:32px; + position:fixed; top:32px; } -fieldset.input { +body>fieldset.input { background-color:#30a7a93d; position:fixed; z-index:50; } -fieldset.input.key { +body>fieldset.input.key { z-index:60; } -fieldset.input.date { +body>fieldset.input.date { z-index:70; } diff --git a/pane/Header.css b/pane/Header.css index 5b7f5ea5..1e461d49 100644 --- a/pane/Header.css +++ b/pane/Header.css @@ -31,7 +31,7 @@ fieldset.Header>div.output>div.state { } fieldset.Header>div.output div.menu { - height:22px; padding:5px; + height:21px; padding:5px; cursor:pointer; float:left; } @@ -39,3 +39,6 @@ fieldset.Header>div.output div.menu:hover { border-bottom:solid 2px red; background-color:#2e515f; } +fieldset.Header>div.status div.menu { + display:none; +} diff --git a/pane/Header.js b/pane/Header.js index aa005ec1..86382e6c 100644 --- a/pane/Header.js +++ b/pane/Header.js @@ -18,6 +18,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.onimport._agent(can, msg, target) can.onimport._menu(can, msg, target) can.onimport._background(can, msg, target) + // can.onengine._daemon(can, can.user.title()) typeof cb == "function" && cb(msg) }, _background: function(can, msg, target) { if (!msg.Option("background")) { return } @@ -133,11 +134,11 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, msg, list, cb, target) { function init() { can.run({}, [], function(msg) { can.Conf(USERNAME, msg.Option("user.nick")||msg.Option("user.name")) can.onimport._init(can, msg, list, function(msg) { - typeof cb == "function" && cb(msg) - can.run({}, ["search", "River.onaction._init"]) can.run({}, ["search", "Search.onaction._init"]) can.run({}, ["search", "Action.onaction._init"]) + can.run({}, ["search", "River.onaction._init"]) can.run({}, ["search", "Footer.onaction._init"]) + typeof cb == "function" && cb(msg) }, can._output) }) } diff --git a/pane/Search.js b/pane/Search.js index d08c055e..2c3b11c5 100644 --- a/pane/Search.js +++ b/pane/Search.js @@ -77,7 +77,7 @@ Volcanos("onaction", {help: "交互操作", list: ["关闭", "清空", "完成"] choice: function(event, can, index) { if (can.list && can.list[index]) { can.onmotion.hide(can) if (typeof can.list[index].text == "function") { - can.list[index].text() + can.list[index].text(event) } else if (can.list[index].text.indexOf("http") == 0) { can.user.open(can.list[index].text) } diff --git a/plugin/input.js b/plugin/input.js index 28caa8c5..82f7d73b 100644 --- a/plugin/input.js +++ b/plugin/input.js @@ -64,7 +64,10 @@ Volcanos("onaction", {help: "控件交互", list: [], _init: function(can, meta, var feature = can.sup.Conf("feature") var input = feature && feature[name]; if (input) { return can.sup.onaction.input(event, can.sup, name, function(msg) { - can.sup.onimport._process(can, msg) + if (can.sup._outputs && can.sup._outputs.length > 0) { var i = can.sup._outputs.length - 1 + can.sup._outputs[i].onimport._process(can.sup._outputs[i], msg) + return + }; can.sup.onimport._process(can.sup, msg) }) } diff --git a/plugin/input/date.js b/plugin/input/date.js index f4669b7c..97b640a5 100644 --- a/plugin/input/date.js +++ b/plugin/input/date.js @@ -55,7 +55,7 @@ Volcanos("onfigure", {help: "控件详情", list: [], date: {onclick: function(e var tr; function add(day, type) {if (day.getDay() == 0) {tr = can.page.Append(can, figure.table, [{type: "tr"}]).tr} can.page.Append(can, tr, [{text: [day.getDate(), "td", can.base.Time(day).split(" ")[0] == can.base.Time(now).split(" ")[0]? "select": type], dataset: {date: day.getTime()}, click: function(event) { - set(now = new Date(parseInt(target.dataset.date))) + set(now = new Date(parseInt(event.target.dataset.date))) can.page.Remove(can, figure.fieldset) }, }]) @@ -72,7 +72,7 @@ Volcanos("onfigure", {help: "控件详情", list: [], date: {onclick: function(e for (var day = new Date(one); day < end; day.setDate(day.getDate()+1)) {add(day, "main")} for (var day = new Date(end); end.getDay() != 0 && day < tail; day.setDate(day.getDate()+1)) {add(day, "next")} return now - }; set(show(now)) + }; show(now) return figure }} }, ["/plugin/input/date.css"]) diff --git a/plugin/local/team/plan.js b/plugin/local/team/plan.js index 0fc7bb1b..0ae08dcf 100644 --- a/plugin/local/team/plan.js +++ b/plugin/local/team/plan.js @@ -74,7 +74,9 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, task.extra && can.core.Item(can.base.Obj(task.extra), function(key, value) { task["extra."+key] = value }), delete(task.extra) can.task && can.page.Cache(can.task.id, can.ui.display, can.task.id) - can.Status(can.task = task); can.page.Cache(task.id, can.ui.display) || task["extra.cmd"] && can.onappend.plugin(can, { + can.task = task + var info = {}; can.core.List(can.onexport.list, function(key) { info[key] = task[key] }) + can.Status(info); can.page.Cache(task.id, can.ui.display) || task["extra.cmd"] && can.onappend.plugin(can, { height: can.Conf("height"), width: can.Conf("width"), index: task["extra.ctx"]+"."+task["extra.cmd"], args: task["extra.arg"], }, function(sub) { sub.run = function(event, cmds, cb, silent) { diff --git a/plugin/state.js b/plugin/state.js index e87322ef..5fa6f4f5 100644 --- a/plugin/state.js +++ b/plugin/state.js @@ -32,7 +32,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, conf, _refresh: function(can, msg) { can.core.Timer(500, function(timer) { var sub = can.request({}, {_count: parseInt(msg.Option("_count"))-1}) - can.run(sub._event) + can.onappend._output(can, can.Conf(), {}, can.Pack()) }) }, _field: function(can, msg) { @@ -58,8 +58,8 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, conf, Volcanos("onaction", {help: "交互操作", list: [], _init: function(can, msg, list, cb, target) { }, input: function(event, can, name, cb) { var feature = can.Conf("feature") + var msg = can.request(event, can.Option()) feature[name]? can.user.input(event, can, feature[name], function(ev, button, data, list) { - var msg = can.request(event, can.Option()) var args = ["action", name]; can.core.Item(data, function(key, value) { key && value && args.push(key, value) }) diff --git a/proto.js b/proto.js index 5b3bc4ad..78c91f67 100644 --- a/proto.js +++ b/proto.js @@ -54,9 +54,6 @@ var Volcanos = shy("火山架", {libs: [], cache: {}}, [], function(name, can, l } var source = !libs[0].endsWith("/") && (libs[0].indexOf(".") == -1? libs[0]+".js": libs[0]) || libs[0] - if (source.indexOf("/publish") == 0 && can.base && can.user) { - source = can.base.URLMerge(source, "pod", can.user.Search(can, "pod")||"") - } // 请求模块 function next() { can._load(source, each), can.require(libs.slice(1), cb, each) }