diff --git a/frame.js b/frame.js
index ca6171dc..9fc1962e 100644
--- a/frame.js
+++ b/frame.js
@@ -83,7 +83,7 @@ Volcanos("ondaemon", {help: "推荐引擎", list: [], _init: function(can, name)
},
grow: function(can, msg, arg) {
var sub = can.ondaemon._list[msg.Option("_target")]
- sub.onimport._grow(sub, arg.join(""))
+ sub.onimport._grow(sub, can.page.Color(arg.join("")))
},
toast: function(can, msg, arg) {
can.onmotion.float.add(can, "float", can.core.CallFunc(can.user.toast, {can: can, msg: msg, cmds: arg}))
@@ -139,14 +139,14 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta,
can.base.isFunc(cb) && cb(sub)
}, target)
},
- Pack: function(cmds, slient) {
+ Pack: function(cmds, silent) {
cmds = cmds && cmds.length > 0? cmds: sub.page.Select(sub, option, "textarea.args,input.args,select.args", function(item) {
return item.name && item.value || ""
}); for (var i = cmds.length-1; i >= 0; i--) {
if (!cmds[i]) { cmds.pop() } else { break }
}
- var last = sub._history[sub._history.length-1]; !sub.base.Eq(last, cmds) && cmds[0] != "action" && !slient && sub._history.push(cmds)
+ var last = sub._history[sub._history.length-1]; !sub.base.Eq(last, cmds) && cmds[0] != "action" && !silent && sub._history.push(cmds)
return cmds
},
}, list.concat(Volcanos.meta.volcano, Volcanos.meta.libs), function(sub) { sub.Conf(meta)
@@ -299,9 +299,12 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta,
case "": return can.page.Append(can, target, [item])
}
+
+ var title = can.Conf(["feature", "title", item.name].join("."))||""
var input = {type: "input", name: item.name, data: item, dataset: {}}
item.value == "auto" && (item.value = "", item.action = "auto")
item.action == "auto" && (input.dataset.action = "auto")
+ title && (input.title = title)
switch (item.type = item.type||item._input||"text") {
case "textarea": input.type = "textarea"
diff --git a/lib/misc.js b/lib/misc.js
index 67b7aa09..15d9bfdf 100644
--- a/lib/misc.js
+++ b/lib/misc.js
@@ -109,7 +109,7 @@ Volcanos("misc", {help: "通信协议", Message: function(event, can) { var msg
})
can.misc.POST(can, msg, can.base.MergeURL(dataset.names.toLowerCase(),
- "_", (msg._can.sup||msg._can)._name, "_daemon", msg._daemon||dataset.daemon||"",
+ "_", (msg._can.sup||msg._can)._name, "_daemon", msg.__daemon||dataset.daemon||"",
), form, cb)
},
WSS: function(can, args, cb, onopen, onclose, onerror) {
diff --git a/page/index.html b/page/index.html
index 47d0b542..0338e55d 100644
--- a/page/index.html
+++ b/page/index.html
@@ -2,8 +2,8 @@
-
+
diff --git a/plugin/input.js b/plugin/input.js
index bd2cfb3b..07393669 100644
--- a/plugin/input.js
+++ b/plugin/input.js
@@ -9,7 +9,11 @@ Volcanos("onaction", {help: "控件交互", list: [], _init: function(can, meta,
}
},
- "执行": function(event, can) { can.run(event) },
+ "执行": function(event, can) {
+ var title = can.sup._name+" "+can.sup.Pack([], true)
+ var toast = can.user.toast(can, "执行中...", title, -1)
+ can.run(event, [], function() { toast.close(), can.user.toast(can, "执行成功...", title) })
+ },
"刷新": function(event, can) { can.run(event) },
"查看": function(event, can) { can.run(event) },
"返回": function(event, can) { can.sup.onimport._back(can.sup) },
diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css
index 20bb35ca..2743e87d 100644
--- a/plugin/local/code/inner.css
+++ b/plugin/local/code/inner.css
@@ -58,6 +58,9 @@ fieldset.editor>div.output div.content td.text span.function {
fieldset.editor>div.output div.content td.text span.datatype {
color:lightgreen; font-weight:bold;
}
+fieldset.editor>div.output div.content td.text span.constant {
+ color:magenta;
+}
fieldset.editor>div.output div.content td.text span.string {
color:magenta;
}
diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js
index 44821b4e..89b2250e 100644
--- a/plugin/local/code/inner.js
+++ b/plugin/local/code/inner.js
@@ -309,11 +309,11 @@ Volcanos("onaction", {help: "控件交互", list: ["项目", "收藏"],
favorLine: function(can, value) {
can.user.input(event, can, [
- {name: "topic", value: "@key"},
- {name: "name", value: "@key"},
+ {name: "zone", value: "@key=some"},
+ {name: "name", value: "@key=some"},
], function(event, button, meta, list) {
can.run(event, ["action", "favor",
- "action", "insert", "topic", meta.topic||"some",
+ "action", "insert", "zone", meta.zone||"some",
"type", can.parse, "name", meta.name||"some", "text", (value||"").trimRight(),
"path", can.Option("path"), "file", can.Option("file"), "line", can.Option("line"),
], function(msg) {
diff --git a/publish/chrome/chrome.js b/publish/chrome/chrome.js
index 1400685a..abfe6674 100644
--- a/publish/chrome/chrome.js
+++ b/publish/chrome/chrome.js
@@ -68,7 +68,7 @@ Volcanos("chrome", {
chrome.runtime.onMessage.addListener(function(req, sender, cb) {
var msg = can.request({}, {tid: sender.tab.id, url: sender.url})
- msg._daemon = "chrome."+sender.tab.id
+ msg.__daemon = "chrome."+sender.tab.id
can.core.List(req.option, function(key) { msg.Option(key, req[key][0]) })
can.run(msg._event, req.detail||[], cb)
return true