diff --git a/frame.js b/frame.js index 5aeac16a..d5d930d6 100644 --- a/frame.js +++ b/frame.js @@ -229,8 +229,8 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, can._daemon == undefined && (can._daemon = can.ondaemon._list.push(can)-1), msg._daemon = msg._daemon||can._daemon return can.run(event, cmds, function(msg) { var sub = can.core.Value(can, "_outputs.-1")||{}; can._msg = msg, sub._msg = msg - if (can.core.CallFunc([sub, "onimport._process"], [sub, msg, cmds, cb])) { return } - if (can.core.CallFunc([can, "onimport._process"], [can, msg, cmds, cb])) { return } + if (msg._can == can && can.core.CallFunc([sub, "onimport._process"], [sub, msg, cmds, cb])) { return } + if (msg._can == can && can.core.CallFunc([can, "onimport._process"], [can, msg, cmds, cb])) { return } if (can.base.isFunc(cb) && can.core.CallFunc(cb, {can: can, msg: msg})) { return } if (silent) { return } diff --git a/page/index.js b/page/index.js index 8b9fbeb0..7aa1d646 100644 --- a/page/index.js +++ b/page/index.js @@ -92,8 +92,6 @@ Volcanos({name: "chat", iceberg: "/chat/", volcano: "/frame.js", {name: "nginx", help: "代理", index: "web.wiki.word", args: ["usr/nginx-story/src/main.shy"]}, ]}, "context": {name: "编程 context", action: [ - {name: "grafana", help: "可视化", index: "web.wiki.word", args: ["usr/golang-story/src/grafana/grafana.shy"]}, - {name: "gogs", help: "代码库", index: "web.wiki.word", args: ["usr/golang-story/src/gogs/gogs.shy"]}, {name: "golang", help: "编程", index: "web.wiki.word", args: ["usr/golang-story/src/main.shy"]}, ]}, "redis": {name: "缓存 redis", action: [ @@ -112,9 +110,6 @@ Volcanos({name: "chat", iceberg: "/chat/", volcano: "/frame.js", ]}, }}, "operate": {name: "运维群", storm: { - "aaa": {name: "权限 aaa", index: [ - "user", - ]}, "cli": {name: "系统 cli", index: [ "system", "daemon", "python", "output", "runtime", "process", @@ -123,6 +118,9 @@ Volcanos({name: "chat", iceberg: "/chat/", volcano: "/frame.js", "route", "serve", "space", "dream", "spide", "share", "cache", "story", ]}, + "aaa": {name: "权限 aaa", index: [ + "user", "sess", "role", + ]}, "nfs": {name: "文件 nfs", index: [ "nfs.cat", "nfs.dir", "nfs.tail", "nfs.trash", ]}, diff --git a/plugin/state.js b/plugin/state.js index 5b286e2d..49dde83f 100644 --- a/plugin/state.js +++ b/plugin/state.js @@ -21,12 +21,9 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, conf, return true }, _inner: function(can, msg) { - can.onappend.table(can, msg, function(value, key, index, line, array) { - return can.onimport._table(can, value, key, index, line, array) - }, can._output) - - can.onappend.board(can, msg.Result(), can._output) - can.onmotion.story.auto(can, can._output) + can.onappend.table(can, msg) + can.onappend.board(can, msg.Result()) + can.onmotion.story.auto(can) can.page.Modify(can, can._output, {style: {display: "block"}}) return true },