diff --git a/index.css b/index.css index ca85158a..29f135a6 100644 --- a/index.css +++ b/index.css @@ -35,7 +35,7 @@ body { --river-width:var(--project-width); --project-width:230px; --input-width:120px; --button-width:60px; --action-height:32px; --status-height:var(--action-height); --footer-height:var(--action-height); --header-height:48px; - --plug-width:800px; --plug-height:320px; --story-height:480px; --float-height:480px; --float-width:1000px; --desktop-width:1200px; --desktop-height:684px; + --plug-width:800px; --plug-height:240px; --story-height:480px; --float-height:480px; --float-width:1000px; --desktop-width:1200px; --desktop-height:684px; --textarea-height:96px; --qrcode-height:320px; --iframe-height:420px; --desktop-icon-size:80px; --river-margin:80px; --action-margin:200px; --plugin-padding:10px; --plugin-margin:var(--plugin-padding); @@ -50,14 +50,13 @@ input { font-family:var(--input-font-family); } body { font-family:var(--body-font-family); } body { background-color:var(--body-bg-color); color:var(--body-fg-color); } body.windows { --code-font-family:"Courier New"; } -body.cmd:not(.portal) { background-color:var(--plugin-bg-color); color:var(--plugin-fg-color); } body.cmd { --plug-width:1200px; --plug-height:480px; } body.width1 { /* 320-640 手机竖屏 */ --svg-font-size:13px; --river-width:280px;; --project-width:120px; --input-width:80px; --river-margin:0; --plugin-margin:0; --button-margin:5px; - --footer-height:60px; + --footer-height:60px; --action-button:2; --table-button:2; } body.width2 { /* 640-960 手机横屏 平板竖屏 笔记本调试 */ diff --git a/panel/action.js b/panel/action.js index 0fb0dcef..db234b20 100644 --- a/panel/action.js +++ b/panel/action.js @@ -9,6 +9,7 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg) { var river = can.Conf(chat.R sub.onexport.output = function() { can.page.style(can, sub._output, html.MAX_HEIGHT, "") } }) }, function() { if (can.isCmdMode()) { return } can.user.mod.isCmd = false + can.page.ClassList.del(can, document.body, "cmd") can.onmotion.delay(can, function() { can.onaction.layout(can), can.onappend.scroll(can, can._output), can.page.style(can, can._output, "visibility", "visible") can.onexport.layout(can) && list[0] == river && list[1] == storm && can.core.List(can._plugins, function(sub) { sub.Conf(ctx.INDEX) == list[2] && can.onmotion.delay(can, function() { sub._tabs.click() }) }) }, 300) diff --git a/plugin/table.js b/plugin/table.js index 1f2d6e90..f28ee4d0 100644 --- a/plugin/table.js +++ b/plugin/table.js @@ -181,7 +181,8 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.onmotion.clear( can.core.Next(list.reverse(), function(meta, next) { can.base.isString(meta) && (meta = {index: meta}), meta.mode = html.FLOAT can.onimport.plug(can, meta, function(sub) { sub.onexport.output = function() { can.page.style(can, sub._output, html.MAX_HEIGHT, "", html.HEIGHT, "", html.WIDTH, "", html.MAX_WIDTH, "") - var height = can.base.Max(html.PLUG_HEIGHT, can.ConfHeight()-html.ACTION_HEIGHT), width = can.base.Max(html.PLUG_WIDTH, can.ConfWidth()-html.PROJECT_WIDTH) + var height = can.base.Min(html.PLUG_HEIGHT, 240, can._output.offsetHeight), width = can.base.Max(html.PLUG_WIDTH, can.ConfWidth()-html.PROJECT_WIDTH) + // var height = can.base.Min(html.PLUG_HEIGHT, 240, can.ConfHeight()-html.ACTION_HEIGHT), width = can.base.Max(html.PLUG_WIDTH, can.ConfWidth()-html.PROJECT_WIDTH) sub.onimport.size(sub, height, width, false), can.onmotion.delay(can, function() { sub.onimport.size(sub, height, width, false) }) } can.onmotion.hidden(can, sub._target), sub._legend._target = sub._target, sub._legend._meta = {index: meta.index}