From c7f5311300354b0508219bec67a2c364f7e0259d Mon Sep 17 00:00:00 2001 From: shy Date: Wed, 6 Mar 2024 19:46:47 +0800 Subject: [PATCH] add some --- lib/user.js | 3 ++- plugin/local/wiki/word.js | 29 +++++++++++++++-------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/lib/user.js b/lib/user.js index 5906ed51..e970e0bc 100644 --- a/lib/user.js +++ b/lib/user.js @@ -299,12 +299,13 @@ Volcanos("user", { 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) can.page.Appends(can, ui.display, [{text: [ can.user.trans(can, "or command login", "或命令行授权: "), html.LABEL]}, {text: ["$ "+_cmd, "", html.ITEM], title: "点击复制，并后台执行此命令，即可登录", style: {cursor: "copy"}, onclick: function() { can.user.copy(event, can, _cmd) }}]) + var referrer can.page.Append(can, ui.display, [{text: [ can.user.trans(can, "or oauth login", "或第三方授权: "), html.LABEL]}, {view: [["sso", html.FLEX]], list: _msg.Table(function(value) { return value.type == "oauth" && {view: [[html.ITEM, html.FLEX]], title: "点击跳转，授权登录", list: [{img: can.misc.Resource(can, value.icons)}, {text: value.name}], onclick: function() { can.user.jumps(can.base.MergeURL(value.link, ice.BACK, location.href)) }, _init: function(target) { - if (document.referrer) { var u = new URL(document.referrer) + if (!referrer && document.referrer) { var u = new URL(document.referrer); referrer = true value.link.indexOf(u.origin) == 0 && can.onmotion.delay(can, function() { target.click() }, 300) } }} diff --git a/plugin/local/wiki/word.js b/plugin/local/wiki/word.js index b673b21e..642172b6 100644 --- a/plugin/local/wiki/word.js +++ b/plugin/local/wiki/word.js @@ -5,7 +5,11 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.Conf(html.PADDI _content: function(can, target, cb) { can.onappend.style(can, web.WIKI_WORD) can.page.Select(can, target, wiki.STORY_ITEM, function(target) { var meta = target.dataset||{}; cb && cb(target, meta) can.core.CallFunc([can.onimport, can.onimport[meta.name]? meta.name: meta.type||target.tagName.toLowerCase()], [can, meta, target]) - var _meta = can.base.Obj(meta.meta); _meta && _meta.style && can.page.style(can, target, can.base.Obj(_meta.style)) + var _meta = can.base.Obj(meta.meta); + if (_meta && _meta.style) { + if (_meta.style.width == "480px") { _meta.style.width = can.ConfWidth() - 2*can.Conf(html.PADDING) } + can.page.style(can, target, can.base.Obj(_meta.style)) + } meta.style && can.page.style(can, target, can.base.Obj(meta.style)) }) can.page.Select(can, target, html.A, function(target) { @@ -43,19 +47,6 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.Conf(html.PADDI return tabs }); select && select.click() }, - field: function(can, meta, target) { var item = can.base.Obj(meta.meta) - var padding = 2*can.Conf(html.PADDING); - // if (can.user.isMobile && !can.isCmdMode() && can.ConfIndex() == web.PORTAL) { padding *= 2 } - // if (can.user.isMobile && !can.isCmdMode()) { padding *= 2 } - if (!item.width || parseInt(item.width) > can.ConfWidth()) { item.width = can.ConfWidth()-padding } - var width = item.width - can.onappend.plugin(can, item, function(sub) { can._plugins = (can._plugins||[]).concat([sub]) - sub.onimport.size(sub, can.base.Max(html.STORY_HEIGHT, can.ConfHeight()), sub.Conf("_width", width), true) - var size = sub.onimport.size; sub.onimport.size = function(can, height, width, auto, mode) { size(can, height, width, auto, mode), can.page.style(can, sub._output, html.MAX_HEIGHT, "", "overflow-y", "hidden") } - can.core.Value(item, "auto.cmd") && can.onmotion.delay(function() { sub.runAction(sub.request({}, can.core.Value(item, "opts")), can.core.Value(item, "auto.cmd")) }) - can.page.style(can, sub._target, html.WIDTH, width) - }, can._output, target) - }, table: function(can, meta, target) { can.page.OrderTable(can, target), can.page.ClassList.add(can, target, chat.CONTENT) can.page.Select(can, target, html.TD, function(item) { can.onmotion.copy(can, item) }) @@ -71,6 +62,16 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.Conf(html.PADDI })); can.page.style(can, ui._target, {left: event.clientX, top: event.clientY}) }) } }, + field: function(can, meta, target) { var item = can.base.Obj(meta.meta), padding = can.Conf(html.PADDING) + if (!item.width || parseInt(item.width) > can.ConfWidth()) { item.width = can.ConfWidth()-2*padding } + var width = item.width + can.onappend.plugin(can, item, function(sub) { can._plugins = (can._plugins||[]).concat([sub]) + sub.onimport.size(sub, can.base.Max(html.STORY_HEIGHT, can.ConfHeight()), sub.Conf("_width", width), true) + var size = sub.onimport.size; sub.onimport.size = function(can, height, width, auto, mode) { size(can, height, width, auto, mode), can.page.style(can, sub._output, html.MAX_HEIGHT, "", "overflow-y", "hidden") } + can.core.Value(item, "auto.cmd") && can.onmotion.delay(function() { sub.runAction(sub.request({}, can.core.Value(item, "opts")), can.core.Value(item, "auto.cmd")) }) + can.page.style(can, sub._target, html.WIDTH, width) + }, can._output, target) + }, layout: function(can) { can.onmotion.delay(can, function() { padding = can.Conf(html.PADDING) if (can.isCmdMode()) { can.ConfHeight(can.page.height()-html.ACTION_HEIGHT-1), can.ConfWidth(can.page.width()) } if (can.sup._navmenu) {