diff --git a/lib/user.js b/lib/user.js index cefbed06..0fff521a 100644 --- a/lib/user.js +++ b/lib/user.js @@ -210,13 +210,13 @@ Volcanos("user", {help: "用户操作", agent: { input: function(event, can, form, cb, button) { // form [ string, array, object, {type: "select", values: []} var msg = can.request(event) var ui = can.page.Append(can, document.body, [{view: ["input"], style: {left: 0, top: 0}, list: [ - {view: ["option", "table"], list: can.core.List(form, function(item) { - item = typeof item == "string"? {type: html.TEXT, name: item}: item.length > 0? {type: html.SELECT, name: item[0], values: item.slice(1)}: item + {view: [chat.OPTION, html.TABLE], list: can.core.List(form, function(item) { + item = typeof item == lang.STRING? {type: html.TEXT, name: item}: item.length > 0? {type: html.SELECT, name: item[0], values: item.slice(1)}: item item.type = item.type||(item.values? html.SELECT: item.name == "text"? html.TEXTAREA: html.TEXT) item._init = function(target) { item.run = function(event, cmds, cb) { - can.request(event, function() { var value = {_handle: "true", action: msg.Option("action")} + can.request(event, function() { var value = {_handle: "true", action: msg.Option(chat.ACTION)} can.page.Select(can, ui.table, "textarea,input,select", function(item) { item.name && item.value && (value[item.name] = item.value) }); return value @@ -227,8 +227,8 @@ Volcanos("user", {help: "用户操作", agent: { can.onappend.figure(can, item, target) } - return {type: "tr", list: [{type: "td", list: [{text: item._trans||can.user.trans(can, item.name)||""}]}, {type: "td", list: [can.page.input(can, item)]} ]} - })}, {view: "action"}, + return {type: html.TR, list: [{type: html.TD, list: [{text: item._trans||can.user.trans(can, item.name)||""}]}, {type: "td", list: [can.page.input(can, item)]} ]} + })}, {view: chat.ACTION}, ]}]); can.onlayout.figure(event, can, ui._target) var action = can.onappend._action(can, button||["submit", "cancel"], ui.action, { @@ -238,7 +238,7 @@ Volcanos("user", {help: "用户操作", agent: { list = can.page.Select(can, ui.table, "textarea,input,select", function(item) { return item.name && item.value && args.push(item.name, item.value), data[item.name] = item.value }) - var msg = can.request(event, {_handle: "true"}) + var msg = can.request(event, {_handle: ice.TRUE}) can.base.isFunc(cb) && !cb(event, button, data, list, args) && action.cancel() }, _target: ui._target, }) @@ -246,7 +246,6 @@ Volcanos("user", {help: "用户操作", agent: { can.page.Select(can, ui._target, "textarea,input", function(item, index) { index == 0 && can.onmotion.focus(can, item) }) - return action }, select: function(event, can, type, fields, cb, cbs) { diff --git a/panel/header.js b/panel/header.js index 5ba3add3..9a032f5d 100644 --- a/panel/header.js +++ b/panel/header.js @@ -198,13 +198,14 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, meta, }, shareuser: function(event, can) { can.user.share(can, can.request(event), [ctx.ACTION, chat.SHARE, kit.MDB_TYPE, aaa.LOGIN]) }, setnick: function(event, can) { - can.user.input(event, can, [{name: aaa.USERNICK, value: can.Conf(aaa.USERNICK)}], function(ev, button, data, list, args) { + var ui = can.user.input(event, can, [{name: aaa.USERNICK, value: can.Conf(aaa.USERNICK)}], function(ev, button, data, list, args) { can.run(event, [aaa.USERNICK, list[0]], function(msg) { can.page.Select(can, can._output, can.core.Keys(html.DIV, aaa.USERNICK), function(item) { can.page.Modify(can, item, can.Conf(aaa.USERNICK, list[0])) }), can.user.toast(can, "修改成功") }, true) }) + can.user.isMobile && can.page.Modify(can, ui._target, {style: {top: 40, right: 0, left: ""}}) }, chinese: function(event, can) { can.user.Search(can, aaa.LANGUAGE, "zh") }, english: function(event, can) { can.user.Search(can, aaa.LANGUAGE, "en") }, diff --git a/plugin/local/chat/wx.js b/plugin/local/chat/wx.js index 73e6058e..9137c2a2 100644 --- a/plugin/local/chat/wx.js +++ b/plugin/local/chat/wx.js @@ -22,11 +22,7 @@ Volcanos("onaction", {source: function(can, msg) { } }) }, }, function(key, value) { return can.user.agent[key] = value, key }), }) - wx.ready(function() { - can.misc.Log("ready") - }) - wx.error(function(err) { - can.misc.Log("what", err) - }) + wx.error(function(err) { can.user.toast(err, "wx load") }) + wx.ready(function() { can.misc.Log("ready") }) }) }}) diff --git a/proto.js b/proto.js index 6e1fa6e9..bcc3a592 100644 --- a/proto.js +++ b/proto.js @@ -107,6 +107,7 @@ var chat = { HEAD: "head", LEFT: "left", MAIN: "main", AUTO: "auto", FOOT: "foot", LAYOUT: "layout", PROJECT: "project", CONTENT: "content", DISPLAY: "display", PROFILE: "profile", SCROLL: "scroll", HEIGHT: "height", WIDTH: "width", LEFT: "left", TOP: "top", RIGHT: "right", BOTTOM: "bottom", + OPTION: "option", ACTION: "action", OUTPUT: "output", STATUS: "status", HEADER: "header", FOOTER: "footer", ONMAIN: "onmain", ONSIZE: "onsize", ONLOGIN: "onlogin", ONSEARCH: "onsearch",