diff --git a/frame.js b/frame.js
index 82dc6a6c..ef2dbf95 100644
--- a/frame.js
+++ b/frame.js
@@ -48,7 +48,7 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta,
remote: function(event, can, msg, pane, cmds, cb) {
if (pane.onengine.engine(event, can, msg, pane, cmds, cb)) { return }
can.misc.Run(event, can, {names: pane._name}, cmds, cb)
- pane.run(event, ["search", "Footer.onimport.ncmd"])
+ // pane.run(event, ["search", "Footer.onimport.ncmd"])
}, engine: function(event, can, msg, pane, cmds, cb) { return false },
river: {
@@ -144,11 +144,12 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta,
]},
}},
"operate": {name: "运维群", storm: {
+ "web": {name: "web", index: [
+ "route", "serve", "space", "dream",
+ "spide", "share", "cache", "story",
+ ]},
"relay": {name: "relay", index: [
"aaa.totp",
- "web.route",
- "web.space",
- "web.dream",
"web.code.tmux.session",
]},
"os": {name: "os", action: [
diff --git a/lib/misc.js b/lib/misc.js
index d7c867a6..ae410468 100644
--- a/lib/misc.js
+++ b/lib/misc.js
@@ -109,7 +109,7 @@ Volcanos("misc", {help: "工具模块", Message: function(event, can) { var msg
msg[item] && (form[item] = msg[item])
})
- can.misc.POST(can, msg, can.Conf("iceberg")+dataset.names.toLowerCase()+"?="+(msg._can.sup||msg._can)._name, form, function(msg) {
+ can.misc.POST(can, msg, (can.Conf("iceberg")?can.Conf("iceberg"):"/chat/")+dataset.names.toLowerCase()+"?="+(msg._can.sup||msg._can)._name, form, function(msg) {
typeof cb == "function" && cb(msg)
})
}),
diff --git a/page/index.css b/page/index.css
index 04fc7642..28bc4a6a 100644
--- a/page/index.css
+++ b/page/index.css
@@ -187,13 +187,13 @@ fieldset>div.output div.project div.list {
fieldset.input {
background-color:#30a7a93d;
position:fixed;
- z-index:100;
+ z-index:50;
}
fieldset.input.key {
- z-index:90;
+ z-index:60;
}
fieldset.input.date {
- z-index:80;
+ z-index:70;
}
div.carte {
@@ -215,7 +215,7 @@ div.upload {
background:black; color:yellow;
position:fixed;
padding:5px;
- z-index:100;
+ z-index:50;
}
div.upload div.item {
float:left;
@@ -225,7 +225,7 @@ div.toast {
background:#0e3369b3; color:yellow;
position:fixed;
padding:5px;
- z-index:100;
+ z-index:20;
}
div.toast div.title {
font-size:14px;
diff --git a/page/index.html b/page/index.html
deleted file mode 100644
index be9b91a9..00000000
--- a/page/index.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- volcanos
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pane/Action.js b/pane/Action.js
index 9f9d2e57..39e8f24a 100644
--- a/pane/Action.js
+++ b/pane/Action.js
@@ -30,6 +30,12 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg,
}
}, target)
},
+ _share: function(can, msg, share, cb) {
+ can.user.title(msg.Option("title"))
+ can.user.topic(can, can.user.Search(can, "topic")||msg.Option("topic")||"white print")
+ can.Conf(RIVER, "_share"), can.Conf(STORM, share)
+ can.onimport._init(can, msg, [], cb, can._output)
+ },
})
Volcanos("onengine", {help: "解析引擎", list: [],
engine: function(event, can, msg, pane, cmds, cb) {
@@ -55,10 +61,13 @@ Volcanos("onengine", {help: "解析引擎", list: [],
Volcanos("onaction", {help: "交互操作", list: [], _init: function(can, msg, list, cb, target) {
var share = can.user.Search(can, "share"); if (share) {
can.run({}, ["_share", share], function(msg) {
- can.user.title(msg.Option("title"))
- can.user.topic(can, can.user.Search(can, "topic")||msg.Option("topic")||"white print")
- can.Conf(RIVER, "_share"), can.Conf(STORM, share)
- can.onimport._init(can, msg, [], cb, can._output)
+ if (msg.append && msg[msg.append[0]]) {
+ can.onimport._share(can, msg, share, cb)
+ return
+ }
+ can.onengine.engine({}, can, msg, can, [msg.Option("sess.river"), msg.Option("sess.storm")], function(msg) {
+ can.onimport._share(can, msg, share, cb)
+ })
})
}
diff --git a/pane/Debug.js b/pane/Debug.js
index 627b83ce..61e32afa 100644
--- a/pane/Debug.js
+++ b/pane/Debug.js
@@ -1,5 +1,5 @@
Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) {
- can.require(["/plugin/github.com/Tencent/vConsole/dist/vconsole.min.js"], function(can) {
+ can.require(["/require/github.com/Tencent/vConsole/dist/vconsole.min.js"], function(can) {
var v = new VConsole();
console.log(v);
})
diff --git a/plugin/input/province.js b/plugin/input/province.js
index 144967e3..358ae317 100644
--- a/plugin/input/province.js
+++ b/plugin/input/province.js
@@ -11,7 +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"])
+ // , ["require/github.com/shylinux/echarts/echarts.js","require/github.com/shylinux/echarts/china.js"])
}},
})
diff --git a/plugin/local/wiki/walk.js b/plugin/local/wiki/walk.js
index 31705e12..924fbfd7 100644
--- a/plugin/local/wiki/walk.js
+++ b/plugin/local/wiki/walk.js
@@ -18,8 +18,8 @@ Volcanos("onimport", {help: "导入数据", list: [],
}
// can.page.Append(can, action, [{type: "script", src: "https://cdn.bootcss.com/echarts/4.2.0-rc.2/echarts.js"}]);
- can.page.Append(can, output, [{include: ["plugin/github.com/shylinux/echarts/echarts.js", function(event) {
- can.page.Append(can, output, [{include: ["plugin/github.com/shylinux/echarts/china.js", function(event) {
+ can.page.Append(can, output, [{include: ["require/github.com/shylinux/echarts/echarts.js", function(event) {
+ can.page.Append(can, output, [{include: ["require/github.com/shylinux/echarts/china.js", function(event) {
var china_chart = echarts.init(can.page.Append(can, output, [{type: "div", style: {width: "600px", height: "400px"}}]).last);
var data = msg.Table()
diff --git a/plugin/state.js b/plugin/state.js
index 9525dd92..cff86cbc 100644
--- a/plugin/state.js
+++ b/plugin/state.js
@@ -44,6 +44,10 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, conf,
can.onappend._init(can, value, ["/plugin/state.js"], function(sub) {
sub.run = function(event, cmds, cb, silent) {
+ var res = can.request(event)
+ can.core.Item(can.Option(), function(key, value) {
+ res.Option(key) || res.Option(key, value)
+ })
can.run(event, (msg["_prefix"]||[]).concat(cmds), cb, true)
}
}, can._output)