diff --git a/frame.js b/frame.js index 48ebc609..3006b24a 100644 --- a/frame.js +++ b/frame.js @@ -1,6 +1,5 @@ // volcanos: 前端 火山架 我看不行 // FMS: a fieldset manager system - Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta, list, cb, target) { can.core.Next(meta.panes, function(item, next) { can.onappend._init(can, item, meta.libs.concat(item.list), function(pane) { pane.Conf(item) @@ -75,6 +74,7 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta, delete(msg._event), delete(msg._can) Volcanos.meta.pack[pane._name+","+cmds.join(",")] = msg typeof cb == "function" && cb(msg) + delete(msg.sessid) }) }, engine: function(event, can, msg, pane, cmds, cb) { if (!can.onengine) { return false } @@ -194,6 +194,7 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta, {name: "HTML5", help: "浏览器", index: "web.wiki.word", args: ["usr/icebergs/misc/chrome/chrome.shy"]}, ]}, "linux": {name: "linux", action: [ + {name: "ES", help: "搜索", index: "web.wiki.word", args: ["usr/learning/自然/编程/es.shy"]}, {name: "linux", help: "系统", index: "web.wiki.word", args: ["usr/linux-story/src/main.shy"]}, ]}, "nginx": {name: "nginx", action: [ @@ -329,7 +330,7 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, break case "返回": can._history.pop(); var his = can._history.pop(); if (his) { - can.page.Select(can, option, "input.args", function(item, index) { + can.page.Select(can, can._option, "input.args", function(item, index) { item.value = his[index] || "" }) } diff --git a/index.html b/index.html index 432ffb73..6bc3fa96 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,6 @@ - diff --git a/index.js b/index.js index edac57ea..2044dcb2 100644 --- a/index.js +++ b/index.js @@ -1,3 +1,4 @@ +_can_name = "" Volcanos({name: "chat", volcano: "/frame.js", iceberg: "/chat/", intshell: "plug.sh", libs: ["/lib/base.js", "/lib/core.js", "/lib/misc.js", "/lib/page.js", "/lib/user.js"], panes: [ {name: "Header", help: "标题栏", pos: "head", state: ["time", "username"]}, diff --git a/lib/core.js b/lib/core.js index 53480de4..7aa17bc0 100644 --- a/lib/core.js +++ b/lib/core.js @@ -142,3 +142,4 @@ var core = Volcanos("core", {help: "核心模块", return obj === other } }) + diff --git a/pane/Header.js b/pane/Header.js index e99e6e0d..e0d7896c 100644 --- a/pane/Header.js +++ b/pane/Header.js @@ -33,6 +33,7 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, msg, delete(msg._event), delete(msg._can) }) var toast = can.user.toast(can, "打包中...", "webpack", 1000000) + msg.Option("name", "demo") msg.Option("content", JSON.stringify(Volcanos.meta.pack)) can.run(event, ["pack"], function(msg) { toast.Close(), can.user.toast(can, "打包成功", "webpack") @@ -121,3 +122,4 @@ Volcanos("onexport", {help: "导出数据", list: [], _init: function(can, msg, target.innerHTML = list[(new Date()).getDay()]+" "+can.base.Time().split(" ")[1] }, }) + diff --git a/pane/Search.js b/pane/Search.js index f95a91e0..eb92a227 100644 --- a/pane/Search.js +++ b/pane/Search.js @@ -119,4 +119,3 @@ Volcanos("onexport", {help: "导出数据", list: ["count", "index", "value"], _ }, }) - diff --git a/plugin/input.js b/plugin/input.js index 4b8772e5..42e5f6e3 100644 --- a/plugin/input.js +++ b/plugin/input.js @@ -65,3 +65,4 @@ Volcanos("onaction", {help: "控件交互", list: [], } }, }) + diff --git a/plugin/input/date.js b/plugin/input/date.js index 7e83aa84..97e23bfb 100644 --- a/plugin/input/date.js +++ b/plugin/input/date.js @@ -79,3 +79,4 @@ Volcanos("onfigure", {help: "控件详情", list: [], _merge: function(can, sub) }; set(show(now)); }}, }, ["/plugin/input/date.css"]) + diff --git a/plugin/input/key.js b/plugin/input/key.js index 128dfa23..84a48510 100644 --- a/plugin/input/key.js +++ b/plugin/input/key.js @@ -22,3 +22,4 @@ Volcanos("onfigure", {help: "控件详情", list: [], run() }}, }) + diff --git a/plugin/input/province.js b/plugin/input/province.js index c330f691..144967e3 100644 --- a/plugin/input/province.js +++ b/plugin/input/province.js @@ -11,8 +11,7 @@ Volcanos("onfigure", {help: "控件详情", list: [], china_chart.on('click', function (params) { target.value = params.name; }); + // , ["plugin/github.com/shylinux/echarts/echarts.js","plugin/github.com/shylinux/echarts/china.js"]) }}, -}, [ - // "plugin/github.com/shylinux/echarts/echarts.js", - // "plugin/github.com/shylinux/echarts/china.js", -]) +}) + diff --git a/plugin/input/upload.js b/plugin/input/upload.js index 25ba92b3..85774d8f 100644 --- a/plugin/input/upload.js +++ b/plugin/input/upload.js @@ -36,3 +36,4 @@ Volcanos("onfigure", {help: "控件详情", list: [], }) }}, }) + diff --git a/plugin/local/code/vimer.js b/plugin/local/code/vimer.js index aef62d47..b7b8f55f 100644 --- a/plugin/local/code/vimer.js +++ b/plugin/local/code/vimer.js @@ -242,3 +242,4 @@ Volcanos("onkeymap", {help: "键盘交互", list: ["command", "normal", "insert" return target }, }) + diff --git a/plugin/local/wiki/feel.js b/plugin/local/wiki/feel.js index 00a056da..b68733b2 100644 --- a/plugin/local/wiki/feel.js +++ b/plugin/local/wiki/feel.js @@ -95,3 +95,4 @@ Volcanos("onexport", {help: "导出数据", list: ["total", "begin", "limit", "p return parseInt((index+1)*100/total)+"%"+" = "+(parseInt(index)+1)+"/"+parseInt(total) }, }) + diff --git a/plugin/local/wiki/walk.js b/plugin/local/wiki/walk.js index 1c4d1d0c..be01be5e 100644 --- a/plugin/local/wiki/walk.js +++ b/plugin/local/wiki/walk.js @@ -147,9 +147,4 @@ Volcanos("onimport", {help: "导入数据", list: [], }) }, }) -Volcanos("onaction", {help: "组件交互", list: []}) -Volcanos("onchoice", {help: "组件菜单", list: []}) -Volcanos("ondetail", {help: "组件详情", list: []}) -Volcanos("onexport", {help: "导出数据", list: []}) - diff --git a/plugin/local/wiki/word.js b/plugin/local/wiki/word.js index 2e1ceb6b..70f9a8b9 100644 --- a/plugin/local/wiki/word.js +++ b/plugin/local/wiki/word.js @@ -273,3 +273,4 @@ Volcanos("onaction", {help: "控件交互", list: ["演示"], })}, ] }]) }, }) + diff --git a/plugin/story/paste.js b/plugin/story/paste.js index 50c3ec07..7186af4b 100644 --- a/plugin/story/paste.js +++ b/plugin/story/paste.js @@ -20,4 +20,3 @@ Volcanos("ondetail", {help: "控件交互", list: ["编辑", "删除"], }, }) - diff --git a/plugin/story/ticker.js b/plugin/story/ticker.js index eb90fc66..538fd49d 100644 --- a/plugin/story/ticker.js +++ b/plugin/story/ticker.js @@ -3,3 +3,4 @@ Volcanos("onimport", {help: "导入数据", list: [], }, }) + diff --git a/plugin/story/trend.js b/plugin/story/trend.js index 3ea1fde1..88dac69c 100644 --- a/plugin/story/trend.js +++ b/plugin/story/trend.js @@ -188,6 +188,5 @@ Volcanos("onaction", {help: "组件菜单", list: ["编辑", "清空", ["view", can.onappend.table(can, can.ui.display, "table", can._msg) }, }) -Volcanos("onchoice", {help: "组件交互", list: []}) -Volcanos("ondetail", {help: "组件详情", list: []}) Volcanos("onexport", {help: "导出数据", list: ["from", "commit", "total", "date", "begin", "add", "del", "close", "note"]}) +