From aa7aa6cfd4d9426a4b3e8a61cb7ee6f1134c5f69 Mon Sep 17 00:00:00 2001 From: shaoying Date: Sun, 3 Jul 2022 16:09:05 +0800 Subject: [PATCH] opt frame.js --- frame.js | 463 +++++---------------------- lib/user.js | 14 +- page/index.js | 8 +- panel/action.js | 48 +-- panel/footer.js | 46 ++- panel/header.js | 6 +- panel/river.js | 10 +- panel/search.js | 6 +- plugin/input.js | 2 +- plugin/input/date.js | 2 +- plugin/input/key.js | 2 +- plugin/input/province.js | 2 +- plugin/local/chat/div.js | 8 +- plugin/local/chat/media.js | 6 +- plugin/local/chat/trans.js | 4 +- plugin/local/chat/wx.js | 2 +- plugin/local/code/inner.js | 74 ++++- plugin/local/code/inner/favor.js | 2 +- plugin/local/code/inner/search.js | 2 +- plugin/local/code/inner/sess.js | 2 +- plugin/local/code/inner/template.js | 2 +- plugin/local/code/snippet.js | 6 +- plugin/local/code/vimer.js | 8 +- plugin/local/team/plan.js | 8 +- plugin/local/wiki/data.js | 10 +- plugin/local/wiki/draw.js | 14 +- plugin/local/wiki/draw/path.js | 2 +- plugin/local/wiki/draw/walk_trash.js | 2 +- plugin/local/wiki/feel.js | 10 +- plugin/local/wiki/word.js | 18 +- plugin/state.js | 33 +- plugin/story/form.js | 2 +- plugin/story/json.js | 6 +- plugin/story/media.js | 6 +- plugin/story/parse.js | 181 +++++++++++ plugin/story/pie.js | 2 +- plugin/story/spide.js | 6 +- plugin/story/trend.js | 8 +- plugin/story/video.js | 6 +- plugin/table.js | 17 +- proto.js | 109 +++---- publish/chrome/contexts.js | 4 +- publish/order.js | 2 - 43 files changed, 566 insertions(+), 605 deletions(-) create mode 100644 plugin/story/parse.js delete mode 100644 publish/order.js diff --git a/frame.js b/frame.js index 9b24a068..9abd2218 100644 --- a/frame.js +++ b/frame.js @@ -1,16 +1,13 @@ -Volcanos("onengine", {help: "搜索引擎", list: [], _init: function(can, meta, list, cb, target) { - can.user.title(can.misc.Search(can, chat.TITLE)||can.misc.Search(can, ice.POD)||location.host) - can.run = function(event, cmds, cb) { var msg = can.request(event); cmds = cmds||[] - return (can.onengine[cmds[0]]||can.onengine._remote)(event, can, msg, can, cmds, cb) - } - - if (can.misc.Search(can, ice.MSG_SESSID)) { - can.misc.CookieSessid(can, can.misc.Search(can, ice.MSG_SESSID)) +Volcanos(chat.ONENGINE, {help: "搜索引擎", list: [], _init: function(can, meta, list, cb, target) { + if (can.misc.Search(can, ice.MSG_SESSID)) { can.misc.CookieSessid(can, can.misc.Search(can, ice.MSG_SESSID)) return can.misc.Search(can, ice.MSG_SESSID, "") } - can.page.Select(can, target, html.IFRAME, function(item) { can.page.Remove(can, item) }) - if (can.user.isExtension) { Volcanos.meta.args = can.base.Obj(localStorage.getItem(ctx.ARGS), {}) } + can.require([can.volcano], null, function(can, key, sub) { can[key] = sub }) + can.run = function(event, cmds, cb) { var msg = can.request(event); cmds = cmds||[] + return (can.onengine[cmds[0]]||can.onengine._remote)(event, can, msg, can, cmds, cb) + }, Volcanos.meta.args = can.user.args(can), can.onlayout.topic(can) + can.user.title(can.misc.Search(can, chat.TITLE)||can.misc.Search(can, ice.POD)||location.host) can.core.Next(list, function(item, next) { item.type = chat.PANEL can.onappend._init(can, can.base.Copy(item, can.core.Value(can._root, [chat.RIVER, item.name])), item.list, function(panel) { @@ -20,11 +17,10 @@ Volcanos("onengine", {help: "搜索引擎", list: [], _init: function(can, meta, can.core.ItemCB(panel.onaction, function(key, cb) { can.onengine.listen(can, key, function(msg) { can.core.CallFunc(cb, {can: panel, msg: msg}) }) - }), can.core.CallFunc([panel.onaction, "_init"], {can: panel, cb: next, target: panel._target}) + }), can.core.CallFunc([panel.onaction, chat._INIT], {can: panel, cb: next, target: panel._target}) }, target) }, function() { can.misc.Log(can.user.title(), ice.RUN, can) - can.require([can.volcano], null, function(can, key, sub) { can[key] = sub }) - can.onlayout.topic(can), can.onmotion._init(can, target), can.onkeymap._init(can) + can.onmotion._init(can, target), can.onkeymap._init(can) can.onengine.signal(can, chat.ONMAIN, can.request()), can.base.isFunc(cb) && cb() }) @@ -32,9 +28,9 @@ Volcanos("onengine", {help: "搜索引擎", list: [], _init: function(can, meta, var list = word[1] == ""? meta: meta[word[1]]? kit.Dict(word[1], meta[word[1]]): {} can.core.Item(list, function(name, command) { name = can.base.trimPrefix(name, "can.") can.core.List(msg.Option(ice.MSG_FIELDS).split(ice.FS), function(item) { - msg.Push(item, kit.Dict(ice.CTX, "onengine", ice.CMD, "command", - mdb.TYPE, "can", mdb.NAME, name, mdb.TEXT, command.help, - ctx.CONTEXT, "can", ctx.COMMAND, name + msg.Push(item, kit.Dict(ice.CTX, chat.ONENGINE, ice.CMD, ctx.COMMAND, + mdb.TYPE, ice.CAN, mdb.NAME, name, mdb.TEXT, command.help, + ctx.CONTEXT, ice.CAN, ctx.COMMAND, name )[item]||"") }) }) @@ -52,18 +48,16 @@ Volcanos("onengine", {help: "搜索引擎", list: [], _init: function(can, meta, button: key, cmd: key, arg: cmds.slice(2), list: cmds.slice(2), }, mod) }, - _engine: function(event, can, msg, panel, cmds, cb) { return false }, + _engine: function(event, can, msg, panel, cmds, cb) { + return false + }, _plugin: function(event, can, msg, panel, cmds, cb) { if (cmds[0] == ctx.ACTION && cmds[1] == ice.RUN && can.onengine.plugin.meta[cmds[2]]) { return can.core.CallFunc(can.onengine.plugin.meta[cmds[2]], {msg: msg, cmds: cmds.slice(3), cb: cb}), true } - var p = can.onengine.plugin.meta[cmds[0]]; if (p) { - if (p.meta && p.meta[cmds[1]] && cmds[0] == ctx.ACTION) { - return can.core.CallFunc(p.meta[cmds[1]], {can: can, msg: msg, cmds: cmds.slice(3), cb: cb}), true - } else if (p.meta && p.meta[cmds[0]]) { - return can.core.CallFunc(p.meta[cmds[0]], {can: can, msg: msg, cmds: cmds.slice(2), cb: cb}), true - } - return can.core.CallFunc(p, {can: can, msg: msg, cmds: cmds.slice(1), cb: cb}), true + var p = can.onengine.plugin.meta[cmds[0]], n = 1; if (p) { + if (p.meta && p.meta[cmds[1]] && cmds[0] == ctx.ACTION) { n = 3 } else if (p.meta && p.meta[cmds[0]]) { n = 2 } + return can.core.CallFunc(p, {can: can, msg: msg, cmds: cmds.slice(n), cb: cb}), true } return false }, @@ -81,10 +75,10 @@ Volcanos("onengine", {help: "搜索引擎", list: [], _init: function(can, meta, return can.base.isFunc(cb) && cb(msg) } - var toast; if (msg.Option("_toast")) { can.core.Timer(1000, function() { - toast = toast||can.user.toast(can, msg.Option("_toast"), msg._can._name, -1) + var toast; if (msg.Option(chat._TOAST)) { can.core.Timer(1000, function() { + toast = toast||can.user.toast(can, msg.Option(chat._TOAST), msg._can._name, -1) }) } - var names = msg.Option("_names")||panel._names||((can.Conf("iceberg")||"/chat/")+panel._name) + var names = msg.Option(chat._NAMES)||panel._names||((can.Conf("iceberg")||Volcanos.meta.iceberg)+panel._name) can.onengine.signal(can, chat.ONREMOTE, can.request({}, {_follow: panel._follow, _msg: msg, _cmds: cmds})) can.misc.Run(event, can, {names: names, daemon: can.core.Keys(can.ondaemon._list[0], msg._daemon)}, cmds, function(msg) { Volcanos.meta.pack[key] = msg, delete(msg._handle), can.base.isFunc(cb) && cb(msg) @@ -92,35 +86,37 @@ Volcanos("onengine", {help: "搜索引擎", list: [], _init: function(can, meta, }) }, - plugin: shy("添加插件", {}, [], function(can, name, command) { name = can.base.trimPrefix(name, "can.") + plugin: shy("添加插件", function(can, name, command) { name = can.base.trimPrefix(name, "can.") var type = html.TEXT; command.list = can.core.List(command.list, function(item) { switch (typeof item) { case lang.STRING: return can.core.SplitInput(item) case lang.OBJECT: return type = item.type||type, item } - }), arguments.callee.meta[can.core.Keys("can", name)] = command + }), arguments.callee.meta[can.core.Keys(ice.CAN, name)] = command + }), + listen: shy("监听事件", function(can, name, cb) { + arguments.callee.meta[name] = (arguments.callee.meta[name]||[]).concat(cb) }), - listen: shy("监听事件", {}, [], function(can, name, cb) { arguments.callee.meta[name] = (arguments.callee.meta[name]||[]).concat(cb) }), signal: shy("触发事件", function(can, name, msg) { msg = msg||can.request() can.misc.Log(gdb.SIGNAL, name, name == chat.ONREMOTE? msg.Option("_msg"): msg) return can.core.List(can.onengine.listen.meta[name], function(cb) { can.core.CallFunc(cb, {event: msg._event, msg: msg}) }).length }), }) -Volcanos("ondaemon", {help: "推荐引擎", list: [], _init: function(can, name) { if (can.user.isLocalFile) { return } +Volcanos(chat.ONDAEMON, {help: "推荐引擎", list: [], _init: function(can, name) { if (can.user.isLocalFile) { return } can.misc.WSS(can, {type: html.CHROME, name: can.misc.Search(can, cli.DAEMON)||name||"", text: can.user.title()}, function(event, msg, cmd, arg) { if (!msg) { return } var sub = can.ondaemon._list[msg.Option(ice.MSG_TARGET)] can.base.isFunc(can.ondaemon[cmd])? can.core.CallFunc(can.ondaemon[cmd], { can: can, sub: sub, msg: msg, cmd: cmd, arg: arg, cb: function() { msg.Reply() }, - }): can.onengine._search({}, can, msg, can, ["_search", cmd].concat(arg), function() { msg.Reply() }) + }): can.onengine._search({}, can, msg, can, [chat._SEARCH, cmd].concat(arg), function() { msg.Reply() }) }) }, _list: [""], - exit: function(can, msg, sub) { can.user.close() }, refresh: function(can, msg, sub) { sub.Update() }, - pwd: function(can, msg, arg) { can.ondaemon._list[0] = arg[0] }, grow: function(can, msg, sub, arg) { sub.onimport._grow(sub, msg, can.page.Color(arg.join(""))) }, toast: function(can, msg, arg) { can.core.CallFunc(can.user.toast, {can: can, msg: msg, cmds: arg}) }, + pwd: function(can, msg, arg) { can.ondaemon._list[0] = arg[0] }, + exit: function(can, msg, sub) { can.user.close() }, }) -Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, list, cb, target, field) { +Volcanos(chat.ONAPPEND, {help: "渲染引擎", list: [], _init: function(can, meta, list, cb, target, field) { meta.name = (meta.name||"").split(ice.SP)[0].split(ice.PT).pop() field = field||can.onappend.field(can, meta.type, meta, target).first var legend = can.page.Select(can, field, html.LEGEND)[0] @@ -163,11 +159,11 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, meta.inputs && sub.onappend._option(sub, meta, sub._option, meta.msg) if (meta.msg) { var msg = sub.request(); msg.Copy(can.base.Obj(meta.msg)), sub.onappend._output(sub, msg, msg.Option(ice.MSG_DISPLAY)||meta.feature.display) } - can.page.Modify(can, sub._legend, kit.Dict(can.Conf("legend_event")||html.ONMOUSEENTER, function(event) { + can.page.Modify(can, sub._legend, kit.Dict(can.Conf("legend_event")||chat.ONMOUSEENTER, function(event) { can.user.carte(event, sub, sub.onaction, sub.onaction.list.concat([["所有"].concat(can.core.Item(meta.feature._trans))]), function(event, item, meta) { - var cb = can.core.Value(sub, ["_outputs.-1.onaction", item]) - if (can.base.isFunc(cb)) { return cb(event, can.core.Value(sub, "_outputs.-1"), item) } - var cb = meta[item]||meta["_engine"] + var cb = can.core.Value(sub, [chat._OUTPUTS_CURRENT, chat.ONACTION, item]) + if (can.base.isFunc(cb)) { return cb(event, can.core.Value(sub, chat._OUTPUTS_CURRENT), item) } + var cb = meta[item]||meta[chat._ENGINE] if (can.base.isFunc(cb)) { return cb(event, sub, item) } }) })), can.base.isFunc(cb) && cb(sub) @@ -183,22 +179,19 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, }, [item.display, chat.PLUGIN_INPUT_JS], function(input) { input.Conf(item) input.run = function(event, cmds, cb, silent) { var msg = can.request(event) if (item._cb) { return item._cb(event) } - if (msg.RunAction(event, can.core.Value(can, "_outputs.-1"), cmds)) { return } + if (msg.RunAction(event, can.core.Value(can, chat._OUTPUTS_CURRENT), cmds)) { return } if (msg.RunAction(event, input, cmds)) { return } return can.Update(event, can.Input(cmds, silent), cb, silent) }, can._inputs[item.name] = input, input.sup = can can.core.ItemCB(input.onaction, function(key, cb) { input._target[key] = function(event) { cb(event, input) } }) can.core.ItemCB(item, function(key, cb) { input._target[key] = function(event) { cb(event, input) } }) - skip? next(): can.core.CallFunc([input.onaction, "_init"], [input, item, next, input._target]); + skip? next(): can.core.CallFunc([input.onaction, chat._INIT], [input, item, next, input._target]); (item.action||can.core.Value(meta, [ctx.FEATURE, ctx.INPUTS])) && can.onappend.figure(input, item, input._target) }) }; can.core.Next(can.base.Obj(meta.inputs, can.core.Value(can, [chat.ONIMPORT, mdb.LIST])).concat(meta.type == chat.FLOAT? [{type: html.BUTTON, name: cli.CLOSE}]: []), add) }, - _action: function(can, list, action, meta) { - list = can.base.getValid(list, can.core.Item(meta)) - list = can.base.Obj(list, can.core.Value(can, [chat.ONACTION, mdb.LIST])) - if (!list) { return } + _action: function(can, list, action, meta) { list = can.base.Obj(can.base.getValid(list, can.core.Item(meta)), can.core.Value(can, [chat.ONACTION, mdb.LIST])); if (!list) { return } var _list = []; for (var i = 0; i < list.length; i++) { switch (list[i]) { case "": _list.push(""); break case mdb.PAGE: @@ -207,28 +200,23 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, _list.push(mdb.PREV, mdb.NEXT) break default: - (function() { - var item = can.core.SplitInput(list[i], html.BUTTON); + (function() { var item = can.core.SplitInput(list[i], html.BUTTON); if (item.type == html.SELECT) { - item._init = function(target) { - target.value = item.value||item.values[0] - target.onchange = function(event) { can.run(event) } - } + item._init = function(target) { target.value = item.value||item.values[0], target.onchange = function(event) { can.run(event) } } } - item.action && (function() { - item._init = function(target) { can.onappend.figure(can, item, target) } - })(), item.type == html.BUTTON? _list.push(list[i]): _list.push(item) + item.action && (function() { item._init = function(target) { can.onappend.figure(can, item, target) } })() + item.type == html.BUTTON? _list.push(list[i]): _list.push(item) }) () } } meta = meta||can.onaction||{}, action = action||can._action, can.onmotion.clear(can, action) return can.core.List(_list, function(item) { if (item == undefined) { return } can.onappend.input(can, item == ""? /*空白*/ {type: html.SPACE}: can.base.isString(item)? /*按键*/ {type: html.BUTTON, value: can.user.trans(can, item), onclick: function(event) { - var cb = meta[item]||meta["_engine"]; cb? can.core.CallFunc(cb, {event: event, can: can, button: item}): can.run(event, [ctx.ACTION, item].concat(can.sup.Input())) + var cb = meta[item]||meta[chat._ENGINE]; cb? can.core.CallFunc(cb, {event: event, can: can, button: item}): can.run(event, [ctx.ACTION, item].concat(can.sup.Input())) }, onkeydown: function(event) { if (event.key == lang.ENTER) { - var cb = meta[item]||meta["_engine"]; cb? can.core.CallFunc(cb, {event: event, can: can, button: item}): can.run(event, [ctx.ACTION, item].concat(can.sup.Input())) + var cb = meta[item]||meta[chat._ENGINE]; cb? can.core.CallFunc(cb, {event: event, can: can, button: item}): can.run(event, [ctx.ACTION, item].concat(can.sup.Input())) } }}: item.length > 0? /*列表*/ {type: html.SELECT, name: item[0], values: item.slice(1), onchange: function(event) { @@ -246,8 +234,7 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, if (can.core.CallFunc([can.sup, chat.ONIMPORT, ice.MSG_PROCESS], {can: can.sup, msg: msg})) { return } if (can.core.CallFunc([can, chat.ONIMPORT, ice.MSG_PROCESS], {can: can, msg: msg})) { return } if (msg.Result().length > 0 || msg.Length() > 0) { - can.onappend.table(can, msg) - can.onappend.board(can, msg) + can.onappend.table(can, msg), can.onappend.board(can, msg) } else { can.Update() } @@ -255,10 +242,6 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, }) } - if (can.base.isUndefined(msg._daemon)) { - can.base.isUndefined(can._daemon) && can.ondaemon._list[0] && (can._daemon = can.ondaemon._list.push(can)-1) - if (can._daemon) { msg.Option(ice.MSG_DAEMON, can.core.Keys(can.ondaemon._list[0], can._daemon)) } - } if (meta && meta.index && meta.index.indexOf("can.") == 0) { can.onengine._plugin(event, can, msg, can, can.misc.concat(can, [meta.index], cmds), function(msg) { if (can.base.isFunc(cb)) { can.core.CallFunc(cb, {can: can, msg: msg}); return } @@ -267,7 +250,12 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, return } - return can.run(event, cmds, function(msg) { var sub = can.core.Value(can, "_outputs.-1")||{}; can._msg = msg, sub._msg = msg + if (can.base.isUndefined(msg._daemon)) { + can.base.isUndefined(can._daemon) && can.ondaemon._list[0] && (can._daemon = can.ondaemon._list.push(can)-1) + if (can._daemon) { msg.Option(ice.MSG_DAEMON, can.core.Keys(can.ondaemon._list[0], can._daemon)) } + } + + return can.run(event, cmds, function(msg) { var sub = can.core.Value(can, chat._OUTPUTS_CURRENT)||{}; can._msg = msg, sub._msg = msg if (can.base.isFunc(cb)) { can.core.CallFunc(cb, {can: can, msg: msg}); return } var process = msg._can == can || msg._can == sub if (process && can.core.CallFunc([sub, chat.ONIMPORT, ice.MSG_PROCESS], {can: sub, msg: msg})) { return } @@ -276,22 +264,21 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, }) }, _output: function(can, msg, display, output, action, cb) { display = display||chat.PLUGIN_TABLE_JS, output = output||can._output - Volcanos(display, {_follow: can.core.Keys(can._follow, display), _display: display, _target: output, _fields: can._target, - _option: can._option, _action: can._action, _output: can._output, _status: can._status, _legend: can._legend, _inputs: {}, - Update: can.Update, Option: can.Option, Action: can.Action, Status: can.Status, _root: can._root, + Volcanos(display, {_follow: can.core.Keys(can._follow, display), _target: output, _fields: can._target, _display: display, + _legend: can._legend, _option: can._option, _action: can._action, _output: can._output, _status: can._status, _root: can._root, + Update: can.Update, Option: can.Option, Action: can.Action, Status: can.Status, }, [display, chat.PLUGIN_TABLE_JS], function(table) { table.Conf(can.Conf()) table.run = function(event, cmds, cb, silent) { var msg = can.request(event) if (msg.RunAction(event, table, cmds)) { return } return can.Update(event, can.Input(cmds, silent), cb, silent) }, can._outputs && can._outputs.push(table), table.sup = can, table._msg = msg - if (can.Conf(ctx.INDEX) == "can.code.inner.plugin" && table.onimport && table.onimport.list.length > 0) { + table._args = can.base.ParseURL(table._display), table._trans = can.base.Copy(table._trans||{}, can.core.Value(table, "onaction._trans")) + if (table.onimport && can.base.isArray(table.onimport.list) && table.onimport.list.length > 0) { can.onmotion.clear(can, can._option), can.onappend._option(can, {inputs: table.onimport.list}) } - table._args = can.base.ParseURL(table._display) - table._trans = can.base.Copy(table._trans||{}, can.core.Value(table, "onaction._trans")) - can.core.CallFunc([table, chat.ONIMPORT, "_init"], {can: table, msg: msg, list: msg.result||msg.append||[], cb: function(msg) { + can.core.CallFunc([table, chat.ONIMPORT, chat._INIT], {can: table, msg: msg, cb: function(msg) { action === false || table.onappend._action(table, msg.Option(ice.MSG_ACTION)||can.Conf(ice.MSG_ACTION), action) action === false || table.onappend._status(table, msg.Option(ice.MSG_STATUS)) can.base.isFunc(cb) && cb(msg) @@ -306,67 +293,6 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, }) }, - tabs: function(can, list, cb, cbs, action, each) { action = action||can._action - return can.page.Append(can, action, can.core.List(list, function(meta) { - return {text: [meta.name, html.DIV, html.TABS], title: meta.text, onclick: function(event) { - can.onmotion.select(can, action, "div.tabs", event.target) - can.base.isFunc(cb) && cb(event, meta) - }, _init: function(item) { const OVER = "over" - function close(item) { var next = item.nextSibling||item.previousSibling - item._close(item) || can.page.Remove(can, item), next && next.click() - } - can.page.Modify(can, item, {draggable: true, _close: cbs, - onmouseenter: function(event) { - can.user.carte(event, can, kit.Dict( - "close tab", function(event) { close(item) }, - "close other", function(event) { - can.page.Select(can, action, html.DIV_TABS, function(_item) { _item == item || close(_item) }) - }, - "close all", function(event) { can.page.Select(can, action, html.DIV_TABS, close) } - ), ["close tab", "close other", "close all"]) - }, - ondragstart: function(event) { var target = event.target; target.click() - action._drop = function(event, before) { action.insertBefore(target, before) } - }, - ondragover: function(event) { event.preventDefault(), action._drop(event, event.target) }, - ondrop: function(event) { event.preventDefault(), action._drop(event, event.target) }, - }), can.core.Timer(10, function() { item.click() }) - can.base.isFunc(each) && each(item) - }} - })).first - }, - list: function(can, root, cb, target) { target = target||can._output - can.core.List(root.list, function(item) { - var ui = can.page.Append(can, target, [{view: [html.ITEM, html.DIV, item.meta.name], onclick: function(event) { - can.base.isFunc(cb) && cb(event, item) || can.onmotion.toggle(can, ui.list) - can.onmotion.select(can, target, html.DIV_ITEM, event.target) - }}, {view: html.LIST}]); can.onappend.list(can, item, cb, ui.list) - }) - }, - item: function(can, type, item, cb, cbs, target) { target = target||can._output - var ui = can.page.Append(can, target, [{view: [type, html.DIV, item.nick||item.name], - onclick: function(event) { cb(event, ui.first) - can.onmotion.select(can, target, can.core.Keys(html.DIV, type), ui.first) - }, onmouseenter: function(event) { cbs(event, ui.first) }, - }]); return ui.first - }, - tree: function(can, list, field, split, cb, target, node) { - node = node||{"": target}; can.core.List(list, function(item) { - item[field] && can.core.List(item[field].split(split), function(value, index, array) { if (!value) { return } - var last = array.slice(0, index).join(split), name = array.slice(0, index+1).join(split) - if (node[name]) { return } - var ui = can.page.Append(can, node[last], [{view: "item", list: [{view: ["switch", "div", (index==array.length-1?"":"⌃")]}, {view: ["name", html.DIV, value+(index==array.length-1?"":"")]}], onclick: function(event) { - index < array.length - 1? can.onmotion.toggle(can, node[name], function() { - can.page.ClassList.add(can, ui["switch"], "open") - }, function() { - can.page.ClassList.del(can, ui["switch"], "open") - }): can.base.isFunc(cb) && cb(event, item) - if (node[name].childElementCount == 2) { node[name].firstChild.click() } - }}, {view: html.LIST, style: {display: html.NONE}, _init: function(list) { item.expand && can.page.style(can, list, html.DISPLAY, html.BLOCK) }}]) - node[name] = ui.list - }) - }); return node - }, field: function(can, type, item, target) { type = type||html.PLUGIN, item = item||{} var name = (item.nick||item.name||"").split(ice.SP)[0] var title = !item.help || can.user.language(can) == "en"? name: name+"("+item.help.split(ice.SP)[0]+")" @@ -384,7 +310,7 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, var br = input.type == html.TEXTAREA? [{type: html.BR, style: {clear: html.BOTH}}]: [] var title = can.Conf([ctx.FEATURE, chat.TITLE, item.name].join(ice.PT))||""; title && (input.title = title) return can.page.Append(can, target, ([{view: style||can.base.join([html.ITEM, item.type]), onkeydown: function(event) { - item.type == html.TEXTAREA && event.key == lang.TAB && can.onkeymap.insertText(event.target, "\t") + item.type == html.TEXTAREA && event.key == lang.TAB && can.onkeymap.insertText(event.target, ice.TB) item.type == html.TEXT && can.onkeymap.input(event, can), can.onmotion.selectField(event, can) }, list: [input]}]).concat(br))[item.name] }, @@ -408,9 +334,8 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, if (can.core.CallFunc([can.sup, chat.ONIMPORT, ice.MSG_PROCESS], {can: can.sup, msg: msg})) { return } if (msg.Option(ice.MSG_DISPLAY) != "") { can.onappend._output(can.sup, msg, msg.Option(ice.MSG_DISPLAY)) - } else if (msg.Result().length > 0 || msg.Length() > 0) { - can.onappend.table(can, msg) - can.onappend.board(can, msg) + } else if (msg.Length() > 0 || msg.Result().length > 0 ) { + can.onappend.table(can, msg), can.onappend.board(can, msg) } else { can.Update() } @@ -418,7 +343,7 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, } return {text: [value, html.TD], onclick: function(event) { var target = event.target - if (target.tagName == "INPUT" && target.type == html.BUTTON) { return run([ctx.ACTION, target.name]) } + if (can.page.tagis(html.INPUT, target) && target.type == html.BUTTON) { return run([ctx.ACTION, target.name]) } if (key == mdb.HASH && can.user.mod.isDiv) { return can.user.jumps("/chat/div/"+value) } can.sup.onaction.change(event, can.sup, key, event.target.innerText) @@ -428,7 +353,7 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, can.onmotion.modifys(can, event.target, function(event, value, old) { run([ctx.ACTION, mdb.MODIFY, key, value]) }, item) }} }); table && can.page.Modify(can, table, {className: chat.CONTENT}) - if (msg.append && msg.append[msg.append.length-1] == "action") { can.page.ClassList.add(can, table, "action") } + if (msg.append && msg.append[msg.append.length-1] == ctx.ACTION) { can.page.ClassList.add(can, table, ctx.ACTION) } can._table = table, can.sup && (can.sup._table = table) return sort && can.page.RangeTable(can, table, sort), table }, @@ -441,197 +366,6 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, }) return (code.scrollBy && code.scrollBy(0, 10000)), code }, - parse: function(can, list, target, keys, data, type) { target = target||can._output, data = data||{} - if (!list) { return } else if (can.base.isArray(list)) { - return can.core.List(list, function(meta, index) { - return can.onappend.parse(can, meta, target, keys, data, type) - }) - - } else if (can.base.isString(list)) { - var ls = can.core.Split(list, "", ":=@"); if (ls.length == 1) { - var meta = type? {type: type, name: ls[0]}: {type: ls[0]} - } else { - var meta = {name: ls[0]}; for (var i = 1; i < ls.length; i += 2) { switch (ls[i]) { - case ":": meta.type = ls[i+1]; break - case "=": meta.value = ls[i+1]; break - case "@": meta.action = ls[i+1]; break - } } - } - - } else if (can.base.isObject(list)) { var meta = list } - - keys = can.core.Keys(keys, meta.name||meta.type) - var item = {view: meta.type}, init, subtype; switch (meta.type) { - case html.HEAD: subtype = "menu", data = {} - init = function(target) { data.head = target - can.page.ClassList.add(can, target, html.LAYOUT) - } - break - case html.LEFT: subtype = "item" - init = function(target) { - can.page.ClassList.add(can, target, html.LAYOUT) - can.core.Timer(10, function() { var height = target.parentNode.offsetHeight - can.page.Select(can, target.parentNode, can.page.Keys(html.DIV_LAYOUT_HEAD, html.DIV_LAYOUT_FOOT), function(item) { - height -= item.offsetHeight - }), can.page.style(can, target, html.HEIGHT, height) - }) - } - break - case html.MAIN: - init = function(target) { data.main = target - can.page.ClassList.add(can, target, html.LAYOUT) - can.core.Timer(10, function() { var height = target.parentNode.offsetHeight - can.page.Select(can, target.parentNode, can.page.Keys(html.DIV_LAYOUT_HEAD, html.DIV_LAYOUT_FOOT), function(item) { - height -= item.offsetHeight - }), can.page.style(can, target, html.HEIGHT, height) - }) - - can.core.Timer(100, function() { - var width = target.parentNode.offsetWidth - can.page.Select(can, target.parentNode, html.DIV_LAYOUT_LEFT, function(item) { - width -= item.offsetWidth+1 - }), can.page.style(can, target, html.WIDTH, width) - }) - - } - break - case html.FOOT: - init = function(target) { data.foot = target - can.page.ClassList.add(can, target, html.LAYOUT) - } - break - case html.TABS: - item.list = [{view: "name"}, {view: html.PAGE}], item._init = function(_target, ui) { - can.page.Append(can, ui.page, [{view: html.INPUT, list: [{type: html.INPUT, onkeyup: function(event) { - can.page.Select(can, _target, [html.DIV_PAGE, html.DIV_ITEM], function(item) { - can.page.ClassList.set(can, item, html.HIDE, item.innerText.indexOf(event.target.value) == -1) - }) - }}]}]) - can.core.List(meta.list, function(item, index) { - can.page.Append(can, ui.name, [{view: [html.ITEM, html.DIV, item.name||item], onclick: function(event) { - can.onmotion.select(can, _target, [[html.DIV_PAGE, html.DIV_LIST]], index) - can.onmotion.select(can, ui.name, html.DIV_ITEM, index) - ui.page.scrollTo(0, 0) - }}]) - can.page.Append(can, ui.page, [{view: [html.ITEM, html.DIV, item.name], onclick: function(event) { - can.page.ClassList.neg(can, event.target.nextSibling, html.SELECT) - can.onmotion.select(can, ui.name, html.DIV_ITEM, index) - }}, {view: [html.LIST], _init: function(target) { - can.onappend.parse(can, item.list, target, can.core.Keys(keys, item.name), data, html.ITEM) - }}]) - }) - can.core.Timer(100, function() { var height = target.offsetHeight - can.page.style(can, ui.page, html.HEIGHT, height-10-(meta.style? 0: ui.name.offsetHeight)) - can.page.style(can, _target, html.HEIGHT, height-10) - }), can.page.Select(can, ui.name, html.DIV_ITEM)[0].click() - } - break - case "username": - can.page.Append(can, target, [ - can.base.Copy({view: ["username", "div"], onclick: function(event) { - }, list: [{view: ["some", html.DIV, can.user.info.usernick]}, {img: can.user.info.avatar}]})]) - return - } - - item._init = item._init||function(target) { - meta.list && can.onappend.parse(can, meta.list, target, keys, data, type||subtype) - can.base.isFunc(init) && init(target), can.base.isFunc(meta.init) && meta.init(target) - } - if (can.base.isString(meta.style)) { item.className = meta.style } - if (can.base.isObject(meta.style)) { item.style = meta.style } - - if ((meta.type||type) == html.MENU) { - can.page.Append(can, target, [can.base.Copy({view: [html.MENU, html.DIV, meta.name||meta], onclick: function(event) { - if (meta.list && meta.list.length > 0) { return } - can.onengine.signal(can, meta.name) || can.onengine.signal(can, html.MENU, can.request(event, {item: meta.name})) - }, onmouseenter: function(event) { - meta.list && meta.list.length > 0 && can.user.carte(event, can, {}, meta.list, function(event, item) { - can.onengine.signal(can, item) || can.onengine.signal(can, meta.name, can.request(event, {item: item})) - }) - }})]).first - return - } - if ((type||subtype) == html.ITEM) { item.view = item.view||html.LIST - if (meta.action == "auto") { - meta.init = meta.init||function(item) { can.core.Timer(100, function() { item.click() }) } - } - if (decodeURIComponent(location.hash) == "#"+can.core.Keys(keys, item.name)) { - meta.init = meta.init||function(item) { can.core.Timer(300, function() { item.click() }) } - } - - var _item = can.page.Append(can, target, [can.base.Copy({view: [html.ITEM, html.DIV, meta.name||meta], onclick: function(event) { - location.hash = can.core.Keys(keys, item.name) - - if (meta.action == "open") { - if (can.misc.Search(can, "pod")) { - can.user.open("/chat/pod/"+can.misc.Search(can, "pod")+"/cmd/"+meta.index) - } else { - can.user.open("/chat/cmd/"+meta.index) - } - return - } - if (meta.action == "push") { - if (can.misc.Search(can, "pod")) { - can.user.jumps("/chat/pod/"+can.misc.Search(can, "pod")+"/cmd/"+meta.index) - } else { - can.user.jumps("/chat/cmd/"+meta.index) - } - return - } - switch (meta.type) { - case html.PLUGIN: - if (can.onmotion.cache(can, function() { return keys }, data.main)) { break } - if (can.base.Ext(meta.index) == nfs.ZML || can.base.Ext(meta.index) == nfs.IML) { - can.page.Append(can, data.main, [{type: html.IFRAME, src: "/chat/cmd/"+meta.index, - height: data.main.offsetHeight, width: data.main.offsetWidth, - }]) - break - } - - can.onappend.plugin(can, {index: meta.index, args: can.base.Obj(meta.args)}, function(sub) { - sub.ConfHeight(data.main.offsetHeight-160) - sub.run = function(event, cmds, cb, silent) { - can.page.style(can, sub._output, html.MAX_WIDTH, sub.ConfWidth(data.main.offsetWidth-40)) - can.run(event, can.misc.concat(can, [ctx.ACTION, ice.RUN, sub._index||meta.index], cmds), function(msg) { - cb(msg), can.core.Timer(10, function() { - can.page.style(can, sub._table, html.MAX_HEIGHT, data.main.offsetHeight-150) - }) - }, true) - } - }, data.main) - default: - meta.list && can.onmotion.toggle(can, event.target.nextSibling) - } - }})]).first; can.core.ItemCB(meta, function(key, cb) { _item[key] = can.base.isFunc(cb)? cb: function(event) { - can.onengine.signal(can, cb, can.request(event)) - } }) - can.core.Timer(10, function() { meta.init && meta.init(_item) }) - if (!meta.list) { return } - } - return can.page.Append(can, target, [item]).first - }, - _parse: function(can, text) { var stack = [{_deep: -1, list: []}] - can.core.List(can.core.Split(text, ice.NL, ice.NL, ice.NL), function(line) { if (line == "") { return } - var deep = 0; for (var i = 0; i < line.length; i++) { if (line[i] == ice.SP) { deep++ } else if (line[i] == ice.TB) { deep += 4 } else { break } } - for (var i = stack.length-1; i > 0; i--) { if (deep <= stack[i]._deep) { stack.pop() } } - - var item = {_deep: deep, list: []}; var list = stack[stack.length-1]; list.list.push(item); if (deep > list._deep) { stack.push(item) } - var ls = can.core.Split(line); switch (ls[0]) { - case html.HEAD: - case html.LEFT: - case html.MAIN: - case html.FOOT: - case html.TABS: - case "username": - case html.MENU: item.type = ls[0]; break - default: item.name = ls[0]; break - } - for (var i = 1; i < ls.length; i += 2) { can.core.Value(item, ls[i], ls[i+1]) - if (ls[i] == ctx.INDEX) { item.type = item.type||html.PLUGIN } - } - }) - return {type: "demo", style: {height: can.ConfHeight()||can._root._height}, list: stack[0].list} - }, _plugin: function(can, value, meta, cb, target) { meta.feature = can.base.getValid(meta.feature, can.base.Obj(value.meta))||{} @@ -646,8 +380,7 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, meta.name = meta.name||value.name meta.help = meta.help||value.help - can.onappend._init(can, meta, [chat.PLUGIN_STATE_JS], function(sub, skip) { - sub._index = value.index||meta.index + can.onappend._init(can, meta, [chat.PLUGIN_STATE_JS], function(sub, skip) { sub._index = value.index||meta.index sub.run = function(event, cmds, cb) { can.run(event, can.misc.concat(can, [ctx.ACTION, ice.RUN, sub._index], cmds), cb) } can.base.isFunc(cb) && cb(sub, meta, skip) }, target||can._output) @@ -656,26 +389,21 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, var p = can.onengine.plugin.meta[meta.index], res = {}; function cbs(sub, meta, skip) { res.__proto__ = sub, cb(sub, meta, skip) } (meta.meta || meta.inputs && meta.inputs.length > 0)? /* 局部命令 */ can.onappend._plugin(can, {meta: meta.meta, list: meta.list}, meta, cbs, target): p? /* 前端命令 */ can.onappend._plugin(can, {name: meta.index, help: p.help, meta: p.meta, list: p.list}, meta, function(sub, meta, skip) { - sub.run = function(event, cmds, cb) { - if (p.meta && p.meta[cmds[1]] && cmds[0] == ctx.ACTION) { - can.core.CallFunc(p.meta[cmds[1]], {can: sub, msg: can.request(event), cmds: cmds.slice(2), cb: cb}) - } else if (p.meta && p.meta[cmds[0]]) { - can.core.CallFunc(p.meta[cmds[0]], {can: sub, msg: can.request(event), cmds: cmds.slice(1), cb: cb}) - } else { - can.core.CallFunc(p, {can: sub, msg: can.request(event), cmds: cmds, cb: cb}) - } + sub.run = function(event, cmds, cb) { var _cb = p, n = 0 + if (p.meta && p.meta[cmds[1]] && cmds[0] == ctx.ACTION) { _cb = p.meta[cmds[1]], n = 2 } else if (p.meta && p.meta[cmds[0]]) { _cb = p.meta[cmds[0]], n = 1 } + can.core.CallFunc(_cb, {can: sub, msg: can.request(event), cmds: cmds.slice(n), cb: cb}) } can.base.isFunc(cbs) && cbs(sub, meta, skip) - }, target): /* 后端命令 */ can.run(can.request({}, meta), [ctx.ACTION, ctx.COMMAND, meta.index], function(msg) { msg.Table(function(value) { + }, target): /* 后端命令 */ can.runAction(can.request({}, meta), ctx.COMMAND, [meta.index], function(msg) { msg.Table(function(value) { can.onappend._plugin(can, value, meta, cbs, target) - }) }, true) + }) }) return res }, figure: function(can, meta, target, cbs) { if ([html.BUTTON, html.SELECT].indexOf(meta.type) > -1) { return } - var input = meta.action||mdb.KEY; input != ice.AUTO && can.require(["/plugin/input/"+input+".js"], function(can) { + var input = meta.action||mdb.KEY; input != ice.AUTO && can.require(["/plugin/input/"+input+html._JS], function(can) { can.core.ItemCB(can.onfigure[input], function(key, on) { var last = target[key]; target[key] = function(event) { on(event, can, meta, function(cb) { if (target._can) { return can.base.isFunc(cb) && cb(target._can, cbs) } - can.onappend._init(can, {type: html.INPUT, name: input, pos: chat.FLOAT}, ["/plugin/input/"+input+".js"], function(sub) { sub.Conf(meta) + can.onappend._init(can, {type: html.INPUT, name: input, pos: chat.FLOAT}, ["/plugin/input/"+input+html._JS], function(sub) { sub.Conf(meta) sub.run = function(event, cmds, cb) { var msg = sub.request(event, can.Option()); (meta.run||can.run)(event, cmds, cb, true) } sub.close = function() { can.page.Remove(can, sub._target), delete(target._can) }, target._can = sub @@ -691,44 +419,9 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, }, target, last) } }) }) }, - float: function(can, msg, cb) { - var ui = can.onappend.field(can, "story toast float", {}, can._root._target) - ui.close = function() { can.page.Remove(can, ui.first) } - - can.getActionSize(function(left, top, height, width) { - can.page.style(can, ui.output, html.MAX_HEIGHT, height-28, html.MAX_WIDTH, width) - can.page.style(can, ui.first, html.LEFT, left, html.TOP, top) - }) - - can.onappend._action(can, [cli.CLOSE, cli.REFRESH, {input: html.TEXT, placeholder: "filter", _init: function(input) { - can.onengine.signal(can, "keymap.focus", can.request({}, {cb: function(event) { - if (event.target.tagName == "INPUT") { return } - if (event.key == lang.ESCAPE) { ui.close(); return } - if (event.key == ice.SP) { input.focus(), can.onkeymap.prevent(event) } - }})) - }, onkeydown: function(event) { can.onkeymap.input(event, can) - if (event.key != lang.ENTER) { return } - event.target.setSelectionRange(0, -1) - - can.page.Select(can, ui.output, html.TR, function(tr, index) { if (index == 0) { return } - can.page.ClassList.add(can, tr, html.HIDDEN) - can.page.Select(can, tr, html.TD, function(td) { if (td.innerText.indexOf(event.target.value) > -1) { - can.page.ClassList.del(can, tr, html.HIDDEN) - } }) - }) - }}], ui.action, kit.Dict(cli.CLOSE, ui.close, cli.REFRESH, function(event) { ui.close(), can.toast.click()})) - - can.onappend.table(can, msg, function(value, key, index, line, list) { - return {text: [value, html.TD], onclick: function(event) { - can.base.isFunc(cb) && cb(value, key, index, line, list) - }} - }, ui.output), can.onappend.board(can, msg.Result(), ui.output) - return ui - }, - }) -Volcanos("onlayout", {help: "页面布局", list: [], _init: function(can, target) { target = target||can._root._target - if (can.page.Select(can, target, can.core.Keys(html.FIELDSET_MAIN, "page")).length > 0) { +Volcanos(chat.ONLAYOUT, {help: "页面布局", list: [], _init: function(can, target) { target = target||can._root._target + if (can.page.Select(can, target, can.core.Keys(html.FIELDSET_MAIN, html.PAGE)).length > 0) { can.page.Select(can, target, html.FIELDSET_LEFT, function(field) { can.page.styleHeight(can, field, "") can.page.Select(can, target, [[html.FIELDSET_LEFT, html.DIV_OUTPUT]], function(output) { can.page.styleHeight(can, output, "") @@ -838,7 +531,7 @@ Volcanos("onlayout", {help: "页面布局", list: [], _init: function(can, targe ] }]); return can.ui = ui }, }) -Volcanos("onmotion", {help: "动态特效", list: [], _init: function(can, target) { +Volcanos(chat.ONMOTION, {help: "动态特效", list: [], _init: function(can, target) { window.addEventListener(html.ORIENTATIONCHANGE, function(event) { can.onengine.signal(can, html.ORIENTATIONCHANGE) }) can.onmotion.float.auto(can, target) }, @@ -920,7 +613,7 @@ Volcanos("onmotion", {help: "动态特效", list: [], _init: function(can, targe }, select: function(can, target, name, which) { var old = can.page.Select(can, target, name, function(item, index) { - if (can.page.ClassList.has(can, item, "select")) { return index } + if (can.page.ClassList.has(can, item, html.SELECT)) { return index } })[0] can.page.Select(can, target, name, function(item, index) { can.page.ClassList.set(can, item, html.SELECT, item == which || which == index) @@ -967,9 +660,9 @@ Volcanos("onmotion", {help: "动态特效", list: [], _init: function(can, targe toimage: function(event, can, name, target) { can.require(["https://cdn.jsdelivr.net/npm/html2canvas@1.0.0-rc.5/dist/html2canvas.min.js"], function() { html2canvas(target||can._target).then(function (canvas) { var url = canvas.toDataURL("image/png") - var toast = can.user.toast(can, {content: {img: url, style: {"max-height": 240, display: "block"}}, duration: -1, + var toast = can.user.toast(can, {content: {img: url, style: {"max-height": 240, display: html.BLOCK}}, duration: -1, action: shy({}, [cli.CLOSE, "download"], function(event, button) { - can.user.input(event, can, [{name: "name", value: name}], function(ev, button, data) { toast.close() + can.user.input(event, can, [{name: mdb.NAME, value: name}], function(ev, button, data) { toast.close() can.page.Create(can, html.A, {href: url, download: data.name}).click() }) }), @@ -1076,7 +769,7 @@ Volcanos("onmotion", {help: "动态特效", list: [], _init: function(can, targe can.Status(kit.Dict(mdb.TOTAL, total, mdb.INDEX, target._index)) }, }) -Volcanos("onkeymap", {help: "键盘交互", list: [], _focus: [], _init: function(can, target) { +Volcanos(chat.ONKEYMAP, {help: "键盘交互", list: [], _focus: [], _init: function(can, target) { document.body.onclick = function(event) { if (window.webview) { if (event.target.tagName == "A") { can.user.open(event.target.href) } @@ -1087,7 +780,7 @@ Volcanos("onkeymap", {help: "键盘交互", list: [], _focus: [], _init: functio switch (event.key) { case "q": window.terminate(); break case "w": can.user.close(); break - case "r": location.reload(); break + case "r": can.user.reload(); break case "f": can.onengine.signal(can, "onopensearch", can.request({}, {type: "*"})); break case "[": history.back(); break case "]": history.forward(); break diff --git a/lib/user.js b/lib/user.js index 28668d27..79fd06d8 100644 --- a/lib/user.js +++ b/lib/user.js @@ -49,6 +49,12 @@ Volcanos("user", {help: "用户操作", info: {}, agent: { var list = can.user.language(can) == "en"? ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]: ["周日", "周一", "周二", "周三", "周四", "周五", "周六"] return can.base.Time(time, (fmt||"%y-%m-%d %H:%M:%S").replace("%w", list[now.getDay()])) }, + args: function(can) { + if (can.user.isExtension) { + return can.base.Obj(localStorage.getItem(ctx.ARGS), {}) + } + return {} + }, title: function(text) { if (window.webview) { return title(text) } @@ -108,7 +114,7 @@ Volcanos("user", {help: "用户操作", info: {}, agent: { {view: "duration", title: "点击关闭", onclick: function() { action.close() }}, can.base.isObject(meta.content)? meta.content: {text: [meta.content||"执行成功", html.DIV, "content"]}, - {view: chat.ACTION}, meta.progress != undefined && {view: "progress", style: {width: width}, list: [ + {view: html.ACTION}, meta.progress != undefined && {view: "progress", style: {width: width}, list: [ {view: "current", style: {width: (meta.progress||0)/100*width}}, ]}, ] }]) @@ -257,13 +263,13 @@ Volcanos("user", {help: "用户操作", info: {}, agent: { input: function(event, can, form, cb, button) { if (!form || form.length == 0) { return cb() } var msg = can.request(event) var ui = can.page.Append(can, document.body, [{view: [html.INPUT], style: {left: 0, top: 0}, list: [ - {view: "content", list: [{view: [chat.OPTION, html.TABLE], list: can.core.List(form, function(item) { + {view: "content", list: [{view: [html.OPTION, html.TABLE], list: can.core.List(form, function(item) { item = can.base.isString(item)? {type: html.TEXT, name: item}: item.length > 0? {type: html.SELECT, name: item[0], values: item.slice(1)}: item item.type = item.type||(item.values? html.SELECT: item.name == html.TEXT? html.TEXTAREA: html.TEXT) item._init = function(target) { item.run = function(event, cmds, cb) { - var _msg = can.request(event, {_handle: ice.TRUE, action: msg.Option(chat.ACTION)}, msg, can.Option()) + var _msg = can.request(event, {_handle: ice.TRUE, action: msg.Option(html.ACTION)}, msg, can.Option()) can.page.Select(can, ui.table, html.OPTION_ARGS, function(item) { item.name && item.value && _msg.Option(item.name, item.value) }) @@ -278,7 +284,7 @@ Volcanos("user", {help: "用户操作", info: {}, agent: { // return {type: html.TR, list: [{type: html.TD, list: [{text: item._trans||can.user.trans(can, item.name)||""}]}, {type: html.TD, list: [can.page.input(can, item)]} ]} return {type: html.TR, list: [{type: html.TD, list: [{text: item.name||""}]}, {type: html.TD, list: [can.page.input(can, item)]} ]} - })}]}, {view: chat.ACTION}, + })}]}, {view: html.ACTION}, ]}]) var layout = can.onlayout.figure(event, can, ui._target) diff --git a/page/index.js b/page/index.js index 66978095..c240092f 100644 --- a/page/index.js +++ b/page/index.js @@ -1,9 +1,9 @@ Volcanos({name: "chat", panels: [ - {name: "Header", help: "标题栏", pos: chat.HEAD, state: ["time", "usernick", "avatar"]}, + {name: "Header", help: "标题栏", pos: html.HEAD, state: ["time", "usernick", "avatar"]}, {name: "River", help: "群聊组", pos: html.LEFT, action: ["create", "refresh"]}, - {name: "Action", help: "工作台", pos: chat.MAIN}, - {name: "Footer", help: "状态条", pos: chat.FOOT, state: ["ncmd"]}, - {name: "Search", help: "搜索框", pos: chat.AUTO}, + {name: "Action", help: "工作台", pos: html.MAIN}, + {name: "Footer", help: "状态条", pos: html.FOOT, state: ["ncmd"]}, + {name: "Search", help: "搜索框", pos: html.AUTO}, ], main: {name: "Header", list: []}, river: { product: {name: "产品群", storm: { office: {name: "办公 office", list: [ diff --git a/panel/action.js b/panel/action.js index 23468ebc..a4ff0f76 100644 --- a/panel/action.js +++ b/panel/action.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg) { var river = can.Conf(chat.RIVER), storm = can.Conf(chat.STORM) can.onmotion.clear(can), can.core.Next(msg.Table(), function(item, next) { item.height = can.Conf(html.HEIGHT)-can.Conf(html.MARGIN_Y) @@ -47,8 +47,8 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg) can.search(event, ["Header.onmotion.hidden"]) can.search(event, ["Footer.onmotion.hidden"]) can.page.ClassList.add(can, can._target, "cmd") - can.Conf(html.HEIGHT, window.innerHeight) - can.Conf(html.WIDTH, window.innerWidth) + can.Conf(html.HEIGHT, can._root._height) + can.Conf(html.WIDTH, can._root._width) } can.Conf(html.MARGIN_X, 0, html.MARGIN_Y, 2*html.ACTION_HEIGHT) @@ -59,17 +59,17 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg) }) }, _cmd: function(can, item, next) { can.base.Copy(item, { - height: window.innerHeight-can.Conf(html.MARGIN_Y)+(can.user.isWindows? 17: 0), - width: window.innerWidth, + height: can._root._height-can.Conf(html.MARGIN_Y)+(can.user.isWindows? 17: 0), + width: can._root._width, opts: can.misc.Search(can), }) can.onappend.plugin(can, item, function(sub, meta, skip) { - can.page.style(can, sub._output, html.MAX_WIDTH, window.innerWidth) + can.page.style(can, sub._output, html.MAX_WIDTH, can._root._width) can.user.title(meta.name), skip || next() }) }, }) -Volcanos("onengine", {help: "解析引擎", list: [], _engine: function(event, page, msg, can, cmds, cb) { +Volcanos(chat.ONENGINE, {help: "解析引擎", list: [], _engine: function(event, page, msg, can, cmds, cb) { var storm = can.core.Value(can._root, can.core.Keys(chat.RIVER, cmds[0], chat.STORM, cmds[1])) if (!storm || cmds.length != 2) { return false } @@ -89,7 +89,7 @@ Volcanos("onengine", {help: "解析引擎", list: [], _engine: function(event, p } return true }}) -Volcanos("onaction", {help: "交互操作", list: [], _init: function(can, cb, target) { +Volcanos(chat.ONACTION, {help: "交互操作", list: [], _init: function(can, cb, target) { can.Conf(html.MARGIN_Y, 4*html.PLUGIN_MARGIN+2*html.ACTION_HEIGHT+html.ACTION_MARGIN) can.Conf(html.MARGIN_X, 4*html.PLUGIN_MARGIN) @@ -102,17 +102,19 @@ Volcanos("onaction", {help: "交互操作", list: [], _init: function(can, cb, t can.onengine.plugin(can, "parse", shy("解析", { "show": function(can, msg, cmds) { - can.onmotion.hidden(can, can._legend) - can.onmotion.hidden(can, can._option) - can.onmotion.hidden(can, can._status) + can.require(["/plugin/story/parse.js"], function() { + can.onmotion.hidden(can, can._legend) + can.onmotion.hidden(can, can._option) + can.onmotion.hidden(can, can._status) - can.ConfHeight(can.ConfHeight()+can.Conf(html.MARGIN_Y)-(can.user.isWindows? 17: 0)) + can.ConfHeight(can.ConfHeight()+can.Conf(html.MARGIN_Y)-(can.user.isWindows? 17: 0)) - can.onengine.listen(can, "menu", function(msg) { can.user.toast(can, msg.Option(html.ITEM)) }) - can.onengine.listen(can, "高级配置", function(msg) { can.user.toast(can, msg.Option(html.ITEM)) }) - can.onengine.listen(can, "h1", function(msg) { can.user.toast(can, "h1") }) + can.onengine.listen(can, "menu", function(msg) { can.user.toast(can, msg.Option(html.ITEM)) }) + can.onengine.listen(can, "高级配置", function(msg) { can.user.toast(can, msg.Option(html.ITEM)) }) + can.onengine.listen(can, "h1", function(msg) { can.user.toast(can, "h1") }) - can.onappend.parse(can, can.onappend._parse(can, cmds[0])) + can.onappend.parse(can, can.onappend._parse(can, cmds[0])) + }) }, }, ["text", "show:button@auto"], function(msg, cmds, cb) { can.run({}, cmds, cb, true) })) @@ -150,7 +152,7 @@ Volcanos("onaction", {help: "交互操作", list: [], _init: function(can, cb, t can.onengine.plugin(can, "can.code.inner.plugin", shy("插件", {}, [{type: "button", name: "list", action: "auto"}, "back"], function(msg, cmds) {})) target.ontouchstart = function(event) { - can.onengine.signal(can, "onaction_touch", can.request(event)) + can.onengine.signal(can, chat.ONACTION_TOUCH, can.request(event)) }, can.base.isFunc(cb) && cb() }, _menus: [ @@ -203,7 +205,7 @@ Volcanos("onaction", {help: "交互操作", list: [], _init: function(can, cb, t } can.run({}, [river, storm], function(msg) { if (msg.Length() > 0) { return can.onimport._init(can, msg) } - can.onengine.signal(can, "onaction_notool", can.request({}, {river: river, storm: storm})) + can.onengine.signal(can, chat.ONACTION_NOTOOL, can.request({}, {river: river, storm: storm})) }) }, onsearch: function(can, msg, word) { @@ -241,8 +243,8 @@ Volcanos("onaction", {help: "交互操作", list: [], _init: function(can, cb, t can.onlayout._init(can) }, }) -Volcanos("onkeymap", {help: "键盘交互", list: [], _focus: [], _init: function(can, target) { - can.onkeymap._build(can), can.onengine.listen(can, "onkeydown", function(msg, model) { +Volcanos(chat.ONKEYMAP, {help: "键盘交互", list: [], _focus: [], _init: function(can, target) { + can.onkeymap._build(can), can.onengine.listen(can, chat.ONKEYDOWN, function(msg, model) { can._keylist = can.onkeymap._parse(msg._event, can, model, can._keylist||[], can._output) }) }, @@ -278,7 +280,7 @@ Volcanos("onkeymap", {help: "键盘交互", list: [], _focus: [], _init: functio }, }, _engine: {}, }) -Volcanos("onexport", {help: "导出数据", list: [], +Volcanos(chat.ONEXPORT, {help: "导出数据", list: [], args: function(can, cb, target) { can.core.Next(can.page.Select(can, target, [[html.FIELDSET_PLUGIN, html.FORM_OPTION]]), function(item, next, index, array) { item.dataset.args = JSON.stringify(can.page.Select(can, item, html.OPTION_ARGS, function(item) { return item.value||"" })) @@ -289,8 +291,8 @@ Volcanos("onexport", {help: "导出数据", list: [], msg.Option(html.TOP, can._target.offsetTop) msg.Option(html.LEFT, can._target.offsetLeft) msg.Option(html.WIDTH, can._target.offsetWidth) - if (msg.Option(html.HEIGHT, can._target.offsetHeight-can._action.offsetHeight) > window.innerHeight) { - msg.Option(html.HEIGHT, window.innerHeight-2*html.ACTION_HEIGHT) + if (msg.Option(html.HEIGHT, can._target.offsetHeight-can._action.offsetHeight) > can._root._height) { + msg.Option(html.HEIGHT, can._root._height-2*html.ACTION_HEIGHT) } msg.Option(html.SCROLL, can.user.isMobile? can._target.parentNode.parentNode.scrollTop: can._output.scrollTop) msg.Option(html.MARGIN_X, can.Conf(html.MARGIN_X)) diff --git a/panel/footer.js b/panel/footer.js index 9d0dadf1..adec620b 100644 --- a/panel/footer.js +++ b/panel/footer.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { can.onmotion.clear(can) can.onimport._title(can, msg, target) can.onimport._state(can, msg, target) @@ -33,7 +33,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, }, _toast: function(can, msg, target) { can.toast = can.page.Append(can, target, [{view: chat.TOAST, onclick: function(event) { - can.show = can.show? (can.page.Remove(can, can.show), null): can.onappend.float(can, can._toast).first + can.show = can.show? (can.page.Remove(can, can.show), null): can.onimport.float(can, can._toast).first can.page.Modify(can, can.show, {style: {left: "", top: "", right: 0, bottom: can.onexport.height(can)}}) }}]).first }, @@ -46,7 +46,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, default: can.run(event, [ice.RUN].concat(can.core.Split(event.target.value, ice.SP)), function(msg) { can.cli && can.cli.close() - can.cli = can.onappend.float(can, msg, function(value, key, index, line, list) { + can.cli = can.onimport.float(can, msg, function(value, key, index, line, list) { }), can.page.Modify(can, can.cli.first, {style: {bottom: can.onexport.height(can), top: ""}}) }) @@ -64,8 +64,42 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, item.innerHTML = can.Conf(NCMD, parseInt(can.Conf(NCMD)||"0")+1+"")+"" }) }, + float: function(can, msg, cb) { + var ui = can.onappend.field(can, "story toast float", {}, can._root._target) + ui.close = function() { can.page.Remove(can, ui.first) } + + can.getActionSize(function(left, top, height, width) { + can.page.style(can, ui.output, html.MAX_HEIGHT, height-28, html.MAX_WIDTH, width) + can.page.style(can, ui.first, html.LEFT, left, html.TOP, top) + }) + + can.onappend._action(can, [cli.CLOSE, cli.REFRESH, {input: html.TEXT, placeholder: "filter", _init: function(input) { + can.onengine.signal(can, "keymap.focus", can.request({}, {cb: function(event) { + if (event.target.tagName == "INPUT") { return } + if (event.key == lang.ESCAPE) { ui.close(); return } + if (event.key == ice.SP) { input.focus(), can.onkeymap.prevent(event) } + }})) + }, onkeydown: function(event) { can.onkeymap.input(event, can) + if (event.key != lang.ENTER) { return } + event.target.setSelectionRange(0, -1) + + can.page.Select(can, ui.output, html.TR, function(tr, index) { if (index == 0) { return } + can.page.ClassList.add(can, tr, html.HIDDEN) + can.page.Select(can, tr, html.TD, function(td) { if (td.innerText.indexOf(event.target.value) > -1) { + can.page.ClassList.del(can, tr, html.HIDDEN) + } }) + }) + }}], ui.action, kit.Dict(cli.CLOSE, ui.close, cli.REFRESH, function(event) { ui.close(), can.toast.click()})) + + can.onappend.table(can, msg, function(value, key, index, line, list) { + return {text: [value, html.TD], onclick: function(event) { + can.base.isFunc(cb) && cb(value, key, index, line, list) + }} + }, ui.output), can.onappend.board(can, msg.Result(), ui.output) + return ui + }, }) -Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, cb, target) { +Volcanos(chat.ONACTION, {help: "交互数据", list: [], _init: function(can, cb, target) { if (can.user.mod.isPod) { can.onmotion.hidden(can, can._target) } else if (can.user.isMobile) { @@ -83,7 +117,7 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, cb, t }, _cmd: function(can) { - return can.onappend.float(can, can._cmds, function(value, key, index, line, list) { + return can.onimport.float(can, can._cmds, function(value, key, index, line, list) { var cmds = can.base.Obj(line.cmds); switch (line.follow) { case "chat.Action": cmds = cmds.slice(2); break case "chat.Footer": cmds = cmds.slice(2); break @@ -107,6 +141,6 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, cb, t }).first }, }) -Volcanos("onexport", {help: "导出数据", list: [], +Volcanos(chat.ONEXPORT, {help: "导出数据", list: [], height: function(can) { return can._target.offsetHeight }, }) diff --git a/panel/header.js b/panel/header.js index 86b74aee..a452341a 100644 --- a/panel/header.js +++ b/panel/header.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, cb, target) { can.Conf(aaa.USERNICK, msg.Option(aaa.USERNICK)||msg.Option(ice.MSG_USERNICK)||msg.Option(ice.MSG_USERNAME)||can.Conf(aaa.USERNICK)) can.user.info.usernick = can.Conf(aaa.USERNICK) can.user.info.avatar = msg.Option(aaa.AVATAR) @@ -142,7 +142,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, }) }]).first }, }) -Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, cb, target) { +Volcanos(chat.ONACTION, {help: "交互数据", list: [], _init: function(can, cb, target) { can.base.isFunc(cb) && cb() }, _menus: [["setting", chat.BLACK, chat.WHITE, chat.PRINT, "webpack", "toimage", ctx.CONFIG]], @@ -261,7 +261,7 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, cb, t clear: function(event, can) { can.onimport.background(event, can, ""), can.onimport.avatar(event, can, ""), can.user.reload(true) }, logout: function(event, can) { can.user.logout(can) }, }) -Volcanos("onexport", {help: "导出数据", list: [], +Volcanos(chat.ONEXPORT, {help: "导出数据", list: [], height: function(can) { return can._target.offsetHeight }, topic: function(can) { return can._topic }, }) diff --git a/panel/river.js b/panel/river.js index ce51a040..2b2a2cf5 100644 --- a/panel/river.js +++ b/panel/river.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, cb, target) { can.onmotion.clear(can), can.river_list = {}, can.storm_list = {} can.onimport._main(can, msg), can.onimport._menu(can, msg) @@ -52,7 +52,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, var show = can.onmotion.toggle(can, can._target); can.onlayout._init(can); return show }, }) -Volcanos("onengine", {help: "解析引擎", list: [], _engine: function(event, can, msg, panel, cmds, cb) { +Volcanos(chat.ONENGINE, {help: "解析引擎", list: [], _engine: function(event, can, msg, panel, cmds, cb) { var list = can._root.river cmds.length == 0 && can.core.ItemSort(list, "order", function(key, value) { if (can.core.Item(value.storm).length == 0) { return } @@ -64,7 +64,7 @@ Volcanos("onengine", {help: "解析引擎", list: [], _engine: function(event, c msg.Push({hash: key, name: can.user.language(can) == "en"? key: value.name}) // 应用列表 }), can.base.isFunc(cb) && cb(msg); return true }}) -Volcanos("onaction", {help: "控件交互", list: [], _init: function(can, cb, target) { +Volcanos(chat.ONACTION, {help: "控件交互", list: [], _init: function(can, cb, target) { can.onmotion.hidden(can, target), can.base.isFunc(cb) && cb() }, onlogin: function(can, msg) { @@ -131,7 +131,7 @@ Volcanos("onaction", {help: "控件交互", list: [], _init: function(can, cb, t can.misc.Search(can, args) }, }) -Volcanos("ondetail", {help: "菜单交互", +Volcanos(chat.ONDETAIL, {help: "菜单交互", list: ["共享群组", "添加应用", "添加设备", "添加用户", "重命名群组", "删除群组"], sublist: ["共享应用", "添加工具", "保存参数", "重命名应用", "删除应用"], _menus: [ @@ -230,7 +230,7 @@ Volcanos("ondetail", {help: "菜单交互", }) }, }) -Volcanos("onexport", {help: "导出数据", list: [], +Volcanos(chat.ONEXPORT, {help: "导出数据", list: [], width: function(can) { return can._target.offsetWidth }, storm: function(can, msg, word) { var fields = (msg.Option(ice.MSG_FIELDS)||"ctx,cmd,type,name,text").split(",") diff --git a/panel/search.js b/panel/search.js index 52afc03d..4eb1cdaf 100644 --- a/panel/search.js +++ b/panel/search.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { can.list = msg.Table(), can.onmotion.clear(can, can.ui.content) var table = can.onappend.table(can, msg, function(value, key, index, line, array) { can.Status(mdb.TOTAL, index+1) return {text: [key == mdb.TEXT && can.base.isFunc(line.text) && line.text.help || value, html.TD], onclick: function(event) { @@ -49,7 +49,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, }) }, }) -Volcanos("onaction", {help: "交互操作", list: [cli.CLEAR, cli.CLOSE, cli.DONE], _init: function(can, cb, target) { +Volcanos(chat.ONACTION, {help: "交互操作", list: [cli.CLEAR, cli.CLOSE, cli.DONE], _init: function(can, cb, target) { can.onmotion.hidden(can, can._target) can.base.isFunc(cb) && cb() }, @@ -117,7 +117,7 @@ Volcanos("onaction", {help: "交互操作", list: [cli.CLEAR, cli.CLOSE, cli.DON }, can.ui.profile) }, }) -Volcanos("onexport", {help: "导出数据", list: [], +Volcanos(chat.ONEXPORT, {help: "导出数据", list: [], select: function(can) { return can.page.Select(can, can.ui.display, html.TR, function(tr) { return can.page.Select(can, tr, html.TD, function(td) { return td.innerHTML }) diff --git a/plugin/input.js b/plugin/input.js index a6adc948..9a40730b 100644 --- a/plugin/input.js +++ b/plugin/input.js @@ -1,4 +1,4 @@ -Volcanos("onaction", {help: "控件交互", list: [], _init: function(can, meta, cb, target) { +Volcanos(chat.ONACTION, {help: "控件交互", list: [], _init: function(can, meta, cb, target) { can.base.isFunc(cb) && cb(); switch (meta.type) { case html.SELECT: meta.value && (target.value = meta.value); break case html.BUTTON: meta.action == ice.AUTO && target.click(); break diff --git a/plugin/input/date.js b/plugin/input/date.js index d85e54c3..b7d7e15f 100644 --- a/plugin/input/date.js +++ b/plugin/input/date.js @@ -1,4 +1,4 @@ -Volcanos("onfigure", {help: "控件详情", list: [], date: {onclick: function(event, can, meta, cb, target) { cb(function(can, cbs) { +Volcanos(chat.ONFIGURE, {help: "控件详情", list: [], date: {onclick: function(event, can, meta, cb, target) { cb(function(can, cbs) { function set(now) { target.value = can.user.time(can, now), can.close(), meta && meta.action == ice.AUTO && can.run({}) } // 添加控件 diff --git a/plugin/input/key.js b/plugin/input/key.js index 0a1e6d5f..c02bad18 100644 --- a/plugin/input/key.js +++ b/plugin/input/key.js @@ -1,4 +1,4 @@ -Volcanos("onfigure", {help: "控件详情", list: [], key: { +Volcanos(chat.ONFIGURE, {help: "控件详情", list: [], key: { _init: function(can, msg, target) { var call = arguments.callee; target._msg = msg can.onmotion.clear(can), can.onappend.table(can, msg, function(value, key, index, line) { return {text: [value, html.TD], onclick: function(event) { target.value = line[key] diff --git a/plugin/input/province.js b/plugin/input/province.js index 3cfcfb30..3317d2a7 100644 --- a/plugin/input/province.js +++ b/plugin/input/province.js @@ -1,4 +1,4 @@ -Volcanos("onfigure", {help: "控件详情", list: [], province: {onclick: function(event, can, meta, cb, target) { cb(function(can, cbs) { +Volcanos(chat.ONFIGURE, {help: "控件详情", list: [], province: {onclick: function(event, can, meta, cb, target) { cb(function(can, cbs) { can.require(["/require/shylinux.com/x/echarts/echarts.js", "/require/shylinux.com/x/echarts/china.js"], function() { var china_chart = echarts.init(can.page.Append(can, can._output, [{type: html.DIV, style: {width: 600, height: 400}}]).first) china_chart.setOption({geo: {map: 'china'}}), china_chart.on(html.CLICK, function (params) { diff --git a/plugin/local/chat/div.js b/plugin/local/chat/div.js index 96f8e506..06630a45 100644 --- a/plugin/local/chat/div.js +++ b/plugin/local/chat/div.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { var meta = {}; msg.Table(function(value) { meta[value.key] = value.value }) can._meta = can.base.Obj(meta.text, {meta: {name: meta.name||"hi"}, list: []}) can.base.isFunc(cb) && cb(msg) @@ -21,7 +21,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.onmotion.hidden(can, can._action) } if (can.user.mod.isCmd || can.user.mod.isDiv) { - width = window.innerWidth, height = window.innerHeight + width = can._root._width, height = can._root._height can.page.Modify(can, can._output, {style: {width: width, height: height}}) } return width @@ -76,7 +76,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, return field }, }, ["/plugin/local/chat/div.css"]) -Volcanos("onaction", {help: "操作数据", list: [], +Volcanos(chat.ONACTION, {help: "操作数据", list: [], "添加": function(event, can) { can.user.input(event, can, [mdb.NAME, ctx.INDEX, ctx.ARGS, ctx.STYLE, html.HEIGHT, html.WIDTH], function(event, button, data, list, args) { can.current._add({meta: data, list: []}) @@ -91,4 +91,4 @@ Volcanos("onaction", {help: "操作数据", list: [], can.onmotion.share(event, can, [], [mdb.LINK, can.misc.MergeURL(can, {_path: "/chat/div/"+can.Option("hash")})]) }, }) -Volcanos("onexport", {help: "导出数据", list: []}) +Volcanos(chat.ONEXPORT, {help: "导出数据", list: []}) diff --git a/plugin/local/chat/media.js b/plugin/local/chat/media.js index 61b8292f..e883864a 100644 --- a/plugin/local/chat/media.js +++ b/plugin/local/chat/media.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { can.ui = can.onlayout.display(can, target) can.ui.canvas = can.page.Append(can, can.ui.display, [{type: "canvas", width: 320, height: 240, style: {display: "none"}}]).first @@ -14,7 +14,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.base.isFunc(cb) && cb(msg) }, }) -Volcanos("onaction", {help: "操作数据", list: [], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONACTION, {help: "操作数据", list: [], _init: function(can, msg, list, cb, target) { }, open: function(event, can) { @@ -31,5 +31,5 @@ Volcanos("onaction", {help: "操作数据", list: [], _init: function(can, msg, can.page.Append(can, can.ui.display, [{type: "img", src: can.ui.canvas.toDataURL('image/webp')}]) }, }) -Volcanos("onexport", {help: "导出数据", list: [], +Volcanos(chat.ONEXPORT, {help: "导出数据", list: [], }) diff --git a/plugin/local/chat/trans.js b/plugin/local/chat/trans.js index 9755313e..70b94dea 100644 --- a/plugin/local/chat/trans.js +++ b/plugin/local/chat/trans.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { can.onmotion.clear(can) can.from = can.onimport._plugin(can, nfs.DIR, html.LEFT, "from", "to") can.to = can.onimport._plugin(can, nfs.DIR, html.RIGHT, "to", "from") @@ -21,7 +21,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, }) }, }) -Volcanos("onaction", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONACTION, {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { }, send: function(can, from, to, event, cmds, cb) { var _from = can[from], _to = can[to] var path = can.request(event).Option(nfs.PATH) diff --git a/plugin/local/chat/wx.js b/plugin/local/chat/wx.js index b546f763..a38751d3 100644 --- a/plugin/local/chat/wx.js +++ b/plugin/local/chat/wx.js @@ -1,4 +1,4 @@ -Volcanos("onaction", {source: function(can, msg) { +Volcanos(chat.ONACTION, {source: function(can, msg) { can.require(["https://res.wx.qq.com/open/js/jweixin-1.6.0.js"], function(can) { wx.config({debug: msg.Option("debug") == ice.TRUE, appId: msg.Option("appid"), signature: msg.Option("signature"), diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index cd7d4257..b683ac3e 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, target) { can.onengine.plugin(can, "can.code.inner.plugin", shy("插件", {}, [ice.LIST, ice.BACK], function(msg, cmds) { console.log("what") })) @@ -24,7 +24,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target })) can.onengine.listen(can, "orientationchange", function(event) { - if (can.user.mod.isCmd) { can.ConfHeight(window.innerHeight), can.ConfWidth(window.innerWidth) } + if (can.user.mod.isCmd) { can.ConfHeight(can._root._height), can.ConfWidth(can._root._width) } can.user.toast(can, can.ConfHeight()+"") can.onimport.layout(can) }) @@ -63,7 +63,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target _simple: function(can, target) { can.tabview[can.onexport.keys(can)] = can._msg can.Conf(html.HEIGHT, ""), can.ui.project._toggle() - can.page.ClassList.add(can, can._fields, chat.OUTPUT) + can.page.ClassList.add(can, can._fields, html.OUTPUT) can.page.ClassList.add(can, can._fields, "simple") can.onmotion.hidden(can, can.ui._tabs) }, @@ -172,19 +172,19 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target } can.run(can.request({}, {dir_root: path, dir_deep: true}), [ice.PWD], function(msg) { can._file = msg.Table() can.core.List(can._file, function(item) { if (can.Option(nfs.FILE).indexOf(item.path) == 0) { item.expand = true } }) - can.onappend.tree(can, can._file, nfs.PATH, ice.PS, function(event, item) { + can.onimport.tree(can, can._file, nfs.PATH, ice.PS, function(event, item) { can.onimport.tabview(can, path, item.path) }, list), can.onimport.layout(can), can.Status("文件数", msg.Length()), next() }, true) }, function() { can.base.isFunc(cb) && cb() }) can.run(can.request({}, {fields: "index"}), [ctx.ACTION, ctx.COMMAND, "search", "command"], function(msg) { - can.onappend.tree(can, msg.Table(), ctx.INDEX, ice.PT, function(event, item) { + can.onimport.tree(can, msg.Table(), ctx.INDEX, ice.PT, function(event, item) { can.onimport.tabview(can, can.Option(nfs.PATH), item.index, ctx.INDEX) }, project.module) }) - can.onappend.tree(can, can.core.Item(can.onengine.plugin.meta, function(key) { return {index: can.base.trimPrefix(key, "can.")} }), ctx.INDEX, ice.PT, function(event, item) { + can.onimport.tree(can, can.core.Item(can.onengine.plugin.meta, function(key) { return {index: can.base.trimPrefix(key, "can.")} }), ctx.INDEX, ice.PT, function(event, item) { can.onimport.tabview(can, can.Option(nfs.PATH), "can."+item.index, ctx.INDEX) }, project.plugin) }, @@ -198,7 +198,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target function show(msg) { can.tabview[key] = msg var skip2 = skip - msg._tab = can.onappend.tabs(can, [{name: file.split(msg.Option(nfs.LINE) == ctx.INDEX? ice.PT: ice.PS).pop(), text: file}], function(event, meta) { + msg._tab = can.onimport.tabs(can, [{name: file.split(msg.Option(nfs.LINE) == ctx.INDEX? ice.PT: ice.PS).pop(), text: file}], function(event, meta) { can.onimport.tabview(can, path, file, "", cb, false, skip2), cb = null, skip2 = false }, function(item) { delete(can.tabview[key]) }, can.ui._tabs, function(item) { can.page.Modify(can, item, {onmouseenter: function(event) { @@ -276,7 +276,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target if (!height && can.Conf("mode") == "simple") { return } var height = can.ConfHeight()-(can.user.isMobile && can.user.mod.isCmd? (can.user.isLandscape()? 14: 54): 0)-(can.user.isWindows? 20: 0) - if (!height || height > window.innerHeight) { height = window.innerHeight - 200 } + if (!height || height > can._root._height) { height = can._root._height - 200 } if (can.user.isMobile && can.user.isLandscape() && height < 200) { height = 400 } if (can.user.mod.isCmd) { can.page.styleHeight(can, can.ui.project, height+2*html.ACTION_HEIGHT) @@ -321,8 +321,54 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target }) }) }, + tabs: function(can, list, cb, cbs, action, each) { action = action||can._action + return can.page.Append(can, action, can.core.List(list, function(meta) { + return {text: [meta.name, html.DIV, html.TABS], title: meta.text, onclick: function(event) { + can.onmotion.select(can, action, "div.tabs", event.target) + can.base.isFunc(cb) && cb(event, meta) + }, _init: function(item) { const OVER = "over" + function close(item) { var next = item.nextSibling||item.previousSibling + item._close(item) || can.page.Remove(can, item), next && next.click() + } + can.page.Modify(can, item, {draggable: true, _close: cbs, + onmouseenter: function(event) { + can.user.carte(event, can, kit.Dict( + "close tab", function(event) { close(item) }, + "close other", function(event) { + can.page.Select(can, action, html.DIV_TABS, function(_item) { _item == item || close(_item) }) + }, + "close all", function(event) { can.page.Select(can, action, html.DIV_TABS, close) } + ), ["close tab", "close other", "close all"]) + }, + ondragstart: function(event) { var target = event.target; target.click() + action._drop = function(event, before) { action.insertBefore(target, before) } + }, + ondragover: function(event) { event.preventDefault(), action._drop(event, event.target) }, + ondrop: function(event) { event.preventDefault(), action._drop(event, event.target) }, + }), can.core.Timer(10, function() { item.click() }) + can.base.isFunc(each) && each(item) + }} + })).first + }, + tree: function(can, list, field, split, cb, target, node) { + node = node||{"": target}; can.core.List(list, function(item) { + item[field] && can.core.List(item[field].split(split), function(value, index, array) { if (!value) { return } + var last = array.slice(0, index).join(split), name = array.slice(0, index+1).join(split) + if (node[name]) { return } + var ui = can.page.Append(can, node[last], [{view: "item", list: [{view: ["switch", "div", (index==array.length-1?"":"⌃")]}, {view: ["name", html.DIV, value+(index==array.length-1?"":"")]}], onclick: function(event) { + index < array.length - 1? can.onmotion.toggle(can, node[name], function() { + can.page.ClassList.add(can, ui["switch"], "open") + }, function() { + can.page.ClassList.del(can, ui["switch"], "open") + }): can.base.isFunc(cb) && cb(event, item) + if (node[name].childElementCount == 2) { node[name].firstChild.click() } + }}, {view: html.LIST, style: {display: html.NONE}, _init: function(list) { item.expand && can.page.style(can, list, html.DISPLAY, html.BLOCK) }}]) + node[name] = ui.list + }) + }); return node + }, }, [""]) -Volcanos("onsyntax", {help: "语法高亮", list: ["keyword", "prefix", "line"], _init: function(can, msg, cb, skip) { +Volcanos(chat.ONSYNTAX, {help: "语法高亮", list: ["keyword", "prefix", "line"], _init: function(can, msg, cb, skip) { if (msg.Option(ctx.INDEX)) { can.ui._path.innerText = msg.Option(nfs.FILE) } else { @@ -411,7 +457,7 @@ Volcanos("onsyntax", {help: "语法高亮", list: ["keyword", "prefix", "line"], return line }, }) -Volcanos("onkeymap", {help: "导入数据", _init: function(can, msg, cb, target) { +Volcanos(chat.ONKEYMAP, {help: "导入数据", _init: function(can, msg, cb, target) { }, _plugin: function(event, can) {}, _normal: function(event, can) {}, @@ -444,7 +490,7 @@ Volcanos("onkeymap", {help: "导入数据", _init: function(can, msg, cb, target }, }, _engine: {}, }) -Volcanos("onaction", {help: "控件交互", list: ["搜索", "打开", "添加", "插件", "扩展"], +Volcanos(chat.ONACTION, {help: "控件交互", list: ["搜索", "打开", "添加", "插件", "扩展"], _trans: {width: "宽度", height: "高度", website: "网页"}, "加载": function(event, can) { var file = can.base.Path("/require/", can.Option(nfs.PATH), can.Option(nfs.FILE)) @@ -523,10 +569,10 @@ Volcanos("onaction", {help: "控件交互", list: ["搜索", "打开", "添加", "全屏": function(event, can) { if (can.page.ClassList.neg(can, can._fields, "full")) { can.onmotion.hidden(can, can.ui.project) - can.ConfHeight(window.innerHeight) + can.ConfHeight(can._root._height) } else { can.onmotion.hidden(can, can.ui.project, true) - can.ConfHeight(window.innerHeight-2*html.ACTION_HEIGHT) + can.ConfHeight(can._root._height-2*html.ACTION_HEIGHT) } can.onimport.layout(can) }, @@ -618,7 +664,7 @@ Volcanos("onaction", {help: "控件交互", list: ["搜索", "打开", "添加", }) }, }) -Volcanos("onexport", {help: "导出数据", list: ["文件数", "解析器", "文件名", "当前行", "跳转数", "标签数"], +Volcanos(chat.ONEXPORT, {help: "导出数据", list: ["文件数", "解析器", "文件名", "当前行", "跳转数", "标签数"], sess: function(can) { localStorage.setItem("web.code.inner.sess", JSON.stringify({ "tabs": can.onexport.tabs(can), "plug": can.onexport.plug(can), "exts": can.onexport.exts(can), diff --git a/plugin/local/code/inner/favor.js b/plugin/local/code/inner/favor.js index 8c333418..c1566c7b 100644 --- a/plugin/local/code/inner/favor.js +++ b/plugin/local/code/inner/favor.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", _init: function(can, args, cb) { +Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, args, cb) { can.onimport.toolkit(can, {index: "web.code.favor"}, function(sub) { sub.run = function(event, cmds, cb) { var msg = can.request(event) if (can.misc.runAction(can, msg, cmds, cb, kit.Dict( diff --git a/plugin/local/code/inner/search.js b/plugin/local/code/inner/search.js index 142a217f..8b3517f8 100644 --- a/plugin/local/code/inner/search.js +++ b/plugin/local/code/inner/search.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", _init: function(can, args, cb) { var history = []; const SEARCH = "can.code.inner.search" +Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, args, cb) { var history = []; const SEARCH = "can.code.inner.search" function show(msg, word) { if (!msg) { return } history.push(msg); var sub = msg._can; sub.Option("word", word||msg._word) !sub.page.ClassList.has(sub, sub._legend, "select") && can.ui.search.select() sub.onmotion.clear(sub), sub.onappend.table(sub, msg, function(value, key, index, line) { diff --git a/plugin/local/code/inner/sess.js b/plugin/local/code/inner/sess.js index d90d64a1..03a00cb3 100644 --- a/plugin/local/code/inner/sess.js +++ b/plugin/local/code/inner/sess.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", _init: function(can, args, cb) { var SESS = "web.code.sess" +Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, args, cb) { var SESS = "web.code.sess" can.onimport.toolkit(can, {index: SESS}, function(sub) { sub.run = function(event, cmds, cb) { var msg = can.request(event) if (can.misc.runAction(can, msg, cmds, cb, kit.Dict( diff --git a/plugin/local/code/inner/template.js b/plugin/local/code/inner/template.js index 44abf545..0fbcfcf1 100644 --- a/plugin/local/code/inner/template.js +++ b/plugin/local/code/inner/template.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", _init: function(can, args, cb) { +Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, args, cb) { can.onimport.toolkit(can, {index: "web.code.template"}, function(sub) { sub.run = function(event, cmds, cb) { var msg = sub.request(event, can.Option()) if (can.misc.runAction(can, msg, cmds, cb, kit.Dict( diff --git a/plugin/local/code/snippet.js b/plugin/local/code/snippet.js index 6cbf9d38..eb2783f8 100644 --- a/plugin/local/code/snippet.js +++ b/plugin/local/code/snippet.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { can.onmotion.clear(can) if (msg.Option("content")) { can.onappend.plugin(can, {index: "web.code.vimer", style: "full"}, function(sub) { @@ -19,7 +19,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.onappend.board(can, msg) }, }) -Volcanos("onaction", {help: "操作数据", list: [], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONACTION, {help: "操作数据", list: [], _init: function(can, msg, list, cb, target) { }, run: function(event, can, msg) { can.run(event, [ctx.ACTION, ice.RUN, "go", "hi.go", can.sub.onexport.content(can.sub)], function(msg) { @@ -27,5 +27,5 @@ Volcanos("onaction", {help: "操作数据", list: [], _init: function(can, msg, }, true) }, }) -Volcanos("onexport", {help: "导出数据", list: [], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONEXPORT, {help: "导出数据", list: [], _init: function(can, msg, list, cb, target) { }}) diff --git a/plugin/local/code/vimer.js b/plugin/local/code/vimer.js index 8abac5a7..6ec985da 100644 --- a/plugin/local/code/vimer.js +++ b/plugin/local/code/vimer.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, cb, target) { can.require(["inner.js"], function(can) { can.onimport.inner_init(can, msg, function() { can.undo = [], can.redo = [] can.onkeymap._build(can), can.onimport._input(can), can.onkeymap._plugin({}, can), can.base.isFunc(cb) && cb(msg) @@ -26,7 +26,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, ]); can.ui.current = ui.current, can.ui.complete = ui.complete }, }, [""]) -Volcanos("onkeymap", {help: "键盘交互", list: [], +Volcanos(chat.ONKEYMAP, {help: "键盘交互", list: [], _model: function(can, value) { can.Status("模式", can.mode = value) can.page.Modify(can, can.ui.current, {className: ["current", can.mode]}), value can.page.Modify(can, can.ui.complete, {className: ["complete", can.mode]}), value @@ -171,7 +171,7 @@ Volcanos("onkeymap", {help: "键盘交互", list: [], }, }, _engine: {}, }) -Volcanos("onaction", {help: "控件交互", list: [nfs.SAVE, code.AUTOGEN, code.COMPILE, nfs.SCRIPT, chat.WEBSITE, web.DREAM, code.PUBLISH], +Volcanos(chat.ONACTION, {help: "控件交互", list: [nfs.SAVE, code.AUTOGEN, code.COMPILE, nfs.SCRIPT, chat.WEBSITE, web.DREAM, code.PUBLISH], _run: function(event, can, button, args, cb) { can.runAction(event, button, args, cb||function(msg) { can.onimport.tabview(can, can.Option(nfs.PATH), msg.Option(nfs.FILE)) @@ -335,4 +335,4 @@ Volcanos("onaction", {help: "控件交互", list: [nfs.SAVE, code.AUTOGEN, code. }) }, }) -Volcanos("onexport", {help: "导出数据", list: ["文件数", "模式", "按键", "解析器", "文件名", "当前行", "跳转数"]}) +Volcanos(chat.ONEXPORT, {help: "导出数据", list: ["文件数", "模式", "按键", "解析器", "文件名", "当前行", "跳转数"]}) diff --git a/plugin/local/team/plan.js b/plugin/local/team/plan.js index 3e933661..a6b64859 100644 --- a/plugin/local/team/plan.js +++ b/plugin/local/team/plan.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { can.onmotion.clear(can, target) can.ui = can.onlayout.profile(can) can.onimport[can.Option("scale")||"week"](can, msg) @@ -46,7 +46,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, } }, draggable: time != undefined, title: can.onexport.title(can, task), _init: function(target) { - var item = can.onappend.item(can, html.ITEM, {nick: task.name+":"+task.text}, function() { + var item = can.onimport.item(can, html.ITEM, {nick: task.name+":"+task.text}, function() { can.core.Timer(10, function() { can.onmotion.select(can, can.ui.content, html.TD, target.parentNode) }) can.onimport._profile(can, task) }, function() { @@ -147,7 +147,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.onimport._content(can, msg, head, list, key, get, set) }, }, [""]) -Volcanos("onaction", {help: "组件交互", list: [ +Volcanos(chat.ONACTION, {help: "组件交互", list: [ "insert", "export", "import", ["level", "all", "l1", "l2", "l3", "l4", "l5"], ["status", "all", "prepare", "process", "cancel", "finish"], @@ -188,7 +188,7 @@ Volcanos("onaction", {help: "组件交互", list: [ can.onimport[can.Option("scale")](can, can._msg) }, }) -Volcanos("onexport", {help: "导出数据", list: ["count", "begin_time", "zone", "id", "type", "name", "text"], +Volcanos(chat.ONEXPORT, {help: "导出数据", list: ["count", "begin_time", "zone", "id", "type", "name", "text"], name: function(can, task) { return task.name }, text: function(can, task) { return task.name+": "+(task.text||"") }, level: function(can, task) { return "l-"+(task.level||3)+": "+(task.name||"") }, diff --git a/plugin/local/wiki/data.js b/plugin/local/wiki/data.js index a0b996e8..a533be0f 100644 --- a/plugin/local/wiki/data.js +++ b/plugin/local/wiki/data.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, list, cb) { can.ui = can.onlayout.display(can) can.base.isFunc(cb) && cb(msg) @@ -18,7 +18,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.onaction._compute(event, can) }, }) -Volcanos("onfigure", {help: "组件菜单", list: [], +Volcanos(chat.ONFIGURE, {help: "组件菜单", list: [], "求和": function(event, can, res, td, index) { res[index] = parseInt(td.innerText) + (res[index]||0); }, @@ -37,7 +37,7 @@ Volcanos("onfigure", {help: "组件菜单", list: [], } }, }) -Volcanos("onaction", {help: "组件菜单", list: ["保存", ["mode", "全选", "块选", "反选", "多选", "拖动", "编辑"], ["some", "求和", "最大", "最小", "平均"]], +Volcanos(chat.ONACTION, {help: "组件菜单", list: ["保存", ["mode", "全选", "块选", "反选", "多选", "拖动", "编辑"], ["some", "求和", "最大", "最小", "平均"]], _compute: function(event, can) { var mul = "tr" + (can.Action("mode") == "全选"? "": ".select") var method = can.onfigure[can.Action("some")], res = {} @@ -122,7 +122,7 @@ Volcanos("onaction", {help: "组件菜单", list: ["保存", ["mode", "全选", }) }, }) -Volcanos("ondetail", {help: "组件详情", list: ["复制", "删除"], +Volcanos(chat.ONDETAIL, {help: "组件详情", list: ["复制", "删除"], "复制": function(event, can, cmd, value, key, index, line) { var end = can.page.Append(can, can.table, [{type: "tr", list: can.core.List(can._msg.append, function(key) { return {text: [line[key], "td"]} @@ -133,7 +133,7 @@ Volcanos("ondetail", {help: "组件详情", list: ["复制", "删除"], can.page.Remove(can, event.target.parentNode) }, }) -Volcanos("onexport", {help: "导出数据", list: [], +Volcanos(chat.ONEXPORT, {help: "导出数据", list: [], file: function(can) { return can.page.Select(can, can.ui.content, "tr", function(tr) { return can.page.Select(can, tr, "th,td", function(td) {return td.innerHTML}).join(",") diff --git a/plugin/local/wiki/draw.js b/plugin/local/wiki/draw.js index 2973edb4..24289867 100644 --- a/plugin/local/wiki/draw.js +++ b/plugin/local/wiki/draw.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { can.onmotion.clear(can), can.onmotion.hidden(can, can._action) can.onimport._show(can, msg), can.base.isFunc(cb) && cb(msg) can.keylist = [], can.onkeymap._build(can) @@ -37,7 +37,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.Action(key, target.Value(key)||can.Action(key)) }) } - return (name || target == can.svg) && can.onappend.item(can, html.ITEM, {name: name||html.SVG}, function(event) { show(event) + return (name || target == can.svg) && can.onimport.item(can, html.ITEM, {name: name||html.SVG}, function(event) { show(event) can.onaction.show(event, can) }, function(event) { can.user.carteRight(event, can, can.onaction, [ice.HIDE, ice.SHOW, mdb.CREATE, cli.CLEAR, mdb.REMOVE]) @@ -114,7 +114,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, return value._init && value._init(item), item }, }, ["/plugin/local/wiki/draw.css"]) -Volcanos("onfigure", {help: "图形绘制", list: [], +Volcanos(chat.ONFIGURE, {help: "图形绘制", list: [], _get: function(can, item, name) { return can.onfigure[name]||can.onfigure[item.getAttribute(mdb.NAME)]||can.onfigure[item.tagName] }, @@ -215,7 +215,7 @@ Volcanos("onfigure", {help: "图形绘制", list: [], show: function(can, target, figure) { return "<("+(target.Val("y2")-target.Val("y1"))+ice.FS+(target.Val("x2")-target.Val("x1"))+")"+can.onexport._position(can, target, figure) }, }, }, []) -Volcanos("onkeymap", {help: "键盘交互", list: [], +Volcanos(chat.ONKEYMAP, {help: "键盘交互", list: [], _mode: { normal: { gr: function(event, can) { can.Action("go", "run") }, @@ -251,7 +251,7 @@ Volcanos("onkeymap", {help: "键盘交互", list: [], }, }, _engine: {}, }) -Volcanos("onaction", {help: "组件菜单", list: [ +Volcanos(chat.ONACTION, {help: "组件菜单", list: [ ["stroke-width", 1, 2, 3, 4, 5], ["stroke", cli.RED, cli.YELLOW, cli.GREEN, cli.CYAN, cli.BLUE, cli.PURPLE, cli.BLACK, cli.WHITE], ["fill", cli.RED, cli.YELLOW, cli.GREEN, cli.CYAN, cli.BLUE, cli.PURPLE, cli.BLACK, cli.WHITE, "#0000"], @@ -388,7 +388,7 @@ Volcanos("onaction", {help: "组件菜单", list: [ can.ondetail.label(event, can) }, }) -Volcanos("ondetail", {help: "组件详情", list: [cli.START, ice.RUN, ice.COPY, html.LABEL, mdb.MODIFY, "toimage", mdb.DELETE], +Volcanos(chat.ONDETAIL, {help: "组件详情", list: [cli.START, ice.RUN, ice.COPY, html.LABEL, mdb.MODIFY, "toimage", mdb.DELETE], start: function(event, can) { var target = event.target var list = [target], dict = {} for (var i = 0; i < list.length; i++) { var ship = list[i].Value("ship") @@ -454,7 +454,7 @@ Volcanos("ondetail", {help: "组件详情", list: [cli.START, ice.RUN, ice.COPY, can.page.Remove(can, target) }, }) -Volcanos("onexport", {help: "导出数据", list: ["group", "figure", "index", "pos"], +Volcanos(chat.ONEXPORT, {help: "导出数据", list: ["group", "figure", "index", "pos"], _show: function(can, target) { var figure = can.onfigure._get(can, target) function show() { return can.onexport._size(can, target, figure)+ice.SP+can.onexport._position(can, target, figure) } can.Status("figure", target.tagName+":"+target.Value("pid")+ice.SP+(figure? (figure.show||show)(can, target, figure): "")) diff --git a/plugin/local/wiki/draw/path.js b/plugin/local/wiki/draw/path.js index e04eb1f1..7714d8db 100644 --- a/plugin/local/wiki/draw/path.js +++ b/plugin/local/wiki/draw/path.js @@ -1,4 +1,4 @@ -Volcanos("onfigure", {help: "图形绘制", list: [], +Volcanos(chat.ONFIGURE, {help: "图形绘制", list: [], path2v: { // data: {name: "path", size: {}, copy: []}, draw: function(event, can, point) { diff --git a/plugin/local/wiki/draw/walk_trash.js b/plugin/local/wiki/draw/walk_trash.js index 0e7ca90e..24ae647b 100644 --- a/plugin/local/wiki/draw/walk_trash.js +++ b/plugin/local/wiki/draw/walk_trash.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], init: function(can, msg, cb, output, action, option) {output.innerHTML = ""; if (!msg.result || msg.result.length == 0) { var table = can.page.AppendTable(can, msg, output, msg.append); diff --git a/plugin/local/wiki/feel.js b/plugin/local/wiki/feel.js index 7218bda5..24fe0178 100644 --- a/plugin/local/wiki/feel.js +++ b/plugin/local/wiki/feel.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { can.path = can.request(), can.list = [], msg.Table(function(value) { value.path.lastIndexOf(ice.PS)==value.path.length-1? can.path.Push(value): can.list.push(value) }) @@ -29,7 +29,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.Status({begin: begin, limit: limit, total: can.list.length}) }, }, ["/plugin/local/wiki/feel.css"]) -Volcanos("onfigure", {help: "组件菜单", list: [], +Volcanos(chat.ONFIGURE, {help: "组件菜单", list: [], png: function(can, path, index) { return can.onfigure.image(can, path, index) }, jpg: function(can, path, index) { return can.onfigure.image(can, path, index) }, jpeg: function(can, path, index) { return can.onfigure.image(can, path, index) }, @@ -55,7 +55,7 @@ Volcanos("onfigure", {help: "组件菜单", list: [], m4v: function(can, path) { return can.onfigure.video(can, path) }, mov: function(can, path) { return can.onfigure.video(can, path) }, }) -Volcanos("onaction", {help: "组件菜单", list: [ +Volcanos(chat.ONACTION, {help: "组件菜单", list: [ ["height", 100, 200, 400, 600, 800], ["limit", 1, 3, 6, 9, 12, 15, 20, 30], ["rate", 0.1, 0.2, 0.5, 1, 2, 3, 5, 10], @@ -83,7 +83,7 @@ Volcanos("onaction", {help: "组件菜单", list: [ }) }) }, }) -Volcanos("ondetail", {help: "组件菜单", list: ["关闭", "下载", "删除", "上一个", "下一个", "设置头像", "设置背景", "复制链接"], _init: function(can, index) { +Volcanos(chat.ONDETAIL, {help: "组件菜单", list: ["关闭", "下载", "删除", "上一个", "下一个", "设置头像", "设置背景", "复制链接"], _init: function(can, index) { can.onappend._init(can, {type: "story feel float"}, [], function(sub) { can.sub = sub sub.run = function(event, cmds, cb) { return can.run(event, cmds, cb, true) } @@ -117,7 +117,7 @@ Volcanos("ondetail", {help: "组件菜单", list: ["关闭", "下载", "删除", can.user.copy(event, can, can.misc.MergeURL(can, {_path: can.onimport._file(can, can.list[can.order].path)}, true)) }, }) -Volcanos("onexport", {help: "导出数据", list: ["begin", "limit", "total", "position", "file"], +Volcanos(chat.ONEXPORT, {help: "导出数据", list: ["begin", "limit", "total", "position", "file"], position: function(can, index, total) { total = total || can.max return parseInt((index+1)*100/total)+"%"+" = "+(parseInt(index)+1)+ice.PS+parseInt(total) }, diff --git a/plugin/local/wiki/word.js b/plugin/local/wiki/word.js index 5da63ce5..0141639c 100644 --- a/plugin/local/wiki/word.js +++ b/plugin/local/wiki/word.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, target) { can.onmotion.clear(can), can.base.isFunc(cb) && cb(msg) if (msg.Length() > 0) { return can.onappend.table(can, msg) } @@ -26,7 +26,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target nav = nav||can.page.Append(can, can._fields, [{view: wiki.NAVMENU}]).first can.onmotion.clear(can, nav), can._fields.insertBefore(nav, can._output) - can.onappend.list(can, can.base.Obj(data.data), function(event, item) { + can.onimport.list(can, can.base.Obj(data.data), function(event, item) { var link = item.meta.link, list = can.core.Split(item.meta.link) if (can.core.Value(can, list[0])) { return can.core.CallFunc([can, list[0]], list.slice(1)) } if (!link || link == can.Option(nfs.PATH)) { return false } @@ -142,7 +142,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target can.page.Modify(can, target, {width: can.Conf(html.WIDTH)-200}) }, }, [""]) -Volcanos("onkeymap", {help: "键盘交互", list: [], +Volcanos(chat.ONKEYMAP, {help: "键盘交互", list: [], _mode: { normal: { "n": function(event, can) { can.ondetail.next(can.sub) }, @@ -157,7 +157,7 @@ Volcanos("onkeymap", {help: "键盘交互", list: [], }, }, _engine: {}, }) -Volcanos("onaction", {help: "控件交互", list: [], +Volcanos(chat.ONACTION, {help: "控件交互", list: [], _trans: {view: "视图"}, play: function(event, can) { var list = [], current = [] can.page.Select(can, can._output, wiki.ITEM, function(item) { @@ -183,12 +183,12 @@ Volcanos("onaction", {help: "控件交互", list: [], }})), can.onkeymap._build(can) sub.page.style(sub, sub._target, html.BACKGROUND, document.body.style.background) - sub.page.style(sub, sub._output, html.HEIGHT, window.innerHeight-4*html.PLUGIN_MARGIN-2*html.ACTION_HEIGHT) - sub.page.style(sub, sub._output, html.WIDTH, window.innerWidth-4*html.PLUGIN_MARGIN) + sub.page.style(sub, sub._output, html.HEIGHT, can._root._height-4*html.PLUGIN_MARGIN-2*html.ACTION_HEIGHT) + sub.page.style(sub, sub._output, html.WIDTH, can._root._width-4*html.PLUGIN_MARGIN) sub.ui = sub.page.Append(sub, sub._output, [{view: chat.PROJECT}, {view: chat.CONTENT}]) can.core.List(sub.list = list, function(page, index) { - can.onappend.item(can, html.ITEM, {name: page[0].innerHTML}, function(event) { + can.onimport.item(can, html.ITEM, {name: page[0].innerHTML}, function(event) { can.ondetail.show(sub, index) }, function(event) {}, sub.ui.project) @@ -198,7 +198,7 @@ Volcanos("onaction", {help: "控件交互", list: [], case chat.FIELD: item = can.onappend.field(can, chat.STORY, can.base.Obj(data.meta), sub.ui.content).first; break default: item = item.cloneNode(true) } - return can.core.CallFunc([can.onimport, data.type], [sub, data, item, window.innerWidth-4*html.PLUGIN_MARGIN]), item + return can.core.CallFunc([can.onimport, data.type], [sub, data, item, can._root._width-4*html.PLUGIN_MARGIN]), item }), }]) }), can.onmotion.hidden(can, sub.ui.project), can.ondetail.show(sub, 0) @@ -216,7 +216,7 @@ Volcanos("onaction", {help: "控件交互", list: [], } }, }) -Volcanos("ondetail", {help: "交互操作", list: ["删除"], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONDETAIL, {help: "交互操作", list: ["删除"], _init: function(can, msg, list, cb, target) { }, show: function(sub, which) { sub.page.Modify(sub, sub.ui.content, {className: chat.CONTENT}) sub.page.Select(sub, sub.ui.content, wiki.DIV_PAGE, function(page, index) { diff --git a/plugin/state.js b/plugin/state.js index 2943f1e0..326bfd4d 100644 --- a/plugin/state.js +++ b/plugin/state.js @@ -1,10 +1,10 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, conf, list, cb, target) {}, +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, meta, cb, target) {}, _process: function(can, msg) { msg.OptionStatus() && can.onmotion.clear(can, can._status) && can.onappend._status(can, can.base.Obj(msg.OptionStatus())) return can.core.CallFunc([can.onimport, msg.OptionProcess()], {can: can, msg: msg}) }, - _location: function(can, msg, _arg) { location.href = _arg; return true }, + _location: function(can, msg, _arg) { can.user.jumps(_arg); return true }, _replace: function(can, msg, _arg) { location.replace(_arg); return true }, _history: function(can, msg) { history.back(); return true }, _confirm: function(can, msg, _arg) { can.user.confirm(_arg) && can.runAction(can.request({}, msg), "confirm"); return true }, @@ -16,24 +16,20 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, conf, }, _rewrite: function(can, msg) { for (var i = 0; i < msg._arg.length; i += 2) { - can.Option(msg._arg[i], msg._arg[i+1]) - can.Action(msg._arg[i], msg._arg[i+1]) + can.Option(msg._arg[i], msg._arg[i+1]), can.Action(msg._arg[i], msg._arg[i+1]) } return can.Update() }, _display: function(can, msg) { - can.onappend._output(can, msg, msg.Option(ice.MSG_DISPLAY)) - return true + return can.onappend._output(can, msg, msg.Option(ice.MSG_DISPLAY)), true }, _field: function(can, msg) { msg.Table(function(item) { item.type = chat.STORY, can.onappend._plugin(can, item, {type: chat.STORY, arg: can.base.Obj(item[ice.ARG], [])}, function(sub, meta) { sub.Conf(can.base.Obj(item.conf)) if (sub.Conf("mode") == "simple") { - var msg = can.request() - msg.Echo(sub.Conf("result")) + var msg = can.request(); msg.Echo(sub.Conf("result")) sub.Conf(html.HEIGHT, can.Conf(html.HEIGHT)/2) - can.onappend._output(sub, msg, msg.Option(ice.MSG_DISPLAY)||sub.Conf("feature.display")||"/plugin/table.js") - return + return can.onappend._output(sub, msg, msg.Option(ice.MSG_DISPLAY)||sub.Conf("feature.display")) } var opt = can.base.Obj(item[ice.OPT], []) sub.Conf(html.HEIGHT, can.Conf(html.HEIGHT)) @@ -50,7 +46,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, conf, can.onappend.table(can, msg) can.onappend.board(can, msg) can.onmotion.story.auto(can) - can.page.style(can, can._output, "display", html.BLOCK) + can.page.style(can, can._output, html.DISPLAY, html.BLOCK) return true }, @@ -66,8 +62,8 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, conf, return true }, _rich: function(can, msg, _arg) { - if (can.page.Select(can, can._output, [html.TABLE_CONTENT, "tbody"], function(table) { - var head = can.page.Select(can, can._output, [html.TABLE_CONTENT, "th"], function(th) { return th.innerText }) + if (can.page.Select(can, can._output, [html.TABLE_CONTENT, html.TBODY], function(table) { + var head = can.page.Select(can, can._output, [html.TABLE_CONTENT, html.TH], function(th) { return th.innerText }) can.page.Append(can, table, msg.Table(function(value) { return {row: can.core.List(head, function(key) { return value[key] })} })) @@ -88,7 +84,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, conf, return can.user.open(_arg), can.Update() }, }) -Volcanos("onaction", {help: "交互操作", list: [ +Volcanos(chat.ONACTION, {help: "交互操作", list: [ "刷新数据", "切换全屏", "共享工具", "打开链接", "生成链接", "生成脚本", "生成图片", [ "其它", "刷新页面", "清空参数", "扩展参数", "复制数据", "下载数据", "清空数据", "删除工具", ], @@ -98,14 +94,13 @@ Volcanos("onaction", {help: "交互操作", list: [ "刷新数据": function(event, can) { can.Update({}, can.Input([], true)) }, "切换全屏": function(event, can) { var sub = can._outputs[can._outputs.length-1] if (can.page.ClassList.neg(can, can._target, "Full")) { sub._height_bak = sub.ConfHeight(), sub._width_bak = sub.ConfWidth() - var height = window.innerHeight-(can._status.innerText? 2: 1)*html.ACTION_HEIGHT; can.user.isMobile && (height -= 2*html.ACTION_HEIGHT) - can.page.style(can, can._output, html.HEIGHT, sub.ConfHeight(height), html.MIN_WIDTH, sub.ConfWidth(window.innerWidth)) - can.core.CallFunc([sub, "onimport.layout"], {can: sub}) + var height = can._root._height-(can._status.innerText? 2: 1)*html.ACTION_HEIGHT; can.user.isMobile && (height -= 2*html.ACTION_HEIGHT) + can.page.style(can, can._output, html.HEIGHT, sub.ConfHeight(height), html.MIN_WIDTH, sub.ConfWidth(can._root._width)) } else { sub.ConfHeight(sub._height_bak), sub.ConfWidth(sub._width_bak) can.page.style(can, can._output, html.HEIGHT, "", html.MIN_WIDTH, "") - can.core.CallFunc([sub, "onimport.layout"], {can: sub}) } + can.core.CallFunc([sub, chat.ONIMPORT, html.LAYOUT], {can: sub}) }, "共享工具": function(event, can) { var meta = can.Conf() can.onmotion.share(event, can, [{name: chat.TITLE, value: meta.name}, {name: chat.TOPIC, values: [cli.WHITE, cli.BLACK]}], [ @@ -203,7 +198,7 @@ Volcanos("onaction", {help: "交互操作", list: [ can.user.input(event, can, [{type: html.TEXTAREA, name: mdb.TEXT}], function(ev, button, data, list, args) { add(list[0]) }) }, }) -Volcanos("onexport", {help: "导出数据", list: [], +Volcanos(chat.ONEXPORT, {help: "导出数据", list: [], table: function(can) { var msg = can._msg; if (msg.Length() == 0) { return } var res = [msg.append && msg.append.join(ice.FS)]; msg.Table(function(line, index, array) { res.push(can.core.Item(line, function(key, value) { return value }).join(ice.FS)) diff --git a/plugin/story/form.js b/plugin/story/form.js index 60f150b1..dbc3f1c5 100644 --- a/plugin/story/form.js +++ b/plugin/story/form.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, cb, target) { can.page.ClassList.add(can, target, "form") msg.Push("type", "text") msg.Push("name", "name") diff --git a/plugin/story/json.js b/plugin/story/json.js index 9d93faf7..3a7d0571 100644 --- a/plugin/story/json.js +++ b/plugin/story/json.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { can.page.ClassList.add(can, target, "json") can.onmotion.clear(can, target), can.base.isFunc(cb) && cb(msg) can.onappend.table(can, msg), can.onimport.show(can, can.base.Obj(msg.Result(), {}), target) @@ -42,7 +42,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, }; show(data, can.page.Append(can, target, [{view: html.ITEM}]).item, 0, 0) }, }, [""]) -Volcanos("onaction", {help: "组件菜单", list: ["展开", "折叠", "复制"], +Volcanos(chat.ONACTION, {help: "组件菜单", list: ["展开", "折叠", "复制"], "展开": function(event, can) { can.page.Select(can, can._output, "div.list div.list", function(list) { can.onmotion.hidden(can, list, true) @@ -57,4 +57,4 @@ Volcanos("onaction", {help: "组件菜单", list: ["展开", "折叠", "复制"] can.user.copy(event, can, can._msg.Result()) }, }) -Volcanos("onexport", {help: "导出数据", list: []}) +Volcanos(chat.ONEXPORT, {help: "导出数据", list: []}) diff --git a/plugin/story/media.js b/plugin/story/media.js index b68163b7..ea1b3015 100644 --- a/plugin/story/media.js +++ b/plugin/story/media.js @@ -1,7 +1,7 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, cb, target) { can.base.isFunc(cb) && cb(msg) }}) -Volcanos("onaction", {help: "操作数据", list: ["打开屏幕", "打开摄像", "打开录音"], +Volcanos(chat.ONACTION, {help: "操作数据", list: ["打开屏幕", "打开摄像", "打开录音"], _action: function(can, cb) { var ui = can.page.Append(can, can._output, [{view: html.ACTION}, {view: html.OUTPUT, list: [{type: html.VIDEO, style: {width: can.ConfWidth()}, _init: function(item) { can.core.Timer(10, function() { cb(item, ui) }) @@ -46,4 +46,4 @@ Volcanos("onaction", {help: "操作数据", list: ["打开屏幕", "打开摄像 }) }, }) -Volcanos("onexport", {help: "导出数据", list: []}) +Volcanos(chat.ONEXPORT, {help: "导出数据", list: []}) diff --git a/plugin/story/parse.js b/plugin/story/parse.js new file mode 100644 index 00000000..216433db --- /dev/null +++ b/plugin/story/parse.js @@ -0,0 +1,181 @@ +Volcanos(chat.ONAPPEND, {help: "渲染引擎", list: [], + parse: function(can, list, target, keys, data, type) { target = target||can._output, data = data||{} + if (!list) { return } else if (can.base.isArray(list)) { + return can.core.List(list, function(meta, index) { + return can.onappend.parse(can, meta, target, keys, data, type) + }) + + } else if (can.base.isString(list)) { + var ls = can.core.Split(list, "", ":=@"); if (ls.length == 1) { + var meta = type? {type: type, name: ls[0]}: {type: ls[0]} + } else { + var meta = {name: ls[0]}; for (var i = 1; i < ls.length; i += 2) { switch (ls[i]) { + case ":": meta.type = ls[i+1]; break + case "=": meta.value = ls[i+1]; break + case "@": meta.action = ls[i+1]; break + } } + } + + } else if (can.base.isObject(list)) { var meta = list } + + keys = can.core.Keys(keys, meta.name||meta.type) + var item = {view: meta.type}, init, subtype; switch (meta.type) { + case html.HEAD: subtype = "menu", data = {} + init = function(target) { data.head = target + can.page.ClassList.add(can, target, html.LAYOUT) + } + break + case html.LEFT: subtype = "item" + init = function(target) { + can.page.ClassList.add(can, target, html.LAYOUT) + can.core.Timer(10, function() { var height = target.parentNode.offsetHeight + can.page.Select(can, target.parentNode, can.page.Keys(html.DIV_LAYOUT_HEAD, html.DIV_LAYOUT_FOOT), function(item) { + height -= item.offsetHeight + }), can.page.style(can, target, html.HEIGHT, height) + }) + } + break + case html.MAIN: + init = function(target) { data.main = target + can.page.ClassList.add(can, target, html.LAYOUT) + can.core.Timer(10, function() { var height = target.parentNode.offsetHeight + can.page.Select(can, target.parentNode, can.page.Keys(html.DIV_LAYOUT_HEAD, html.DIV_LAYOUT_FOOT), function(item) { + height -= item.offsetHeight + }), can.page.style(can, target, html.HEIGHT, height) + }) + + can.core.Timer(100, function() { + var width = target.parentNode.offsetWidth + can.page.Select(can, target.parentNode, html.DIV_LAYOUT_LEFT, function(item) { + width -= item.offsetWidth+1 + }), can.page.style(can, target, html.WIDTH, width) + }) + + } + break + case html.FOOT: + init = function(target) { data.foot = target + can.page.ClassList.add(can, target, html.LAYOUT) + } + break + case html.TABS: + item.list = [{view: "name"}, {view: html.PAGE}], item._init = function(_target, ui) { + can.page.Append(can, ui.page, [{view: html.INPUT, list: [{type: html.INPUT, onkeyup: function(event) { + can.page.Select(can, _target, [html.DIV_PAGE, html.DIV_ITEM], function(item) { + can.page.ClassList.set(can, item, html.HIDE, item.innerText.indexOf(event.target.value) == -1) + }) + }}]}]) + can.core.List(meta.list, function(item, index) { + can.page.Append(can, ui.name, [{view: [html.ITEM, html.DIV, item.name||item], onclick: function(event) { + can.onmotion.select(can, _target, [[html.DIV_PAGE, html.DIV_LIST]], index) + can.onmotion.select(can, ui.name, html.DIV_ITEM, index) + ui.page.scrollTo(0, 0) + }}]) + can.page.Append(can, ui.page, [{view: [html.ITEM, html.DIV, item.name], onclick: function(event) { + can.page.ClassList.neg(can, event.target.nextSibling, html.SELECT) + can.onmotion.select(can, ui.name, html.DIV_ITEM, index) + }}, {view: [html.LIST], _init: function(target) { + can.onappend.parse(can, item.list, target, can.core.Keys(keys, item.name), data, html.ITEM) + }}]) + }) + can.core.Timer(100, function() { var height = target.offsetHeight + can.page.style(can, ui.page, html.HEIGHT, height-10-(meta.style? 0: ui.name.offsetHeight)) + can.page.style(can, _target, html.HEIGHT, height-10) + }), can.page.Select(can, ui.name, html.DIV_ITEM)[0].click() + } + break + case aaa.USERNAME: + can.page.Append(can, target, [ + can.base.Copy({view: [aaa.USERNAME, html.DIV], onclick: function(event) { + }, list: [{view: ["some", html.DIV, can.user.info.usernick]}, {img: can.user.info.avatar}]})]) + return + } + + item._init = item._init||function(target) { + meta.list && can.onappend.parse(can, meta.list, target, keys, data, type||subtype) + can.base.isFunc(init) && init(target), can.base.isFunc(meta.init) && meta.init(target) + } + if (can.base.isString(meta.style)) { item.className = meta.style } + if (can.base.isObject(meta.style)) { item.style = meta.style } + + if ((meta.type||type) == html.MENU) { + can.page.Append(can, target, [can.base.Copy({view: [html.MENU, html.DIV, meta.name||meta], onclick: function(event) { + if (meta.list && meta.list.length > 0) { return } + can.onengine.signal(can, meta.name) || can.onengine.signal(can, html.MENU, can.request(event, {item: meta.name})) + }, onmouseenter: function(event) { + meta.list && meta.list.length > 0 && can.user.carte(event, can, {}, meta.list, function(event, item) { + can.onengine.signal(can, item) || can.onengine.signal(can, meta.name, can.request(event, {item: item})) + }) + }})]).first + return + } + if ((type||subtype) == html.ITEM) { item.view = item.view||html.LIST + if (meta.action == "auto") { + meta.init = meta.init||function(item) { can.core.Timer(100, function() { item.click() }) } + } + if (decodeURIComponent(location.hash) == "#"+can.core.Keys(keys, item.name)) { + meta.init = meta.init||function(item) { can.core.Timer(300, function() { item.click() }) } + } + + var _item = can.page.Append(can, target, [can.base.Copy({view: [html.ITEM, html.DIV, meta.name||meta], onclick: function(event) { + var url = can.misc.MergeURL(can, {pod: can.misc.Search(can, "pod"), cmd: meta.index}) + if (meta.action == "push") { return can.user.jumps(url) } + if (meta.action == "open") { return can.user.open(url) } + location.hash = can.core.Keys(keys, item.name) + + switch (meta.type) { + case html.PLUGIN: + if (can.onmotion.cache(can, function() { return keys }, data.main)) { break } + if (can.base.Ext(meta.index) == nfs.ZML || can.base.Ext(meta.index) == nfs.IML) { + can.page.Append(can, data.main, [{type: html.IFRAME, src: "/chat/cmd/"+meta.index, + height: data.main.offsetHeight, width: data.main.offsetWidth, + }]) + break + } + + can.onappend.plugin(can, {index: meta.index, args: can.base.Obj(meta.args)}, function(sub) { + sub.ConfHeight(data.main.offsetHeight-160) + sub.run = function(event, cmds, cb, silent) { + can.page.style(can, sub._output, html.MAX_WIDTH, sub.ConfWidth(data.main.offsetWidth-40)) + can.run(event, can.misc.concat(can, [ctx.ACTION, ice.RUN, sub._index||meta.index], cmds), function(msg) { + cb(msg), can.core.Timer(10, function() { + can.page.style(can, sub._table, html.MAX_HEIGHT, data.main.offsetHeight-150) + }) + }, true) + } + }, data.main) + default: + meta.list && can.onmotion.toggle(can, event.target.nextSibling) + } + }})]).first; can.core.ItemCB(meta, function(key, cb) { _item[key] = can.base.isFunc(cb)? cb: function(event) { + can.onengine.signal(can, cb, can.request(event)) + } }) + can.core.Timer(10, function() { meta.init && meta.init(_item) }) + if (!meta.list) { return } + } + return can.page.Append(can, target, [item]).first + }, + _parse: function(can, text) { var stack = [{_deep: -1, list: []}] + can.core.List(can.core.Split(text, ice.NL, ice.NL, ice.NL), function(line) { if (line == "") { return } + var deep = 0; for (var i = 0; i < line.length; i++) { if (line[i] == ice.SP) { deep++ } else if (line[i] == ice.TB) { deep += 4 } else { break } } + for (var i = stack.length-1; i > 0; i--) { if (deep <= stack[i]._deep) { stack.pop() } } + + var item = {_deep: deep, list: []}; var list = stack[stack.length-1]; list.list.push(item); if (deep > list._deep) { stack.push(item) } + var ls = can.core.Split(line); switch (ls[0]) { + case html.HEAD: + case html.LEFT: + case html.MAIN: + case html.FOOT: + case html.TABS: + case aaa.USERNAME: + case html.MENU: item.type = ls[0]; break + default: item.name = ls[0]; break + } + for (var i = 1; i < ls.length; i += 2) { can.core.Value(item, ls[i], ls[i+1]) + if (ls[i] == ctx.INDEX) { item.type = item.type||html.PLUGIN } + } + }) + return {type: "demo", style: {height: can.ConfHeight()||can._root._height}, list: stack[0].list} + }, +}) + diff --git a/plugin/story/pie.js b/plugin/story/pie.js index b09b89b3..75f53983 100644 --- a/plugin/story/pie.js +++ b/plugin/story/pie.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { can.require(["/plugin/local/wiki/draw.js", "/plugin/local/wiki/draw/path.js"], function() { var height = msg.Option(html.HEIGHT)||can.ConfHeight() can.onmotion.clear(can), can.base.isFunc(cb) && cb(msg) diff --git a/plugin/story/spide.js b/plugin/story/spide.js index a8901297..d92cd41f 100644 --- a/plugin/story/spide.js +++ b/plugin/story/spide.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { can.onmotion.clear(can), can.base.isFunc(cb) && cb(msg) if (msg.Length() == 0) { return } @@ -58,7 +58,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, return tree.meta&&tree.meta.color || (tree.list == 0? cli.PURPLE: cli.YELLOW) }, }, [""]) -Volcanos("onaction", {help: "用户操作", list: ["edit", [ice.VIEW, "横向", "纵向"], "生成图片"], +Volcanos(chat.ONACTION, {help: "用户操作", list: ["edit", [ice.VIEW, "横向", "纵向"], "生成图片"], "edit": function(event, can) { can.onmotion.toggle(can, can._action), can.onmotion.toggle(can, can._status) }, "横向": function(event, can) { @@ -123,7 +123,7 @@ Volcanos("onaction", {help: "用户操作", list: ["edit", [ice.VIEW, "横向", }) }, }) -Volcanos("ondetail", {help: "用户交互", list: [], +Volcanos(chat.ONDETAIL, {help: "用户交互", list: [], onmouseenter: function(event, can, tree) { var y = tree.y+tree.height*can.size/2 can.page.Remove(can, can.pos), can.pos = can.onimport.draw({}, can, { shape: svg.RECT, point: [ diff --git a/plugin/story/trend.js b/plugin/story/trend.js index f1415b0b..26e41f3d 100644 --- a/plugin/story/trend.js +++ b/plugin/story/trend.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { can.onmotion.clear(can), can.base.isFunc(cb) && cb(msg) if (msg.Length() == 0) { return } if (msg.Option("branch")) { return can.onappend.table(can, msg) } @@ -41,7 +41,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.Status({"from": begin, "commit": count, "total": add+del, "max": max}) }, }, [""]) -Volcanos("onaction", {help: "组件菜单", list: ["edit", [ice.VIEW, "趋势图", "柱状图", "数据源"], ["height", "100", "200", "400", "600", "800", "auto"], ["speed", "10", "20", "50", "100"]], +Volcanos(chat.ONACTION, {help: "组件菜单", list: ["edit", [ice.VIEW, "趋势图", "柱状图", "数据源"], ["height", "100", "200", "400", "600", "800", "auto"], ["speed", "10", "20", "50", "100"]], "edit": function(event, can) { can.onmotion.toggle(can, can._action), can.onmotion.toggle(can, can._status) }, "趋势图": function(event, can) { var height = can.Action(html.HEIGHT) @@ -130,7 +130,7 @@ Volcanos("onaction", {help: "组件菜单", list: ["edit", [ice.VIEW, "趋势图 height: function(event, can) { can.onaction[can.Action(ice.VIEW)](event, can) }, speed: function(event, can) { can.onaction[can.Action(ice.VIEW)](event, can) }, }) -Volcanos("ondetail", {help: "用户交互", list: [], +Volcanos(chat.ONDETAIL, {help: "用户交互", list: [], onmouseenter: function(event, can, line) { can.Status(line, ["date", "text", "add", "del"]) }, }) -Volcanos("onexport", {help: "导出数据", list: []}) +Volcanos(chat.ONEXPORT, {help: "导出数据", list: []}) diff --git a/plugin/story/video.js b/plugin/story/video.js index d177f0f8..9793cc4a 100644 --- a/plugin/story/video.js +++ b/plugin/story/video.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { can.onimport.select(can, msg) can.onmotion.clear(can), can.base.isFunc(cb) && cb(msg) can.onappend.table(can, msg), can.onappend.board(can, msg) @@ -24,7 +24,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, ])) }, }) -Volcanos("onaction", {help: "控件交互", list: [], +Volcanos(chat.ONACTION, {help: "控件交互", list: [], next: function(event, can) { var msg = can._msg msg.Table(function(line, index) { if (line.link == location.href) { @@ -44,4 +44,4 @@ Volcanos("onaction", {help: "控件交互", list: [], }) }, }) -Volcanos("onexport", {help: "导出数据", list: []}) +Volcanos(chat.ONEXPORT, {help: "导出数据", list: []}) diff --git a/plugin/table.js b/plugin/table.js index 5172d2e7..ef2ba88d 100644 --- a/plugin/table.js +++ b/plugin/table.js @@ -1,4 +1,4 @@ -Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, cb, target) { +Volcanos(chat.ONIMPORT, {help: "导入数据", list: [], _init: function(can, msg, cb, target) { can.user.isMobile && !can.user.isLandscape() && can.onmotion.hidden(can, can._action) var cbs = can.onimport[can._args[ctx.STYLE]]; if (can.base.isFunc(cbs)) { can.page.ClassList.add(can, target, can._args[ctx.STYLE]) @@ -22,4 +22,19 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, ]} })) }, + list: function(can, root, cb, target) { target = target||can._output + can.core.List(root.list, function(item) { + var ui = can.page.Append(can, target, [{view: [html.ITEM, html.DIV, item.meta.name], onclick: function(event) { + can.base.isFunc(cb) && cb(event, item) || can.onmotion.toggle(can, ui.list) + can.onmotion.select(can, target, html.DIV_ITEM, event.target) + }}, {view: html.LIST}]); can.onimport.list(can, item, cb, ui.list) + }) + }, + item: function(can, type, item, cb, cbs, target) { target = target||can._output + var ui = can.page.Append(can, target, [{view: [type, html.DIV, item.nick||item.name], + onclick: function(event) { cb(event, ui.first) + can.onmotion.select(can, target, can.core.Keys(html.DIV, type), ui.first) + }, onmouseenter: function(event) { cbs(event, ui.first) }, + }]); return ui.first + }, }) diff --git a/proto.js b/proto.js index 2a9b8e3e..c04159cd 100644 --- a/proto.js +++ b/proto.js @@ -14,6 +14,7 @@ var ice = { POD: "pod", CTX: "ctx", CMD: "cmd", ARG: "arg", RES: "res", RUN: "run", ERR: "err", OPT: "opt", + CAN: "can", PWD: "./", MSG_DETAIL: "detail", @@ -137,9 +138,7 @@ var wiki = { var chat = { LIB: "lib", PAGE: "page", PANEL: "panel", PLUGIN: "plugin", OUTPUT: "output", STORY: "story", FLOAT: "float", TOAST: "toast", CARTE: "carte", INPUT: "input", UPLOAD: "upload", CONTEXTS: "contexts", - LEGNED: "legend", OPTION: "option", ACTION: "action", OUTPUT: "output", STATUS: "status", LAYOUT: "layout", PROJECT: "project", CONTENT: "content", DISPLAY: "display", PROFILE: "profile", - ONIMPORT: "onimport", ONACTION: "onaction", ONKEYMAP: "onkeymap", ONEXPORT: "onexport", TITLE: "title", TOPIC: "topic", BLACK: "black", WHITE: "white", PRINT: "print", SHARE: "share", RIVER: "river", STORM: "storm", FIELD: "field", @@ -148,20 +147,9 @@ var chat = { AGENT: "agent", CHECK: "check", GRANT: "grant", STATE: "state", MENUS: "menus", TRANS: "trans", - SSO: "sso", - - ONMAIN: "onmain", ONLOGIN: "onlogin", ONSEARCH: "onsearch", - ONSIZE: "onsize", ONTOAST: "ontoast", ONREMOTE: "onremote", - ONKEYDOWN: "onkeydown", ONSTORM_SELECT: "onstorm_select", - - HEAD: "head", LEFT: "left", MAIN: "main", AUTO: "auto", HIDE: "hide", FOOT: "foot", - HEADER: "header", FOOTER: "footer", WEBSITE: "website", + SSO: "sso", WEBSITE: "website", ACTION_LAYOUT_FMT: " fieldset.Action.grid>div.output fieldset.plugin { width:_width; height:_height; } fieldset.Action.grid>div.output fieldset.plugin>div.output { width:_width; height:_height; } ", - PLUGIN_STATE_JS: "/plugin/state.js", - PLUGIN_INPUT_JS: "/plugin/input.js", - PLUGIN_TABLE_JS: "/plugin/table.js", - libs: ["/lib/base.js", "/lib/core.js", "/lib/misc.js", "/lib/page.js", "/lib/user.js"], panel_list: [ {name: "Header", help: "标题栏", pos: "head", state: ["time", "usernick", "avatar"]}, @@ -185,6 +173,20 @@ var chat = { "/plugin/local/wiki/word.js", "/plugin/local/team/plan.js", ], + PLUGIN_STATE_JS: "/plugin/state.js", + PLUGIN_INPUT_JS: "/plugin/input.js", + PLUGIN_TABLE_JS: "/plugin/table.js", + + ONENGINE: "onengine", ONDAEMON: "ondaemon", ONAPPEND: "onappend", ONLAYOUT: "onlayout", ONMOTION: "onmotion", ONKEYMAP: "onkeymap", + ONIMPORT: "onimport", ONSYNTAX: "onsyntax", ONACTION: "onaction", ONDETAIL: "ondetail", ONFIGURE: "onfigure", ONEXPORT: "onexport", + + ONMAIN: "onmain", ONLOGIN: "onlogin", ONSEARCH: "onsearch", + ONSIZE: "onsize", ONTOAST: "ontoast", ONREMOTE: "onremote", + ONKEYDOWN: "onkeydown", ONMOUSEENTER: "onmouseenter", ORIENTATIONCHANGE: "orientationchange", + ONSTORM_SELECT: "onstorm_select", ONACTION_TOUCH: "onaction_touch", ONACTION_NOTOOL: "onaction_notool", + + _INIT: "_init", _ENGINE: "_engine", _SEARCH: "_search", _OUTPUTS_CURRENT: "_outputs.-1", + _NAMES: "_names", _TOAST: "_toast", } var team = { TASK: "task", PLAN: "plan", @@ -200,18 +202,18 @@ var svg = { PATH2V: "path2v", PATH2H: "path2h", } var html = { + // FIELDSET FIELDSET: "fieldset", LEGEND: "legend", OPTION: "option", ACTION: "action", OUTPUT: "output", STATUS: "status", FORM_OPTION: "form.option", DIV_ACTION: "div.action", DIV_OUTPUT: "div.output", DIV_STATUS: "div.status", FIELDSET_PANEL: "fieldset.panel", FIELDSET_PLUGIN: "fieldset.plugin", FIELDSET_STORY: "fieldset.story", - FIELDSET_HEAD: "fieldset.head", FIELDSET_FOOT: "fieldset.foot", FIELDSET_LEFT: "fieldset.left", FIELDSET_MAIN: "fieldset.main", FIELDSET_AUTO: "fieldset.auto", FIELDSET_FLOAT: "fieldset.float", - OPTION_ARGS: "select.args,input.args,textarea.args", INPUT_ARGS: "input.args,textarea.args", INPUT_BUTTON: "input[type=button]", + // HTML UPLOAD: "upload", USERNAME: "username", PASSWORD: "password", INPUT: "input", TEXT: "text", TEXTAREA: "textarea", SELECT: "select", BUTTON: "button", FORM: "form", FILE: "file", SPACE: "space", CLICK: "click", SUBMIT: "submit", CANCEL: "cancel", @@ -219,7 +221,9 @@ var html = { TABLE: "table", TBODY: "tbody", TR: "tr", TH: "th", TD: "td", BR: "br", UL: "ul", LI: "li", A: "a", LABEL: "label", INNER: "inner", TITLE: "title", H1: "h1", H2: "h2", H3: "h3", + WSS: "wss", SVG: "svg", CANVAS: "canvas", IFRAME: "iframe", CHROME: "chrome", + // CSS CLASS: "class", FLOAT: "float", CLEAR: "clear", BOTH: "both", BACKGROUND: "background", SELECT: "select", HIDDEN: "hidden", DISPLAY: "display", BLOCK: "block", NONE: "none", FIXED: "fixed", @@ -230,31 +234,26 @@ var html = { PLUGIN_MARGIN: 10, ACTION_HEIGHT: 29, ACTION_MARGIN: 200, TOGGLE: "toggle", - WSS: "wss", SVG: "svg", CANVAS: "canvas", IFRAME: "iframe", CHROME: "chrome", - LIST: "list", ITEM: "item", MENU: "menu", NODE: "node", - DIV_ITEM: "div.item", DIV_FLOAT: "div.float", - TABS: "tabs", DIV_TABS: "div.tabs", - HIDE: "hide", SHOW: "show", - - HEAD: "head", LEFT: "left", MAIN: "main", FOOT: "foot", - TABS: "tabs", MENU: "menu", + PAGE: "page", TABS: "tabs", LIST: "list", ITEM: "item", - PAGE: "page", - HIDE: "hide", - LAYOUT: "layout", - PLUGIN: "plugin", - DIV_CODE: "div.code", + MENU: "menu", NODE: "node", + HIDE: "hide", SHOW: "show", AUTO: "auto", + HEAD: "head", LEFT: "left", MAIN: "main", FOOT: "foot", + LAYOUT: "layout", PLUGIN: "plugin", + DIV_PAGE: "div.page", + DIV_TABS: "div.tabs", DIV_LIST: "div.list", DIV_ITEM: "div.item", + DIV_CODE: "div.code", DIV_LAYOUT_HEAD: "div.layout.head", DIV_LAYOUT_LEFT: "div.layout.left", DIV_LAYOUT_FOOT: "div.layout.foot", TABLE_CONTENT: "table.content", + DIV_FLOAT: "div.float", ESCAPE: "Escape", ENTER: "Enter", TAB: "Tab", - ONMOUSEENTER: "onmouseenter", - ORIENTATIONCHANGE: "orientationchange" + _CSS: ".css", _JS: ".js", } var lang = { UNDEFINED: "undefined", @@ -265,31 +264,23 @@ var lang = { PS: "/", } -function shy(help, meta, list, cb) { - var index = 0, args = arguments; function next(type) { - if (index < args.length && (!type || type == typeof args[index])) { return args[index++] } - } - - cb = args[args.length-1]||function() {} - cb.help = next(lang.STRING)||"" - cb.meta = next(lang.OBJECT)||{} - cb.list = next(lang.OBJECT)||[] - return cb +function shy(help, meta, list, cb) { var index = 0, args = arguments + function next(type) { if (index < args.length && (!type || type == typeof args[index])) { return args[index++] } } + return cb = args[args.length-1]||function() {}, cb.help = next(lang.STRING)||"", cb.meta = next(lang.OBJECT)||{}, cb.list = next(lang.OBJECT)||[], cb }; var _can_name = "", _can_path = "" -var Volcanos = shy("火山架", {iceberg: "/chat/", volcano: "/frame.js", args: {}, pack: {}, libs: [], cache: {}}, function(name, can, libs, cb) { +var Volcanos = shy("火山架", {iceberg: "/chat/", volcano: "/frame.js", pack: {}, cache: {}}, function(name, can, libs, cb) { var meta = arguments.callee.meta, list = arguments.callee.list - if (typeof name == lang.OBJECT) { var Config = name; Config.plugin = Config.plugin||chat.plugin_list - Config.panels = Config.panels||chat.panel_list + if (typeof name == lang.OBJECT) { var Config = name, panels = Config.panels||chat.panel_list meta.libs = Config.libs||chat.libs, meta.iceberg = Config.iceberg||meta.iceberg // 预加载 - libs = []; for (var i = 0; i < Config.panels.length; i++) { var panel = Config.panels[i] - panel && (libs = libs.concat(panel.list = panel.list||["/panel/"+panel.name+".css", "/panel/"+panel.name+".js"])) - }; libs = libs.concat(Config.plugin) + libs = []; for (var i = 0; i < panels.length; i++) { var p = panels[i] + p && (libs = libs.concat(p.list = p.list||["/panel/"+p.name+html._CSS, "/panel/"+p.name+html._JS])) + }; libs = libs.concat(Config.plugin||chat.plugin_list) // 根模块 - _can_name = "", name = Config.name||"chat", cb = can||function(can) { - can.onengine._init(can, can.Conf(Config), Config.panels, Config._init, can._target) + _can_name = "", name = Config.name||ice.CAN, cb = can||function(can) { + can.onengine._init(can, can.Conf(Config), panels, Config._init, can._target) }, can = {_follow: name, _target: Config.target||meta.target, _height: Config.height||window.innerHeight, _width: Config.width||window.innerWidth} for (var k in Config) { can[k] = Config[k] } can._root = can @@ -319,7 +310,7 @@ var Volcanos = shy("火山架", {iceberg: "/chat/", volcano: "/frame.js", args: if (libs[0] == "") { // 样式地址 - libs[0] = can._name.replace(".js", ".css") + libs[0] = can._name.replace(html._JS, html._CSS) } else if (libs[0][0] != ice.PS && libs[0].indexOf(ice.HTTP) != 0) { // 相对地址 libs[0] = can._name.slice(0, can._name.lastIndexOf(ice.PS)+1)+libs[0] @@ -356,7 +347,7 @@ var Volcanos = shy("火山架", {iceberg: "/chat/", volcano: "/frame.js", args: if (cmds && typeof cmds == lang.OBJECT && cmds.length > 0 && typeof cmds[0] == lang.OBJECT && cmds[0].length > 0 ) { cmds[0] = cmds[0].join(ice.PT) } - return can.run && can.run(event, ["_search"].concat(cmds), cb, true) + return can.run && can.run(event, [chat._SEARCH].concat(cmds), cb, true) }, get: function(name, key, cb) { return can.search({}, [can.core.Keys(name, chat.ONEXPORT, key)], cb) }, set: function(name, key, value) { var msg = can.request({}); msg.Option(key, value) @@ -396,12 +387,12 @@ var Volcanos = shy("火山架", {iceberg: "/chat/", volcano: "/frame.js", args: } if (can._follow) { libs = libs.concat(meta.libs, meta.volcano) } - if (libs && libs.length > 0) { + if (libs && libs.length > 0) { // 解析参数 for (var i = 0; i < libs.length; i++) { if (libs[i] == undefined) { } else if (libs[i] == "") { - libs[i] = _can_path.replace(".js", ".css") + libs[i] = _can_path.replace(html._JS, html._CSS) } else if (libs[i][0] != ice.PS && libs[i].indexOf(ice.HTTP) != 0) { libs[i] = _can_path.slice(0, _can_path.lastIndexOf(ice.PS)+1)+libs[i] } @@ -410,14 +401,14 @@ var Volcanos = shy("火山架", {iceberg: "/chat/", volcano: "/frame.js", args: return can.require(libs, cb), can }) function can(tool) { - Volcanos({name: "chat", panels: [ - {name: "Header", help: "标题栏", pos: chat.HIDE, state: ["usernick"]}, - {name: "Action", help: "工作台", pos: chat.MAIN, tool: tool}, - {name: "Search", help: "搜索框", pos: chat.AUTO}, + Volcanos({panels: [ + {name: "Header", help: "标题栏", pos: html.HIDE, state: [aaa.USERNICK]}, + {name: "Action", help: "工作台", pos: html.MAIN, tool: tool}, + {name: "Search", help: "搜索框", pos: html.AUTO}, ]}) } -try { if (typeof(global) == lang.OBJECT) { +try { if (typeof(global) == lang.OBJECT) { // nodejs global.kit = kit, global.ice = ice global.ctx = ctx, global.cli = cli, global.web = web, global.aaa = aaa global.mdb = mdb, global.ssh = ssh, global.nfs = nfs, global.tcp = tcp @@ -443,7 +434,7 @@ try { if (typeof(global) == lang.OBJECT) { }) }) }) -} else { +} else { // browser Volcanos.meta.target = document.body Volcanos.meta._load = function(url, cb) { switch (url.split("?")[0].split(ice.PT).pop().toLowerCase()) { diff --git a/publish/chrome/contexts.js b/publish/chrome/contexts.js index 7f92e13d..2bc1093c 100644 --- a/publish/chrome/contexts.js +++ b/publish/chrome/contexts.js @@ -60,8 +60,8 @@ setTimeout(function() { Volcanos({Option: function() { return [] }, can.page.Modify(can, sub._target, {style: pos}) can.onmotion.move(can, sub._target, pos, function(target) { can.page.Modify(can, sub._output, {style: { - "max-height": window.innerHeight-target.offsetTop-80, - "max-width": window.innerWidth-target.offsetLeft-20, + "max-height": can._root._height-target.offsetTop-80, + "max-width": can._root._width-target.offsetLeft-20, }}) }) diff --git a/publish/order.js b/publish/order.js deleted file mode 100644 index b99fa118..00000000 --- a/publish/order.js +++ /dev/null @@ -1,2 +0,0 @@ -Volcanos("onengine", {}) -