diff --git a/core/chat/flows.css b/core/chat/flows.css index e856c0da..e3072187 100644 --- a/core/chat/flows.css +++ b/core/chat/flows.css @@ -9,6 +9,11 @@ $content svg text { dominant-baseline:middle; } $content svg text.fail { stroke:var(--web-flows-fail); fill:var(--web-flows-fail); } $content svg text.done { stroke:var(--web-flows-done); fill:var(--web-flows-done); } $content svg text.select { stroke:var(--notice-bg-color); fill:var(--notice-bg-color); } +$content svg g.line0 line { stroke-width:10; } +$content svg g.line1 line { stroke-width:8; } +$content svg g.line2 line { stroke-width:6; } +$content svg g.line3 line { stroke-width:4; } +$content svg g.line4 line { stroke-width:2; } $content fieldset.can._action { position:absolute; bottom:var(--action-height); } $content fieldset.can._action>legend { display:none; } $content fieldset.can._action>div.action { display:contents; } diff --git a/core/chat/flows.js b/core/chat/flows.js index 245526f7..1473c15a 100644 --- a/core/chat/flows.js +++ b/core/chat/flows.js @@ -3,12 +3,37 @@ Volcanos(chat.ONIMPORT, { if (can.Option(mdb.ZONE)) { can.onimport._content(can, msg, can.db.value = {zone: can.Option(mdb.ZONE)}) } else { + msg.Push(mdb.ZONE, "command") can.ui = can.onappend.layout(can), can.ui.toggle = can.onappend.toggle(can), can.onimport._project(can, msg) } }, _project: function(can, msg) { msg.Table(function(value) { value._select = value.zone == can.db.hash[0] can.onimport.item(can, value, function(event, item, show, target) { can.onimport.tabsCache(can, can.request(), item.zone, item, target, function() { + if (value.zone == "command") { + can.run(event, [ctx.RUN, ctx.COMMAND], function(msg) { + var res = can.request() + var cmds = {ice: []} + res.Push("hash", "ice").Push("name", "ice").Push("index", "").Push("prev", "").Push("from", "") + msg.Table(function(value) { + can.core.List(value.index.split("."), function(cmd, index, list) { + if (list[0] == "ice") { return } + var _mod = list.slice(0, index).join(".")||"ice" + var _cmd = list.slice(0, index+1).join(".") + var last = (cmds[_mod][cmds[_mod].length-1])||_mod + _cmd != last && cmds[_mod].push(_cmd) + var prev = "", from = "" + if (index % 2 == 0) { prev = last } else { from = last } + if (!cmds[_cmd]) { + res.Push("hash", _cmd).Push("name", cmd).Push("index", index < list.length-1? "": _cmd).Push("prev", prev).Push("from", from) + if (index < list.length-1) { cmds[_cmd] = [] } + } + }) + }) + can.onimport._content(can, res, value) + }) + return + } can.run(event, [value.zone], function(msg) { can.onimport._content(can, msg, value) }) }) }) @@ -16,92 +41,109 @@ Volcanos(chat.ONIMPORT, { _content: function(can, msg, value) { var target = can.ui.content||can._output; can.onmotion.clear(can, target) can.onappend.plugin(can, {index: web.WIKI_DRAW, style: html.OUTPUT, display: "/plugin/local/wiki/draw.js", height: target.offsetHeight, width: target.offsetWidth}, function(sub) { sub.onexport.output = function() { value._content_plugin = sub, can.onimport._toolkit(can, msg, value) } - sub.run = function(event, cmds, cb) { cb(can.request(event)) } + sub.run = function(event, cmds, cb) { cb && cb(can.request(event)) } }, target) }, _toolkit: function(can, msg, value) { var target = can.ui.content||can._output can.onappend.plugin(can, {index: "can._action"}, function(sub) { sub.ConfSpace(can.ConfSpace()), sub.ConfIndex([can.ConfIndex(), value.zone].join(":")) - sub.run = function(event, cmds, cb) { cmds[0] == ctx.ACTION? can.core.CallFunc(can.onaction[cmds[1]], [event, can, value]): cb(can.request(event)) } + sub.run = function(event, cmds, cb) { cmds[0] == ctx.ACTION? can.core.CallFunc(can.onaction[cmds[1]], [event, can, value]): cb && cb(can.request(event)) } sub.onexport.output = function() { sub.onappend._action(sub, can.onaction._toolkit), value._toolkit_plugin = sub, sub.onaction._select(), can.onimport.layout(can) } sub.onaction._select = function() { can.onimport._display(can, msg, value), can.onimport._flows(can, value) } }, target) }, _display: function(can, msg, value) { if (!can.ui.display) { return } can.onmotion.clear(can, can.ui.display) var list = {}; msg.Table(function(value) { list[value.hash] = value }) - var root; can.core.Item(list, function(key, item) { if (!item.prev && !item.from) { return root = item } - try { if (item.prev) { list[item.prev].next = item } if (item.from) { list[item.from].to = item } } catch(e) { console.log(e) } - }), value._root = root, can.core.Item(list, function(key, item) { if (item.prev) { item.prev = list[item.prev] } if (item.from) { item.from = list[item.from] } }) - var _list = can.onexport.travel(can, value, root, true), _msg = can.request(); can.core.List(_list, function(item) { + can.core.Item(list, function(key, item) { if (!item.prev && !item.from) { return value._root = item } + if (item.prev) { list[item.prev].next = item, item.prev = list[item.prev] } + if (item.from) { list[item.from].to = item, item.from = list[item.from] } + }), value._list = list + var _list = can.onexport.travel(can, value, value._root), _msg = can.request(); can.core.List(_list, function(item) { _msg.Push(mdb.TIME, item.time), _msg.Push(mdb.HASH, item.hash), _msg.Push(mdb.NAME, item.name) _msg.Push(web.SPACE, item.space), _msg.Push(ctx.INDEX, item.index||""), _msg.Push(ctx.ARGS, item.args||""), _msg.Push(ctx.ACTION, item.action||"") - }) - var table = can.onappend.table(can, _msg, null, can.ui.display); can.page.Select(can, table, "tbody>tr", function(target, index) { _list[index]._tr = target }) + }); var table = can.onappend.table(can, _msg, null, can.ui.display); can.page.Select(can, table, "tbody>tr", function(target, index) { _list[index]._tr = target }) // can.onappend._status(can, can.base.Obj(msg.Option(ice.MSG_STATUS))) }, - _profile: function(can, item, value) { - value._current = item, value._profile_plugin = item._profile_plugin, can.onexport.hash(can, value.zone, item.hash) - if (!item.index) { return can.onmotion.hidden(can, can.ui.profile), can.onimport.layout(can) } can.onmotion.toggle(can, can.ui.profile, true), can.onimport.layout(can) + _profile: function(can, item, value) { if (!can.ui.profile) { return } + value._profile_plugin = item._profile_plugin, value._current = item, can.onexport.hash(can, value.zone, item.hash) + can.onmotion.toggle(can, can.ui.profile, true), can.onimport.layout(can) if (can.onmotion.cache(can, function() { return can.core.Keys(value.zone, item.hash) }, can.ui.profile)) { return } - can.onappend.plugin(can, {space: item.space, index: item.index, args: item.args, width: (can.ConfWidth()-can.ui.project.offsetWidth)/2-1}, function(sub) { - item._profile_plugin = sub, value._profile_plugin = item._profile_plugin - sub.run = function(event, cmds, cb) { can.runActionCommand(can.request(event, {pod: item.space}), item.index, cmds, cb) } + item.index && can.onappend.plugin(can, {pod: item.space, index: item.index, args: item.args, width: can.ui.profileWidth-1}, function(sub) { value._profile_plugin = item._profile_plugin = sub sub.onaction._close = function() { can.onmotion.hidden(can, can.ui.profile), can.onimport.layout(can) } sub.onexport.output = function() { can.onimport.layout(can) } }, can.ui.profile) }, - _flows: async function(can, value) { - var sub = value._content_plugin.sub - var _sub = value._toolkit_plugin.sub - var margin = can.onexport.margin(_sub), height = can.onexport.height(_sub), width = can.onexport.width(_sub) - var matrix = {}, horizon = _sub.Action("direct") == "horizon"; can.onmotion.clear(can, sub.ui.svg) - async function sleep() { return new Promise(resolve => { setTimeout(resolve, _sub.Action("delay")) }) } - async function show(item, main) { var prev = "from", from = "prev"; if (horizon) { var prev = "prev", from = "from" } + _flows: function(can, value) { var sub = value._toolkit_plugin.sub, _sub = value._content_plugin.sub + var margin = can.onexport.margin(sub), height = can.onexport.height(sub), width = can.onexport.width(sub) + var matrix = {}, horizon = sub.Action("direct") == "horizon"; can.onmotion.clear(can, _sub.ui.svg) + var lines = [], rects = [] + function show(item, main, deep) { var prev = "from", from = "prev"; if (horizon) { var prev = "prev", from = "from" } while (matrix[can.core.Keys(item.x, item.y)]) { if (horizon && main || !horizon && !main) { item.y++ - for(var _item = item[prev]; _item; _item = _item[prev]) { _item.y++ - if (!horizon && _item[prev]) { _item._line.Val("y1", _item._line.Val("y1")+height) } _item._line.Val("y2", _item._line.Val("y2")+height) - _item._rect.Val("y", _item._rect.Val("y")+height), _item._text.Val("y", _item._text.Val("y")+height) - } + for(var _head = item[prev]; _head; _head = _head[prev]) { if (!_head[prev]) { + can.core.List(can.onexport.travel(can, value, _head, main), function(_item) { if (!_item._rect) { return } + delete(matrix[can.core.Keys(_item.x, _item.y)]), _item.y++, matrix[can.core.Keys(_item.x, _item.y)] = _item + if ( _item._line) { + if (_item != _head) { + _item._line.Val("y1", _item._line.Val("y1")+height) + } _item._line.Val("y2", _item._line.Val("y2")+height) + } + _item._rect.Val("y", _item._rect.Val("y")+height), _item._text.Val("y", _item._text.Val("y")+height) + }) + can.core.List(can.onexport.travel(can, value, _head, main), function(_item) { if (!_item._rect) { return } + matrix[can.core.Keys(_item.x, _item.y)] = _item + }) + } } } else { item.x++ - for(var _item = item[from]; _item; _item = _item[from]) { _item.x++ - if (horizon && _item[from]) { _item._line.Val("x1", _item._line.Val("x1")+width) } _item._line.Val("x2", _item._line.Val("x2")+width) - _item._rect.Val("x", _item._rect.Val("x")+width), _item._text.Val("x", _item._text.Val("x")+width) - } + for(var _head = item[from]; _head; _head = _head[from]) { if (!_head[from]) { + can.core.List(can.onexport.travel(can, value, _head, main), function(_item) { if (!_item._rect) { return } + delete(matrix[can.core.Keys(_item.x, _item.y)]), _item.x++ + if ( _item._line) { + if (_item != _head) { + _item._line.Val("x1", _item._line.Val("x1")+width) + } + _item._line.Val("x2", _item._line.Val("x2")+width) + } + _item._rect.Val("x", _item._rect.Val("x")+width), _item._text.Val("x", _item._text.Val("x")+width) + }) + can.core.List(can.onexport.travel(can, value, _head, main), function(_item) { if (!_item._rect) { return } + matrix[can.core.Keys(_item.x, _item.y)] = _item + }) + } } } } matrix[can.core.Keys(item.x, item.y)] = item - if (item.from || item.prev) { item._line = sub.onimport.draw(sub, {shape: svg.LINE, points: - horizon && item.from || !horizon && !item.from? [{x: item.x*width+width/2, y: item.y*height-margin}, {x: item.x*width+width/2, y: item.y*height+margin}]: - [{x: item.x*width-margin, y: item.y*height+height/2}, {x: item.x*width+margin, y: item.y*height+height/2}] - }) } can.onimport._block(can, value, item, item.x*width, item.y*height) - // , await sleep() + if (item.from || item.prev) { lines.length <= deep && lines.push(_sub.onimport.group(_sub, "line"+deep)) + item._line = _sub.onimport.draw(_sub, {shape: svg.LINE, points: + horizon && item.from || !horizon && !item.from? [{x: item.x*width+width/2, y: item.y*height-margin}, {x: item.x*width+width/2, y: item.y*height+margin}]: + [{x: item.x*width-margin, y: item.y*height+height/2}, {x: item.x*width+margin, y: item.y*height+height/2}] + }, lines[deep]) + } rects.length <= deep && rects.push(_sub.onimport.group(_sub, "rect"+deep)) + can.onimport._block(can, value, item, item.x*width, item.y*height, rects[deep]) var next = 0, to = 1; if (horizon) { var next = 1, to = 0 } + if (item._close) { return } if (main) { - var _item = item.to; if (_item) { _item.x = item.x+to, _item.y = item.y+next, await show(_item) } - var _item = item.next; if (_item) { _item.x = item.x+next, _item.y = item.y+to, await show(_item, true) } + var _item = item.to; if (_item) { _item.x = item.x+to, _item.y = item.y+next, show(_item, false, deep+1) } + var _item = item.next; if (_item) { _item.x = item.x+next, _item.y = item.y+to, show(_item, true, deep) } } else { - var _item = item.next; if (_item) { _item.x = item.x+next, _item.y = item.y+to, await show(_item, true) } - var _item = item.to; if (_item) { _item.x = item.x+to, _item.y = item.y+next, await show(_item) } + var _item = item.next; if (_item) { _item.x = item.x+next, _item.y = item.y+to, show(_item, true, deep+1) } + var _item = item.to; if (_item) { _item.x = item.x+to, _item.y = item.y+next, show(_item, false, deep) } } - } value._root.x = 0, value._root.y = 0, await show(value._root, true) + } value._root.x = 0, value._root.y = 0, show(value._root, true, 0) + var max_x = 0, max_y = 0 + can.core.List(can.onexport.travel(can, value, value._root), function(item) { item.x > max_x && (max_x = item.x), item.y > max_y && (max_y = item.y) }) + _sub.ui.svg.Value(html.HEIGHT, max_y*height), _sub.ui.svg.Value(html.WIDTH, max_x*width) }, - _block: function(can, value, item, x, y) { - var sub = value._content_plugin.sub - var _sub = value._toolkit_plugin.sub - var margin = can.onexport.margin(_sub), height = can.onexport.height(_sub), width = can.onexport.width(_sub) - var rect = sub.onimport.draw(sub, {shape: svg.RECT, points: [{x: x+margin, y: y+margin}, {x: x+width-margin, y: y+height-margin}]}) - var text = sub.onimport.draw(sub, {shape: svg.TEXT, points: [{x: x+width/2, y: y+height/2}], style: {inner: item.name||item.index.split(nfs.PT).pop()}}) - sub.ui.svg.Value(html.HEIGHT, y+height), sub.ui.svg.Value(html.WIDTH, x+width) - item._rect = rect, item._text = text, can.core.ItemCB(can.ondetail, function(key, cb) { text[key] = rect[key] = function(event) { - can.request(event, item, {zone: value.zone}), cb(event, can, item, value) - } }) - if (item.status) { item._line && item._line.Value(html.CLASS, item.status), rect.Value(html.CLASS, item.status), text.Value(html.CLASS, item.status) } - if (value.zone == can.db.hash[0] && item.hash == can.db.hash[1] && can.onexport.session(can, "profile.show") != ice.FALSE) { - can.onmotion.delay(can, function() { rect.onclick({target: rect}) }) - } + _block: function(can, value, item, x, y, group) { var sub = value._toolkit_plugin.sub, _sub = value._content_plugin.sub + var margin = can.onexport.margin(sub), height = can.onexport.height(sub), width = can.onexport.width(sub) + var rect = _sub.onimport.draw(_sub, {shape: svg.RECT, points: [{x: x+margin, y: y+margin}, {x: x+width-margin, y: y+height-margin}]}, group) + var text = _sub.onimport.draw(_sub, {shape: svg.TEXT, points: [{x: x+width/2, y: y+height/2}], style: {inner: item.name||item.index.split(nfs.PT).pop()}}, group) + var line = item._line||{}; item._rect = rect, item._text = text + _sub.ui.svg.Value(html.HEIGHT, y+height), _sub.ui.svg.Value(html.WIDTH, x+width) + can.core.ItemCB(can.ondetail, function(key, cb) { line[key] = rect[key] = text[key] = function(event) { can.request(event, item, value), cb(event, can, item, value) } }) + if (item.status) { item._line && line.Value(html.CLASS, item.status), rect.Value(html.CLASS, item.status), text.Value(html.CLASS, item.status) } + if (value.zone == can.db.hash[0] && item.hash == can.db.hash[1] && can.onexport.session(can, "profile.show") != ice.FALSE) { can.onmotion.delay(can, function() { rect.onclick({target: rect}) }) } }, layout: function(can) { can.ui.layout(can.ConfHeight(), can.ConfWidth(), 0, function(height, width) { - var sub = can.db.value && can.db.value._toolkit_plugin - if (sub) { + var sub = can.db.value && can.db.value._toolkit_plugin; if (sub) { can.page.style(can, sub._target, html.LEFT, 0), sub.onimport.size(sub, html.ACTION_HEIGHT, width, true) can.page.style(can, sub._target, html.LEFT, (can.ui.content.offsetWidth-sub._target.offsetWidth)/2) } @@ -111,36 +153,42 @@ Volcanos(chat.ONACTION, { _toolkit: [ "play", "prev", "next", ["travel", "deep", "wide"], - ["delay", 30, 100, 200, 500, 1000], + ["delay", 1000, 3000, 5000], "", ["direct", "vertical", "horizon"], [html.MARGIN, 10, 20, 40, 60], [html.HEIGHT, 60, 80, 100, 120, 140, 200], - [html.WIDTH, 200, 240, 280, 400], + [html.WIDTH, 180, 200, 240, 280, 400], ], - play: function(event, can, value) { var list = can.onexport.travel(can, value, value._root, true) + play: function(event, can, value) { var list = can.onexport.travel(can, value, value._root); var sub = value._toolkit_plugin.sub can.core.List(list, function(item) { item._line && item._line.Value(html.CLASS, ""), item._rect.Value(html.CLASS, ""), item._text.Value(html.CLASS, "") }) can.core.Next(list, function(item, next, index, list) { item._line && item._line.Value(html.CLASS, "done"), item._rect.Value(html.CLASS, "done"), item._text.Value(html.CLASS, "done") - can.user.toast(can, list[index].index), can.ondetail._select(event, can, item, value), can.onmotion.delay(can, next, 1000) + can.user.toast(can, list[index].index), can.ondetail._select(event, can, item, value), can.onmotion.delay(can, next, sub.Action("delay")) }, function() { can.user.toastSuccess(can) }) }, prev: function(event, can, value) { if (!can.db.current) { can.db.current = value._root } can.ondetail._select(event, can, can.db.current.prev || can.db.current.from, value) }, - next: function(event, can, value) { if (!can.db.current) { can.db.current = value._root } var _sub = value._toolkit_plugin.sub - can.ondetail._select(event, can, _sub.Action("travel") == "wide" && can.db.current.next || can.db.current.to, value) + next: function(event, can, value) { if (!can.db.current) { can.db.current = value._root } var sub = value._toolkit_plugin.sub + can.ondetail._select(event, can, sub.Action("travel") == "wide" && can.db.current.next || can.db.current.to, value) }, create: function(event, can) { can.user.input(event, can, can.Conf("feature.create"), function(data) { can.runAction(can.request(event, data), mdb.CREATE, [], function(msg) { - can.onexport.hash(can, data.zone), can.Update() + can.db.hash = can.onexport.hash(can, data.zone) + msg = can.request(), msg.Push(data), can.onimport._project(can, msg) }) }) }, addnext: function(event, can) { can.onaction._insert(event, can, "prev") }, addto: function(event, can) { can.onaction._insert(event, can, "from") }, + toggles: function(event, can) { + var msg = can.request(event) + can.db.value._list[msg.Option(mdb.HASH)]._close = !can.db.value._list[msg.Option(mdb.HASH)]._close + can.onimport._flows(can, can.db.value) + }, rename: function(event, can) { can.onaction._modify(event, can, [mdb.NAME]) }, plugin: function(event, can) { can.onaction._modify(event, can, [ctx.INDEX, ctx.ARGS]) }, _insert: function(event, can, from) { var msg = can.request(event), zone = msg.Option(mdb.ZONE) @@ -160,9 +208,9 @@ Volcanos(chat.ONACTION, { }, }) Volcanos(chat.ONDETAIL, { - _select: function(event, can, item, value) { if (!item) { return can.onmotion.hidden(can, can.ui.profile) } - can.isCmdMode() && item._rect.scrollIntoView(), value._current = item, can.onimport._profile(can, item, value) - can.page.Select(can, item._rect.parentNode, "", function(target) { var _class = (target.Value(html.CLASS)||"").split(lex.SP) + _select: function(event, can, item, value) { can.onimport._profile(can, item, value), can.isCmdMode() && item._rect.scrollIntoView() + var sub = value._toolkit_plugin.sub, _sub = value._content_plugin.sub + can.page.Select(can, _sub.ui.svg, "rect", function(target) { var _class = (target.Value(html.CLASS)||"").split(lex.SP) if (can.base.isIn(target, item._line, item._rect, item._text)) { if (_class.indexOf(html.SELECT) == -1) { target.Value(html.CLASS, _class.concat([html.SELECT]).join(lex.SP).trim()) } } else { @@ -174,27 +222,29 @@ Volcanos(chat.ONDETAIL, { }) }, onclick: function(event, can, item, value) { can.request(event, item, {zone: value.zone}) - var sub = value._content_plugin.sub - var _sub = value._toolkit_plugin.sub - switch (sub.ui.svg.style.cursor) { - case "e-resize": - if (_sub.Action("direct") == "horizon") { can.onaction.addnext(event, can) } else { can.onaction.addto(event, can) } break - case "s-resize": - if (_sub.Action("direct") == "horizon") { can.onaction.addto(event, can) } else { can.onaction.addnext(event, can) } break + var sub = value._toolkit_plugin.sub, _sub = value._content_plugin.sub + switch (_sub.ui.svg.style.cursor) { + case "e-resize": if (sub.Action("direct") == "horizon") { can.onaction.addnext(event, can) } else { can.onaction.addto(event, can) } break + case "s-resize": if (sub.Action("direct") == "horizon") { can.onaction.addto(event, can) } else { can.onaction.addnext(event, can) } break default: can.ondetail._select(event, can, item, value) } }, oncontextmenu: function(event, can, item, value) { - can.user.carteItem(event, can, can.base.CopyStr({action: item.action, zone: value.zone}, item)) + item.action? can.user.carteItem(event, can, can.base.CopyStr({action: item.action, zone: value.zone}, item)): can.user.carte(can.request(event, item, value), can, can.onaction, ["toggles"], function(event, button) { + can.request(event, item, value) + can.onaction[button](event, can, button) + }) }, }) Volcanos(chat.ONEXPORT, { margin: function(can) { var margin = can.Action(html.MARGIN); return parseFloat(margin)||10 }, height: function(can) { var height = can.Action(html.HEIGHT); return parseFloat(height)||60 }, width: function(can) { var width = can.Action(html.WIDTH); return parseFloat(width)||200 }, - travel: function(can, value, root, main) { if (!root) { return [] } - var _sub = value._toolkit_plugin.sub - if (_sub.Action("travel") == "deep") { var list = [root] + travel: function(can, value, root, main) { if (!root) { return [] } main == undefined && (main = true) + var sub = value._toolkit_plugin.sub + var list = [root] + if (root._close) { return list } + if (sub.Action("travel") == "deep") { if (main) { if (root.to) { list = list.concat(can.onexport.travel(can, value, root.to, false)) } if (root.next) { list = list.concat(can.onexport.travel(can, value, root.next, true)) } @@ -202,7 +252,7 @@ Volcanos(chat.ONEXPORT, { if (root.next) { list = list.concat(can.onexport.travel(can, value, root.next, true)) } if (root.to) { list = list.concat(can.onexport.travel(can, value, root.to, false)) } } - } else { var list = [root], i = 0 + } else { var i = 0 while (i < list.length) { var count = list.length for (i; i < count; i++) { for (var item = list[i].next; item; item = item.next) { list.push(item) } } if (count == 1) { i = 0 } var count = list.length