add display.canvas.js

src/contexts/cli/cli.go

@@ -885,6 +885,7 @@ var version = struct {
 			}
 
 			m.Cmdy("cli.system", path.Join(m.Conf("runtime", "boot.ctx_home"), "bin/node.sh"), "create", arg[0],
+				"daemon",
 				"cmd_env", "PATH", os.Getenv("path"),
 				"cmd_dir", m.Conf("missyou", "path"),
 				"cmd_env", "ctx_home", m.Conf("runtime", "boot.ctx_home"),

src/contexts/nfs/nfs.go

@@ -915,7 +915,7 @@ func (nfs *NFS) Start(m *ctx.Message, arg ...string) bool {
 
 		// 终端控制
 		if nfs.in = m.Optionv("in").(*os.File); m.Has("out") {
-			if nfs.out = m.Optionv("out").(*os.File); m.Cap("goos") != "windows" && !m.Options("daemon") {
+			if nfs.out = m.Optionv("out").(*os.File); m.Conf("runtime", "host.GOOS") != "windows" && !m.Options("daemon") {
 				kit.STDIO = nfs
 				nfs.Term(m, "init")
 				m.Conf("term", "use", true)

usr/librarys/chat.js

@@ -339,10 +339,18 @@ page = Page({
                 "减参": function(event, value) {
                     page.plugin && page.plugin.Plugin.Remove()
                 },
+
+                "表格": function(event, value) {
+                    page.plugin && page.plugin.Plugin.display("table")
+                },
+                "图表": function(event, value) {
+                    page.plugin && page.plugin.Plugin.display("trend")
+                },
             },
             Button: [["layout", "聊天", "办公", "工作", "最高", "最宽", "最大"], "",
                 "刷新", "清空", "并行", "串行", "",
                 "添加", "删除", "加参", "减参", "",
+				["display", "表格", "图表"],
             ],
         }
     },

usr/librarys/example.js

@@ -551,7 +551,7 @@ function Pane(page, field) {
         page.Sync(k).change(pane.Listen[k])
     }
     pane.Button && pane.Button.length > 0 && (kit.InsertChild(field, output, "div", pane.Button.map(function(value) {
-        return typeof value == "object"? {className: value[0], select: [value.slice(1), function(event) {
+        return typeof value == "object"? {className: value[0], select: [value.slice(1), function(value, event) {
             value = event.target.value
             typeof pane.Action == "function"? pane.Action(value, event): pane.Action[value](event, value)
         }]}: value == ""? {view: ["space"]} :value == "br"? {type: "br"}: {button: [value, function(event) {
@@ -718,6 +718,7 @@ function Plugin(page, pane, field) {
             })
             return pane.View(field.parentNode, "plugin", field.Meta, [], field.Run).field.Plugin
         },
+
         Check: function(target, cb) {
             option.querySelectorAll(".args").forEach(function(item, index, list) {
                 item == target && (index == list.length-1? plugin.Runs(event, cb): page.plugin == field && list[index+1].focus())
@@ -729,7 +730,7 @@ function Plugin(page, pane, field) {
                 show && page.ontoast(kit.Format(args||["running..."]), meta.name, -1)
             }, 1000)
             event.Plugin = plugin, field.Run(event, args, function(msg) {
-                show = false, page.ontoast("")
+                plugin.msg = msg, show = false, page.ontoast("")
                 plugin.ondaemon[display.deal||"table"](msg, cb)
             })
         },
@@ -751,6 +752,7 @@ function Plugin(page, pane, field) {
         Clear: function() {
             output.innerHTML = ""
         },
+
         ondaemon: {
             table: function(msg, cb) {
                 output.innerHTML = ""
@@ -827,6 +829,10 @@ function Plugin(page, pane, field) {
                 })
             },
         },
+        display: function(arg) {
+            display.deal = arg
+            plugin.ondaemon[display.deal||"table"](plugin.msg)
+        },
 
         Location: function(event) {
             output.className = "output long"
@@ -1083,7 +1089,7 @@ function Canvas(plugin, output, width, height, space, msg) {
                     for (var i = 0; i < nrow; i++) {
                         sum += data[keys[1]][i]
                         sum > total && (total = sum)
-                        sum -= data[keys[2]][i]
+                        sum -= data[keys[2]||keys[1]][i]
                     }
                     if (!data["sum"]) {
                         var sum = 0, max = 0, min = 0, end = 0
@@ -1094,8 +1100,8 @@ function Canvas(plugin, output, width, height, space, msg) {
                         data["end"] = []
                         for (var i = 0; i < nrow; i++) {
                             max = sum + data[keys[1]][i]
-                            min = sum - data[keys[2]][i]
+                            min = sum - data[keys[2||keys[1]]][i]
-                            end = sum + data[keys[1]][i] - data[keys[2]][i]
+                            end = sum + data[keys[1]][i] - data[keys[2]||keys[1]][i]
                             data["sum"].push(sum)
                             data["max"].push(max)
                             data["min"].push(min)
@@ -1276,8 +1282,8 @@ function Canvas(plugin, output, width, height, space, msg) {
                 p.x -= 200
             }
             canvas.fillText("index: "+index, p.x, -p.y+conf.plabel.height)
-            keys.forEach(function(key, i) {
+            msg.append.forEach(function(key, i) {
-                data[key][index] && canvas.fillText(key+": "+data[key][index], p.x, -p.y+(i+2)*conf.plabel.height)
+                msg[key][index] && canvas.fillText(key+": "+msg[key][index], p.x, -p.y+(i+2)*conf.plabel.height)
             })
             canvas.restore()
             return what