diff --git a/frame.js b/frame.js index 3ca4a502..fb28f81b 100644 --- a/frame.js +++ b/frame.js @@ -520,12 +520,12 @@ Volcanos("onlayout", {help: "页面布局", list: [], _init: function(can, targe can.user.isMobile || (width -= field.offsetWidth) can.page.styleHeight(can, field, height) can.page.Select(can, target, [[html.FIELDSET_LEFT, html.DIV_OUTPUT]], function(output) { - can.page.styleHeight(can, output, height-html.ACTION_HEIGHT) + can.page.styleHeight(can, output, height-html.ACTION_HEIGHT-1) }) }) - can.user.isMobile || can.page.Select(can, target, html.FIELDSET_MAIN, function(field, index) { var scroll = 1 - can.page.style(can, field, html.HEIGHT, height, html.WIDTH, width-scroll) + can.user.isMobile || can.page.Select(can, target, html.FIELDSET_MAIN, function(field, index) { + can.page.style(can, field, html.HEIGHT, height, html.WIDTH, width) can.page.Select(can, target, [[html.FIELDSET_MAIN, html.DIV_OUTPUT]], function(output) { height -= can.page.Select(can, field, html.DIV_ACTION)[0].offsetHeight can.page.styleHeight(can, output, height) diff --git a/panel/action.js b/panel/action.js index d414a729..9a96fc8c 100644 --- a/panel/action.js +++ b/panel/action.js @@ -21,7 +21,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg) meta.id && (sub._option.dataset = sub._option.dataset||{}, sub._option.dataset.id = meta.id) - can.page.Modify(can, sub._output, {style: kit.Dict(html.MAX_WIDTH, meta.width)}) + can.page.Modify(can, sub._output, {style: kit.Dict(html.MAX_WIDTH, meta.width-20)}) can.page.Append(can, can._action, [{view: [html.TABS, html.DIV, meta.name], onclick: function(event) { can.onmotion.select(can, can._output, html.FIELDSET_PLUGIN, sub._target) can.onmotion.select(can, can._action, html.DIV_TABS, event.target) diff --git a/panel/river.css b/panel/river.css index ca0f8541..85363166 100644 --- a/panel/river.css +++ b/panel/river.css @@ -1,4 +1,5 @@ fieldset.River { overflow:auto; float:left; } +fieldset.River>div.output { width:180px; } fieldset.River>div.output div.item { padding:3px 16px; border-left:solid 3px #00ffae; } fieldset.River>div.output div.item.select { background-color:#2e515f; } fieldset.River>div.output div.item:hover { background-color:#2e515f; } diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 5b010849..7dfacefc 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -182,7 +182,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target }, can.base.isFunc(cb) && cb(sub) }, target) }, - layout: function(can) { var height = can.ConfHeight()-(can.user.mod.isCmd && can.user.isWindows? 20: 0), width = can.ConfWidth() + layout: function(can) { var height = can.ConfHeight()-(can.user.isWindows? 20: 0), width = can.ConfWidth()-(can.user.isWindows && !can.user.mod.isCmd? 20: 0) can.page.styleWidth(can, can.ui.profile_output, can.profile_size[can.onexport.keys(can)]||(width-can.ui.project.offsetWidth)/2) can.page.styleWidth(can, can.ui.content, width-can.ui.project.offsetWidth-can.ui.profile.offsetWidth) diff --git a/plugin/local/team/plan.js b/plugin/local/team/plan.js index a6e7aefe..ec686c3d 100644 --- a/plugin/local/team/plan.js +++ b/plugin/local/team/plan.js @@ -3,6 +3,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.ui = can.onlayout.profile(can) can.onmotion.hidden(can, can._action) can.onimport[can.Option("scale")||"week"](can, msg) + can.page.Modify(can, can._output, {style: {"min-height": 452}}) can.page.Modify(can, can.ui.project, {style: {"max-height": can.ui.content.offsetHeight}}) can.page.Modify(can, can.ui.profile, {style: {"max-height": can.ui.content.offsetHeight}}) can.page.Modify(can, can.ui.profile, {style: {display: "block"}}) diff --git a/plugin/local/wiki/word.js b/plugin/local/wiki/word.js index 4bda0f76..5daae708 100644 --- a/plugin/local/wiki/word.js +++ b/plugin/local/wiki/word.js @@ -104,7 +104,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target can.run(event, can.misc.concat(can, [ctx.ACTION, chat.STORY, data.type, data.name, data.text], cmds), cb, true) } sub.ConfHeight(can.ConfHeight()) - sub.ConfWidth(item.width = (width||can.ConfWidth())-20) + sub.ConfWidth(item.width = (width||can.ConfWidth())-40) can.core.Value(item, "auto.cmd") && can.core.Timer300ms(function() { var msg = sub.request({}, can.core.Value(item, "opts")); msg.Option(ice.MSG_HANDLE, ice.TRUE)