From 31316d13f02da6181203ff778fe54a0cf1fe84bb Mon Sep 17 00:00:00 2001 From: shaoying Date: Fri, 17 Apr 2020 23:46:59 +0800 Subject: [PATCH] opt login --- page/chat.js | 1 - pane/Action.js | 2 +- pane/Footer.js | 21 ++++++++++++--------- pane/Header.js | 32 ++++++++++++++++---------------- pane/Ocean.js | 2 +- pane/float/Login.js | 10 +++++++--- 6 files changed, 37 insertions(+), 31 deletions(-) diff --git a/page/chat.js b/page/chat.js index 12a14531..9bdd3411 100644 --- a/page/chat.js +++ b/page/chat.js @@ -14,7 +14,6 @@ Volcanos("onimport", {help: "导入数据", list: [], var list = location.pathname.split("/"); can.Login? can.user.login(function(user) { can.River.Import(event, "update", "river") - can.Header.Import(event, user.name, "username") }): ( can.Action.Import(event, list[2], "river"), can.Action.Import(event, "action", "storm") diff --git a/pane/Action.js b/pane/Action.js index 51bb75ca..c30f888e 100644 --- a/pane/Action.js +++ b/pane/Action.js @@ -38,7 +38,7 @@ Volcanos("onimport", {help: "导入数据", list: [], can.user.title(value) }, - layout: function(event, can, value, cmd, field) {value && can.Action(cmd, value)}, + layout: function(event, can, value, cmd, field) {value}, scroll: function(event, can, value, cmd, field) {can.layout = value; can.output.parentElement.scrollBy(value.x, value.y) }, diff --git a/pane/Footer.js b/pane/Footer.js index 77061f88..4a6046c4 100644 --- a/pane/Footer.js +++ b/pane/Footer.js @@ -1,15 +1,18 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, conf, output, action, option, field) {output.innerHTML = ""; - can.run({}, [], function(msg) { - can.core.List(msg.result, function(title) { - can.page.Append(can, output, [{view: "title", list: [{text: title, className: "title"}]}]) - }) + can._init = function() { + can.run({}, [], function(msg) { + can.core.List(msg.result, function(title) { + can.page.Append(can, output, [{view: "title", list: [{text: title, className: "title"}]}]) + }) - can.ui = can.page.Append(can, output, [{view: "state", list: can.core.List(conf.state, function(item) { - return {text: conf[item]||"", className: item, click: function(event) {can.Export(event, conf[item], item)}}; - })}]) - }) + can.ui = can.page.Append(can, output, [{view: "state", list: can.core.List(conf.state, function(item) { + return {text: conf[item]||"", className: item, click: function(event) {can.Export(event, conf[item], item)}}; + })}]) + }) + } }, + username: function(event, can, value, cmd, field) {can._init()}, email: function(event, can, value, cmd, field) { can.ui[cmd].innerHTML = value @@ -18,7 +21,7 @@ Volcanos("onimport", {help: "导入数据", list: [], can.ui[cmd].innerHTML = cmd+":"+ can.Conf(cmd, can.base.Int(value)+can.base.Int(state)) }, ncmd: function(event, can, value, cmd, field) {var state = can.Conf(cmd); - can.ui[cmd].innerHTML = cmd+":"+ can.Conf(cmd, can.base.Int(value)+can.base.Int(state)) + can.ui && (can.ui[cmd].innerHTML = cmd+":"+ can.Conf(cmd, can.base.Int(value)+can.base.Int(state))) }, }) Volcanos("onaction", {help: "组件交互", list: []}) diff --git a/pane/Header.js b/pane/Header.js index dc8c194a..a193deeb 100644 --- a/pane/Header.js +++ b/pane/Header.js @@ -1,28 +1,28 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, conf, output, action, option, field) {output.innerHTML = ""; - can.run({}, [], function(msg) { - can.core.List(msg.result, function(title) { - can.page.Append(can, output, [{view: "title", list: [{text: title, className: "title"}], - click: function(event) {can.Export(event, conf.title, "title")}, - }]) - }) + can._init = function() { + can.run({}, [], function(msg) { + can.core.List(msg.result, function(title) { + can.page.Append(can, output, [{view: "title", list: [{text: title, className: "title"}], + click: function(event) {can.Export(event, conf.title, "title")}, + }]) + }) - can.ui = can.page.Append(can, output, [{view: "state", list: can.core.List(conf.state, function(item) { - return {text: conf[item]||"", className: item, click: function(event) {can.Export(event, conf[item], item)}}; - })}]) + can.ui = can.page.Append(can, output, [{view: "state", list: can.core.List(conf.state, function(item) { + return {text: conf[item]||"", className: item, click: function(event) {can.Export(event, conf[item], item)}}; + })}]) - can.timer = can.Timer({interval: 1000, length: -1}, function(event) { - can.onimport.time(event, can, can.base.Time().split(" ")[1], "time") + can.timer = can.Timer({interval: 1000, length: -1}, function(event) { + can.onimport.time(event, can, can.base.Time().split(" ")[1], "time") + }) }) - }) + } }, + username: function(event, can, value, cmd, field) {can.Conf("user", value), can._init()}, + title: function(event, can, value, cmd, field) { can.ui[cmd].innerHTML = value }, - username: function(event, can, value, cmd, field) { - value.length > 10 && (value = value.slice(0, 8)) - can.ui["user"].innerHTML = value - }, time: function(event, can, value, cmd, field) { can.ui[cmd].innerHTML = value }, diff --git a/pane/Ocean.js b/pane/Ocean.js index 0d4272dc..da2b437a 100644 --- a/pane/Ocean.js +++ b/pane/Ocean.js @@ -20,7 +20,7 @@ Volcanos("onimport", {help: "导入数据", list: [], ]}]) can.ui = ui }, - init: function(event, can, msg, key, field) {can.output.innerHTML = ""; + init: function(event, can, msg, key, field) {can.output.innerHTML = ""; can.Show(event, -100, -100); var table = can.page.Append(can, can.output, "table"); can.page.Appends(can, table, [{text: ["1. 选择用户节点 ->", "caption"]}]) diff --git a/pane/float/Login.js b/pane/float/Login.js index ff15ae86..b76d068e 100644 --- a/pane/float/Login.js +++ b/pane/float/Login.js @@ -1,6 +1,10 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, conf, output, action, option, field) { can.user.login = function(cb) { + var cbs = function(res) { + typeof cb == "function" && cb(res) + can.Export({}, res.name, "username") + } can.misc.WSS(can, "", {node: "active", user: can.user.title()}, function(event, msg, cmd, arg) { switch (cmd) { case "space": @@ -8,12 +12,12 @@ Volcanos("onimport", {help: "导入数据", list: [], break case "sessid": can.user.Cookie(can, "sessid", arg[0]), can.user.toast(""), can.Hide() - typeof cb == "function" && cb({name: msg["user.name"]}) + cbs({name: msg["user.name"]}) break } }) - can.user.Cookie("sessid")? can.onaction.check(event, can, cb, "check", output): - can.onaction.login(event, can, cb, "login", output) + can.user.Cookie("sessid")? can.onaction.check(event, can, cbs, "check", output): + can.onaction.login(event, can, cbs, "login", output) } }, share: function(event, can, value, cmd, target) {var msg = can.Event(event)