From f418628ec7cd3b7f0c65d34ef4c9f0f5540bf50b Mon Sep 17 00:00:00 2001
From: shaoying <shaoying@zuoyebang.com>
Date: Mon, 20 Apr 2020 22:31:47 +0800
Subject: [PATCH] opt some

---
 frame.js        | 10 +++++-----
 lib/page.js     |  2 ++
 plugin/table.js |  9 +++++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/frame.js b/frame.js
index 63078511..46f1596e 100644
--- a/frame.js
+++ b/frame.js
@@ -215,17 +215,17 @@ var can = Volcanos("chat", {
                 }).length > 0 && plugin.Runs(event)
             },
             Runs: function(event, cb) {
-                plugin.Run(event, plugin.Option(), cb)
-            },
-            Run: function(event, args, cb, silent) {var show = !silent;
                 history.push(plugin.page.Select(can, option, ".args", function(item, index, list) {
                     return {target: item, value: item.value}
                 }))
                 can.Export(event, 1, "ncmd")
 
+                plugin.Run(event, plugin.Option(), cb)
+            },
+            Run: function(event, args, cb, silent) {var show = !silent;
                 var msg = can.Event(event);
                 can.page.Select(can, option, ".opts", function(item) {
-                    item.name && item.value && msg.Option(item.name, item.value)
+                    msg[item] == undefined && item.name && item.value && msg.Option(item.name, item.value)
                 })
 
                 for (var i = args.length-1; i >= 0; i--) {if (args[i] == "") {args = args.slice(0, i)} else {break}}
@@ -318,7 +318,7 @@ var can = Volcanos("chat", {
 
             run: function(event, cmd, cb, silent) {var msg = can.Event(event);
                 cmd = cmd || can.Option(), can.page.Select(can, option, ".args", function(item) {
-                    item.name && item.value && msg.Option(item.name) == undefined && msg.Option(item.name, item.value)
+                    msg[item.name] == undefined && item.name && item.value && msg.Option(item.name, item.value)
                 });
                 can.Run(event, cmd, cb, silent);
             },
diff --git a/lib/page.js b/lib/page.js
index 1a7aa2d0..323da439 100644
--- a/lib/page.js
+++ b/lib/page.js
@@ -317,6 +317,8 @@ Volcanos("page", {help: "网页模块",
         text = text.replace(/\033\[0m/g, "</span>")
         text = text.replace(/\033\[m/g, "</span>")
         text = text.replace(/\\n/g, "<br>")
+        text = text.replace(/</g, "&lt;")
+        text = text.replace(/>/g, "&gt;")
         return text;
     },
     CopyText: function(can, text) {
diff --git a/plugin/table.js b/plugin/table.js
index 84532596..d0d1ad50 100644
--- a/plugin/table.js
+++ b/plugin/table.js
@@ -4,13 +4,16 @@ Volcanos("onimport", {help: "导入数据", list: [],
             can.ondetail["复制"](event, can, msg, value, index, key, td);
             can.Export(event, value.trim(), key, index)
         }, function(event, value, key, index, tr, td) {
-            can.user.carte(event, shy("上下文菜单", can.ondetail, can.feature.detail || can.ondetail.list, function(event, cmd, meta) {var cb = meta[cmd];
+            can.user.carte(event, shy("上下文菜单", can.ondetail, msg["field.detail"] || can.feature.detail || can.ondetail.list, function(event, cmd, meta) {var cb = meta[cmd];
                 var sub = can.Event(event);
                 msg.append.forEach(function(key) {sub.Option(key, msg[key][index].trim())})
 
                 typeof cb == "function"? cb(event, can, msg, index, key, cmd, td):
                     can.run(event, ["action", typeof cb == "string"? cb: cmd, key, value.trim(), msg.Ids(index)], function(msg) {
                         can.user.toast(msg.Result())
+                        if (msg.Option("field.reload") == "true") {
+                            can.run(event)
+                        }
                     }, true)
             }))
         });
@@ -39,7 +42,9 @@ Volcanos("onimport", {help: "导入数据", list: [],
                     break
 
                 default:
-                    msg.result && can.page.Append(can, output, [{view: ["code", "div", can.page.Display(msg.Result())]}]).code;
+                    msg.result && can.page.Append(can, output, [{view: ["code", "div"], list: [
+                        {view: ["code", "pre", can.page.Display(msg.Result())]},
+                    ]}]).code;
             }
         }
         return typeof cb == "function" && cb(msg);