diff --git a/index.css b/index.css index 066a4c1a..8a762f23 100644 --- a/index.css +++ b/index.css @@ -173,7 +173,7 @@ body>div.input div.action { padding:0 var(--table-padding); width:100%; position body>div.input div.action>div.item { margin-left:var(--button-margin); float:right; } body>div.input div.action>div.item>input[type=button] { width:112px; } body>div.input.login { box-shadow:unset; flex-direction:column; } -body>div.input.login>div.action { border-bottom:var(--box-border); } +body>div.input.login>div.action { border-bottom:var(--box-border); flex-direction:row; } body>div.input.login>div.action>div.tabs { padding:var(--button-padding); } body>div.input.login>div.output { text-align:center; clear:both; } body>div.input.login>div.output { height:var(--qrcode-height); width:var(--iframe-height); overflow:hidden; } diff --git a/lib/user.js b/lib/user.js index 6c118d1b..fcc07ce0 100644 --- a/lib/user.js +++ b/lib/user.js @@ -263,14 +263,15 @@ Volcanos("user", { } can.core.Timer(1000, function() { check() }), can.onimport.theme(can) } if (cmd == cli.PWD) { if (check()) { return } can.page.ClassList.add(can, document.body, aaa.LOGIN) - var list = {}; msg.Table(function(value) { if (value.order == "") {} else if (value.type == mdb.PLUGIN) { list[value.name] = function(target) { - can.onappend.plugin(can, {space: value.space, index: value.index, args: can.core.Split(value.args), style: html.OUTPUT, width: 420}, function(sub) { + var _list = [] + var list = {}; msg.Table(function(value) { if (value.order == "") {} else if (value.type == mdb.PLUGIN) { _list.push(value.name), list[value.name] = function(target) { + can.onappend.plugin(can, {space: value.space, index: value.index, args: can.core.Split(value.args), style: html.OUTPUT, height: 360, width: 420}, function(sub) { var run = sub.run; sub.run = function(event, cmds, cb) { var msg = can.request(event, {space: arg[0]}); can.page.exportValue(can, msg), run(event, cmds, cb) } }, ui.output) - } } else if (value.type == cli.QRCODE) { list[value.name] = function(target) { + } } else if (value.type == cli.QRCODE) { _list.push(value.name), list[value.name] = function(target) { can.page.Modify(can, target, arg[2]) } } }) - var ui = can.onappend.tabview(can, list, can.core.Item(list), can.page.Append(can, document.body, [{view: "input login float flex"}])._target) + var ui = can.onappend.tabview(can, list, _list, can.page.Append(can, document.body, [{view: "input login float flex"}])._target) can.page.style(can, ui._target, {left: (window.innerWidth-ui._target.offsetWidth)/2, top: can.user.isMobile? can.user.isLandscape()? 0 :48 :window.innerHeight/8}) var _cmd = "space login "+arg[0]; ui.display = can.page.Append(can, ui._target, [html.DISPLAY])._target can.onappend.style(can, html.FLEX, ui.display)