From 2e6c39b593981dd3a33610482fab77a2b819b12b Mon Sep 17 00:00:00 2001
From: shaoying <shylinux@icloud.com>
Date: Fri, 26 Jun 2020 14:18:08 +0800
Subject: [PATCH] opt some

---
 frame.js        |  2 +-
 plugin/input.js | 17 +++++++++--------
 plugin/state.js |  3 +--
 plugin/table.js |  3 +--
 proto.js        |  6 ++----
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/frame.js b/frame.js
index b2adafa0..6c867598 100644
--- a/frame.js
+++ b/frame.js
@@ -201,7 +201,7 @@ Volcanos("onappend", { _init: function(can, meta, list, cb, target, field) { met
                         }
 
                         // 解析参数
-                        cmds = cmds && cmds.length > 0? cmds: can.page.Select(can, option, "input.args,select.args", function(item) {
+                        cmds = cmds && cmds.length > 0? cmds: can.page.Select(can, 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 }
diff --git a/plugin/input.js b/plugin/input.js
index 1ea7cf4a..c41ec7be 100644
--- a/plugin/input.js
+++ b/plugin/input.js
@@ -4,10 +4,6 @@ Volcanos("onimport", {help: "导入数据", list: [],
 })
 Volcanos("onaction", {help: "控件交互", list: [],
     onchange: function(event, can) {
-        can.run(event)
-        // if (can.Conf("auto") == "true") {
-        //     can.run(event)
-        // }
     },
     onclick: function(event, can) {
         switch (can.Conf("type")) {
@@ -18,21 +14,26 @@ Volcanos("onaction", {help: "控件交互", list: [],
     },
     onkeydown: function(event, can) {
         switch (event.key) {
-            case "Enter": can.run(event, [], function() {}); break
+            case "Enter":
+                if (event.target.tagName == "INPUT") {
+                    can.run(event)
+                    break
+                }
+                event.stopPropagation()
+                event.preventDefault()
+                break
             case "b": if (!event.ctrlKey) { return }; can.CloneInput(); break
             case "m": if (!event.ctrlKey) { return }; can.CloneField(); break
             default: return
         }
-        event.stopPropagation()
-        event.preventDefault()
     },
     onkeyup: function(event, can) {
         switch (event.key) {
             case "Enter":
-                can.run(event, [], function() {})
                 event.stopPropagation()
                 event.preventDefault()
                 break
+            default: return
         }
     },
 })
diff --git a/plugin/state.js b/plugin/state.js
index 8caf88e6..5f962f32 100644
--- a/plugin/state.js
+++ b/plugin/state.js
@@ -1,5 +1,4 @@
-Volcanos("onimport", {help: "导入数据", list: [],
-    _init: function(can, meta, list, cb, target) {
+Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, meta, list, cb, target) {
     },
 })
 
diff --git a/plugin/table.js b/plugin/table.js
index 93eb5ac0..962b4e03 100644
--- a/plugin/table.js
+++ b/plugin/table.js
@@ -1,5 +1,4 @@
-Volcanos("onimport", {help: "导入数据", list: [],
-    _init: function(can, msg, list, cb, target) { can._output.innerHTML = "";
+Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { can._output.innerHTML = "";
         can.ui = can.page.Append(can, can._target, [
             {view: ["content", "div"]}, {view: ["display", "pre"]},
         ])
diff --git a/proto.js b/proto.js
index 189624a8..80fbf863 100644
--- a/proto.js
+++ b/proto.js
@@ -92,9 +92,7 @@ var Volcanos = shy("火山架", {cache: {}, index: 1, order: 1, debug: {
                 Option: function(key, val) {
                     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) || "" }
-                    msg.option = msg.option || [], can.core.List(msg.option, function(k) {
-                        if (k == key) {return k}
-                    }).length > 0 || msg.option.push(key)
+                    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
                 },
@@ -114,7 +112,7 @@ var Volcanos = shy("火山架", {cache: {}, index: 1, order: 1, debug: {
                     });
 
                     return can.core.List(msg[max], function(value, index, array) { var one = {}, res;
-                        can.core.List(msg.append, function(key) { one[key] = msg[key][index]||"" })
+                        can.core.List(msg.append, function(key) { one[key] = (msg[key][index]||"").trim() })
                         return typeof cb == "function" && (res = cb(one, index, array)) && res != undefined && res || one
                     })
                 }),