diff --git a/lib/misc.js b/lib/misc.js index e7cf49a8..c56284a5 100644 --- a/lib/misc.js +++ b/lib/misc.js @@ -56,10 +56,17 @@ Volcanos("misc", {help: "工具模块", // kit.Log(msg.detail.concat([msg])) // kit.History("run", -1, option) +if (can.user.Search(can, "feature") == "ice") { + this.POST(can, msg, can.Conf("context")+msg.Option("names"), option, function(msg) { + // kit.Log("run", what, "result", msg.result? msg.result[0]: "", msg) + typeof cb == "function" && cb(msg) + }), delete(event.msg) +} else { this.POST(can, msg, can.Conf("context"), option, function(msg) { // kit.Log("run", what, "result", msg.result? msg.result[0]: "", msg) typeof cb == "function" && cb(msg) }), delete(event.msg) +} }), }) diff --git a/lib/page.js b/lib/page.js index 345afba1..96759351 100644 --- a/lib/page.js +++ b/lib/page.js @@ -139,7 +139,7 @@ Volcanos("page", {help: "网页模块", AppendItem: shy("添加插件", function(can, target, list, click, cb, cbs) { can.core.List(list, function(line, index) { - var item = can.page.Append(can, target, [{view: ["item k"+line.key], list: [{text: [line.nick||line.key]}], click: function(event) { + var item = can.page.Append(can, target, [{view: ["item k"+line.key], list: [{text: [line.nick||line.name||line.key]}], click: function(event) { typeof cb == "function" && cb(event, line, item) can.page.Select(can, target, "div.item.select", function(item) { can.page.ClassList.del(can, item, "select") @@ -161,7 +161,9 @@ Volcanos("page", {help: "网页模块", var list = can.page.Select(can, target, "div.item.k"+click) if (list.length>0) {list[0].click(); return} } - can.page.Select(can, target, "div.item")[0].click() + can.page.Select(can, target, "div.item", function(item, index) { + index == 0 && item.click() + }) }), AppendField: shy("添加插件", function(can, target, type, item) { var dataset = {}; item && item.name && (dataset.names = item.name); item && item.group && (dataset.group = item.group); diff --git a/pane/Login.js b/pane/Login.js index 3c9ca2ff..72c43e38 100644 --- a/pane/Login.js +++ b/pane/Login.js @@ -7,6 +7,15 @@ Volcanos("onimport", {help: "导入数据", list: [], if (!ui.username.value) {ui.username.focus(); return} if (!ui.password.value) {ui.password.focus(); return} +if (can.user.Search(can, "feature") == "ice") { + can.run(event, ["login", ui.username.value, ui.password.value], function(msg) { + if (msg.result && msg.result.length > 0) { + can.Hide(), can.Export(event, "", "login") + } else { + can.user.toast("用户或密码错误") + } + }) +} else { can.run(event, [ui.username.value, ui.password.value], function(msg) { if (msg.result && msg.result.length > 0) { can.Hide(), can.Export(event, "", "login") @@ -14,6 +23,7 @@ Volcanos("onimport", {help: "导入数据", list: [], can.user.toast("用户或密码错误") } }) +} event.stopPropagation() event.preventDefault() return true @@ -23,10 +33,16 @@ Volcanos("onimport", {help: "导入数据", list: [], login: function(event, can, value, cmd, output) { if (!can.user.Cookie("sessid")) {can.Show(event, 400, 400); return} - can.run(event||{}, [], function(msg) { - msg.nickname && msg.nickname.length > 0? - can.Export(event, msg.nickname[0], "username"): can.Show(event, -1, -1) - }) +if (can.user.Search(can, "feature") == "ice") { + can.run(event||{}, ["check"], function(msg) {var user = msg.Result() + user? can.Export(event, user, "username"): can.Show(event, -1, -1) + }) +} else { + can.run(event||{}, [], function(msg) { + msg.nickname && msg.nickname.length > 0? + can.Export(event, msg.nickname[0], "username"): can.Show(event, -1, -1) + }) +} }, }) Volcanos("onaction", {help: "组件交互", list: []}) diff --git a/pane/Ocean.js b/pane/Ocean.js index 78633f86..0df638e6 100644 --- a/pane/Ocean.js +++ b/pane/Ocean.js @@ -21,9 +21,11 @@ Volcanos("onimport", {help: "导入数据", list: [], var table = can.page.Append(can, output, "table"); can.page.Append(can, table, [{text: ["1. 选择用户节点 ->", "caption"]}]) - can.page.AppendTable(can, table, msg, ["key", "user.route"], function(event, value, key, index, tr, td) { - tr.className = "hidden"; - var uis = kit.AppendChild(can.ui.list, [{type: "tr", list: [{text: [key, "td"]}, {text: [msg["user.route"][index], "td"]}], dataset: {user: key}, click: function(event) { + can.page.AppendTable(can, table, msg, ["key", "user.route"], function(event, value, key, index, tr, td) {tr.className = "hidden"; + var uis = can.page.Append(can, can.ui.list, [{type: "tr", list: [ + {text: [value, "td"]}, + {text: [msg["user.route"][index], "td"]}, + ], dataset: {user: value}, click: function(event) { tr.className = "normal", uis.last.parentNode.removeChild(uis.last) }}]) }) diff --git a/proto.js b/proto.js index 8716e41c..a3fa8144 100644 --- a/proto.js +++ b/proto.js @@ -79,7 +79,7 @@ function Volcanos(name, can, libs, cb, msg) { // 封装模块 _create_time: can.base.Time(), _source: can, Log: shy("输出日志", function() {console.log(arguments)}), Option: function(key, val) { - if (val == undefined) {return msg[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}