opt some

frame.js

@@ -26,7 +26,7 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta,
     },
     _daemon: function(can, name) {
         return
-        can.misc.WSS(can, "", {name: name, type: "chrome"}, function(event, msg) {
+        can.misc.WSS(can, "", {type: "chrome", name: name}, function(event, msg) {
             if (msg.Option("_handle")) { return can.user.toast(can, msg.result.join("")) }
             can.user.toast(can, msg.detail.join(" "))
 
@@ -55,14 +55,11 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta,
 
         if (Volcanos.meta.webpack == true || location.protocol == "file:") {
             var res = Volcanos.meta.pack[pane._name+","+cmds.join(",")]
-            if (res) {
+            if (res) { res = can.request(event, res)
-                res = can.request(event, res)
                 delete(msg._event), delete(msg._can)
                 return typeof cb == "function" && cb(res)
             }
-
+            return typeof cb == "function" && cb(msg)
-            typeof cb == "function" && cb(msg)
-            return
         }
 
         can.misc.Run(event, can, {names: pane._name}, cmds, function(msg) {
@@ -75,21 +72,14 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta,
     engine: function(event, can, msg, pane, cmds, cb) { if (!can.onengine) { return false }
         switch (pane._name) {
             case "River":
-                if (cmds.length == 0) {
+                cmds.length == 0 && can.core.Item(can.onengine.river, function(key, value) {
-                    can.core.Item(can.onengine.river, function(key, value) {
+                    msg.Push("hash", key), msg.Push("name", value.name)
-                        msg.Push("hash", key)
+                })
-                        msg.Push("name", value.name)
+                if (cmds.length != 1 && cmds[1] != "tool") { break }
-                    })
-                }
-                if (cmds.length != 1 && cmds[1] != "tool") {
-                    break
-                }
             case "Storm":
                 var river = can.onengine.river[cmds[0]]; if (!river) { break }
                 can.core.Item(river.storm, function(key, value) {
-                    msg.Push("hash", key)
+                    msg.Push("hash", key), msg.Push("name", value.name)
-                    msg.Push("name", value.name)
-                    msg.Push("count", (value.index||value.action).length)
                 })
                 typeof cb == "function" && cb(msg)
                 return true
@@ -99,14 +89,10 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta,
                 var action = storm && storm.action && storm.action[cmds[2]]
                 if (!storm) { break } if (cmds.length == 2) {
                     if (storm.index) {
-                        if (Volcanos.meta.webpack == true) {
+                        if (Volcanos.meta.webpack == true) { typeof cb == "function" && cb(msg); return true }
-                            typeof cb == "function" && cb(msg)
-                            return true
-                        }
                         can.misc.Run(event, can, {names: pane._name}, ["action", "command"].concat(storm.index), cb)
                         return true
                     }
-                    if (location.pathname == "/share") { return false }
 
                     can.core.List(storm.action, function(value) {
                         msg.Push("name", value.name||"")
@@ -117,16 +103,8 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta,
                         msg.Push("args", value.args||"[]")
                     })
                     typeof cb == "function" && cb(msg)
-                } else if (action && action.engine) {
+                    return true
-                    action.engine(event, can, msg, pane, cmds, cb)
-                } else if (action) {
-                    msg.Option("group", action.group)
-                    msg.Option("index", action.index)
-                    return false
-                } else {
-                    return false
                 }
-                return true
         }
         return false
     },
@@ -270,7 +248,7 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta,
             },
             Clone: function() {
                 meta.args = sub.page.Select(sub, sub._option, "textarea.args,input.args,select.args", function(item) {
-                    return item.value || ""
+                    return item.name && item.value || ""
                 })
                 sub.onappend._init(sub, meta, list, function(sub) {
                     cb(sub), sub.Timer(10, function() {
@@ -281,7 +259,7 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta,
             Option: function(key, value) {
                 if (typeof key == "object") { return sub.core.Item(key, sub.Option), key }
                 if (key == undefined) { value = {}
-                    sub.page.Select(sub, option, "select.args,input.args,textarea.args", function(item) {
+                    sub.page.Select(sub, option, "textarea.args,input.args,select.args", function(item) {
                         item.name && item.value && (value[item.name] = item.value)
                     })
                     return value
@@ -309,8 +287,6 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta,
             sub.page.ClassList.add(sub, field, meta.style||meta.feature.style||"")
             sub.onimport && sub.onimport._init(sub, sub.Conf(meta), list, function() {}, field)
 
-            // meta.detail = meta.feature["detail"] || {}
-
             meta.inputs && sub.onappend._option(sub, meta, list, cb)
             sub.onaction && sub.onappend._action(sub, sub._action, meta.button || sub.onaction.list)
             sub.onexport && sub.onappend._status(sub, sub._status, sub.onexport.list)
@@ -324,7 +300,7 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta,
                 _option: can._option, _action: can._action, _output: can._output,
                 CloneInput: function() { add(item, function() {})._target.focus() },
                 CloneField: function() { can.Clone() },
-            }, Volcanos.meta.libs.concat([item.display||"/plugin/input.js", "/frame.js"]), function(input) { input.sup = can
+            }, Volcanos.meta.libs.concat([item.display||"/plugin/input.js", Volcanos.meta.volcano]), function(input) { input.sup = can
                 input.run = function(event, cmds, cb, silent) {
                     var msg = can.request(event); msg.Option(can.Conf("option"))
                     return can.onappend._output(can, meta, event, can.Pack(cmds), cb, silent)

plugin/table.js

@@ -105,15 +105,19 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg,
         var cb = can.onimport[process]; return typeof cb == "function" && cb(can, msg)
     },
     _follow: function(can, msg) {
-        if (msg.Result() == "stop") { return }
+        if (msg.Result() == "stop") { return can.user.toast(can, msg.Option("cache.action")+" done!")}
-        can.onappend.board(can, can._target, "board", msg)
+        can.ui || (can.ui = can.page.Appends(can, can._target, [{view: ["content", "div"]}]))
+        can.page.ClassList.add(can, can.ui.content, "code")
+        can.page.Modify(can, can.ui.content, {style: {"max-height": 400}})
+        can.page.Append(can, can.ui.content, [{text: msg.Result()}])
+        can.ui.content.scrollBy(0, 1000)
 
         can.Timer(100, function() {
             var sub = can.request({})
-            sub.Option("cache.limit", msg.Option("cache.limit"))
-            sub.Option("cache.begin", msg.Option("cache.begin"))
             sub.Option("cache.hash", msg.Option("cache.hash"))
-            can.run(sub._event, [msg.Option("cache.button")], function(msg) {
+            sub.Option("cache.begin", msg.Option("cache.begin"))
+            sub.Option("cache.limit", msg.Option("cache.limit"))
+            can.run(sub._event, [msg.Option("cache.action")], function(msg) {
                 can.onimport._follow(can, msg)
             }, true)
         })

proto.js

@@ -11,7 +11,7 @@ function shy(help, meta, list, cb) {
     cb.list = next("object") || []
     return cb
 }; var _can_name = ""
-var Volcanos = shy("火山架", {cache: {}, index: 1, order: 1, pack: {}, libs: []}, [], function(name, can, libs, cb) {
+var Volcanos = shy("火山架", {libs: [], pack: {}, order: 1, cache: {}, index: 1}, [], function(name, can, libs, cb) {
     var meta = arguments.callee.meta, list = arguments.callee.list
     if (typeof name == "object") { var Config = name
         meta.volcano = Config.volcano, meta.libs = Config.libs
@@ -30,7 +30,7 @@ var Volcanos = shy("火山架", {cache: {}, index: 1, order: 1, pack: {}, libs:
     }
 
     var conf = {}, conf_cb = {}, cache = {}
-    can = can || {}, list.push(can) && (can.__proto__ = {_name: name, _root: "volcano", _create_time: new Date(), _load: function(name, cb) {
+    can = can || {}, list.push(can) && (can.__proto__ = {_name: name, _create_time: new Date(), _load: function(name, cb) {
             for (var cache = meta.cache[name] || []; meta.index < list.length; meta.index++) {
                 if (name == "/plugin/input/date.css" && cache.length > 0) { continue }
                 if (name == "/lib/base.js" && cache.length > 0) { continue }
@@ -48,7 +48,7 @@ var Volcanos = shy("火山架", {cache: {}, index: 1, order: 1, pack: {}, libs:
             meta.cache[name] = cache
         },
         require: function(libs, cb, each) { if (!libs || libs.length == 0) {
-                typeof cb == "function" && setTimeout(function() {cb(can)}, 10)
+                typeof cb == "function" && setTimeout(function() { cb(can) }, 10)
                 return // 加载完成
             }
 
@@ -82,33 +82,32 @@ var Volcanos = shy("火山架", {cache: {}, index: 1, order: 1, pack: {}, libs:
         },
         request: function(event, msg, proto) { event = event || {}
             if (!msg && event._msg) { return event._msg }
+
             var ls = (can._name||can._help).split("/")
             event._pane = ls[ls.length-1]
+
             event._msg = msg = msg || {}, msg._event = event, msg._can = can
             msg.__proto__ = proto || { _name: meta.order++, _create_time: new Date(),
                 Option: function(key, val) {
+                    if (key == undefined) { return msg && msg.option || [] }
                     if (typeof key == "object") { can.core.Item(key, msg.Option) }
-                    if (val == undefined) { return msg && msg[key] && msg[key][0] || msg._msg && msg._msg.Option(key) || "" }
+                    if (val == undefined) { return msg && msg[key] && msg[key][0] || ""}
                     msg.option = msg.option || [], can.core.List(msg.option, function(k) { if (k == key) {return k} }).length > 0 || msg.option.push(key)
                     msg[key] = can.core.List(arguments).slice(1)
                     return val
                 },
                 Append: function(key, val) {
+                    if (key == undefined) { return msg && msg.append || [] }
                     if (typeof key == "object") { can.core.Item(key, msg.Append) }
-                    if (val == undefined) { return msg && msg[key] && msg[key][0] || msg._msg && msg._msg.Append(key) || "" }
+                    if (val == undefined) { return msg && msg[key] && msg[key][0] || ""}
+                    msg.append = msg.append || [], can.core.List(msg.append, function(k) { if (k == key) {return k} }).length > 0 || msg.append.push(key)
+                    msg[key] = can.core.List(arguments).slice(1)
                     return val
                 },
-                Copy: function(res) { if (!res) { return msg }
+                Result: function(cb) {
-                    res.result && (msg.result = (msg.result||[]).concat(res.result))
+                    return msg.result && msg.result.join("") || ""
-                    res.append && (msg.append = res.append) && res.append.forEach(function(item) {
-                        res[item] && (msg[item] = (msg[item]||[]).concat(res[item]))
-                    })
-                    res.option && (msg.option = res.option) && res.option.forEach(function(item) {
-                        res[item] && (msg[item] = res[item])
-                    })
-                    return msg
                 },
-                Table: shy("遍历数据", function(cb) { if (!msg.append || !msg.append.length || !msg[msg.append[0]]) { return }
+                Table: function(cb) { if (!msg.append || !msg.append.length || !msg[msg.append[0]]) { return }
                     var max = "", len = 0; can.core.List(msg.append, function(key, index) {
                         if (msg[key] && msg[key].length > len) { max = key, len = msg[key].length }
                     })
@@ -117,10 +116,7 @@ var Volcanos = shy("火山架", {cache: {}, index: 1, order: 1, pack: {}, libs:
                         can.core.List(msg.append, function(key) { one[key] = (msg[key]&&msg[key][index]||"").trim() })
                         return typeof cb == "function" && (res = cb(one, index, array)) && res != undefined && res || one
                     })
-                }),
+                },
-                Result: shy("遍历数据", function(cb) {
-                    return msg.result && msg.result.join("") || ""
-                }),
                 Clear: function(key) {
                     switch (key) {
                         case "append":
@@ -132,7 +128,17 @@ var Volcanos = shy("火山架", {cache: {}, index: 1, order: 1, pack: {}, libs:
                             msg[key] = []
                     }
                 },
-                Push: function(key, value, detail) {msg.append = msg.append || []
+                Copy: function(res) { if (!res) { return msg }
+                    res.result && (msg.result = (msg.result||[]).concat(res.result))
+                    res.append && (msg.append = res.append) && res.append.forEach(function(item) {
+                        res[item] && (msg[item] = (msg[item]||[]).concat(res[item]))
+                    })
+                    res.option && (msg.option = res.option) && res.option.forEach(function(item) {
+                        res[item] && (msg[item] = res[item])
+                    })
+                    return msg
+                },
+                Push: function(key, value, detail) { msg.append = msg.append || []
                     if (typeof key == "object") {
                         value = value || can.core.Item(key)
                         can.core.List(value, function(item) {
@@ -152,19 +158,20 @@ var Volcanos = shy("火山架", {cache: {}, index: 1, order: 1, pack: {}, libs:
                     msg[key].push(""+(typeof value == "object"? JSON.stringify(value): value)+"")
                     return msg
                 },
-                Echo: shy("输出响应", function(res) {msg.result = msg.result || []
+                Echo: function(res) {msg.result = msg.result || []
                     msg._hand = true
                     for (var i = 0; i < arguments.length; i++) {msg.result.push(arguments[i])}
                     return msg
-                }),
+                },
             }
             return msg
         },
 
-        Conf: shy("配置器", function(key, value, cb) { if (key == undefined) { return conf }
+        Conf: function(key, value, cb) {
+            if (key == undefined) { return conf }
             if (typeof key == "object") { conf = key; return conf }
             typeof cb == "function" && (conf_cb[key] = cb)
-            if (value != undefined) {var old = conf[key], res;
+            if (value != undefined) { var old = conf[key], res;
                 conf[key] = conf_cb[key] && (res = conf_cb[key](value, old, key)) != undefined && res || value
             }
             if (conf[key] == undefined && key.indexOf(".") > 0) {
@@ -175,8 +182,8 @@ var Volcanos = shy("火山架", {cache: {}, index: 1, order: 1, pack: {}, libs:
                 return p
             }
             return conf[key] || ""
-        }),
+        },
-        Cache: shy("缓存器", function(name, output, data) {
+        Cache: function(name, output, data) {
             if (data) { if (output.children.length == 0) { return }
                 // 写缓存
                 var temp = document.createDocumentFragment()
@@ -201,15 +208,17 @@ var Volcanos = shy("火山架", {cache: {}, index: 1, order: 1, pack: {}, libs:
             }
             delete(cache[name])
             return list.data
-        }),
+        },
-        Timer: shy("定时器, value, [1,2,3,4], {value, length}", function(interval, cb, cbs) { interval = typeof interval == "object"? interval || []: [interval]
+        Timer: shy("定时器, value, [1,2,3,4], {value, length}", function(interval, cb, cbs) {
-            var timer = {stop: false}
+            interval = typeof interval == "object"? interval || []: [interval]
-            function loop(timer, i) {if (timer.stop || i >= interval.length && interval.length >= 0) {return typeof cbs == "function" && cbs(timer, interval)}
+            var timer = {stop: false}; function loop(timer, i) {
+                if (timer.stop || i >= interval.length && interval.length >= 0) {
+                    return typeof cbs == "function" && cbs(timer, interval)
+                }
                 return typeof cb == "function" && cb(timer, interval.value||interval[i], i, interval)?
-                    typeof cbs == "function" && cbs(timer, interval):
+                    typeof cbs == "function" && cbs(timer, interval): setTimeout(function() { loop(timer, i+1) }, interval.value||interval[i+1])
-                        setTimeout(function() {loop(timer, i+1)}, interval.value||interval[i+1])
             }
-            setTimeout(function() {loop(timer, 0)}, interval.value||interval[0])
+            setTimeout(function() { loop(timer, 0) }, interval.value||interval[0])
             return timer
         }),
     })